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>

23 files changed, 11 insertions, 86 deletions

diff --git a/include/editeng/bulletitem.hxx b/include/editeng/bulletitem.hxx
index 345cf3ff7639..deb122f556d4 100644
--- a/include/editeng/bulletitem.hxx
+++ b/include/editeng/bulletitem.hxx
@@ -74,10 +74,8 @@ class EDITENG_DLLPUBLIC SvxBulletItem : public SfxPoolItem
     sal_uInt16      nValidMask; // Only temporary for GetAttribs / setAttribs,
                                 // because of the large Bullets
 
-#ifdef _SVX_BULITEM_CXX
     void    SetDefaultFont_Impl();
     void    SetDefaults_Impl();
-#endif
 
 public:
     TYPEINFO();
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index 925ee1a8b71e..659f6fbb3e2d 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -216,8 +216,6 @@ private:
     };
     MouseTarget OLD_ePrevMouseTarget;
 
-#ifdef _OUTLINER_CXX
-
     EDITENG_DLLPRIVATE void         ImplExpandOrCollaps( sal_uInt16 nStartPara, sal_uInt16 nEndPara, sal_Bool bExpand );
 
     EDITENG_DLLPRIVATE sal_uLong       ImpCheckMousePos( const Point& rPosPixel, MouseTarget& reTarget);
@@ -230,8 +228,6 @@ private:
     EDITENG_DLLPRIVATE sal_uInt16      ImpCalcSelectedPages( sal_Bool bIncludeFirstSelected );
     EDITENG_DLLPRIVATE sal_Bool        ImpIsIndentingPages();
 
-#endif
-
 public:
                 OutlinerView( Outliner* pOut, Window* pWindow );
     virtual     ~OutlinerView();
@@ -603,8 +599,6 @@ class EDITENG_DLLPUBLIC Outliner : public SfxBroadcaster
 
     sal_uLong               nDummy;
 
-#ifdef _OUTLINER_CXX
-
     DECL_LINK(              ParaVisibleStateChangedHdl, Paragraph* );
     DECL_LINK(              BeginMovingParagraphsHdl, void* );
     DECL_LINK(              EndMovingParagraphsHdl, MoveParagraphsInfo* );
@@ -641,7 +635,6 @@ class EDITENG_DLLPUBLIC Outliner : public SfxBroadcaster
 
     sal_uInt16      ImplGetOutlinerMode() const { return nOutlinerMode & OUTLINERMODE_USERMASK; }
     void        ImplCheckDepth( sal_Int16& rnDepth ) const;
-#endif
 
 protected:
     void            ParagraphInserted( sal_uInt16 nParagraph );
diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx
index d5c84235a4f9..e4810e6492c6 100644
--- a/include/svl/zforlist.hxx
+++ b/include/svl/zforlist.hxx
@@ -28,6 +28,7 @@
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/i18n/NumberFormatCode.hpp>
 #include <unotools/localedatawrapper.hxx>
+#include <unotools/numberformatcodewrapper.hxx>
 #include <tools/link.hxx>
 #include <svl/ondemand.hxx>
 #include <svl/nfkeytab.hxx>
@@ -815,8 +816,6 @@ private:
     OUString aThousandSep;
     OUString aDateSep;
 
-#ifdef _ZFORLIST_CXX                // ----- private Methoden -----
-
     SVL_DLLPRIVATE static bool          bCurrencyTableInitialized;
     SVL_DLLPRIVATE static sal_uInt16            nSystemCurrencyPosition;
     SVL_DLLPRIVATE static SvNumberFormatterRegistry_Impl* pFormatterRegistry;
@@ -916,8 +915,6 @@ private:
     // link to be set at <method>SvtSysLocaleOptions::SetCurrencyChangeLink()</method>
     DECL_DLLPRIVATE_STATIC_LINK( SvNumberFormatter, CurrencyChangeLink, void* );
 
-#endif // _ZFORLIST_CXX
-
 public:
 
     // own static mutex, may also be used by internal class SvNumberFormatterRegistry_Impl
diff --git a/include/svl/zformat.hxx b/include/svl/zformat.hxx
index 20cc4d110c24..fce623d58569 100644
--- a/include/svl/zformat.hxx
+++ b/include/svl/zformat.hxx
@@ -25,11 +25,6 @@
 #include <svl/nfversi.hxx>
 #include <svl/nfkeytab.hxx>
 
-// We need ImpSvNumberformatScan for the private SvNumberformat definitions.
-#ifdef _ZFORMAT_CXX
-#include "zforscan.hxx"
-#endif
-
 namespace utl {
     class DigitGroupingIterator;
 }
@@ -531,12 +526,10 @@ private:
     /// Whether it's a (YY)YY-M(M)-D(D) format.
     SVL_DLLPRIVATE bool ImpIsIso8601( const ImpSvNumFor& rNumFor );
 
