[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - cui/source

[Caolán McNamara (via logerrit)]

 cui/source/tabpages/tplnedef.cxx |   15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

New commits:
commit f686f17de2d894a5a65746a6548e968cd21061fe
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Aug 9 12:18:53 2019 +0100
Commit:     Xisco Faulí <xiscofauli at libreoffice.org>
CommitDate: Mon Aug 12 14:08:19 2019 +0200

    Resolves: tdf#126736 change range on change of unit
    
    and make the max % 800 instead of 500 while we're at it
    (0.15cm is considered 100% FWIW)
    
    when flipping from measurement unit to %
    
    Change-Id: Ia1b15559f3db0d1e11d4563ad7c6aacc3f9ba32d
    Reviewed-on: https://gerrit.libreoffice.org/77193
    Tested-by: Jenkins
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>

diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 576b8b06a1b9..8b8622361952 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -412,6 +412,11 @@ void SvxLineDefTabPage::ChangeMetricHdl_Impl(const weld::ToggleButton* p)
         m_xMtrLength2->set_unit(eFUnit);
         m_xMtrDistance->set_unit(eFUnit);
 
+        // tdf#126736 max 5cm
+        m_xMtrLength1->set_range(0, 500, FieldUnit::CM);
+        m_xMtrLength2->set_range(0, 500, FieldUnit::CM);
+        m_xMtrDistance->set_range(0, 500, FieldUnit::CM);
+
         SetMetricValue( *m_xMtrLength1, nTmp1, ePoolUnit );
         SetMetricValue( *m_xMtrLength2, nTmp2, ePoolUnit );
         SetMetricValue( *m_xMtrDistance, nTmp3, ePoolUnit );
@@ -442,10 +447,14 @@ void SvxLineDefTabPage::ChangeMetricHdl_Impl(const weld::ToggleButton* p)
         m_xMtrLength2->set_unit(FieldUnit::PERCENT);
         m_xMtrDistance->set_unit(FieldUnit::PERCENT);
 
-        SetMetricValue( *m_xMtrLength1, nTmp1, ePoolUnit );
-        SetMetricValue( *m_xMtrLength2, nTmp2, ePoolUnit );
-        SetMetricValue( *m_xMtrDistance, nTmp3, ePoolUnit );
+        // tdf#126736 800%
+        m_xMtrLength1->set_range(0, 800, FieldUnit::PERCENT);
+        m_xMtrLength2->set_range(0, 800, FieldUnit::PERCENT);
+        m_xMtrDistance->set_range(0, 800, FieldUnit::PERCENT);
 
+        m_xMtrLength1->set_value(nTmp1, FieldUnit::PERCENT);
+        m_xMtrLength2->set_value(nTmp2, FieldUnit::PERCENT);
+        m_xMtrDistance->set_value(nTmp3, FieldUnit::PERCENT);
     }
     SelectTypeHdl_Impl( nullptr );
 }