Bin ugly (ab)use of preprocessor in headers

The time when it made sense to use "clever" #ifdefs to, for performance or
compiler reasons, conditionally bypass private parts of a class declaration
passed a decade or longer ago.

Still more of this in sw and sc. People working on those modules might want to
do it too, or not.

Change-Id: I1053139ca5e5e2631f7b22d99d3bada54fc337be
Reviewed-on: https://gerrit.libreoffice.org/3627
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

16 files changed, 10 insertions, 76 deletions

diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index b760dca00044..3d518d2b1d01 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -28,6 +28,12 @@
 #include <svx/langbox.hxx>
 #include "svtools/treelistentry.hxx"
 
+#include <vcl/group.hxx>
+#include <vcl/button.hxx>
+#include <vcl/lstbox.hxx>
+#include <svtools/svtabbx.hxx>
+#include <svx/simptabl.hxx>
+
 class CharClass;
 class CollatorWrapper;
 class SmartTagMgr;
@@ -52,13 +58,6 @@ public:
     void EnableLanguage(bool bEnable);
 };
 
-#ifdef _OFA_AUTOCDLG_CXX
-#include <vcl/group.hxx>
-#include <vcl/button.hxx>
-#include <vcl/lstbox.hxx>
-#include <svtools/svtabbx.hxx>
-#include <svx/simptabl.hxx>
-
 // class OfaACorrCheckListBox ------------------------------------------
 
 class OfaACorrCheckListBox : public SvxSimpleTable
@@ -528,8 +527,6 @@ public:
     virtual void        ActivatePage( const SfxItemSet& );
 };
 
-#endif // _OFA_AUTOCDLG_CXX
-
-#endif //
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/inc/connect.hxx b/cui/source/inc/connect.hxx
index 78638efda788..d9cf630a9b04 100644
--- a/cui/source/inc/connect.hxx
+++ b/cui/source/inc/connect.hxx
@@ -61,11 +61,9 @@ private:
     const SdrView*      pView;
     SfxMapUnit          eUnit;
 
-#ifdef _SVX_CONNECT_CXX
     void                FillTypeLB();
 
                         DECL_LINK( ChangeAttrHdl_Impl, void * );
-#endif
 
 public:
 
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index ece9e683991f..548a9018192c 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -63,10 +63,8 @@ private:
 
 protected:
     virtual short       Ok();
-#ifdef _SVX_TABAREA_CXX
     DECL_LINK( CancelHdlImpl, void * );
     void                SavePalettes();