-#ifdef _ZFORMAT_CXX     // ----- private implementation methods -----
-
-    const CharClass& rChrCls() const        { return rScan.GetChrCls(); }
-    const LocaleDataWrapper& rLoc() const   { return rScan.GetLoc(); }
-    CalendarWrapper& GetCal() const         { return rScan.GetCal(); }
-    const SvNumberFormatter& GetFormatter() const   { return *rScan.GetNumberformatter(); }
+    const CharClass& rChrCls() const;
+    const LocaleDataWrapper& rLoc() const;
+    CalendarWrapper& GetCal() const;
+    const SvNumberFormatter& GetFormatter() const;
 
     // divide in substrings and color conditions
     SVL_DLLPRIVATE short ImpNextSymbol( OUStringBuffer& rString,
@@ -702,9 +695,6 @@ private:
             impTransliterateImpl(rStr, rNum);
         }
     }
-
-#endif // _ZFORMAT_CXX
-
 };
 
 #endif  // _ZFORMAT_HXX
diff --git a/include/svtools/calendar.hxx b/include/svtools/calendar.hxx
index 2c41ae7ed929..0fa8a949455b 100644
--- a/include/svtools/calendar.hxx
+++ b/include/svtools/calendar.hxx
@@ -224,7 +224,6 @@ private:
     Timer           maDragScrollTimer;
     sal_uInt16          mnDragScrollHitTest;
 
-#ifdef _SV_CALENDAR_CXX
     using Control::ImplInitSettings;
     using Window::ImplInit;
     SVT_DLLPRIVATE void         ImplInit( WinBits nWinStyle );
@@ -252,7 +251,6 @@ private:
     SVT_DLLPRIVATE void         ImplTracking( const Point& rPos, sal_Bool bRepeat );
     SVT_DLLPRIVATE void         ImplEndTracking( sal_Bool bCancel );
     SVT_DLLPRIVATE DayOfWeek    ImplGetWeekStart() const;
-#endif
 
 protected:
 
@@ -412,11 +410,9 @@ private:
     sal_Bool                mbNone;
     Link                maSelectHdl;
 
-#ifdef _SV_CALENDAR_CXX
                         DECL_DLLPRIVATE_LINK( ImplSelectHdl, Calendar* );
                         DECL_DLLPRIVATE_LINK( ImplClickHdl, PushButton* );
                         DECL_DLLPRIVATE_LINK( ImplPopupModeEndHdl, void* );
-#endif
 
 public:
                         CalendarField( Window* pParent, WinBits nWinStyle );
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;
diff --git a/include/svtools/ctrltool.hxx b/include/svtools/ctrltool.hxx
index b90f1b67a532..efe7b53b7cb3 100644
--- a/include/svtools/ctrltool.hxx
+++ b/include/svtools/ctrltool.hxx
@@ -162,12 +162,11 @@ private:
     OutputDevice*           mpDev;
     OutputDevice*           mpDev2;
     boost::ptr_vector<ImplFontListNameInfo> maEntries;
-#ifdef CTRLTOOL_CXX
+
     SVT_DLLPRIVATE ImplFontListNameInfo*    ImplFind( const OUString& rSearchName, sal_uLong* pIndex ) const;
     SVT_DLLPRIVATE ImplFontListNameInfo*    ImplFindByName( const OUString& rStr ) const;
     SVT_DLLPRIVATE void                 ImplInsertFonts( OutputDevice* pDev, sal_Bool bAll,
                                              sal_Bool bInsertData );
-#endif
 
 public:
                             FontList( OutputDevice* pDevice,
diff --git a/include/svtools/headbar.hxx b/include/svtools/headbar.hxx
index 9be63ce3229d..29bd35fe2804 100644
--- a/include/svtools/headbar.hxx
+++ b/include/svtools/headbar.hxx
@@ -263,7 +263,6 @@ private:
         ::com::sun::star::accessibility::XAccessible >
                         mxAccessible;
 
-#ifdef _SV_HEADBAR_CXX
     using Window::ImplInit;
     SVT_DLLPRIVATE void             ImplInit( WinBits nWinStyle );
     SVT_DLLPRIVATE void             ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground );
@@ -285,7 +284,6 @@ private:
     SVT_DLLPRIVATE void             ImplStartDrag( const Point& rPos, sal_Bool bCommand );
     SVT_DLLPRIVATE void             ImplDrag( const Point& rPos );
     SVT_DLLPRIVATE void             ImplEndDrag( sal_Bool bCancel );
-#endif
 
 public:
                         HeaderBar( Window* pParent, WinBits nWinBits = WB_STDHEADERBAR );
diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx
index a06109bca6a0..5a457103cea0 100644
--- a/include/svtools/ruler.hxx
+++ b/include/svtools/ruler.hxx
@@ -644,7 +644,6 @@ private:
     Link                maDoubleClickHdl;
     Link                maExtraDownHdl;
 
-#ifdef _SV_RULER_CXX
     SVT_DLLPRIVATE void                ImplVDrawLine( long nX1, long nY1, long nX2, long nY2 );
     SVT_DLLPRIVATE void                ImplVDrawRect( long nX1, long nY1, long nX2, long nY2 );
     SVT_DLLPRIVATE void                ImplVDrawText( long nX, long nY, const String& rText, long nMin = LONG_MIN, long nMax = LONG_MAX );
