1 files changed, 7 insertions, 26 deletions
diff --git a/sc/source/ui/inc/condformatdlg.hxx b/sc/source/ui/inc/condformatdlg.hxx
index 212b20436ef2..42b39a8bcad1 100644
--- a/sc/source/ui/inc/condformatdlg.hxx
+++ b/sc/source/ui/inc/condformatdlg.hxx
@@ -22,9 +22,12 @@
 #include "rangelst.hxx"
 #include "condformathelper.hxx"
 #include "viewdata.hxx"
+#include "condformatdlgitem.hxx"
 
 #include "anyrefdg.hxx"
 
+#include <memory>
+
 #define DLG_RET_ADD         8
 #define DLG_RET_EDIT        16
 
@@ -35,24 +38,6 @@ class ScConditionalFormat;
 struct ScDataBarFormatData;
 class ScCondFrmtEntry;
 
-namespace condformat {
-
-namespace dialog {
-
-enum ScCondFormatDialogType
-{
-    NONE,
-    CONDITION,
-    COLORSCALE,
-    DATABAR,
-    ICONSET,
-    DATE
-};
-
-}
-
-}
-
 class ScCondFormatDlg;
 
 class ScCondFormatList : public Control
@@ -108,14 +93,15 @@ private:
     VclPtr<formula::RefButton> mpRbRange;
 
     VclPtr<ScCondFormatList> mpCondFormList;
-    sal_Int32 maKey;
+    sal_Int32 mnKey;
 
-    bool mbManaged;
     ScAddress maPos;
     ScViewData* mpViewData;
 
     VclPtr<formula::RefEdit> mpLastEdit;
 
+    std::shared_ptr<ScCondFormatDlgItem> mpDlgItem;
+
     OUString msBaseTitle;
     void updateTitle();
 
@@ -128,17 +114,12 @@ protected:
 
 public:
     SC_DLLPUBLIC ScCondFormatDlg(SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pWindow,
-                                 ScViewData* pViewData, const ScConditionalFormat* pFormat,
-                                 const ScRangeList& rRange, const ScAddress& rPos,
-                                 condformat::dialog::ScCondFormatDialogType eType, bool bManaged);
+                                 ScViewData* pViewData, const ScCondFormatDlgItem* pDlgItem);
     virtual ~ScCondFormatDlg();
     virtual void dispose() override;
 
     SC_DLLPUBLIC ScConditionalFormat* GetConditionalFormat() const;
 
-    static OUString GenerateXmlString(sal_uInt32 nIndex, sal_uInt8 nType, bool bManaged);
-    static bool ParseXmlString(const OUString& sXMLString, sal_uInt32& nIndex,
-                               sal_uInt8& nType, bool& bManaged);
     virtual void SetReference(const ScRange&, ScDocument*) override;
     virtual bool IsRefInputMode() const override;
     virtual void SetActive() override;