-#endif
 
 public:
     SvxAreaTabDialog( Window* pParent,
@@ -144,14 +142,12 @@ class SvxTransparenceTabPage : public SvxTabPage
     XFillAttrSetItem    aXFillAttr;
     SfxItemSet&         rXFSet;
 
-#ifdef _SVX_TPAREA_CXX
     DECL_LINK(ClickTransOffHdl_Impl, void * );
     DECL_LINK(ClickTransLinearHdl_Impl, void * );
     DECL_LINK(ClickTransGradientHdl_Impl, void * );
     DECL_LINK(ModifyTransparentHdl_Impl, void*);
     DECL_LINK(ChangeTrgrTypeHdl_Impl, void*);
     DECL_LINK(ModifiedTrgrHdl_Impl, void*);
-#endif
 
     void ActivateLinear(sal_Bool bActivate);
     void ActivateGradient(sal_Bool bActivate);
@@ -250,7 +246,6 @@ private:
     SfxMapUnit          ePoolUnit;
     FieldUnit           eFUnit;
 
-#ifdef _SVX_TPAREA_CXX
     DECL_LINK(SelectDialogTypeHdl_Impl, void *);
     DECL_LINK( ModifyColorHdl_Impl, void * );
     DECL_LINK( ModifyHatchBckgrdColorHdl_Impl, void * );
@@ -266,7 +261,6 @@ private:
     void ClickGradientHdl_Impl();
     void ClickColorHdl_Impl();
     void ClickBitmapHdl_Impl();
-#endif
 
 public:
     SvxAreaTabPage( Window* pParent, const SfxItemSet& rInAttrs  );
@@ -335,10 +329,8 @@ private:
     SfxItemSet&         rXFSet;
     SfxMapUnit          ePoolUnit;
 
-#ifdef _SVX_TPSHADOW_CXX
     DECL_LINK( ClickShadowHdl_Impl, void * );
     DECL_LINK( ModifyShadowHdl_Impl, void * );
-#endif
 
 public:
     SvxShadowTabPage( Window* pParent, const SfxItemSet& rInAttrs  );
@@ -409,7 +401,6 @@ private:
     XFillAttrSetItem    aXFillAttr;
     SfxItemSet&         rXFSet;
 
-#ifdef _SVX_TPGRADNT_CXX
     DECL_LINK( ClickAddHdl_Impl, void * );
     DECL_LINK( ClickModifyHdl_Impl, void * );
     DECL_LINK( ClickDeleteHdl_Impl, void * );
@@ -420,7 +411,6 @@ private:
 
     long CheckChanges_Impl();
     void SetControlState_Impl( XGradientStyle eXGS );
-#endif
 
 public:
     SvxGradientTabPage( Window* pParent, const SfxItemSet& rInAttrs  );
@@ -493,7 +483,6 @@ private:
 
     SfxMapUnit          ePoolUnit;
 
-#ifdef _SVX_TPHATCH_CXX
     DECL_LINK( ChangeHatchHdl_Impl, void * );
     DECL_LINK( ModifiedHdl_Impl, void * );
     DECL_LINK( ClickAddHdl_Impl, void * );
@@ -503,7 +492,6 @@ private:
     DECL_LINK( ClickSaveHdl_Impl, void * );
 
     long CheckChanges_Impl();
-#endif
 
 public:
     SvxHatchTabPage( Window* pParent, const SfxItemSet& rInAttrs  );
@@ -581,7 +569,6 @@ private:
     XFillAttrSetItem    aXFillAttr;
     SfxItemSet&         rXFSet;
 
-#ifdef _SVX_TPBITMAP_CXX
     DECL_LINK( ClickAddHdl_Impl, void * );
     DECL_LINK( ClickImportHdl_Impl, void * );
     DECL_LINK( ClickModifyHdl_Impl, void * );
@@ -593,7 +580,6 @@ private:
     DECL_LINK( ClickSaveHdl_Impl, void * );
 
     long CheckChanges_Impl();
-#endif
 
 public:
     SvxBitmapTabPage( Window* pParent, const SfxItemSet& rInAttrs  );
@@ -706,7 +692,6 @@ private:
 
     Color               aAktuellColor;
 
-#ifdef _SVX_TPCOLOR_CXX
     void    ConvertColorValues (Color& rColor, ColorModel eModell);
     void    RgbToCmyk_Impl( Color& rColor, sal_uInt16& rK );
     void    CmykToRgb_Impl( Color& rColor, const sal_uInt16 nKey );
@@ -727,7 +712,6 @@ private:
     DECL_LINK( ModifiedHdl_Impl, void * );
 
     long CheckChanges_Impl();
-#endif
 
     void UpdateModified();
 public:
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index a07ff3aca380..5207b7a04611 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -53,10 +53,8 @@ private:
 
 protected:
     virtual short       Ok();
-#ifdef _SVX_TABLINE_CXX
     DECL_LINK( CancelHdlImpl, void * );
     void                SavePalettes();
-#endif
 
 public:
     SvxLineTabDialog( Window* pParent, const SfxItemSet* pAttr,
@@ -182,7 +180,6 @@ private:
     DECL_LINK( SizeHdl_Impl, MetricField * );
     DECL_LINK( RatioHdl_Impl, CheckBox * );
 
-#ifdef _SVX_TPLINE_CXX
     DECL_LINK( ClickInvisibleHdl_Impl, void * );
     DECL_LINK( ChangeStartHdl_Impl, void * );
     DECL_LINK( ChangeEndHdl_Impl, void * );
@@ -196,7 +193,6 @@ private:
      DECL_LINK ( ChangeCapStyleHdl_Impl, void * );
 
     sal_Bool FillXLSet_Impl();
-#endif
 
     void InitSymbols(MenuButton* pButton);
     void SymbolSelected(MenuButton* pButton);
@@ -292,7 +288,6 @@ private:
     SfxMapUnit          ePoolUnit;
     FieldUnit           eFUnit;
 
-#ifdef _SVX_TPLNEDEF_CXX
     void FillDash_Impl();
     void FillDialog_Impl();
 
@@ -309,7 +304,6 @@ private:
     DECL_LINK( SelectTypeHdl_Impl, void * );
 
     void CheckChanges_Impl();
-#endif
 
 public:
     SvxLineDefTabPage( Window* pParent, const SfxItemSet& rInAttrs  );
@@ -374,7 +368,6 @@ private:
     sal_uInt16*         pDlgType;
     sal_uInt16*             pPosLineEndLb;
 
-#ifdef _SVX_TPLNEEND_CXX
     DECL_LINK( ClickAddHdl_Impl, void * );
     DECL_LINK( ClickModifyHdl_Impl, void * );
     DECL_LINK( ClickDeleteHdl_Impl, void * );
@@ -384,7 +377,6 @@ private:
     long ChangePreviewHdl_Impl( void* p );
 
     void CheckChanges_Impl();
-#endif
 
 public:
     SvxLineEndDefTabPage( Window* pParent, const SfxItemSet& rInAttrs );
diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx
index 44ca18b39430..8b35b8ef416e 100644
--- a/cui/source/inc/labdlg.hxx
+++ b/cui/source/inc/labdlg.hxx
@@ -68,14 +68,12 @@ private:
     sal_uInt16          nAnsatzTypePos;
     sal_uInt16          nWinkelTypePos;
 
-#ifdef _SVX_LABDLG_CXX
     void            SetupAnsatz_Impl( sal_uInt16 nType );
     void            SetupType_Impl( sal_uInt16 nType );
     DECL_LINK( AnsatzSelectHdl_Impl, ListBox * );
     DECL_LINK( AnsatzRelSelectHdl_Impl, ListBox * );
     DECL_LINK( LineOptHdl_Impl, Button * );
     DECL_LINK( SelectCaptTypeHdl_Impl, void * );
-#endif
 
     const SfxItemSet&   rOutAttrs;
     const SdrView*      pView;
diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx
index 6606a2e6a418..a05cab446c1a 100644
--- a/cui/source/inc/measure.hxx
+++ b/cui/source/inc/measure.hxx
@@ -67,12 +67,10 @@ private:
 
     sal_Bool                bPositionModified;
 
-#ifdef _SVX_MEASURE_CXX
     void                FillUnitLB();
 
     DECL_LINK( ClickAutoPosHdl_Impl, void * );
     DECL_LINK( ChangeAttrHdl_Impl, void * );
-#endif
 
 public:
 
diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx
index a8507a6cc2c9..2251a2b7c459 100644
--- a/cui/source/inc/optdict.hxx
+++ b/cui/source/inc/optdict.hxx
@@ -64,10 +64,8 @@ private:
     ::com::sun::star::uno::Reference<
         ::com::sun::star::linguistic2::XDictionary >    xNewDic;
 
-#ifdef _SVX_OPTDICT_CXX
     DECL_LINK(OKHdl_Impl, void *);
     DECL_LINK(ModifyHdl_Impl, void *);
-#endif
 
 public:
     SvxNewDictionaryDialog( Window* pParent,
@@ -137,7 +135,6 @@ private:
     sal_Bool            bDoNothing;
     sal_Bool                bDicIsReadonly;
 
-#ifdef _SVX_OPTDICT_CXX
     DECL_LINK(SelectBookHdl_Impl, void *);
     DECL_LINK(SelectLangHdl_Impl, void *);
     DECL_LINK(SelectHdl, SvTabListBox*);
@@ -154,8 +151,6 @@ private:
     void            RemoveDictEntry(SvTreeListEntry* pEntry);
     sal_uInt16          GetLBInsertPos(const String &rDicWord);
 
-#endif
-
 protected:
 
     virtual void    Paint( const Rectangle& rRect );
@@ -170,7 +165,6 @@ public:
     sal_uInt16 GetSelectedDict() {return aAllDictsLB.GetSelectEntryPos();}
 };
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx
index b870f618f17e..abafc3941cff 100644
--- a/cui/source/inc/optlingu.hxx
+++ b/cui/source/inc/optlingu.hxx
@@ -77,7 +77,6 @@ class SvxEditModulesDlg : public ModalDialog
 
     SvTreeListEntry*    CreateEntry(String& rTxt, sal_uInt16 nCol);
 
-#ifdef _SVX_OPTLINGU_CXX
     DECL_LINK( SelectHdl_Impl, SvxCheckListBox * );
     DECL_LINK( UpDownHdl_Impl, PushButton * );
     DECL_LINK( ClickHdl_Impl, PushButton * );
@@ -86,7 +85,6 @@ class SvxEditModulesDlg : public ModalDialog
     DECL_LINK( LangSelectHdl_Impl, ListBox* );
     DECL_LINK( BoxCheckButtonHdl_Impl, SvTreeListBox * );
     DECL_LINK(OpenURLHdl_Impl, void *);
-#endif
 
 public:
     SvxEditModulesDlg(Window* pParent, SvxLinguData_Impl& rData);
@@ -143,7 +141,6 @@ private:
     void    AddDicBoxEntry( const com::sun::star::uno::Reference< com::sun::star::linguistic2::XDictionary > &rxDic, sal_uInt16 nIdx );
     sal_uLong   GetDicUserData( const com::sun::star::uno::Reference< com::sun::star::linguistic2::XDictionary > &rxDic, sal_uInt16 nIdx );
 
-#ifdef _SVX_OPTLINGU_CXX
     DECL_LINK( SelectHdl_Impl, SvxCheckListBox * );
     DECL_LINK( ClickHdl_Impl, PushButton * );
     DECL_LINK( BoxDoubleClickHdl_Impl, SvTreeListBox * );
@@ -153,7 +150,6 @@ private:
 
     void                UpdateModulesBox_Impl();
     void                UpdateDicBox_Impl();
-#endif
 
 public:
     virtual             ~SvxLinguTabPage();
diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx
index e6b8982a828e..f01c5b17c2e3 100644
--- a/cui/source/inc/optpath.hxx
+++ b/cui/source/inc/optpath.hxx
@@ -52,7 +52,6 @@ private:
     ::com::sun::star::uno::Reference< ::svt::DialogClosedListener > xDialogListener;
     ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFolderPicker2 > xFolderPicker;
 
-#ifdef _SVX_OPTPATH_CXX
     void        ChangeCurrentEntry( const String& _rFolder );
 
     DECL_LINK(PathHdl_Impl, void *);
@@ -68,7 +67,6 @@ private:
                              String& _rUserPath, String& _rWritablePath, sal_Bool& _rReadOnly );
     void        SetPathList( sal_uInt16 _nPathHandle,
                              const String& _rUserPath, const String& _rWritablePath );
-#endif
 
 public:
     SvxPathTabPage( Window* pParent, const SfxItemSet& rSet );
diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx
index fa18d962d709..b61c47ae5311 100644
--- a/cui/source/inc/page.hxx
+++ b/cui/source/inc/page.hxx
@@ -142,7 +142,6 @@ class SvxPageDescPage : public SfxTabPage
 
     SvxPage_Impl*       pImpl;
 
-#ifdef _SVX_PAGE_CXX
     void                Init_Impl();
     DECL_LINK(LayoutHdl_Impl, void *);
     DECL_LINK(PaperBinHdl_Impl, void *);
@@ -173,7 +172,6 @@ class SvxPageDescPage : public SfxTabPage
                                                 long nLastMargin, MarginPosition nPos );
     void                CheckMarginEdits( bool _bClear );
     bool                IsMarginOutOfRange();
