fdo#79028: ungroup widgets and Show() them correctly

Showing the whole box (m_pBxMain) shows all children widgets, but
that's not what we want as different widgets must be exposed in
case of date vs. non-date axis.

m_pMt_MainDateStep was then visible at all times, thus bWasDateAxis
was always true and m_pFmtFldStepMain value got unintentionally reset

Change-Id: I4be0b18f181a45fe6bd3cac0594d6a34d875293e

2 files changed, 18 insertions, 9 deletions

diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx
index bff207a99b37..8970e9d60631 100644
--- a/chart2/source/controller/dialogs/tp_Scale.cxx
+++ b/chart2/source/controller/dialogs/tp_Scale.cxx
@@ -84,13 +84,12 @@ ScaleTabPage::ScaleTabPage(Window* pWindow,const SfxItemSet& rInAttrs) :
     get(m_pLB_TimeResolution, "LB_TIME_RESOLUTION");
     get(m_pCbx_AutoTimeResolution, "CBX_AUTO_TIME_RESOLUTION");
 
-    get(m_pBxMain, "boxMAIN");
+    get(m_pTxtMain, "TXT_STEP_MAIN");
     get(m_pFmtFldStepMain, "EDT_STEP_MAIN");
     get(m_pMt_MainDateStep, "MT_MAIN_DATE_STEP");
     get(m_pLB_MainTimeUnit, "LB_MAIN_TIME_UNIT");
     get(m_pCbxAutoStepMain, "CBX_AUTO_STEP_MAIN");
 
-    get(m_pBxMinor, "boxMINOR");
     get(m_pMtStepHelp, "MT_STEPHELP");
     get(m_pLB_HelpTimeUnit, "LB_HELP_TIME_UNIT");
     get(m_pCbxAutoStepHelp, "CBX_AUTO_STEP_HELP");
@@ -147,13 +146,16 @@ void ScaleTabPage::EnableControls()
     m_pCbxLogarithm->Show( bValueAxis && !bDateAxis );
 
     m_pBxMinMax->Show(bValueAxis);
-    m_pBxMain->Show( bValueAxis );
-    m_pBxMinor->Show( bValueAxis );
-    m_pBxOrigin->Show( m_bShowAxisOrigin && bValueAxis );
+
+    m_pTxtMain->Show( bValueAxis );
+    m_pCbxAutoStepMain->Show( bValueAxis );
 
     m_pTxtHelpCount->Show( bValueAxis && !bDateAxis );
     m_pTxtHelp->Show( bDateAxis );
+    m_pMtStepHelp->Show( bValueAxis );
+    m_pCbxAutoStepHelp->Show( bValueAxis );
 
+    m_pBxOrigin->Show( m_bShowAxisOrigin && bValueAxis );
     m_pBxResolution->Show( bDateAxis );
 
     bool bWasDateAxis = m_pMt_MainDateStep->IsVisible();
@@ -165,6 +167,7 @@ void ScaleTabPage::EnableControls()
         else
             m_pMt_MainDateStep->SetValue( static_cast<sal_Int32>(m_pFmtFldStepMain->GetValue()) );
     }
+
     m_pFmtFldStepMain->Show( bValueAxis && !bDateAxis );
     m_pMt_MainDateStep->Show( bDateAxis );
 
@@ -603,8 +606,15 @@ void ScaleTabPage::HideAllControls()
     m_pBxType->Hide();
     m_pCbxLogarithm->Hide();
     m_pBxMinMax->Hide();
-    m_pBxMain->Hide();
-    m_pBxMinor->Hide();
+    m_pTxtMain->Hide();
+    m_pFmtFldStepMain->Hide();
+    m_pMt_MainDateStep->Hide();
+    m_pLB_MainTimeUnit->Hide();
+    m_pCbxAutoStepMain->Hide();
+    m_pTxtHelpCount->Hide();
+    m_pTxtHelp->Hide();
+    m_pMtStepHelp->Hide();
+    m_pCbxAutoStepHelp->Hide();
     m_pBxOrigin->Hide();
     m_pBxResolution->Hide();
 }
diff --git a/chart2/source/controller/dialogs/tp_Scale.hxx b/chart2/source/controller/dialogs/tp_Scale.hxx
index a1adfec47539..3c65b604845f 100644
--- a/chart2/source/controller/dialogs/tp_Scale.hxx
+++ b/chart2/source/controller/dialogs/tp_Scale.hxx
@@ -65,13 +65,12 @@ private:
     ListBox*             m_pLB_TimeResolution;
     CheckBox*            m_pCbx_AutoTimeResolution;
 
-    VclBox*              m_pBxMain;
+    FixedText*           m_pTxtMain;
     FormattedField*      m_pFmtFldStepMain;
     MetricField*         m_pMt_MainDateStep;
     ListBox*             m_pLB_MainTimeUnit;
     CheckBox*            m_pCbxAutoStepMain;
 
-    VclBox*              m_pBxMinor;
     FixedText*           m_pTxtHelpCount;
     FixedText*           m_pTxtHelp;
     MetricField*         m_pMtStepHelp;