diff options
author | Caolán McNamara <caolanm@redhat.com> | 2019-01-09 17:03:57 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2019-01-10 17:30:41 +0100 |
commit | 34973d2c957606e0b793d007ad709160e7797ed7 (patch) | |
tree | 9c67f2999fa14c221ff27782ba87ab891e2e610b /chart2 | |
parent | 4db0b6fc7f51fb5bfe2d61faf50a3063228da1c8 (diff) |
Resolves: tdf#122398 max/min limits too small for scale FormattedSpinButtons
Change-Id: I679b6cc7e4bfc4273fc438e6d1d897ba66ead77b
Reviewed-on: https://gerrit.libreoffice.org/66049
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'chart2')
-rw-r--r-- | chart2/source/controller/dialogs/tp_Scale.cxx | 7 | ||||
-rw-r--r-- | chart2/uiconfig/ui/tp_Scale.ui | 8 |
2 files changed, 9 insertions, 6 deletions
diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx index 561295f9756d..ddd305762e24 100644 --- a/chart2/source/controller/dialogs/tp_Scale.cxx +++ b/chart2/source/controller/dialogs/tp_Scale.cxx @@ -96,6 +96,13 @@ ScaleTabPage::ScaleTabPage(TabPageParent pWindow,const SfxItemSet& rInAttrs) m_xCbxAutoOrigin->connect_toggled(LINK(this, ScaleTabPage, EnableValueHdl)); m_xCbx_AutoTimeResolution->connect_toggled(LINK(this, ScaleTabPage, EnableValueHdl)); + const double nMin = static_cast<double>(SAL_MIN_INT64); + const double nMax = static_cast<double>(SAL_MAX_INT64); + m_xFmtFldMin->set_range(nMin, nMax); + m_xFmtFldMax->set_range(nMin, nMax); + m_xFmtFldStepMain->set_range(nMin, nMax); + m_xFmtFldOrigin->set_range(nMin, nMax); + m_xLB_AxisType->connect_changed(LINK(this, ScaleTabPage, SelectAxisTypeHdl)); HideAllControls(); diff --git a/chart2/uiconfig/ui/tp_Scale.ui b/chart2/uiconfig/ui/tp_Scale.ui index 6b5b1cf195c1..2bdcf6741716 100644 --- a/chart2/uiconfig/ui/tp_Scale.ui +++ b/chart2/uiconfig/ui/tp_Scale.ui @@ -3,22 +3,18 @@ <interface domain="chart"> <requires lib="gtk+" version="3.18"/> <object class="GtkAdjustment" id="adjustment1"> - <property name="upper">100</property> <property name="step_increment">1</property> <property name="page_increment">10</property> </object> <object class="GtkAdjustment" id="adjustment2"> - <property name="upper">100</property> <property name="step_increment">1</property> <property name="page_increment">10</property> </object> <object class="GtkAdjustment" id="adjustment3"> - <property name="upper">100</property> <property name="step_increment">1</property> <property name="page_increment">10</property> </object> <object class="GtkAdjustment" id="adjustment4"> - <property name="upper">100</property> <property name="step_increment">1</property> <property name="page_increment">10</property> </object> @@ -425,7 +421,7 @@ <property name="xalign">0</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">0</property> </packing> @@ -439,7 +435,7 @@ <property name="xalign">0</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">1</property> </packing> |