-#endif
 
     SvxPageDescPage( Window* pParent, const SfxItemSet& rSet );
 
diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx
index bf78a269742d..c28689c4e9ba 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -95,7 +95,6 @@ private:
     sal_Bool                    bRelativeMode;
     sal_Bool                    bNegativeIndents;
 
-#ifdef _SVX_PARAGRPH_CXX
     void                    SetLineSpacing_Impl( const SvxLineSpacingItem& rAttr );
     void                    Init_Impl();
     void                    UpdateExample_Impl( sal_Bool bAll = sal_False );
@@ -103,7 +102,6 @@ private:
     DECL_LINK( LineDistHdl_Impl, ListBox* );
     DECL_LINK(ModifyHdl_Impl, void *);
     DECL_LINK( AutoHdl_Impl, CheckBox* );
-#endif
 
 protected:
     virtual int             DeactivatePage( SfxItemSet* pSet = 0 );
@@ -158,13 +156,11 @@ class SvxParaAlignTabPage : public SfxTabPage
     FixedText                   aTextDirectionFT;
     svx::FrameDirectionListBox  aTextDirectionLB;
 
-#ifdef _SVX_PARAGRPH_CXX
     DECL_LINK(AlignHdl_Impl, void *);
     DECL_LINK(LastLineHdl_Impl, void *);
     DECL_LINK(TextDirectionHdl_Impl, void *);
 
     void                    UpdateExample_Impl( sal_Bool bAll = sal_False );
