Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3627
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/27/3627/1
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
---
M cui/source/dialogs/postdlg.cxx
M cui/source/dialogs/zoom.cxx
M cui/source/inc/autocdlg.hxx
M cui/source/inc/connect.hxx
M cui/source/inc/cuitabarea.hxx
M cui/source/inc/cuitabline.hxx
M cui/source/inc/labdlg.hxx
M cui/source/inc/measure.hxx
M cui/source/inc/optdict.hxx
M cui/source/inc/optlingu.hxx
M cui/source/inc/optpath.hxx
M cui/source/inc/page.hxx
M cui/source/inc/paragrph.hxx
M cui/source/inc/postdlg.hxx
M cui/source/inc/tabstpge.hxx
M cui/source/inc/textanim.hxx
M cui/source/inc/textattr.hxx
M cui/source/inc/zoom.hxx
M cui/source/options/optdict.cxx
M cui/source/options/optinet2.cxx
M cui/source/options/optinet2.hxx
M cui/source/options/optlingu.cxx
M cui/source/options/optpath.cxx
M cui/source/options/optsave.cxx
M cui/source/options/optsave.hxx
M cui/source/tabpages/autocdlg.cxx
M cui/source/tabpages/connect.cxx
M cui/source/tabpages/labdlg.cxx
M cui/source/tabpages/measure.cxx
M cui/source/tabpages/page.cxx
M cui/source/tabpages/paragrph.cxx
M cui/source/tabpages/tabarea.cxx
M cui/source/tabpages/tabline.cxx
M cui/source/tabpages/tabstpge.cxx
M cui/source/tabpages/textanim.cxx
M cui/source/tabpages/textattr.cxx
M cui/source/tabpages/tparea.cxx
M cui/source/tabpages/tpbitmap.cxx
M cui/source/tabpages/tpcolor.cxx
M cui/source/tabpages/tpgradnt.cxx
M cui/source/tabpages/tphatch.cxx
M cui/source/tabpages/tpline.cxx
M cui/source/tabpages/tplnedef.cxx
M cui/source/tabpages/tplneend.cxx
M cui/source/tabpages/tpshadow.cxx
M editeng/source/items/bulitem.cxx
M editeng/source/outliner/outleeng.cxx
M editeng/source/outliner/outlin2.cxx
M editeng/source/outliner/outliner.cxx
M editeng/source/outliner/outlobj.cxx
M editeng/source/outliner/outlundo.cxx
M editeng/source/outliner/outlvw.cxx
M include/editeng/bulletitem.hxx
M include/editeng/outliner.hxx
M include/svl/zforlist.hxx
M include/svl/zformat.hxx
M include/svtools/calendar.hxx
M include/svtools/ctrlbox.hxx
M include/svtools/ctrltool.hxx
M include/svtools/headbar.hxx
M include/svtools/ruler.hxx
M include/svtools/scrwin.hxx
M include/svtools/valueset.hxx
M include/svtools/wizdlg.hxx
M include/svx/charmap.hxx
M include/svx/checklbx.hxx
M include/svx/fontwork.hxx
M include/svx/hdft.hxx
M include/svx/insctrl.hxx
M include/svx/itemwin.hxx
M include/svx/numfmtsh.hxx
M include/svx/optgrid.hxx
M include/svx/srchdlg.hxx
M include/tools/config.hxx
M include/tools/multisel.hxx
M svl/source/numbers/zforfind.cxx
M svl/source/numbers/zforfind.hxx
M svl/source/numbers/zforlist.cxx
M svl/source/numbers/zformat.cxx
M svl/source/numbers/zforscan.cxx
M svl/source/numbers/zforscan.hxx
M svtools/source/control/calendar.cxx
M svtools/source/control/ctrlbox.cxx
M svtools/source/control/ctrltool.cxx
M svtools/source/control/headbar.cxx
M svtools/source/control/ruler.cxx
M svtools/source/control/scrwin.cxx
M svtools/source/control/valueacc.cxx
M svtools/source/control/valueset.cxx
M svtools/source/dialogs/wizdlg.cxx
M svx/source/accessibility/charmapacc.cxx
M svx/source/dialog/charmap.cxx
M svx/source/dialog/checklbx.cxx
M svx/source/dialog/fontwork.cxx
M svx/source/dialog/hdft.cxx
M svx/source/dialog/optgrid.cxx
M svx/source/dialog/srchctrl.cxx
M svx/source/dialog/srchdlg.cxx
M svx/source/items/numfmtsh.cxx
M svx/source/stbctrls/insctrl.cxx
M svx/source/tbxctrls/itemwin.cxx
M tools/source/generic/config.cxx
M tools/source/memtools/multisel.cxx
103 files changed, 42 insertions(+), 287 deletions(-)
diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx
index a459ec7..ae786c3 100644
--- a/cui/source/dialogs/postdlg.cxx
+++ b/cui/source/dialogs/postdlg.cxx
@@ -29,8 +29,6 @@
#include <comphelper/processfactory.hxx>
#include <svx/svxids.hrc> // SID_ATTR_...
-#define _SVX_POSTDLG_CXX
-
#include <cuires.hrc>
#include <svx/postattr.hxx>
#include "postdlg.hxx"
diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx
index 01a9031..4f2de22 100644
--- a/cui/source/dialogs/zoom.cxx
+++ b/cui/source/dialogs/zoom.cxx
@@ -24,8 +24,6 @@
#include <vcl/layout.hxx>
#include <vcl/msgbox.hxx>
-#define _SVX_ZOOM_CXX
-
#include <cuires.hrc>
#include "zoom.hxx"
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index b760dca..3d518d2 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;
@@ -51,13 +57,6 @@
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 ------------------------------------------
@@ -528,8 +527,6 @@
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 78638ef..d9cf630 100644
--- a/cui/source/inc/connect.hxx
+++ b/cui/source/inc/connect.hxx
@@ -61,11 +61,9 @@
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 ece9e68..548a901 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -63,10 +63,8 @@
protected:
virtual short Ok();
-#ifdef _SVX_TABAREA_CXX
DECL_LINK( CancelHdlImpl, void * );
void SavePalettes();
-#endif
public:
SvxAreaTabDialog( Window* pParent,
@@ -144,14 +142,12 @@
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 @@
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 @@
void ClickGradientHdl_Impl();
void ClickColorHdl_Impl();
void ClickBitmapHdl_Impl();
-#endif
public:
SvxAreaTabPage( Window* pParent, const SfxItemSet& rInAttrs );
@@ -335,10 +329,8 @@
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 @@
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 @@
long CheckChanges_Impl();
void SetControlState_Impl( XGradientStyle eXGS );
-#endif
public:
SvxGradientTabPage( Window* pParent, const SfxItemSet& rInAttrs );
@@ -493,7 +483,6 @@
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 @@
DECL_LINK( ClickSaveHdl_Impl, void * );
long CheckChanges_Impl();
-#endif
public:
SvxHatchTabPage( Window* pParent, const SfxItemSet& rInAttrs );
@@ -581,7 +569,6 @@
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 @@
DECL_LINK( ClickSaveHdl_Impl, void * );
long CheckChanges_Impl();
-#endif
public:
SvxBitmapTabPage( Window* pParent, const SfxItemSet& rInAttrs );
@@ -706,7 +692,6 @@
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 @@
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 a07ff3a..5207b7a 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -53,10 +53,8 @@
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 @@
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 @@
DECL_LINK ( ChangeCapStyleHdl_Impl, void * );
sal_Bool FillXLSet_Impl();
-#endif
void InitSymbols(MenuButton* pButton);
void SymbolSelected(MenuButton* pButton);
@@ -292,7 +288,6 @@
SfxMapUnit ePoolUnit;
FieldUnit eFUnit;
-#ifdef _SVX_TPLNEDEF_CXX
void FillDash_Impl();
void FillDialog_Impl();
@@ -309,7 +304,6 @@
DECL_LINK( SelectTypeHdl_Impl, void * );
void CheckChanges_Impl();
-#endif
public:
SvxLineDefTabPage( Window* pParent, const SfxItemSet& rInAttrs );
@@ -374,7 +368,6 @@
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 @@
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 44ca18b..8b35b8e 100644
--- a/cui/source/inc/labdlg.hxx
+++ b/cui/source/inc/labdlg.hxx
@@ -68,14 +68,12 @@
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 6606a2e..a05cab4 100644
--- a/cui/source/inc/measure.hxx
+++ b/cui/source/inc/measure.hxx
@@ -67,12 +67,10 @@
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 a8507a6..2251a2b 100644
--- a/cui/source/inc/optdict.hxx
+++ b/cui/source/inc/optdict.hxx
@@ -64,10 +64,8 @@
::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 @@
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 @@
void RemoveDictEntry(SvTreeListEntry* pEntry);
sal_uInt16 GetLBInsertPos(const String &rDicWord);
-#endif
-
protected:
virtual void Paint( const Rectangle& rRect );
@@ -169,7 +164,6 @@
sal_uInt16 GetSelectedDict() {return aAllDictsLB.GetSelectEntryPos();}
};
-
#endif
diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx
index b870f61..abafc39 100644
--- a/cui/source/inc/optlingu.hxx
+++ b/cui/source/inc/optlingu.hxx
@@ -77,7 +77,6 @@
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 @@
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 @@
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 @@
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 e6b8982..f01c5b1 100644
--- a/cui/source/inc/optpath.hxx
+++ b/cui/source/inc/optpath.hxx
@@ -52,7 +52,6 @@
::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 @@
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 fa18d96..b61c47a 100644
--- a/cui/source/inc/page.hxx
+++ b/cui/source/inc/page.hxx
@@ -142,7 +142,6 @@
SvxPage_Impl* pImpl;
-#ifdef _SVX_PAGE_CXX
void Init_Impl();
DECL_LINK(LayoutHdl_Impl, void *);
DECL_LINK(PaperBinHdl_Impl, void *);
@@ -173,7 +172,6 @@
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 bf78a26..c28689c 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -95,7 +95,6 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 74c763b..592db0d 100644
--- a/cui/source/inc/postdlg.hxx
+++ b/cui/source/inc/postdlg.hxx
@@ -105,14 +105,11 @@
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
diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx
index 0e4953a..e34c872 100644
--- a/cui/source/inc/tabstpge.hxx
+++ b/cui/source/inc/tabstpge.hxx
@@ -107,7 +107,6 @@
FieldUnit eDefUnit;
sal_Bool bCheck;
-#ifdef _SVX_TABSTPGE_CXX
void InitTabPos_Impl( sal_uInt16 nPos = 0 );
void SetFillAndTabType_Impl();
@@ -123,11 +122,10 @@
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 45b95bb..317bf05 100644
--- a/cui/source/inc/textanim.hxx
+++ b/cui/source/inc/textanim.hxx
@@ -67,7 +67,6 @@
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 @@
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 81f3b6f..3684d72 100644
--- a/cui/source/inc/textattr.hxx
+++ b/cui/source/inc/textattr.hxx
@@ -72,11 +72,8 @@
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 75588a0..1251c26 100644
--- a/cui/source/inc/zoom.hxx
+++ b/cui/source/inc/zoom.hxx
@@ -47,14 +47,12 @@
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 );
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index 218b67a..eab99e4 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 3039d21..bc3b032 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 0057351..2ef906b 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 @@
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 @@
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 2ef6af49..9ab17cf 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 93f3c66..dfc13a1 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 9318ba2..24e8a08 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 dcc3a5a..111f0d8 100644
--- a/cui/source/options/optsave.hxx
+++ b/cui/source/options/optsave.hxx
@@ -66,13 +66,11 @@
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 );
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index bb5db5e..2e11890 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -43,7 +43,6 @@
#include <com/sun/star/smarttags/XSmartTagAction.hpp>
#include <rtl/strbuf.hxx>
-#define _OFA_AUTOCDLG_CXX
#include "autocdlg.hxx"
#include "autocdlg.hrc"
#include "helpid.hrc"
diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx
index 64d26c5..1b69183 100644
--- a/cui/source/tabpages/connect.cxx
+++ b/cui/source/tabpages/connect.cxx
@@ -24,8 +24,6 @@
#include <sfx2/request.hxx>
#include <svx/dialogs.hrc>
-#define _SVX_CONNECT_CXX
-
#include <svx/svdoedge.hxx>
#include <svx/svdattr.hxx>
#include <svx/svdattrx.hxx>
diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx
index 1091b4d..819dd2a 100644
--- a/cui/source/tabpages/labdlg.cxx
+++ b/cui/source/tabpages/labdlg.cxx
@@ -23,7 +23,6 @@
#include <sfx2/module.hxx>
#include <swpossizetabpage.hxx>
#include <svx/dialogs.hrc>
-#define _SVX_LABDLG_CXX
#include <svx/svdattrx.hxx>
#include <cuires.hrc>
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx
index 4050e8d..e5f67e7 100644
--- a/cui/source/tabpages/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -23,8 +23,6 @@
#include <cuires.hrc>
-#define _SVX_MEASURE_CXX
-
#include <svx/svdomeas.hxx>
#include <svx/svdattr.hxx>
#include <svx/svdattrx.hxx>
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 9986056..da2ac1c 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -29,8 +29,6 @@
#include <sfx2/htmlmode.hxx>
#include <sal/macros.h>
-#define _SVX_PAGE_CXX
-
#include <cuires.hrc>
#include "helpid.hrc"
#include "page.hxx"
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 6271cc0..e82ffb3 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -24,8 +24,6 @@
#include <vcl/mnemonic.hxx>
#include <svx/dialogs.hrc>
-#define _SVX_PARAGRPH_CXX 0
-
#include <svl/languageoptions.hxx>
#include <svl/cjkoptions.hxx>
#include <editeng/pgrditem.hxx>
diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx
index 780a7b6..236333d 100644
--- a/cui/source/tabpages/tabarea.cxx
+++ b/cui/source/tabpages/tabarea.cxx
@@ -26,8 +26,6 @@
#include <svx/svdview.hxx>
#include <svx/dialogs.hrc>
-#define _SVX_TABAREA_CXX
-
#include <cuires.hrc>
#include <svx/xtable.hxx>
#include "svx/globl3d.hxx"
diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx
index 5eac85b..f213077 100644
--- a/cui/source/tabpages/tabline.cxx
+++ b/cui/source/tabpages/tabline.cxx
@@ -24,7 +24,6 @@
#include <sfx2/objsh.hxx>
#include <svx/dialogs.hrc>
-#define _SVX_TABLINE_CXX
#include <cuires.hrc>
#include "tabline.hrc"
diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index 93ef129..01c6b0e 100644
--- a/cui/source/tabpages/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -22,8 +22,6 @@
#include <svtools/ruler.hxx>
#include <svx/dialogs.hrc>
-#define _SVX_TABSTPGE_CXX
-
#include <cuires.hrc>
#include "tabstpge.hrc"
#include <editeng/lrspitem.hxx>
diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx
index b075c94..b678ed3 100644
--- a/cui/source/tabpages/textanim.cxx
+++ b/cui/source/tabpages/textanim.cxx
@@ -24,9 +24,6 @@
#include <cuires.hrc>
#include <svx/dialogs.hrc>
-#ifndef _SVX_TEXTANIM_CXX
-#define _SVX_TEXTANIM_CXX
-#endif
#include "textanim.hxx"
#include "textanim.hrc"
#include "textattr.hxx"
diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx
index 32e0448..37a7212 100644
--- a/cui/source/tabpages/textattr.cxx
+++ b/cui/source/tabpages/textattr.cxx
@@ -33,9 +33,6 @@
#include <svx/svdotext.hxx>
#include <svx/dialogs.hrc>
-#ifndef _SVX_TEXTATTR_CXX
-#define _SVX_TEXTATTR_CXX
-#endif
#include "textattr.hxx"
#include "textattr.hrc"
#include <dialmgr.hxx>
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 56939dd..8afcfff 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -23,8 +23,6 @@
#include <sfx2/module.hxx>
#include <svx/dialogs.hrc>
-#define _SVX_TPAREA_CXX
-
#if defined (UNX) || defined (ICC) || defined(WNT)
#include <stdlib.h>
#endif
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index be2f504..05c23ef 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -31,8 +31,6 @@
#include <vcl/bmpacc.hxx>
#include <svx/dialogs.hrc>
-#define _SVX_TPBITMAP_CXX
-
#include <cuires.hrc>
#include "helpid.hrc"
#include "svx/xattr.hxx"
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index e15bb84..371b61e 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -32,8 +32,6 @@
#include <svx/ofaitem.hxx>
#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
-#define _SVX_TPCOLOR_CXX
-
#include <cuires.hrc>
#include "helpid.hrc"
#include "svx/xattr.hxx"
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index 1772c8a..a5506b2f 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -26,8 +26,6 @@
#include <sfx2/filedlghelper.hxx>
#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
-#define _SVX_TPGRADNT_CXX
-
#include <cuires.hrc>
#include "helpid.hrc"
#include "svx/xattr.hxx"
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index c9ed900..e73b8e0 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -26,8 +26,6 @@
#include <sfx2/filedlghelper.hxx>
#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
-#define _SVX_TPHATCH_CXX
-
#include <cuires.hrc>
#include "tabarea.hrc"
#include "helpid.hrc"
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 3036474..8f80f91 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -23,8 +23,6 @@
#include <sfx2/app.hxx>
#include <sfx2/module.hxx>
-#define _SVX_TPLINE_CXX
-
#include <cuires.hrc>
#include "tabline.hrc"
#include "svx/xattr.hxx"
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 84172dc..7bf9ad2 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -26,8 +26,6 @@
#include <sfx2/filedlghelper.hxx>
#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
-#define _SVX_TPLNEDEF_CXX
-
#include <cuires.hrc>
#include "tabline.hrc"
#include "helpid.hrc"
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index 31ce111..3155b326 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -25,8 +25,6 @@
#include <sfx2/filedlghelper.hxx>
#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
-#define _SVX_TPLNEEND_CXX
-
#include <cuires.hrc>
#include "tabline.hrc"
#include "helpid.hrc"
diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx
index 66faa42..824bb8a 100644
--- a/cui/source/tabpages/tpshadow.cxx
+++ b/cui/source/tabpages/tpshadow.cxx
@@ -22,8 +22,6 @@
#include <sfx2/module.hxx>
#include <svx/dialogs.hrc>
-#define _SVX_TPSHADOW_CXX
-
#include "svx/xattr.hxx"
#include <svx/xpool.hxx>
#include <cuires.hrc>
diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx
index 0841f53..c8de24a 100644
--- a/editeng/source/items/bulitem.cxx
+++ b/editeng/source/items/bulitem.cxx
@@ -20,8 +20,6 @@
#include <tools/stream.hxx>
#include <vcl/outdev.hxx>
-#define _SVX_BULITEM_CXX
-
#include <editeng/bulletitem.hxx>
#include <editeng/editrids.hrc>
diff --git a/editeng/source/outliner/outleeng.cxx b/editeng/source/outliner/outleeng.cxx
index 8393ef9..457a903 100644
--- a/editeng/source/outliner/outleeng.cxx
+++ b/editeng/source/outliner/outleeng.cxx
@@ -25,7 +25,6 @@
#include <editeng/lrspitem.hxx>
#include <editeng/fhgtitem.hxx>
-#define _OUTLINER_CXX
#include <editeng/outliner.hxx>
#include <outleeng.hxx>
#include <paralist.hxx>
diff --git a/editeng/source/outliner/outlin2.cxx b/editeng/source/outliner/outlin2.cxx
index 8fea84b..096fff9c 100644
--- a/editeng/source/outliner/outlin2.cxx
+++ b/editeng/source/outliner/outlin2.cxx
@@ -30,8 +30,6 @@
#include <editeng/forbiddencharacterstable.hxx>
-#define _OUTLINER_CXX
-
#include <editeng/outliner.hxx>
#include <paralist.hxx>
#include <editeng/outlobj.hxx>
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index d585e72..8029501 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -29,7 +29,6 @@
#include <math.h>
#include <svl/style.hxx>
#include <vcl/wrkwin.hxx>
-#define _OUTLINER_CXX
#include <editeng/outliner.hxx>
#include <paralist.hxx>
#include <editeng/outlobj.hxx>
diff --git a/editeng/source/outliner/outlobj.cxx b/editeng/source/outliner/outlobj.cxx
index dc39bd6..1140e50 100644
--- a/editeng/source/outliner/outlobj.cxx
+++ b/editeng/source/outliner/outlobj.cxx
@@ -25,7 +25,6 @@
#include <editeng/lrspitem.hxx>
#include <editeng/fhgtitem.hxx>
-#define _OUTLINER_CXX
#include <editeng/outliner.hxx>
#include <editeng/outlobj.hxx>
#include <outleeng.hxx>
diff --git a/editeng/source/outliner/outlundo.cxx b/editeng/source/outliner/outlundo.cxx
index 0bf8cfb..6ebdf3c 100644
--- a/editeng/source/outliner/outlundo.cxx
+++ b/editeng/source/outliner/outlundo.cxx
@@ -26,7 +26,6 @@
#include <editeng/lrspitem.hxx>
#include <editeng/fhgtitem.hxx>
-#define _OUTLINER_CXX
#include <editeng/outliner.hxx>
#include <outlundo.hxx>
diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx
index d6c07e3..a735e07 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -30,7 +30,6 @@
#include <svl/style.hxx>
#include <i18nlangtag/languagetag.hxx>
-#define _OUTLINER_CXX
#include <editeng/outliner.hxx>
#include <outleeng.hxx>
#include <paralist.hxx>
diff --git a/include/editeng/bulletitem.hxx b/include/editeng/bulletitem.hxx
index 345cf3f..deb122f 100644
--- a/include/editeng/bulletitem.hxx
+++ b/include/editeng/bulletitem.hxx
@@ -74,10 +74,8 @@
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 925ee1a..659f6fb 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -216,8 +216,6 @@
};
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);
@@ -229,8 +227,6 @@
EDITENG_DLLPRIVATE void ImpPasted( sal_uLong nStart, sal_uLong nPrevParaCount,
sal_uInt16 nSize);
EDITENG_DLLPRIVATE sal_uInt16 ImpCalcSelectedPages( sal_Bool bIncludeFirstSelected );
EDITENG_DLLPRIVATE sal_Bool ImpIsIndentingPages();
-
-#endif
public:
OutlinerView( Outliner* pOut, Window* pWindow );
@@ -603,8 +599,6 @@
sal_uLong nDummy;
-#ifdef _OUTLINER_CXX
-
DECL_LINK( ParaVisibleStateChangedHdl, Paragraph* );
DECL_LINK( BeginMovingParagraphsHdl, void* );
DECL_LINK( EndMovingParagraphsHdl, MoveParagraphsInfo* );
@@ -641,7 +635,6 @@
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 d5c8423..e4810e6 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 @@
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;
@@ -915,8 +914,6 @@
// link to be set at <method>SvtSysLocaleOptions::SetCurrencyChangeLink()</method>
DECL_DLLPRIVATE_STATIC_LINK( SvNumberFormatter, CurrencyChangeLink, void* );
-
-#endif // _ZFORLIST_CXX
public:
diff --git a/include/svl/zformat.hxx b/include/svl/zformat.hxx
index 20cc4d1..fce623d 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 @@
/// 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 @@
impTransliterateImpl(rStr, rNum);
}
}
-
-#endif // _ZFORMAT_CXX
-
};
#endif // _ZFORMAT_HXX
diff --git a/include/svtools/calendar.hxx b/include/svtools/calendar.hxx
index 2c41ae7..0fa8a94 100644
--- a/include/svtools/calendar.hxx
+++ b/include/svtools/calendar.hxx
@@ -224,7 +224,6 @@
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 @@
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 @@
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 39e5bb0..d2c933b 100644
--- a/include/svtools/ctrlbox.hxx
+++ b/include/svtools/ctrlbox.hxx
@@ -164,11 +164,10 @@
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 @@
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 @@
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 b90f1b6..efe7b53 100644
--- a/include/svtools/ctrltool.hxx
+++ b/include/svtools/ctrltool.hxx
@@ -162,12 +162,11 @@
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 9be63ce..29bd35f 100644
--- a/include/svtools/headbar.hxx
+++ b/include/svtools/headbar.hxx
@@ -263,7 +263,6 @@
::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 @@
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 a06109b..5a45710 100644
--- a/include/svtools/ruler.hxx
+++ b/include/svtools/ruler.hxx
@@ -644,7 +644,6 @@
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 @@
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 f9af5b9..3980954 100644
--- a/include/svtools/scrwin.hxx
+++ b/include/svtools/scrwin.hxx
@@ -57,11 +57,9 @@
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 ff032fd..70fcd00 100644
--- a/include/svtools/valueset.hxx
+++ b/include/svtools/valueset.hxx
@@ -37,10 +37,8 @@
struct ValueSetItem;
typedef ::std::vector< ValueSetItem* > ValueItemList;
-#ifdef _SV_VALUESET_CXX
class ValueSetAcc;
class ValueItemAcc;
-#endif
/*************************************************************************
@@ -241,7 +239,6 @@
Link maSelectHdl;
Link maHighlightHdl;
-#ifdef _SV_VALUESET_CXX
friend class ValueSetAcc;
friend class ValueItemAcc;
using Control::ImplInitSettings;
@@ -272,7 +269,6 @@
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 f161b73..765d2fa 100644
--- a/include/svtools/wizdlg.hxx
+++ b/include/svtools/wizdlg.hxx
@@ -239,7 +239,6 @@
*/
void SetEmptyViewMargin();
-#ifdef _SVT_WIZDLG_CXX
private:
SVT_DLLPRIVATE void ImplInitData();
SVT_DLLPRIVATE void ImplCalcSize( Size& rSize );
@@ -247,7 +246,6 @@
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 8f1ff76..0c41d63 100644
--- a/include/svx/charmap.hxx
+++ b/include/svx/charmap.hxx
@@ -62,7 +62,6 @@
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 @@
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 8a9b355..324de12 100644
--- a/include/svx/checklbx.hxx
+++ b/include/svx/checklbx.hxx
@@ -34,9 +34,7 @@
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 4d2c4a0..4e24257 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 @@
XColorListRef pColorList;
-#ifdef _SVX_FONTWORK_CXX
friend class SvxFontWorkChildWindow;
friend class SvxFontWorkControllerItem;
@@ -152,7 +152,6 @@
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 bb1d2f5..3af1316a 100644
--- a/include/svx/hdft.hxx
+++ b/include/svx/hdft.hxx
@@ -93,9 +93,7 @@
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 9fbcd4e..91e6966 100644
--- a/include/svx/insctrl.hxx
+++ b/include/svx/insctrl.hxx
@@ -40,11 +40,8 @@
private:
sal_Bool bInsert;
-#ifdef _SVX_INSCTRL_CXX
SVX_DLLPRIVATE void DrawItemText_Impl();
-#endif
};
-
#endif
diff --git a/include/svx/itemwin.hxx b/include/svx/itemwin.hxx
index d2a1b25..92daba3 100644
--- a/include/svx/itemwin.hxx
+++ b/include/svx/itemwin.hxx
@@ -41,11 +41,10 @@
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 @@
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 @@
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 @@
sal_Bool bSelect;
sal_Bool bRelease;
-#ifdef _SVX_ITEMWIN_CXX
void ReleaseFocus_Impl();
-#endif
};
// class SvxFillAttrBox --------------------------------------------------
@@ -176,9 +169,7 @@
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 2a8607c..cba5559 100644
--- a/include/svx/numfmtsh.hxx
+++ b/include/svx/numfmtsh.hxx
@@ -199,7 +199,7 @@
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,9 +220,7 @@
Color*& rpColor );
SVX_DLLPRIVATE void PosToCategory_Impl( sal_uInt16 nPos, short& rCategory );
SVX_DLLPRIVATE void CategoryToPos_Impl( short nCategory, sal_uInt16& rPos );
-#endif
};
-
#endif
diff --git a/include/svx/optgrid.hxx b/include/svx/optgrid.hxx
index 300dfaab..777a61a 100644
--- a/include/svx/optgrid.hxx
+++ b/include/svx/optgrid.hxx
@@ -155,15 +155,11 @@
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
diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx
index 9282e3e..f9c44fa 100644
--- a/include/svx/srchdlg.hxx
+++ b/include/svx/srchdlg.hxx
@@ -223,7 +223,6 @@
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 @@
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 1e73d32..64b690f 100644
--- a/include/tools/config.hxx
+++ b/include/tools/config.hxx
@@ -37,10 +37,8 @@
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 678fc94..8b5d434 100644
--- a/include/tools/multisel.hxx
+++ b/include/tools/multisel.hxx
@@ -42,12 +42,10 @@
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();
diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index f80d729..bd68ab4 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -37,10 +37,7 @@
#include "zforscan.hxx"
#include <svl/zformat.hxx>
-#define _ZFORFIND_CXX
#include "zforfind.hxx"
-#undef _ZFORFIND_CXX
-
#ifndef DBG_UTIL
#define NF_TEST_CALENDAR 0
diff --git a/svl/source/numbers/zforfind.hxx b/svl/source/numbers/zforfind.hxx
index dadde5c..de86412 100644
--- a/svl/source/numbers/zforfind.hxx
+++ b/svl/source/numbers/zforfind.hxx
@@ -183,7 +183,6 @@
*/
sal_uInt16 nDatePatternNumbers;
-#ifdef _ZFORFIND_CXX // methods private to implementation
void Reset(); // Reset all variables before start of analysis
void InitText(); // Init of months and days of week
@@ -414,11 +413,7 @@
@see nMayBeMonthDate
*/
bool MayBeMonthDate();
-
-#endif // _ZFORFIND_CXX
};
-
-
#endif // _ZFORFIND_HXX
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 6b42aaa..ae0a163 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -30,10 +30,8 @@
#include <unotools/misccfg.hxx>
-#define _ZFORLIST_CXX
#include <osl/mutex.hxx>
#include <svl/zforlist.hxx>
-#undef _ZFORLIST_CXX
#include "zforscan.hxx"
#include "zforfind.hxx"
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 8bc6dc2..fc9254b 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -36,7 +36,6 @@
#include <com/sun/star/i18n/CalendarDisplayCode.hpp>
#include <com/sun/star/i18n/AmPmValue.hpp>
-#define _ZFORMAT_CXX
#include <svl/zformat.hxx>
#include <zforscan.hxx>
@@ -5479,4 +5478,24 @@
return nCnt;
}
+const CharClass& SvNumberformat::rChrCls() const
+{
+ return rScan.GetChrCls();
+}
+
+const LocaleDataWrapper& SvNumberformat::rLoc() const
+{
+ return rScan.GetLoc();
+}
+
+CalendarWrapper& SvNumberformat::GetCal() const
+{
+ return rScan.GetCal();
+}
+
+const SvNumberFormatter& SvNumberformat::GetFormatter() const
+{
+ return *rScan.GetNumberformatter();
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index a0d44db..43a354f 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -31,9 +31,8 @@
#include <svl/zformat.hxx>
#include <unotools/digitgroupingiterator.hxx>
-#define _ZFORSCAN_CXX
#include "zforscan.hxx"
-#undef _ZFORSCAN_CXX
+
#include <svl/nfsymbol.hxx>
using namespace svt;
diff --git a/svl/source/numbers/zforscan.hxx b/svl/source/numbers/zforscan.hxx
index a93ef966..7872b07 100644
--- a/svl/source/numbers/zforscan.hxx
+++ b/svl/source/numbers/zforscan.hxx
@@ -218,7 +218,6 @@
void InitSpecialKeyword( NfKeywordIndex eIdx ) const;
void InitCompatCur() const;
-#ifdef _ZFORSCAN_CXX // ----- private Methoden -----
void SetDependentKeywords();
// Setzt die Sprachabh. Keyw.
void SkipStrings(sal_uInt16& i, sal_Int32& nPos);// Ueberspringt StringSymbole
@@ -270,11 +269,7 @@
// remove "..." and \... quotes from rStr, return how many chars removed
static sal_Int32 RemoveQuotes( OUString& rStr );
-
-#endif //_ZFORSCAN_CXX
};
-
-
#endif // _ZFORSCAN_HXX
diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx
index 8ef2de2..a37cda3 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -33,7 +33,6 @@
#include <com/sun/star/i18n/CalendarDisplayIndex.hpp>
#include <com/sun/star/i18n/CalendarFieldIndex.hpp>
-#define _SV_CALENDAR_CXX
#include <svtools/svtools.hrc>
#include <svtools/svtresid.hxx>
#include <svtools/calendar.hxx>
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index 663d2473..10ec0f1 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-#define _CTRLBOX_CXX
#include <tools/stream.hxx>
#include <vcl/builder.hxx>
#include <vcl/svapp.hxx>
diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx
index e225bc3..e4e6dd2 100644
--- a/svtools/source/control/ctrltool.cxx
+++ b/svtools/source/control/ctrltool.cxx
@@ -17,9 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-#define CTRLTOOL_CXX
-
#include <string.h>
#include <comphelper/string.hxx>
diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx
index 6e7f88e..0cf0730 100644
--- a/svtools/source/control/headbar.cxx
+++ b/svtools/source/control/headbar.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-#define _SV_HEADBAR_CXX
#include <svtools/headbar.hxx>
#include <tools/debug.hxx>
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index bd99974..7e5e2f1 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -17,14 +17,12 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <string.h>
#include <tools/debug.hxx>
#include <vcl/svapp.hxx>
#include <tools/poly.hxx>
#include <vcl/i18nhelp.hxx>
-#define _SV_RULER_CXX
#include <svtools/ruler.hxx>
// =======================================================================
@@ -101,12 +99,10 @@
sal_Bool bAutoPageWidth;
sal_Bool bTextRTL;
-#ifdef _SV_RULER_CXX
public:
ImplRulerData();
~ImplRulerData();
ImplRulerData& operator=( const ImplRulerData& rData );
-#endif
};
diff --git a/svtools/source/control/scrwin.cxx b/svtools/source/control/scrwin.cxx
index c66a31e..5535e4c 100644
--- a/svtools/source/control/scrwin.cxx
+++ b/svtools/source/control/scrwin.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-#define _SVT_SCRWIN_CXX
#include <svtools/scrwin.hxx>
//===================================================================
diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx
index 53c4432..1bef13a 100644
--- a/svtools/source/control/valueacc.cxx
+++ b/svtools/source/control/valueacc.cxx
@@ -17,9 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-#define _SV_VALUESET_CXX
-
#include <unotools/accessiblestatesethelper.hxx>
#include <vcl/svapp.hxx>
#include <svtools/valueset.hxx>
diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx
index 1e349b4..9eb2124 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -31,7 +31,6 @@
#include "valueimp.hxx"
-#define _SV_VALUESET_CXX
#include <svtools/valueset.hxx>
namespace
diff --git a/svtools/source/dialogs/wizdlg.cxx b/svtools/source/dialogs/wizdlg.cxx
index 8112b58..1a9191a 100644
--- a/svtools/source/dialogs/wizdlg.cxx
+++ b/svtools/source/dialogs/wizdlg.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-#define _SVT_WIZDLG_CXX
#include <vcl/fixed.hxx>
#include <vcl/button.hxx>
#include <vcl/tabpage.hxx>
diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx
index fe67018..7728329 100644
--- a/svx/source/accessibility/charmapacc.cxx
+++ b/svx/source/accessibility/charmapacc.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-#define _SVX_CHARMAP_CXX_
#include <unotools/accessiblestatesethelper.hxx>
#include <vcl/svapp.hxx>
#include <stdio.h>
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index f8434de..23494a8 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -19,7 +19,6 @@
#include <stdio.h>
-#define _SVX_CHARMAP_CXX_
#include <vcl/svapp.hxx>
#include <svtools/colorcfg.hxx>
diff --git a/svx/source/dialog/checklbx.cxx b/svx/source/dialog/checklbx.cxx
index 266eac6..d3145bc 100644
--- a/svx/source/dialog/checklbx.cxx
+++ b/svx/source/dialog/checklbx.cxx
@@ -21,8 +21,6 @@
#include <svtools/treelistentry.hxx>
-#define _SVX_CHECKLBX_CXX
-
#include <svx/checklbx.hxx>
#include <svx/dialmgr.hxx>
diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx
index 5efd33a..32aab9e 100644
--- a/svx/source/dialog/fontwork.cxx
+++ b/svx/source/dialog/fontwork.cxx
@@ -21,7 +21,6 @@
#include <sfx2/dispatch.hxx>
#include <tools/shl.hxx>
-#define _SVX_FONTWORK_CXX
#include <svx/svdobj.hxx>
#include <svx/svdopath.hxx>
#include <svx/svdview.hxx>
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index 639afff..b987f43 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -31,8 +31,6 @@
#include <svl/intitem.hxx>
-#define _SVX_HDFT_CXX
-
#include <svx/hdft.hxx>
#include <svx/pageitem.hxx>
diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx
index f6ceeae..664c70e 100644
--- a/svx/source/dialog/optgrid.cxx
+++ b/svx/source/dialog/optgrid.cxx
@@ -22,8 +22,6 @@
#include <sfx2/module.hxx>
#include <svl/intitem.hxx>
-#define _SVX_OPTGRID_CXX
-
#include <svx/svxids.hrc>
#include <svx/dialmgr.hxx>
#include "svx/optgrid.hxx"
diff --git a/svx/source/dialog/srchctrl.cxx b/svx/source/dialog/srchctrl.cxx
index a766d05..2e42541 100644
--- a/svx/source/dialog/srchctrl.cxx
+++ b/svx/source/dialog/srchctrl.cxx
@@ -22,8 +22,6 @@
#include <svx/svxids.hrc>
-#define _SVX_SRCHDLG_CXX // so that private methods from SrchDlgare known
-
#include "srchctrl.hxx"
#include "svx/srchdlg.hxx"
#include <svl/srchitem.hxx>
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 26dd195..ae395a0 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -47,7 +47,6 @@
#include <sfx2/app.hxx>
#include <toolkit/unohlp.hxx>
-#define _SVX_SRCHDLG_CXX
#include "svx/srchdlg.hxx"
#include <svx/dialogs.hrc>
diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx
index 2616f73..ae6fbe7 100644
--- a/svx/source/items/numfmtsh.cxx
+++ b/svx/source/items/numfmtsh.cxx
@@ -19,7 +19,6 @@
#include <tools/color.hxx>
-#define _SVX_NUMFMTSH_CXX
#include <tools/debug.hxx>
#include <i18nlangtag/mslangid.hxx>
diff --git a/svx/source/stbctrls/insctrl.cxx b/svx/source/stbctrls/insctrl.cxx
index 1e931a9..f992882 100644
--- a/svx/source/stbctrls/insctrl.cxx
+++ b/svx/source/stbctrls/insctrl.cxx
@@ -23,8 +23,6 @@
#include <sfx2/app.hxx>
#include <sfx2/dispatch.hxx>
-#define _SVX_INSCTRL_CXX
-
#include <svx/dialogs.hrc>
#include "svx/insctrl.hxx"
diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx
index 8043a54..da87d23 100644
--- a/svx/source/tbxctrls/itemwin.cxx
+++ b/svx/source/tbxctrls/itemwin.cxx
@@ -24,8 +24,6 @@
#include <sfx2/module.hxx>
#include <tools/urlobj.hxx>
-#define _SVX_ITEMWIN_CXX
-
#include <vcl/svapp.hxx>
#include <svx/dialogs.hrc>
diff --git a/tools/source/generic/config.cxx b/tools/source/generic/config.cxx
index 64c0fdf..854136e 100644
--- a/tools/source/generic/config.cxx
+++ b/tools/source/generic/config.cxx
@@ -16,7 +16,6 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#define _CONFIG_CXX
#include <cstddef>
#include <cstdlib>
diff --git a/tools/source/memtools/multisel.cxx b/tools/source/memtools/multisel.cxx
index 1219dd5..d91c499 100644
--- a/tools/source/memtools/multisel.cxx
+++ b/tools/source/memtools/multisel.cxx
@@ -16,7 +16,6 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#define _SV_MULTISEL_CXX
#ifdef MI_DEBUG
#define private public
--
To view, visit https://gerrit.libreoffice.org/3627
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1053139ca5e5e2631f7b22d99d3bada54fc337be
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Tor Lillqvist <tml@iki.fi>
Context
- [PATCH] Bin ugly (ab)use of preprocessor in headers · Tor Lillqvist (via Code Review)
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.