From 11208eaa2fa89467e795a2f4dc6f17247caaa4aa Mon Sep 17 00:00:00 2001
From: Kohei Yoshida <kyoshida@novell.com>
Date: Fri, 6 May 2011 22:34:11 -0400
Subject: fdo#36789: Set all dynamic controls invisible upon instantiation.

Some of the dialog code depends on the controls being hidden unless
explicitly set visible.  Unfortunately that's not really guaranteed
so we need to make that logic explicit.
---
 chart2/source/controller/dialogs/tp_Scale.cxx | 45 +++++++++++++++++++++++++++
 chart2/source/controller/dialogs/tp_Scale.hxx |  2 ++
 2 files changed, 47 insertions(+)

(limited to 'chart2')

diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx
index 0eb9ae7bf047..9e77ad94c35d 100644
--- a/chart2/source/controller/dialogs/tp_Scale.cxx
+++ b/chart2/source/controller/dialogs/tp_Scale.cxx
@@ -183,6 +183,8 @@ ScaleTabPage::ScaleTabPage(Window* pWindow,const SfxItemSet& rInAttrs) :
     aFmtFldMax.SetModifyHdl(LINK(this, ScaleTabPage, FmtFieldModifiedHdl));
     aFmtFldStepMain.SetModifyHdl(LINK(this, ScaleTabPage, FmtFieldModifiedHdl));
     aFmtFldOrigin.SetModifyHdl(LINK(this, ScaleTabPage, FmtFieldModifiedHdl));
+
+    HideAllControls();
 }
 
 IMPL_LINK( ScaleTabPage, FmtFieldModifiedHdl, FormattedField*, pFmtFied )
@@ -784,6 +786,49 @@ bool ScaleTabPage::ShowWarning( sal_uInt16 nResIdMessage, Control* pControl /* =
     return true;
 }
 
+void ScaleTabPage::HideAllControls()
+{
+    // We need to set these controls invisible when the class is instantiated
+    // since some code in EnableControls() depends on that logic. The real
+    // visibility of these controls depend on axis data type, and are
+    // set in EnableControls().
+
+    m_aTxt_AxisType.Hide();
+    m_aLB_AxisType.Hide();
+
+    aCbxLogarithm.Hide();
+    aTxtMin.Hide();
+    aFmtFldMin.Hide();
+    aCbxAutoMin.Hide();
+    aTxtMax.Hide();
+    aFmtFldMax.Hide();
+    aCbxAutoMax.Hide();
+    aTxtMain.Hide();
+    aFmtFldStepMain.Hide();
+    aCbxAutoStepMain.Hide();
+    aTxtHelp.Hide();
+    aTxtHelpCount.Hide();
+    aMtStepHelp.Hide();
+    aCbxAutoStepHelp.Hide();
+
+    aTxtOrigin.Hide();
+    aFmtFldOrigin.Hide();
+    aCbxAutoOrigin.Hide();
+
+    aTxtHelpCount.Hide();
+    aTxtHelp.Hide();
+
+    m_aTxt_TimeResolution.Hide();
+    m_aLB_TimeResolution.Hide();
+    m_aCbx_AutoTimeResolution.Hide();
+
+    aFmtFldStepMain.Hide();
+    m_aMt_MainDateStep.Hide();
+
+    m_aLB_MainTimeUnit.Hide();
+    m_aLB_HelpTimeUnit.Hide();
+}
+
 //.............................................................................
 } //namespace chart
 //.............................................................................
diff --git a/chart2/source/controller/dialogs/tp_Scale.hxx b/chart2/source/controller/dialogs/tp_Scale.hxx
index f062ed438383..0a56b4f7a0bd 100644
--- a/chart2/source/controller/dialogs/tp_Scale.hxx
+++ b/chart2/source/controller/dialogs/tp_Scale.hxx
@@ -138,6 +138,8 @@ private:
         @return false, if nResIdMessage was 0, true otherwise
      */
     bool ShowWarning( sal_uInt16 nResIdMessage, Control* pControl = NULL );
+
+    void HideAllControls();
 };
 
 //.............................................................................
-- 
cgit