-#endif
 
                             SvxParaAlignTabPage( Window* pParent, const SfxItemSet& rSet );
     virtual                 ~SvxParaAlignTabPage();
@@ -258,7 +254,6 @@ private:
     sal_Bool                bHtmlMode;
     sal_uInt16              nStdPos;
 
-#ifdef _SVX_PARAGRPH_CXX
     DECL_LINK(PageBreakHdl_Impl, void *);
     DECL_LINK(KeepTogetherHdl_Impl, void *);
     DECL_LINK(WidowHdl_Impl, void *);
@@ -267,7 +262,7 @@ private:
     DECL_LINK(ApplyCollClickHdl_Impl, void *);
     DECL_LINK( PageBreakPosHdl_Impl, ListBox* );
     DECL_LINK( PageBreakTypeHdl_Impl, ListBox* );
-#endif
+
     virtual void            PageCreated(SfxAllItemSet aSet);
 };
 
@@ -281,9 +276,8 @@ class SvxAsianTabPage : public SfxTabPage
 
     SvxAsianTabPage( Window* pParent, const SfxItemSet& rSet );
 
-#ifdef _SVX_PARAGRPH_CXX
     DECL_LINK( ClickHdl_Impl, CheckBox* );
-#endif
+
 public:
     ~SvxAsianTabPage();
 
