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>

9 files changed, 4 insertions, 31 deletions

diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx
index 8f1ff765f78d..0c41d63020c0 100644
--- a/include/svx/charmap.hxx
+++ b/include/svx/charmap.hxx
@@ -62,7 +62,6 @@ public:
     void            SetPreSelectHdl( const Link& rHdl ) { aPreSelectHdl = rHdl; }
     static sal_uInt32& getSelectedChar();
 
-#ifdef _SVX_CHARMAP_CXX_
     ::svx::SvxShowCharSetItem*  ImplGetItem( int _nPos );
     int                         FirstInView( void) const;
     int                         LastInView( void) const;
@@ -77,7 +76,6 @@ public:
     ScrollBar*                  getScrollBar();
     void                        ReleaseAccessible();
     sal_Int32                   getMaxCharCount() const;
-#endif // _SVX_CHARMAP_CXX_
 
     virtual void    Resize();
 
diff --git a/include/svx/checklbx.hxx b/include/svx/checklbx.hxx
index 8a9b3558d272..324de12150b2 100644
--- a/include/svx/checklbx.hxx
+++ b/include/svx/checklbx.hxx
@@ -34,9 +34,7 @@ class SVX_DLLPUBLIC SvxCheckListBox : public SvTreeListBox
 private:
     SvLBoxButtonData*   pCheckButton;
 
-#ifdef _SVX_CHECKLBX_CXX
     SVX_DLLPRIVATE void             Init_Impl();
-#endif
 
     using SvTreeListBox::InsertEntry;
     // Avoid ambiguity with new InsertEntry:
diff --git a/include/svx/fontwork.hxx b/include/svx/fontwork.hxx
index 4d2c4a0f6558..4e24257aed9b 100644
--- a/include/svx/fontwork.hxx
+++ b/include/svx/fontwork.hxx
@@ -26,7 +26,8 @@
 #include <sfx2/ctrlitem.hxx>
 #include <svx/xenum.hxx>
 #include <svx/dlgctrl.hxx>
-#include "svx/svxdllapi.h"
+#include <svx/svxdllapi.h>
+#include <svx/xtextit0.hxx>
 
 // forward ---------------------------------------------------------------
 
@@ -125,7 +126,6 @@ class SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow
 
     XColorListRef   pColorList;
 
-#ifdef _SVX_FONTWORK_CXX
  friend class SvxFontWorkChildWindow;
  friend class SvxFontWorkControllerItem;
 
@@ -152,7 +152,6 @@ class SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow
     void SetShadowColor_Impl(const XFormTextShadowColorItem*);
     void SetShadowXVal_Impl(const XFormTextShadowXValItem*);
     void SetShadowYVal_Impl(const XFormTextShadowYValItem*);
-#endif
 
     virtual void DataChanged( const DataChangedEvent& rDCEvt );
     void ApplyImageList();
diff --git a/include/svx/hdft.hxx b/include/svx/hdft.hxx
index bb1d2f507d3d..3af1316aba10 100644
--- a/include/svx/hdft.hxx
+++ b/include/svx/hdft.hxx
@@ -93,9 +93,7 @@ protected:
     DECL_LINK(RangeHdl, void *);
 
 private:
-#ifdef _SVX_HDFT_CXX
     SVX_DLLPRIVATE void         ResetBackground_Impl( const SfxItemSet& rSet );
-#endif
 };
 
 // class SvxHeaderPage ---------------------------------------------------
diff --git a/include/svx/insctrl.hxx b/include/svx/insctrl.hxx
index 9fbcd4e0e490..91e6966e7a35 100644
--- a/include/svx/insctrl.hxx
+++ b/include/svx/insctrl.hxx
@@ -40,12 +40,9 @@ public:
 private:
     sal_Bool    bInsert;
 
-#ifdef _SVX_INSCTRL_CXX
     SVX_DLLPRIVATE void DrawItemText_Impl();
-#endif
 };
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/itemwin.hxx b/include/svx/itemwin.hxx
index d2a1b25997e0..92daba38023a 100644
--- a/include/svx/itemwin.hxx
+++ b/include/svx/itemwin.hxx
@@ -41,11 +41,10 @@ class SvxLineBox : public LineLB
     SfxObjectShell* mpSh;
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame;
 
