summaryrefslogtreecommitdiff
path: root/cui/source
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2019-08-09 12:18:53 +0100
committerAndras Timar <andras.timar@collabora.com>2019-08-29 09:18:08 +0200
commit403356bcff58bd1a5c30081e450da0cc48d2ed2b (patch)
tree882be4fef4386dbc9d70f2594f8e1d8ce5693512 /cui/source
parent8ff0ef8db7647b639aab4f78b2180be8a5226bc2 (diff)
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/77194 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/77905 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'cui/source')
-rw-r--r--cui/source/tabpages/tplnedef.cxx15
1 files changed, 12 insertions, 3 deletions
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 5d822005f8ba..dea7c0e3ba02 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -408,6 +408,11 @@ void SvxLineDefTabPage::ChangeMetricHdl_Impl(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 );
@@ -438,10 +443,14 @@ void SvxLineDefTabPage::ChangeMetricHdl_Impl(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 );
}