move color options .ui to right place and adapt code

Change-Id: I645775bcec9993a2d8fd4b5ea67197ad3b2a9e03

2 files changed, 34 insertions, 52 deletions

diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index ef3832c6687e..f8d59d5de1fc 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -635,26 +635,28 @@ public:
     virtual Window* GetParentLabeledBy( const Window* pLabeled ) const;
 };
 
-/// Load save embed functionality
-class SvxLoadSaveEmbed {
+/************************************************************************/
+
+struct SvxColorTabPageShadow;
+class SvxColorTabPage : public SfxTabPage
+{
+    using TabPage::ActivatePage;
+    using TabPage::DeactivatePage;
+
+private:
     XPropertyListType   meType;
     XOutdevItemPool*    mpXPool;
 
     Window             *mpTopDlg;
-    CheckBox            maBoxEmbed;
-    ImageButton         maBtnLoad;
-    ImageButton         maBtnSave;
-    FixedText           maTableName;
+    CheckBox           *m_pBoxEmbed;
+    PushButton         *m_pBtnLoad;
+    PushButton         *m_pBtnSave;
+    FixedText          *m_pTableName;
 
     DECL_LINK( EmbedToggleHdl_Impl, void * );
     DECL_LINK( ClickLoadHdl_Impl, void * );
     DECL_LINK( ClickSaveHdl_Impl, void * );
-public:
-    SvxLoadSaveEmbed( Window *pParent, Window *pDialog,
-                      const ResId &aLoad, const ResId &aSave,
-                      const ResId &aEmbed, const ResId &aTableName,
-                      XPropertyListType t, XOutdevItemPool* mpXPool );
-    virtual ~SvxLoadSaveEmbed() {};
+
     XPropertyListRef GetList();
     void HideLoadSaveEmbed();
     bool GetEmbed();
@@ -662,48 +664,32 @@ public:
     void UpdateTableName();
     void EnableSave( bool bCanSave );
 
-    virtual bool IsModified() = 0;
-    virtual void SetModified(bool bIsModified) = 0;
-    virtual void AddState(ChangeType nState) = 0;
-    virtual void Update(bool bLoaded) = 0;
-};
-
-/************************************************************************/
-
-struct SvxColorTabPageShadow;
-class SvxColorTabPage : public SfxTabPage, public SvxLoadSaveEmbed
-{
-    using TabPage::ActivatePage;
-    using TabPage::DeactivatePage;
-
-private:
     SvxColorTabPageShadow *pShadow;
-    FixedLine           aFlProp;
-    FixedText           aFtName;
-    Edit                aEdtName;
-    FixedText           aFtColor;
-    ColorLB             aLbColor;
+    Edit*               m_pEdtName;
+    ColorLB*            m_pLbColor;
 
-    ValueSet            aValSetColorList;
+    ValueSet*           m_pValSetColorList;
 
-    SvxXRectPreview     aCtlPreviewOld;
-    SvxXRectPreview     aCtlPreviewNew;
+    SvxXRectPreview*    m_pCtlPreviewOld;
+    SvxXRectPreview*    m_pCtlPreviewNew;
 
-    ListBox             aLbColorModel;
-    FixedText           aFtColorModel1;
-    MetricField         aMtrFldColorModel1;
-    FixedText           aFtColorModel2;
-    MetricField         aMtrFldColorModel2;
-    FixedText           aFtColorModel3;
-    MetricField         aMtrFldColorModel3;
+    ListBox*            m_pLbColorModel;
 
-    FixedText           aFtColorModel4;
-    MetricField         aMtrFldColorModel4;
+    VclContainer*       m_pRGB;
+    NumericField*       m_pR;
+    NumericField*       m_pG;
+    NumericField*       m_pB;
 
-    PushButton          aBtnAdd;
-    PushButton          aBtnModify;
-    PushButton          aBtnWorkOn;
-    PushButton          aBtnDelete;
+    VclContainer*       m_pCYMK;
+    MetricField*        m_pC;
+    MetricField*        m_pY;
+    MetricField*        m_pM;
+    MetricField*        m_pK;
+
+    PushButton*         m_pBtnAdd;
+    PushButton*         m_pBtnModify;
+    PushButton*         m_pBtnWorkOn;
+    PushButton*         m_pBtnDelete;
 
     const SfxItemSet&   rOutAttrs;
 
@@ -743,8 +729,6 @@ private:
     DECL_LINK( SelectColorModelHdl_Impl, void * );
     long ChangeColorHdl_Impl( void* p );
     DECL_LINK( ModifiedHdl_Impl, void * );
-    DECL_LINK( ClickLoadHdl_Impl, void * );
-    DECL_LINK( ClickSaveHdl_Impl, void * );
 
     long CheckChanges_Impl();
 #endif
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index 78b84df96880..ffc7c9ebe5f1 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -23,7 +23,6 @@
 
 // Help-Ids --------------------------------------------------------------
 
-#define HID_OPTIONS_COLOR "CUI_HID_OPTIONS_COLOR"
 #define HID_OPTIONS_SAVE "CUI_HID_OPTIONS_SAVE"
 #define HID_OPTIONS_PATH "CUI_HID_OPTIONS_PATH"
 #define HID_OPTIONS_GENERAL "CUI_HID_OPTIONS_GENERAL"
@@ -42,7 +41,6 @@
 #define HID_EDIT_MODULES "CUI_HID_EDIT_MODULES"
 #define HID_LNGDLG_NUM_PREBREAK "CUI_HID_LNGDLG_NUM_PREBREAK"
 #define HID_OPTIONS_COLORCONFIG_SAVE_SCHEME "CUI_HID_OPTIONS_COLORCONFIG_SAVE_SCHEME"
-#define HID_OPTIONS_COLORCONFIG_NAME_SCHEME "CUI_HID_OPTIONS_COLORCONFIG_NAME_SCHEME"
 #define HID_OPTIONS_PATHS_SELECTFOLDER "CUI_HID_OPTIONS_PATHS_SELECTFOLDER"
 #define HID_OPTIONS_JAVA "CUI_HID_OPTIONS_JAVA"
 #define HID_OPTIONS_JAVA_LIST "CUI_HID_OPTIONS_JAVA_LIST"