@@ -675,7 +674,6 @@ private:
     SVT_DLLPRIVATE void                ImplDrag( const Point& rPos );
     SVT_DLLPRIVATE void                ImplEndDrag();
                         DECL_DLLPRIVATE_LINK( ImplUpdateHdl, void* );
-#endif
 
     // Forbidden and not implemented.
     Ruler (const Ruler &);
diff --git a/include/svtools/scrwin.hxx b/include/svtools/scrwin.hxx
index f9af5b9aa620..3980954e5dab 100644
--- a/include/svtools/scrwin.hxx
+++ b/include/svtools/scrwin.hxx
@@ -57,11 +57,9 @@ private:
                     bHCenter:1,
                     bVCenter:1;
 
-#ifdef _SVT_SCRWIN_CXX
     SVT_DLLPRIVATE void         ImpInitialize( ScrollableWindowFlags nFlags );
     DECL_DLLPRIVATE_LINK( ScrollHdl, ScrollBar * );
     DECL_DLLPRIVATE_LINK( EndScrollHdl, ScrollBar * );
-#endif
 
 public:
                     ScrollableWindow( Window* pParent, WinBits nBits = 0,
diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx
index ff032fd3baa4..70fcd008c363 100644
--- a/include/svtools/valueset.hxx
+++ b/include/svtools/valueset.hxx
@@ -37,10 +37,8 @@ class ScrollBar;
 struct ValueSetItem;
 typedef ::std::vector< ValueSetItem* > ValueItemList;
 
-#ifdef _SV_VALUESET_CXX
 class ValueSetAcc;
 class ValueItemAcc;
-#endif
 
 /*************************************************************************
 
@@ -241,7 +239,6 @@ private:
     Link            maSelectHdl;
     Link            maHighlightHdl;
 
-#ifdef _SV_VALUESET_CXX
     friend class ValueSetAcc;
     friend class ValueItemAcc;
     using Control::ImplInitSettings;
@@ -272,7 +269,6 @@ private:
     SVT_DLLPRIVATE void         ImplEndTracking( const Point& rPos, bool bCancel );
     DECL_DLLPRIVATE_LINK( ImplScrollHdl, ScrollBar* );
     DECL_DLLPRIVATE_LINK( ImplTimerHdl, void* );
-#endif
 
     // Forbidden and not implemented.
     ValueSet (const ValueSet &);
diff --git a/include/svtools/wizdlg.hxx b/include/svtools/wizdlg.hxx
index f161b7339ff7..765d2fac6dd7 100644
--- a/include/svtools/wizdlg.hxx
+++ b/include/svtools/wizdlg.hxx
@@ -239,7 +239,6 @@ protected:
     */
     void                SetEmptyViewMargin();
 
-#ifdef _SVT_WIZDLG_CXX
 private:
     SVT_DLLPRIVATE void             ImplInitData();
     SVT_DLLPRIVATE void             ImplCalcSize( Size& rSize );
@@ -247,7 +246,6 @@ private:
     SVT_DLLPRIVATE void             ImplPosTabPage();
     SVT_DLLPRIVATE void             ImplShowTabPage( TabPage* pPage );
     SVT_DLLPRIVATE TabPage*         ImplGetPage( sal_uInt16 nLevel ) const;
-#endif
 
 public:
                         WizardDialog( Window* pParent, WinBits nStyle = WB_STDTABDIALOG );
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
diff --git a/include/tools/config.hxx b/include/tools/config.hxx
index 1e73d32b5a33..64b690fda742 100644
--- a/include/tools/config.hxx
+++ b/include/tools/config.hxx
@@ -37,10 +37,8 @@ private:
     sal_Bool            mbPersistence;
     sal_Bool            mbDummy1;
 
-#ifdef _CONFIG_CXX
     TOOLS_DLLPRIVATE sal_Bool           ImplUpdateConfig() const;
     TOOLS_DLLPRIVATE ImplGroupData*     ImplGetGroup() const;
-#endif
 
 public:
                         Config( const OUString& rFileName );
diff --git a/include/tools/multisel.hxx b/include/tools/multisel.hxx
index 678fc94a998a..8b5d434130fa 100644
--- a/include/tools/multisel.hxx
+++ b/include/tools/multisel.hxx
@@ -42,12 +42,10 @@ private:
     sal_Bool        bCurValid;  // are nCurIndex and nCurSubSel valid
     sal_Bool        bSelectNew; // auto-select newly inserted indexes
 
-#ifdef _SV_MULTISEL_CXX
     TOOLS_DLLPRIVATE void           ImplClear();
     TOOLS_DLLPRIVATE size_t         ImplFindSubSelection( long nIndex ) const;
     TOOLS_DLLPRIVATE sal_Bool       ImplMergeSubSelections( size_t nPos1, size_t nPos2 );
     TOOLS_DLLPRIVATE long           ImplFwdUnselected();
-#endif
 
 public:
                     MultiSelection();