diff --git a/cui/source/inc/postdlg.hxx b/cui/source/inc/postdlg.hxx
index 74c763bef5d3..592db0d121e1 100644
--- a/cui/source/inc/postdlg.hxx
+++ b/cui/source/inc/postdlg.hxx
@@ -105,15 +105,12 @@ private:
     Link                aPrevHdlLink;
     Link                aNextHdlLink;
 
-#ifdef _SVX_POSTDLG_CXX
     DECL_LINK(Stamp, void *);
     DECL_LINK(OKHdl, void *);
     DECL_LINK(PrevHdl, void *);
     DECL_LINK(NextHdl, void *);
-#endif
 };
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx
index 0e4953a24d41..e34c872b6af9 100644
--- a/cui/source/inc/tabstpge.hxx
+++ b/cui/source/inc/tabstpge.hxx
@@ -107,7 +107,6 @@ private:
     FieldUnit       eDefUnit;
     sal_Bool            bCheck;
 
-#ifdef _SVX_TABSTPGE_CXX
     void            InitTabPos_Impl( sal_uInt16 nPos = 0 );
     void            SetFillAndTabType_Impl();
 
@@ -123,11 +122,10 @@ private:
     DECL_LINK(ModifyHdl_Impl, void *);
     DECL_LINK( GetFillCharHdl_Impl, Edit* );
     DECL_LINK( GetDezCharHdl_Impl, Edit* );
-#endif
+
     virtual void            PageCreated(SfxAllItemSet aSet);
 };
 
 #endif // #ifndef _SVX_TABSTPGE_HXX
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx
index 45b95bbcc10c..317bf0568b4c 100644
--- a/cui/source/inc/textanim.hxx
+++ b/cui/source/inc/textanim.hxx
@@ -67,7 +67,6 @@ private:
     FieldUnit           eFUnit;
     SfxMapUnit          eUnit;
 
-#ifdef _SVX_TEXTANIM_CXX
     DECL_LINK( SelectEffectHdl_Impl, void * );
     DECL_LINK( ClickEndlessHdl_Impl, void * );
     DECL_LINK( ClickAutoHdl_Impl, void * );
@@ -76,10 +75,8 @@ private:
 
     void                SelectDirection( SdrTextAniDirection nValue );
     sal_uInt16              GetSelectedDirection();
-#endif
 
 public:
-
     SvxTextAnimationPage( Window* pWindow, const SfxItemSet& rInAttrs );
     ~SvxTextAnimationPage();
 
diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx
index 81f3b6fbeedd..3684d72d431b 100644
--- a/cui/source/inc/textattr.hxx
+++ b/cui/source/inc/textattr.hxx
@@ -72,11 +72,8 @@ private:
     sal_Bool                bWordWrapTextEnabled;
     sal_Bool                bFitToSizeEnabled;
 
-
-#ifdef _SVX_TEXTATTR_CXX
     DECL_LINK( ClickFullWidthHdl_Impl, void * );
     DECL_LINK( ClickHdl_Impl, void * );
-#endif
 
     /** Return whether the text direction is from left to right (</sal_True>) or
         top to bottom (</sal_False>).
diff --git a/cui/source/inc/zoom.hxx b/cui/source/inc/zoom.hxx
index 75588a0e020c..1251c2611e64 100644
--- a/cui/source/inc/zoom.hxx
+++ b/cui/source/inc/zoom.hxx
@@ -47,14 +47,12 @@ private:
     SfxItemSet*         pOutSet;
     sal_Bool            bModified;
 
-#ifdef _SVX_ZOOM_CXX
     DECL_LINK( UserHdl, RadioButton* );
     DECL_LINK(SpinHdl, void *);
     DECL_LINK( ViewLayoutUserHdl, RadioButton* );
     DECL_LINK( ViewLayoutSpinHdl, NumericField* );
     DECL_LINK( ViewLayoutCheckHdl, CheckBox* );
     DECL_LINK( OKHdl, Button* );
-#endif
 
 public:
     SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet );