[Libreoffice-commits] core.git: Branch 'libreoffice-6-2-0' - chart2/source chart2/uiconfig

[Libreoffice Gerrit user]

 chart2/source/controller/dialogs/tp_Scale.cxx |    7 +++++++
 chart2/uiconfig/ui/tp_Scale.ui                |    8 ++------
 2 files changed, 9 insertions(+), 6 deletions(-)

New commits:
commit 6b7b09eb0742c9d32ad78c0e94fa406dfbffeab3
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Jan 9 17:03:57 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Jan 21 18:14:44 2019 +0100

    Resolves: tdf#122398 max/min limits too small for scale FormattedSpinButtons
    
    Change-Id: I679b6cc7e4bfc4273fc438e6d1d897ba66ead77b
    Reviewed-on: https://gerrit.libreoffice.org/66126
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
    Tested-by: Xisco Faulí <xiscofauli at libreoffice.org>
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx
index 5c320ddf6151..c27651391310 100644
--- a/chart2/source/controller/dialogs/tp_Scale.cxx
+++ b/chart2/source/controller/dialogs/tp_Scale.cxx
@@ -98,6 +98,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>