[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - chart2/source chart2/uiconfig

[Muhammet Kara (via logerrit)]

 chart2/source/controller/dialogs/ChartTypeDialogController.cxx |    8 ++++++++
 chart2/uiconfig/ui/sidebartype.ui                              |    4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit acc78c5c0bcb435d7149f755dcb89af6e2f9d353
Author:     Muhammet Kara <muhammet.kara at collabora.com>
AuthorDate: Mon Nov 11 09:18:30 2019 +0300
Commit:     Muhammet Kara <muhammet.kara at collabora.com>
CommitDate: Mon Nov 11 08:31:48 2019 +0100

    Show/hide number of lines on chart type panel properly
    
    Change-Id: I16c05e7b90de5d5467adb2c8e257ec18a304f6b3
    Reviewed-on: https://gerrit.libreoffice.org/82413
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Muhammet Kara <muhammet.kara at collabora.com>

diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index b34bf3f102df..a80655abcb74 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -1319,6 +1319,8 @@ void CombiColumnLineChartDialogController::showExtraControls(VclBuilderContainer
             m_pMF_NumberOfLines->SetModifyHdl( LINK( this, CombiColumnLineChartDialogController, ChangeLineCountHdl_unwelded ) );
         }
 
+        m_pFT_NumberOfLines->Enable();
+        m_pMF_NumberOfLines->Enable();
         m_pFT_NumberOfLines->Show();
         m_pMF_NumberOfLines->Show();
 }
@@ -1331,9 +1333,15 @@ void CombiColumnLineChartDialogController::hideExtraControls() const
         m_xMF_NumberOfLines->hide();
 
     if(m_pFT_NumberOfLines)
+    {
+        m_pFT_NumberOfLines->Disable();
         m_pFT_NumberOfLines->Hide();
+    }
     if(m_pMF_NumberOfLines)
+    {
+        m_pMF_NumberOfLines->Disable();
         m_pMF_NumberOfLines->Hide();
+    }
 }
 
 void CombiColumnLineChartDialogController::fillExtraControls( const ChartTypeParameter& /*rParameter*/
diff --git a/chart2/uiconfig/ui/sidebartype.ui b/chart2/uiconfig/ui/sidebartype.ui
index 65568362a6db..2f619939207b 100644
--- a/chart2/uiconfig/ui/sidebartype.ui
+++ b/chart2/uiconfig/ui/sidebartype.ui
@@ -343,7 +343,7 @@
                 <property name="column_spacing">12</property>
                 <child>
                   <object class="GtkLabel" id="nolinesft">
-                    <property name="visible">True</property>
+                    <property name="sensitive">False</property>
                     <property name="can_focus">False</property>
                     <property name="no_show_all">True</property>
                     <property name="label" translatable="yes" context="sidebartype|nolinesft">_Number of lines</property>
@@ -359,7 +359,7 @@
                 </child>
                 <child>
                   <object class="GtkSpinButton" id="nolines">
-                    <property name="visible">True</property>
+                    <property name="sensitive">False</property>
                     <property name="can_focus">True</property>
                     <property name="no_show_all">True</property>
                     <property name="adjustment">adjustment1</property>