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>

1 files changed, 1 insertions, 6 deletions

diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx
index 39e5bb02bcc0..d2c933b8c0a1 100644
--- a/include/svtools/ctrlbox.hxx
+++ b/include/svtools/ctrlbox.hxx
@@ -164,11 +164,10 @@ class SVT_DLLPUBLIC ColorListBox : public ListBox
     ImpColorList*   pColorList; // separate liste, in case of user data are required from outside
     Size            aImageSize;
 
-#ifdef _CTRLBOX_CXX
     using Window::ImplInit;
     SVT_DLLPRIVATE void         ImplInit();
     SVT_DLLPRIVATE void         ImplDestroyColorEntries();
-#endif
+
 public:
                     ColorListBox( Window* pParent,
                                   WinBits nWinStyle = WB_BORDER );
@@ -424,10 +423,8 @@ private:
     sal_Bool        mbWYSIWYG;
     String          maFontMRUEntriesFile;
 
-#ifdef _CTRLBOX_CXX
     SVT_DLLPRIVATE void         ImplCalcUserItemSize();
     SVT_DLLPRIVATE void         ImplDestroyFontList();
-#endif
 
 protected:
     void            LoadMRUEntries( const String& aFontMRUEntriesFile, sal_Unicode cSep = ';' );
@@ -506,10 +503,8 @@ class SVT_DLLPUBLIC FontSizeBox : public MetricBox
                     bPtRelative:1,
                     bStdSize:1;
 
-#ifdef _CTRLBOX_CXX
     using Window::ImplInit;
     SVT_DLLPRIVATE void         ImplInit();
-#endif
 
 protected:
     virtual OUString CreateFieldText( sal_Int64 nValue ) const;