split up redline dialog and adapt filter page code

Change-Id: Id6fab654b4c92aaba753e7099923efb135a0bdd8

4 files changed, 21 insertions, 26 deletions

diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc
index d8ae9eb75b67..b4a2737853cd 100644
--- a/svx/inc/helpid.hrc
+++ b/svx/inc/helpid.hrc
@@ -168,7 +168,6 @@
 #define HID_REDLINING_FILTER_LB_ACTION                        "SVX_HID_REDLINING_FILTER_LB_ACTION"
 #define HID_REDLINING_FILTER_LB_AUTOR                         "SVX_HID_REDLINING_FILTER_LB_AUTOR"
 #define HID_REDLINING_FILTER_LB_DATE                          "SVX_HID_REDLINING_FILTER_LB_DATE"
-#define HID_REDLINING_FILTER_PAGE                             "SVX_HID_REDLINING_FILTER_PAGE"
 #define HID_REDLINING_FILTER_TF_DATE                          "SVX_HID_REDLINING_FILTER_TF_DATE"
 #define HID_REDLINING_FILTER_TF_DATE2                         "SVX_HID_REDLINING_FILTER_TF_DATE2"
 #define HID_REDLINING_TABCONTROL                              "SVX_HID_REDLINING_TABCONTROL"
diff --git a/svx/inc/svx/ctredlin.hxx b/svx/inc/svx/ctredlin.hxx
index 4268adc3a817..2ce91fc95709 100644
--- a/svx/inc/svx/ctredlin.hxx
+++ b/svx/inc/svx/ctredlin.hxx
@@ -173,26 +173,24 @@ private:
     Link            aModifyComLink;
 
     SvxRedlinTable* pRedlinTable;
-    CheckBox        aCbDate;
-    ListBox         aLbDate;
-    DateField       aDfDate;
-    TimeField       aTfDate;
-    ImageButton     aIbClock;
-    FixedText       aFtDate2;
-    DateField       aDfDate2;
-    TimeField       aTfDate2;
-    ImageButton     aIbClock2;
-    CheckBox        aCbAuthor;
-    ListBox         aLbAuthor;
-    CheckBox        aCbRange;
-    Edit            aEdRange;
-    PushButton      aBtnRange;
-    ListBox         aLbAction;
-    CheckBox        aCbComment;
-    Edit            aEdComment;
-    String          aActionStr;
-    String          aRangeStr;
-    String          aStrMyName;
+    CheckBox*       m_pCbDate;
+    ListBox*        m_pLbDate;
+    DateField*      m_pDfDate;
+    TimeField*      m_pTfDate;
+    PushButton*     m_pIbClock;
+    FixedText*      m_pFtDate2;
+    DateField*      m_pDfDate2;
+    TimeField*      m_pTfDate2;
+    PushButton*     m_pIbClock2;
+    CheckBox*       m_pCbAuthor;
+    ListBox*        m_pLbAuthor;
+    CheckBox*       m_pCbRange;
+    Edit*           m_pEdRange;
+    PushButton*     m_pBtnRange;
+    CheckBox*       m_pCbAction;
+    ListBox*        m_pLbAction;
+    CheckBox*       m_pCbComment;
+    Edit*           m_pEdComment;
     sal_Bool            bModified;
 
     DECL_LINK( SelDateHdl, ListBox* );
@@ -215,7 +213,6 @@ public:
     virtual void    DeactivatePage();
     void            SetRedlinTable(SvxRedlinTable*);
 
-    String          GetMyName() const;
     Date            GetFirstDate() const;
     void            SetFirstDate(const Date &aDate);
     Time            GetFirstTime() const;
@@ -319,7 +316,6 @@ private:
     String          aTitle3;
     String          aTitle4;
     String          aTitle5;
-    String          aStrMyName;
     long            nDistance;
     Size            aMinSize;
 
@@ -333,8 +329,6 @@ protected:
 public:
                     SvxTPView( Window * pParent);
 
-    String          GetMyName() const;
-
     void            InsertWriterHeader();
     void            InsertCalcHeader();
     SvxRedlinTable* GetTableControl();
diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc
index 8fe6bb5fcc18..0e83191be238 100644
--- a/svx/inc/svx/dialogs.hrc
+++ b/svx/inc/svx/dialogs.hrc
@@ -349,6 +349,9 @@
 #define RID_SVXSTR_CENTERED                 (RID_SVX_START + 306)
 #define RID_SVXSTR_NOTCENTERED              (RID_SVX_START + 307)
 
+#define RID_SVXSTR_VIEW                     (RID_SVX_START + 308)
+#define RID_SVXSTR_FILTER                   (RID_SVX_START + 309)
+
 // String-Arrays
 #define RID_SVXSTR_TEXTENCODING_TABLE       (RID_SVX_START + 312)
 
diff --git a/svx/inc/svx/svxids.hrc b/svx/inc/svx/svxids.hrc
index 2f0624666c76..d18dfcfa8ab9 100644
--- a/svx/inc/svx/svxids.hrc
+++ b/svx/inc/svx/svxids.hrc
@@ -620,7 +620,6 @@
 #define SID_FM_NEW                                      ( SID_SVX_START + 638 )
 #define SID_FM_DELETE                                   ( SID_SVX_START + 639 )
 #define SID_FM_NEW_FORM                                 ( SID_SVX_START + 640 )
-#define SID_REDLIN_FILTER_PAGE                          ( SID_SVX_START + 642 )
 #define SID_REDLIN_VIEW_PAGE                            ( SID_SVX_START + 643 )
 #define SID_3D_WIN                                      ( SID_SVX_START + 644 )
 #define SID_3D_STATE                                    ( SID_SVX_START + 645 )