Bin ugly (ab)use of preprocessor in headers (final part)

Finish the work of ec8617568ff091026b2f17cce3b547b1633fa6c4

Only one is left: SC_PROGRESS_CXX

Change-Id: Ifdc07ec377d7a84e92bc4b0a66ab82b1fc93f76a
Reviewed-on: https://gerrit.libreoffice.org/9636
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>

9 files changed, 1 insertions, 25 deletions

diff --git a/sc/source/ui/inc/areasdlg.hxx b/sc/source/ui/inc/areasdlg.hxx
index 2800ac44894c..d7c6789865bb 100644
--- a/sc/source/ui/inc/areasdlg.hxx
+++ b/sc/source/ui/inc/areasdlg.hxx
@@ -22,6 +22,7 @@
 
 #include "address.hxx"
 
+#include <svl/stritem.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/fixed.hxx>
 #include "anyrefdg.hxx"
@@ -67,8 +68,6 @@ private:
     ScViewData*     pViewData;
     SCTAB           nCurTab;
 
-#ifdef _AREASDLG_CXX
-private:
     void Impl_Reset();
     bool Impl_CheckRefStrings();
     void Impl_FillLists();
@@ -79,7 +78,6 @@ private:
     DECL_LINK( Impl_ModifyHdl,      formula::RefEdit*  );
     DECL_LINK( Impl_BtnHdl,         PushButton* );
     DECL_LINK( Impl_GetFocusHdl,    Control*    );
-#endif
 };
 
 #endif
diff --git a/sc/source/ui/inc/consdlg.hxx b/sc/source/ui/inc/consdlg.hxx
index b7ff60d46f97..30ce8f61a292 100644
--- a/sc/source/ui/inc/consdlg.hxx
+++ b/sc/source/ui/inc/consdlg.hxx
@@ -87,8 +87,6 @@ private:
     formula::RefEdit*   pRefInputEdit;
     bool                bDlgLostFocus;
 
-#ifdef _CONSDLG_CXX
-private:
     void Init               ();
     void FillAreaLists      ();
     bool VerifyEdit         ( formula::RefEdit* pEd );
@@ -101,7 +99,6 @@ private:
 
     ScSubTotalFunc  LbPosToFunc( sal_uInt16 nPos );
     sal_uInt16          FuncToLbPos( ScSubTotalFunc eFunc );
-#endif // _CONSDLG_CXX
 };
 
 #endif // INCLUDED_SC_SOURCE_UI_INC_CONSDLG_HXX
diff --git a/sc/source/ui/inc/crnrdlg.hxx b/sc/source/ui/inc/crnrdlg.hxx
index b6fcd927afd7..5337886961ce 100644
--- a/sc/source/ui/inc/crnrdlg.hxx
+++ b/sc/source/ui/inc/crnrdlg.hxx
@@ -72,8 +72,6 @@ private:
     formula::RefEdit*       pEdActive;
     bool            bDlgLostFocus;
 
-#ifdef _CRNRDLG_CXX
-private:
     void Init               ();
     void UpdateNames        ();
     void UpdateRangeData    ( const ScRange& rRange, bool bColName );
@@ -90,7 +88,6 @@ private:
     DECL_LINK( Range2DataModifyHdl, void * );
     DECL_LINK( GetFocusHdl, Control* );
     DECL_LINK( LoseFocusHdl, void* );
-#endif
 };
 
 #endif // INCLUDED_SC_SOURCE_UI_INC_CRNRDLG_HXX
diff --git a/sc/source/ui/inc/filldlg.hxx b/sc/source/ui/inc/filldlg.hxx
index 954b8244cb69..cc8710d91f7d 100644
--- a/sc/source/ui/inc/filldlg.hxx
+++ b/sc/source/ui/inc/filldlg.hxx
@@ -96,8 +96,6 @@ private:
 
     bool        bStartValFlag;
 
-#ifdef _FILLDLG_CXX
-private:
     void Init( sal_uInt16 nPossDir );
     bool CheckStartVal();
     bool CheckIncrementVal();
@@ -105,7 +103,6 @@ private:
 
     DECL_LINK( OKHdl, void * );
     DECL_LINK( DisableHdl, Button * );
-#endif
 };
 
 #endif // INCLUDED_SC_SOURCE_UI_INC_FILLDLG_HXX
