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>

7 files changed, 0 insertions, 15 deletions

diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index 218b67aec1be..eab99e44fe66 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -30,8 +30,6 @@
 #include <vcl/msgbox.hxx>
 #include <svx/dialogs.hrc>
 
-#define _SVX_OPTDICT_CXX
-
 #include <linguistic/misc.hxx>
 #include <cuires.hrc>
 #include "optdict.hrc"
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 3039d21d9c85..bc3b03246665 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -43,7 +43,6 @@
 #include <unotools/extendedsecurityoptions.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 
-#define _SVX_OPTINET2_CXX
 #include <dialmgr.hxx>
 #include "optinet2.hxx"
 #include <svx/svxdlg.hxx>
diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx
index 0057351f406c..2ef906b8ac5f 100644
--- a/cui/source/options/optinet2.hxx
+++ b/cui/source/options/optinet2.hxx
@@ -29,11 +29,7 @@
 #include <sfx2/tabdlg.hxx>
 #include <unotools/configitem.hxx>
 
-#ifdef _SVX_OPTINET2_CXX
 #include <svtools/headbar.hxx>
-#else
-class HeaderBar;
-#endif
 #include <readonlyimage.hxx>
 
 namespace svx {
@@ -101,7 +97,6 @@ private:
 
     uno::Reference< uno::XInterface > m_xConfigurationUpdateAccess;
 
-#ifdef _SVX_OPTINET2_CXX
     void ArrangeControls_Impl();
     void EnableControls_Impl(sal_Bool bEnable);
     void ReadConfigData_Impl();
@@ -110,7 +105,6 @@ private:
 
     DECL_LINK( ProxyHdl_Impl, ListBox * );
     DECL_LINK( LoseFocusHdl_Impl, Edit * );
-#endif
 
     SvxProxyTabPage( Window* pParent, const SfxItemSet& rSet );
     virtual ~SvxProxyTabPage();
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 2ef6af4925ba..9ab17cf95674 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -55,7 +55,6 @@
 #include <svl/intitem.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <vcl/svapp.hxx>
-#define _SVX_OPTLINGU_CXX
 #include "optlingu.hrc"
 
 #include <svx/svxdlg.hxx>
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 93f3c666e9f1..dfc13a1b29ff 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -33,8 +33,6 @@
 #include <unotools/moduleoptions.hxx>
 #include <unotools/viewoptions.hxx>
 
-#define _SVX_OPTPATH_CXX
-
 #include "optpath.hxx"
 #include <dialmgr.hxx>
 #include <cuires.hrc>
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index 9318ba24dd2e..24e8a08166f0 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -20,7 +20,6 @@
 #include <tools/shl.hxx>
 #include <svl/eitem.hxx>
 #include <svl/intitem.hxx>
-#define _SVX_OPTSAVE_CXX
 
 #include "optsave.hrc"
 #include <cuires.hrc>
diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx
index dcc3a5af5772..111f0d865294 100644
--- a/cui/source/options/optsave.hxx
+++ b/cui/source/options/optsave.hxx
@@ -66,13 +66,11 @@ private:
 
     SvxSaveTabPage_Impl*    pImpl;
 
-#ifdef _SVX_OPTSAVE_CXX
     DECL_LINK( AutoClickHdl_Impl, CheckBox * );
     DECL_LINK( FilterHdl_Impl, ListBox * );
     DECL_LINK(ODFVersionHdl_Impl, void *);
 
     void    DetectHiddenControls();
-#endif
 
 public:
     SvxSaveTabPage( Window* pParent, const SfxItemSet& rSet );