Some cleanups & removed lazy macros.

1 files changed, 33 insertions, 45 deletions

diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx
index c8fce8662d92..61e1e2a5b345 100644
--- a/sc/source/ui/inc/filtdlg.hxx
+++ b/sc/source/ui/inc/filtdlg.hxx
@@ -47,44 +47,6 @@ class ScDocument;
 class ScQueryItem;
 class TypedScStrCollection;
 
-//==================================================================
-// Shared resource objects:
-
-#define _COMMON_FILTER_RSCOBJS \
-    CheckBox        aBtnCase; \
-    CheckBox        aBtnRegExp; \
-    CheckBox        aBtnHeader; \
-    CheckBox        aBtnUnique; \
-    CheckBox        aBtnCopyResult; \
-    ListBox         aLbCopyArea; \
-    formula::RefEdit        aEdCopyArea; \
-    formula::RefButton      aRbCopyArea; \
-    CheckBox        aBtnDestPers; \
-    FixedText       aFtDbAreaLabel; \
-    FixedInfo       aFtDbArea; \
-    const String    aStrUndefined; \
-    const String    aStrNoName; \
-    const String    aStrNone;
-
-
-#define _INIT_COMMON_FILTER_RSCOBJS \
-    aBtnCase        ( this, ScResId( BTN_CASE ) ), \
-    aBtnRegExp      ( this, ScResId( BTN_REGEXP ) ), \
-    aBtnHeader      ( this, ScResId( BTN_HEADER ) ), \
-    aBtnUnique      ( this, ScResId( BTN_UNIQUE ) ), \
-    aBtnCopyResult  ( this, ScResId( BTN_COPY_RESULT ) ), \
-    aLbCopyArea     ( this, ScResId( LB_COPY_AREA ) ), \
-    aEdCopyArea     ( this, this, ScResId( ED_COPY_AREA ) ), \
-    aRbCopyArea     ( this, ScResId( RB_COPY_AREA ), &aEdCopyArea, this ), \
-    aBtnDestPers    ( this, ScResId( BTN_DEST_PERS ) ), \
-    aFtDbAreaLabel  ( this, ScResId( FT_DBAREA_LABEL ) ), \
-    aFtDbArea       ( this, ScResId( FT_DBAREA ) ), \
-    aStrUndefined   ( ScResId( SCSTR_UNDEFINED ) ), \
-    aStrNoName      ( ScGlobal::GetRscString(STR_DB_NONAME) ), \
-    aStrNone        ( ScResId( SCSTR_NONE ) ),
-
-
-//============================================================================
 class ScFilterDlg : public ScAnyRefDlg
 {
 public:
@@ -139,7 +101,20 @@ private:
     OKButton        aBtnOk;
     CancelButton    aBtnCancel;
 
-    _COMMON_FILTER_RSCOBJS
+    CheckBox        aBtnCase;
+    CheckBox        aBtnRegExp;
+    CheckBox        aBtnHeader;
+    CheckBox        aBtnUnique;
+    CheckBox        aBtnCopyResult;
+    ListBox         aLbCopyArea;
+    formula::RefEdit aEdCopyArea;
+    formula::RefButton aRbCopyArea;
+    CheckBox        aBtnDestPers;
+    FixedText       aFtDbAreaLabel;
+    FixedInfo       aFtDbArea;
+    const String    aStrUndefined;
+    const String    aStrNoName;
+    const String    aStrNone;
 
     const String    aStrEmpty;
     const String    aStrNotEmpty;
@@ -213,12 +188,25 @@ public:
 private:
     FixedText   aFtFilterArea;
     ListBox     aLbFilterArea;
-    formula::RefEdit    aEdFilterArea;
-    formula::RefButton  aRbFilterArea;
+    formula::RefEdit aEdFilterArea;
+    formula::RefButton aRbFilterArea;
 
     FixedLine       aFlOptions;
 
-    _COMMON_FILTER_RSCOBJS
+    CheckBox        aBtnCase;
+    CheckBox        aBtnRegExp;
+    CheckBox        aBtnHeader;
+    CheckBox        aBtnUnique;
+    CheckBox        aBtnCopyResult;
+    ListBox         aLbCopyArea;
+    formula::RefEdit aEdCopyArea;
+    formula::RefButton aRbCopyArea;
+    CheckBox        aBtnDestPers;
+    FixedText       aFtDbAreaLabel;
+    FixedInfo       aFtDbArea;
+    const String    aStrUndefined;
+    const String    aStrNoName;
+    const String    aStrNone;
 
     OKButton        aBtnOk;
     CancelButton    aBtnCancel;
@@ -227,14 +215,14 @@ private:
 
     ScFilterOptionsMgr* pOptionsMgr;
 
-    const sal_uInt16        nWhichQuery;
+    const sal_uInt16    nWhichQuery;
     const ScQueryParam  theQueryData;
     ScQueryItem*        pOutItem;
     ScViewData*         pViewData;
     ScDocument*         pDoc;
 
-    formula::RefEdit*           pRefInputEdit;
-    sal_Bool                bRefInputMode;
+    formula::RefEdit*   pRefInputEdit;
+    bool                bRefInputMode;
 
     // Hack: RefInput control
     Timer*  pTimer;