diff --git a/sc/source/ui/inc/instbdlg.hxx b/sc/source/ui/inc/instbdlg.hxx
index d247b356214f..ad68712fe22a 100644
--- a/sc/source/ui/inc/instbdlg.hxx
+++ b/sc/source/ui/inc/instbdlg.hxx
@@ -84,7 +84,6 @@ private:
     SCTAB               nTableCount;
     OUString            m_sSheetDotDotDot;
 
-#ifdef SC_INSTBDLG_CXX
     void    Init_Impl( bool bFromFile );
     void    SetNewTable_Impl();
     void    SetFromTo_Impl();
@@ -98,7 +97,6 @@ private:
     DECL_LINK(DoEnterHdl, void *);
     DECL_LINK(BrowseTimeoutHdl, void *);
     DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper* );
-#endif
 };
 
 #endif // INCLUDED_SC_SOURCE_UI_INC_INSTBDLG_HXX
diff --git a/sc/source/ui/inc/pfiltdlg.hxx b/sc/source/ui/inc/pfiltdlg.hxx
index 6c5654a3379f..7dfe935b7fe4 100644
--- a/sc/source/ui/inc/pfiltdlg.hxx
+++ b/sc/source/ui/inc/pfiltdlg.hxx
@@ -82,7 +82,6 @@ private:
 
     std::vector<ScTypedStrData>* pEntryLists[MAXCOLCOUNT];
 
-#ifdef _PFILTDLG_CXX
 private:
     void    Init            ( const SfxItemSet& rArgSet );
     void    FillFieldLists  ();
@@ -94,7 +93,6 @@ private:
     DECL_LINK( LbSelectHdl, ListBox* );
     DECL_LINK( ValModifyHdl, ComboBox* );
     DECL_LINK( CheckBoxHdl,  CheckBox* );
-#endif
 };
 
 
diff --git a/sc/source/ui/inc/solvrdlg.hxx b/sc/source/ui/inc/solvrdlg.hxx
index 7ffa45084ade..e0a728791f6d 100644
--- a/sc/source/ui/inc/solvrdlg.hxx
+++ b/sc/source/ui/inc/solvrdlg.hxx
@@ -77,8 +77,6 @@ private:
     const OUString  errMsgNoFormula;
     const OUString  errMsgInvalidVal;
 
-
-#ifdef _SOLVRDLG_CXX
     void    Init();
     bool    CheckTargetValue( const OUString& rStrVal );
     void    RaiseError( ScSolverErr eError );
@@ -86,7 +84,6 @@ private:
     DECL_LINK( BtnHdl, PushButton* );
     DECL_LINK( GetFocusHdl, Control* );
     DECL_LINK( LoseFocusHdl, void* );
-#endif  // _SOLVERDLG_CXX
 };
 
 #endif // INCLUDED_SC_SOURCE_UI_INC_SOLVRDLG_HXX
diff --git a/sc/source/ui/inc/tphf.hxx b/sc/source/ui/inc/tphf.hxx
index 733242df0229..2f4fff087ac8 100644
--- a/sc/source/ui/inc/tphf.hxx
+++ b/sc/source/ui/inc/tphf.hxx
@@ -52,12 +52,9 @@ private:
     sal_uInt16          nPageUsage;
     const ScStyleDlg*   pStyleDlg;
 
-#ifdef _TPHF_CXX
-private:
     DECL_LINK(BtnHdl, void *);
     DECL_LINK( HFEditHdl, void* );
     DECL_LINK(TurnOnHdl, void *);
-#endif
 };
 
 class ScHeaderPage : public ScHFPage
diff --git a/sc/source/ui/inc/tpusrlst.hxx b/sc/source/ui/inc/tpusrlst.hxx
index 39590b24149a..9e3564976e87 100644
--- a/sc/source/ui/inc/tpusrlst.hxx
+++ b/sc/source/ui/inc/tpusrlst.hxx
@@ -81,8 +81,6 @@ private:
     bool            bCopyDone;
     sal_Int32       nCancelPos;
 
-#ifdef _TPUSRLST_CXX
-private:
     void    Init                ();
     size_t  UpdateUserListBox   ();
     void    UpdateEntries       ( size_t nList );
@@ -98,7 +96,6 @@ private:
     DECL_LINK( LbSelectHdl,     ListBox* );
     DECL_LINK( BtnClickHdl,     PushButton* );
     DECL_LINK( EdEntriesModHdl, VclMultiLineEdit* );
-#endif
 };
 
 #endif // INCLUDED_SC_SOURCE_UI_INC_TPUSRLST_HXX