-#ifdef _SVX_ITEMWIN_CXX
                     DECL_LINK(DelayHdl_Impl, void *);
 
     void            ReleaseFocus_Impl();
-#endif
+
 public:
     SvxLineBox( Window* pParent,
                 const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
@@ -75,9 +74,7 @@ class SvxColorBox : public ColorLB
     OUString maCommand;
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame;
 
-#ifdef _SVX_ITEMWIN_CXX
     void            ReleaseFocus_Impl();
-#endif
 
 public:
     SvxColorBox( Window* pParent,
@@ -108,9 +105,7 @@ class SVX_DLLPUBLIC SvxMetricField : public MetricField
     Size            aLogicalSize;
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame;
 
-#ifdef _SVX_ITEMWIN_CXX
     void            ReleaseFocus_Impl();
-#endif
 
 protected:
     virtual void    Modify();
@@ -152,9 +147,7 @@ private:
     sal_Bool            bSelect;
     sal_Bool            bRelease;
 
-#ifdef _SVX_ITEMWIN_CXX
     void            ReleaseFocus_Impl();
-#endif
 };
 
 // class SvxFillAttrBox --------------------------------------------------
@@ -176,9 +169,7 @@ private:
     sal_uInt16          nCurPos;
     sal_Bool            bRelease;
 
-#ifdef _SVX_ITEMWIN_CXX
     void            ReleaseFocus_Impl();
-#endif
 };
 
 #endif // #ifndef _SVX_ITEMWIN_HXX
diff --git a/include/svx/numfmtsh.hxx b/include/svx/numfmtsh.hxx
index 2a8607c13b42..cba55594d6a6 100644
--- a/include/svx/numfmtsh.hxx
+++ b/include/svx/numfmtsh.hxx
@@ -199,7 +199,7 @@ private:
     sal_uInt16              nCurCurrencyEntryPos;
     std::vector<String*>    aCurrencyFormatList;
     bool                    bUseStarFormat;
-#ifdef _SVX_NUMFMTSH_CXX
+
     SVX_DLLPRIVATE short FillEntryList_Impl( std::vector<String*>& rList );
     SVX_DLLPRIVATE void  FillEListWithStd_Impl( std::vector<String*>& rList,sal_uInt16 aPrivCat, short &Pos);
     SVX_DLLPRIVATE short FillEListWithFormats_Impl( std::vector<String*>& rList,short nSelPos,
@@ -220,10 +220,8 @@ private:
                                                 Color*& rpColor );
     SVX_DLLPRIVATE void  PosToCategory_Impl( sal_uInt16 nPos, short& rCategory );
     SVX_DLLPRIVATE void  CategoryToPos_Impl( short nCategory, sal_uInt16& rPos );
-#endif
 };
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/optgrid.hxx b/include/svx/optgrid.hxx
index 300dfaabcd4a..777a61a1fde4 100644
--- a/include/svx/optgrid.hxx
+++ b/include/svx/optgrid.hxx
@@ -155,16 +155,12 @@ protected:
 private:
     sal_Bool                bAttrModified;
 
-#ifdef _SVX_OPTGRID_CXX
     DECL_LINK( ClickRotateHdl_Impl, void * );
     DECL_LINK( ChangeDrawHdl_Impl, MetricField * );
     DECL_LINK( ChangeGridsnapHdl_Impl, void * );
     DECL_LINK( ChangeDivisionHdl_Impl, NumericField * );
-
-#endif
 };
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx
index 9282e3e8cc7e..f9c44fa683db 100644
--- a/include/svx/srchdlg.hxx
+++ b/include/svx/srchdlg.hxx
@@ -223,7 +223,6 @@ private:
 
     mutable sal_Int32           nTransliterationFlags;
 
-#ifdef _SVX_SRCHDLG_CXX
     DECL_LINK( ModifyHdl_Impl, ComboBox* pEdit );
     DECL_LINK( FlagHdl_Impl, Control* pCtrl );
     DECL_LINK( CommandHdl_Impl, Button* pBtn );
@@ -254,7 +253,6 @@ private:
     void            SaveToModule_Impl();
 
     void            ApplyTransliterationFlags_Impl( sal_Int32 nSettings );
-#endif
 };
 
 inline sal_Bool SvxSearchDialog::HasSearchAttributes() const