add the text for collapsed entries back

Change-Id: I67d4f3122e1fe13bda7bf91f500b479ee6853cab

2 files changed, 33 insertions, 1 deletions

diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx
index 447e97b240c2..646f928a4b01 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -103,7 +103,7 @@ void ScCondFrmtEntry::Select()
 
 void ScCondFrmtEntry::Deselect()
 {
-    rtl::OUString maCondText("deselected");// = ScCondFormatHelper::GetExpression(CONDITION, maLbCondType.GetSelectEntryPos());
+    rtl::OUString maCondText = GetExpressionString();
     maFtCondition.SetText(maCondText);
     maFtCondition.Show();
     maLbType.Hide();
@@ -287,6 +287,11 @@ ScFormatEntry* ScConditionFrmtEntry::createConditionEntry() const
     return pEntry;
 }
 
+rtl::OUString ScConditionFrmtEntry::GetExpressionString()
+{
+    return ScCondFormatHelper::GetExpression(CONDITION, maLbCondType.GetSelectEntryPos());
+}
+
 ScFormatEntry* ScConditionFrmtEntry::GetEntry() const
 {
     return createConditionEntry();
@@ -476,6 +481,11 @@ ScFormatEntry* ScFormulaFrmtEntry::GetEntry() const
     return createFormulaEntry();
 }
 
+rtl::OUString ScFormulaFrmtEntry::GetExpressionString()
+{
+    return ScCondFormatHelper::GetExpression(FORMULA, 0);
+}
+
 void ScFormulaFrmtEntry::SetActive()
 {
     maWdPreview.Show();
@@ -654,6 +664,11 @@ ScFormatEntry* ScColorScale2FrmtEntry::createColorscaleEntry() const
     return pColorScale;
 }
 
+rtl::OUString ScColorScale2FrmtEntry::GetExpressionString()
+{
+    return ScCondFormatHelper::GetExpression( COLORSCALE, 0 );
+}
+
 ScFormatEntry* ScColorScale2FrmtEntry::GetEntry() const
 {
     return createColorscaleEntry();
@@ -823,6 +838,11 @@ ScFormatEntry* ScColorScale3FrmtEntry::createColorscaleEntry() const
     return pColorScale;
 }
 
+rtl::OUString ScColorScale3FrmtEntry::GetExpressionString()
+{
+    return ScCondFormatHelper::GetExpression( COLORSCALE, 0 );
+}
+
 ScFormatEntry* ScColorScale3FrmtEntry::GetEntry() const
 {
     return createColorscaleEntry();
@@ -994,6 +1014,11 @@ ScFormatEntry* ScDataBarFrmtEntry::createDatabarEntry() const
     return pDataBar;
 }
 
+rtl::OUString ScDataBarFrmtEntry::GetExpressionString()
+{
+    return ScCondFormatHelper::GetExpression( DATABAR, 0 );
+}
+
 void ScDataBarFrmtEntry::SetActive()
 {
     maLbColorFormat.Show();
diff --git a/sc/source/ui/inc/condformatdlgentry.hxx b/sc/source/ui/inc/condformatdlgentry.hxx
index c9c61dbd247f..0abe83bcc428 100644
--- a/sc/source/ui/inc/condformatdlgentry.hxx
+++ b/sc/source/ui/inc/condformatdlgentry.hxx
@@ -52,6 +52,8 @@ protected:
     void Select();
     void Deselect();
 
+    virtual rtl::OUString GetExpressionString() = 0;
+
 public:
     ScCondFrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos );
     virtual ~ScCondFrmtEntry();
@@ -83,6 +85,7 @@ class ScConditionFrmtEntry : public ScCondFrmtEntry
 
     ScFormatEntry* createConditionEntry() const;
 
+    virtual rtl::OUString GetExpressionString();
     void Init();
     DECL_LINK( StyleSelectHdl, void* );
     DECL_LINK( ConditionTypeSelectHdl, void* );
@@ -105,6 +108,7 @@ class ScFormulaFrmtEntry : public ScCondFrmtEntry
     formula::RefEdit maEdFormula;
 
     ScFormatEntry* createFormulaEntry() const;
+    virtual rtl::OUString GetExpressionString();
     void Init();
 
     DECL_LINK( StyleSelectHdl, void* );
@@ -136,6 +140,7 @@ class ScColorScale2FrmtEntry : public ScCondFrmtEntry
 
     ScFormatEntry* createColorscaleEntry() const;
 
+    virtual rtl::OUString GetExpressionString();
     void Init();
 
     DECL_LINK( EntryTypeHdl, ListBox* );
@@ -168,6 +173,7 @@ class ScColorScale3FrmtEntry : public ScCondFrmtEntry
 
     ScFormatEntry* createColorscaleEntry() const;
 
+    virtual rtl::OUString GetExpressionString();
     void Init();
 
     DECL_LINK( EntryTypeHdl, ListBox* );
@@ -196,6 +202,7 @@ class ScDataBarFrmtEntry : public ScCondFrmtEntry
 
     ScFormatEntry* createDatabarEntry() const;
 
+    virtual rtl::OUString GetExpressionString();
     void Init();
 
     DECL_LINK( OptionBtnHdl, void* );