sc/source/filter/inc/rtfparse.hxx | 9 ---------
sc/source/filter/rtf/rtfparse.cxx | 3 ---
sc/source/ui/dbgui/consdlg.cxx | 2 --
sc/source/ui/dbgui/pfiltdlg.cxx | 2 --
sc/source/ui/inc/areasdlg.hxx | 4 +---
sc/source/ui/inc/consdlg.hxx | 3 ---
sc/source/ui/inc/crnrdlg.hxx | 3 ---
sc/source/ui/inc/filldlg.hxx | 3 ---
sc/source/ui/inc/instbdlg.hxx | 2 --
sc/source/ui/inc/pfiltdlg.hxx | 2 --
sc/source/ui/inc/solvrdlg.hxx | 3 ---
sc/source/ui/inc/tphf.hxx | 3 ---
sc/source/ui/inc/tpusrlst.hxx | 3 ---
sc/source/ui/miscdlgs/crnrdlg.cxx | 3 ---
sc/source/ui/miscdlgs/filldlg.cxx | 7 -------
sc/source/ui/miscdlgs/instbdlg.cxx | 5 -----
sc/source/ui/miscdlgs/solvrdlg.cxx | 3 ---
sc/source/ui/optdlg/tpusrlst.cxx | 4 ----
sc/source/ui/pagedlg/areasdlg.cxx | 3 ---
sc/source/ui/pagedlg/tphf.cxx | 6 ------
store/workben/t_store.cxx | 1 -
sw/source/core/inc/layact.hxx | 10 ----------
sw/source/core/layout/layact.cxx | 1 -
23 files changed, 1 insertion(+), 84 deletions(-)
New commits:
commit 4c3b36073ae542fc5a8ccffa685a4105525b3394
Author: Thomas Arnhold <tho...@arnhold.org>
Date: Tue Jun 3 22:45:34 2014 +0200
Bin ugly (ab)use of preprocessor in headers (final part)
Finish the work of ec8617568ff091026b2f17cce3b547b1633fa6c4
Only one is left: SC_PROGRESS_CXX
Change-Id: Ifdc07ec377d7a84e92bc4b0a66ab82b1fc93f76a
Reviewed-on: https://gerrit.libreoffice.org/9636
Reviewed-by: Thomas Arnhold <tho...@arnhold.org>
Tested-by: Thomas Arnhold <tho...@arnhold.org>
diff --git a/sc/source/filter/inc/rtfparse.hxx
b/sc/source/filter/inc/rtfparse.hxx
index 7da0872..644a331 100644
--- a/sc/source/filter/inc/rtfparse.hxx
+++ b/sc/source/filter/inc/rtfparse.hxx
@@ -22,7 +22,6 @@
#include "eeparser.hxx"
-#ifdef SC_RTFPARSE_CXX
#include <boost/ptr_container/ptr_vector.hpp>
#include <o3tl/sorted_vector.hxx>
@@ -44,14 +43,6 @@ struct ScRTFCellDefault
class ScRTFColTwips : public o3tl::sorted_vector<sal_uLong> {};
-#else // SC_RTFPARSE_CXX
-
-struct ScRTFCellDefault;
-class ScRTFColTwips;
-
-#endif // SC_RTFPARSE_CXX
-
-
class EditEngine;
class ScRTFParser : public ScEEParser
diff --git a/sc/source/filter/rtf/rtfparse.cxx
b/sc/source/filter/rtf/rtfparse.cxx
index 3449bb1..f8df028 100644
--- a/sc/source/filter/rtf/rtfparse.cxx
+++ b/sc/source/filter/rtf/rtfparse.cxx
@@ -19,15 +19,12 @@
#include "scitems.hxx"
#include <editeng/eeitem.hxx>
-
-
#include <editeng/editeng.hxx>
#include <editeng/fhgtitem.hxx>
#include <editeng/svxrtf.hxx>
#include <vcl/outdev.hxx>
#include <svtools/rtftoken.h>
-#define SC_RTFPARSE_CXX
#include "rtfparse.hxx"
#include "global.hxx"
#include "document.hxx"
diff --git a/sc/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx
index 0f8e328..3bd36c3 100644
--- a/sc/source/ui/dbgui/consdlg.cxx
+++ b/sc/source/ui/dbgui/consdlg.cxx
@@ -31,9 +31,7 @@
#include "globstr.hrc"
#include "sc.hrc"
-#define _CONSDLG_CXX
#include "consdlg.hxx"
-#undef _CONSDLG_CXX
#include <vcl/msgbox.hxx>
#define INFOBOX(id) InfoBox(this, ScGlobal::GetRscString(id)).Execute()
diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx
index 2d68f0b..2133fc0 100644
--- a/sc/source/ui/dbgui/pfiltdlg.cxx
+++ b/sc/source/ui/dbgui/pfiltdlg.cxx
@@ -36,9 +36,7 @@
#include "filter.hrc"
#include "globstr.hrc"
-#define _PFILTDLG_CXX
#include "pfiltdlg.hxx"
-#undef _PFILTDLG_CXX
#include <svl/zforlist.hxx>
#include <svl/sharedstringpool.hxx>
diff --git a/sc/source/ui/inc/areasdlg.hxx b/sc/source/ui/inc/areasdlg.hxx
index 2800ac4..d7c6789 100644
--- a/sc/source/ui/inc/areasdlg.hxx
+++ b/sc/source/ui/inc/areasdlg.hxx
@@ -22,6 +22,7 @@
#include "address.hxx"
+#include <svl/stritem.hxx>
#include <vcl/lstbox.hxx>
#include <vcl/fixed.hxx>
#include "anyrefdg.hxx"
@@ -67,8 +68,6 @@ private:
ScViewData* pViewData;
SCTAB nCurTab;
-#ifdef _AREASDLG_CXX
-private:
void Impl_Reset();
bool Impl_CheckRefStrings();
void Impl_FillLists();
@@ -79,7 +78,6 @@ private:
DECL_LINK( Impl_ModifyHdl, formula::RefEdit* );
DECL_LINK( Impl_BtnHdl, PushButton* );
DECL_LINK( Impl_GetFocusHdl, Control* );
-#endif
};
#endif
diff --git a/sc/source/ui/inc/consdlg.hxx b/sc/source/ui/inc/consdlg.hxx
index b7ff60d..30ce8f6 100644
--- a/sc/source/ui/inc/consdlg.hxx
+++ b/sc/source/ui/inc/consdlg.hxx
@@ -87,8 +87,6 @@ private:
formula::RefEdit* pRefInputEdit;
bool bDlgLostFocus;
-#ifdef _CONSDLG_CXX
-private:
void Init ();
void FillAreaLists ();
bool VerifyEdit ( formula::RefEdit* pEd );
@@ -101,7 +99,6 @@ private:
ScSubTotalFunc LbPosToFunc( sal_uInt16 nPos );
sal_uInt16 FuncToLbPos( ScSubTotalFunc eFunc );
-#endif // _CONSDLG_CXX
};
#endif // INCLUDED_SC_SOURCE_UI_INC_CONSDLG_HXX
diff --git a/sc/source/ui/inc/crnrdlg.hxx b/sc/source/ui/inc/crnrdlg.hxx
index b6fcd92..5337886 100644
--- a/sc/source/ui/inc/crnrdlg.hxx
+++ b/sc/source/ui/inc/crnrdlg.hxx
@@ -72,8 +72,6 @@ private:
formula::RefEdit* pEdActive;
bool bDlgLostFocus;
-#ifdef _CRNRDLG_CXX
-private:
void Init ();
void UpdateNames ();
void UpdateRangeData ( const ScRange& rRange, bool bColName );
@@ -90,7 +88,6 @@ private:
DECL_LINK( Range2DataModifyHdl, void * );
DECL_LINK( GetFocusHdl, Control* );
DECL_LINK( LoseFocusHdl, void* );
-#endif
};
#endif // INCLUDED_SC_SOURCE_UI_INC_CRNRDLG_HXX
diff --git a/sc/source/ui/inc/filldlg.hxx b/sc/source/ui/inc/filldlg.hxx
index 954b824..cc8710d 100644
--- a/sc/source/ui/inc/filldlg.hxx
+++ b/sc/source/ui/inc/filldlg.hxx
@@ -96,8 +96,6 @@ private:
bool bStartValFlag;
-#ifdef _FILLDLG_CXX
-private:
void Init( sal_uInt16 nPossDir );
bool CheckStartVal();
bool CheckIncrementVal();
@@ -105,7 +103,6 @@ private:
DECL_LINK( OKHdl, void * );
DECL_LINK( DisableHdl, Button * );
-#endif
};
#endif // INCLUDED_SC_SOURCE_UI_INC_FILLDLG_HXX
diff --git a/sc/source/ui/inc/instbdlg.hxx b/sc/source/ui/inc/instbdlg.hxx
index d247b35..ad68712 100644
--- a/sc/source/ui/inc/instbdlg.hxx
+++ b/sc/source/ui/inc/instbdlg.hxx
@@ -84,7 +84,6 @@ private:
SCTAB nTableCount;
OUString m_sSheetDotDotDot;
-#ifdef SC_INSTBDLG_CXX
void Init_Impl( bool bFromFile );
void SetNewTable_Impl();
void SetFromTo_Impl();
@@ -98,7 +97,6 @@ private:
DECL_LINK(DoEnterHdl, void *);
DECL_LINK(BrowseTimeoutHdl, void *);
DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper* );
-#endif
};
#endif // INCLUDED_SC_SOURCE_UI_INC_INSTBDLG_HXX
diff --git a/sc/source/ui/inc/pfiltdlg.hxx b/sc/source/ui/inc/pfiltdlg.hxx
index 6c5654a..7dfe935 100644
--- a/sc/source/ui/inc/pfiltdlg.hxx
+++ b/sc/source/ui/inc/pfiltdlg.hxx
@@ -82,7 +82,6 @@ private:
std::vector<ScTypedStrData>* pEntryLists[MAXCOLCOUNT];
-#ifdef _PFILTDLG_CXX
private:
void Init ( const SfxItemSet& rArgSet );
void FillFieldLists ();
@@ -94,7 +93,6 @@ private:
DECL_LINK( LbSelectHdl, ListBox* );
DECL_LINK( ValModifyHdl, ComboBox* );
DECL_LINK( CheckBoxHdl, CheckBox* );
-#endif
};
diff --git a/sc/source/ui/inc/solvrdlg.hxx b/sc/source/ui/inc/solvrdlg.hxx
index 7ffa450..e0a7287 100644
--- a/sc/source/ui/inc/solvrdlg.hxx
+++ b/sc/source/ui/inc/solvrdlg.hxx
@@ -77,8 +77,6 @@ private:
const OUString errMsgNoFormula;
const OUString errMsgInvalidVal;
-
-#ifdef _SOLVRDLG_CXX
void Init();
bool CheckTargetValue( const OUString& rStrVal );
void RaiseError( ScSolverErr eError );
@@ -86,7 +84,6 @@ private:
DECL_LINK( BtnHdl, PushButton* );
DECL_LINK( GetFocusHdl, Control* );
DECL_LINK( LoseFocusHdl, void* );
-#endif // _SOLVERDLG_CXX
};
#endif // INCLUDED_SC_SOURCE_UI_INC_SOLVRDLG_HXX
diff --git a/sc/source/ui/inc/tphf.hxx b/sc/source/ui/inc/tphf.hxx
index 733242d..2f4fff0 100644
--- a/sc/source/ui/inc/tphf.hxx
+++ b/sc/source/ui/inc/tphf.hxx
@@ -52,12 +52,9 @@ private:
sal_uInt16 nPageUsage;
const ScStyleDlg* pStyleDlg;
-#ifdef _TPHF_CXX
-private:
DECL_LINK(BtnHdl, void *);
DECL_LINK( HFEditHdl, void* );
DECL_LINK(TurnOnHdl, void *);
-#endif
};
class ScHeaderPage : public ScHFPage
diff --git a/sc/source/ui/inc/tpusrlst.hxx b/sc/source/ui/inc/tpusrlst.hxx
index 39590b2..9e35649 100644
--- a/sc/source/ui/inc/tpusrlst.hxx
+++ b/sc/source/ui/inc/tpusrlst.hxx
@@ -81,8 +81,6 @@ private:
bool bCopyDone;
sal_Int32 nCancelPos;
-#ifdef _TPUSRLST_CXX
-private:
void Init ();
size_t UpdateUserListBox ();
void UpdateEntries ( size_t nList );
@@ -98,7 +96,6 @@ private:
DECL_LINK( LbSelectHdl, ListBox* );
DECL_LINK( BtnClickHdl, PushButton* );
DECL_LINK( EdEntriesModHdl, VclMultiLineEdit* );
-#endif
};
#endif // INCLUDED_SC_SOURCE_UI_INC_TPUSRLST_HXX
diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx
b/sc/source/ui/miscdlgs/crnrdlg.cxx
index 294cf79..ea118ed 100644
--- a/sc/source/ui/miscdlgs/crnrdlg.cxx
+++ b/sc/source/ui/miscdlgs/crnrdlg.cxx
@@ -22,10 +22,7 @@
#include "scresid.hxx"
#include "globstr.hrc"
#include "docsh.hxx"
-
-#define _CRNRDLG_CXX
#include "crnrdlg.hxx"
-#undef _CRNRDLG_CXX
#include <vcl/msgbox.hxx>
#include <boost/scoped_array.hpp>
diff --git a/sc/source/ui/miscdlgs/filldlg.cxx
b/sc/source/ui/miscdlgs/filldlg.cxx
index aa654de..c9b51ad 100644
--- a/sc/source/ui/miscdlgs/filldlg.cxx
+++ b/sc/source/ui/miscdlgs/filldlg.cxx
@@ -17,11 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#undef SC_DLLIMPLEMENTATION
-
-
#include <svl/zforlist.hxx>
#include <vcl/msgbox.hxx>
#include <limits.h>
@@ -30,11 +27,7 @@
#include "document.hxx"
#include "globstr.hrc"
#include "miscdlgs.hrc"
-
-#define _FILLDLG_CXX
#include "filldlg.hxx"
-#undef _FILLDLG_CXX
-
// class ScFillSeriesDlg
diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx
b/sc/source/ui/miscdlgs/instbdlg.cxx
index 248504c..676012cd 100644
--- a/sc/source/ui/miscdlgs/instbdlg.cxx
+++ b/sc/source/ui/miscdlgs/instbdlg.cxx
@@ -17,11 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#undef SC_DLLIMPLEMENTATION
-
-
#include <sfx2/app.hxx>
#include <sfx2/docfile.hxx>
#include <sfx2/docinsert.hxx>
@@ -35,8 +32,6 @@
#include "viewdata.hxx"
#include "scresid.hxx"
#include "globstr.hrc"
-
-#define SC_INSTBDLG_CXX
#include "instbdlg.hxx"
ScInsertTableDlg::ScInsertTableDlg( Window* pParent, ScViewData& rData, SCTAB
nTabCount, bool bFromFile )
diff --git a/sc/source/ui/miscdlgs/solvrdlg.cxx
b/sc/source/ui/miscdlgs/solvrdlg.cxx
index c1cb88a..d6cae3a 100644
--- a/sc/source/ui/miscdlgs/solvrdlg.cxx
+++ b/sc/source/ui/miscdlgs/solvrdlg.cxx
@@ -29,10 +29,7 @@
#include "scresid.hxx"
#include "globstr.hrc"
#include "sc.hrc"
-
-#define _SOLVRDLG_CXX
#include "solvrdlg.hxx"
-#undef _SOLVRDLG_CXX
namespace
{
diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx
index 47d7fb7..19c432f 100644
--- a/sc/source/ui/optdlg/tpusrlst.cxx
+++ b/sc/source/ui/optdlg/tpusrlst.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#undef SC_DLLIMPLEMENTATION
#include <comphelper/string.hxx>
@@ -34,10 +33,7 @@
#include "scresid.hxx"
#include "sc.hrc"
#include "globstr.hrc"
-
-#define _TPUSRLST_CXX
#include "tpusrlst.hxx"
-#undef _TPUSRLST_CXX
// STATIC DATA -----------------------------------------------------------
diff --git a/sc/source/ui/pagedlg/areasdlg.cxx
b/sc/source/ui/pagedlg/areasdlg.cxx
index cde8be6..097a1bb 100644
--- a/sc/source/ui/pagedlg/areasdlg.cxx
+++ b/sc/source/ui/pagedlg/areasdlg.cxx
@@ -26,10 +26,7 @@
#include <unotools/charclass.hxx>
#include <stdlib.h>
-#define _AREASDLG_CXX
#include "areasdlg.hxx"
-#undef _AREASDLG_CXX
-
#include "scresid.hxx"
#include "rangenam.hxx"
#include "reffact.hxx"
diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx
index 0d22eed..3d495da 100644
--- a/sc/source/ui/pagedlg/tphf.cxx
+++ b/sc/source/ui/pagedlg/tphf.cxx
@@ -17,12 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#undef SC_DLLIMPLEMENTATION
-
-
-#define _TPHF_CXX
#include "scitems.hxx"
#include <sfx2/basedlgs.hxx>
#include <svl/style.hxx>
@@ -40,10 +36,8 @@
#include "styledlg.hxx"
#include "scresid.hxx"
#include "scuitphfedit.hxx"
-#undef _TPHF_CXX
#include <boost/scoped_ptr.hpp>
-
// class ScHFPage
diff --git a/store/workben/t_store.cxx b/store/workben/t_store.cxx
index 455f053..2f2c712 100644
--- a/store/workben/t_store.cxx
+++ b/store/workben/t_store.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#define _T_STORE_CXX
#include <sal/types.h>
#include <osl/diagnose.h>
#include <osl/thread.h>
diff --git a/sw/source/core/inc/layact.hxx b/sw/source/core/inc/layact.hxx
index ac87a66..0c83a38 100644
--- a/sw/source/core/inc/layact.hxx
+++ b/sw/source/core/inc/layact.hxx
@@ -92,8 +92,6 @@ class SwLayAction
// OD 14.04.2003 #106346# - new flag for content formatting on interrupt.
bool mbFormatCntntOnInterrupt;
-#ifdef _LAYACT_CXX
-
void PaintCntnt( const SwCntntFrm *, const SwPageFrm *,
const SwRect &rOldRect, long nOldBottom );
bool PaintWithoutFlys( const SwRect &, const SwCntntFrm *,
@@ -119,13 +117,10 @@ class SwLayAction
inline void CheckIdleEnd();
inline sal_uLong GetStartTicks() { return nStartTicks; }
-#endif
-
public:
SwLayAction( SwRootFrm *pRt, SwViewImp *pImp );
~SwLayAction();
-#ifdef _LAYACT_CXX
void SetIdle ( bool bNew ) { bIdle = bNew; }
void SetCheckPages ( bool bNew ) { bCheckPages = bNew; }
void SetBrowseActionStop( bool bNew ) { bBrowseActionStop = bNew; }
@@ -142,7 +137,6 @@ public:
bool IsInterrupt() const { return IsInput(); }
sal_uInt16 GetInputType() const { return nInputType; }
-#endif
// adjusting Action to the wanted behaviour
void SetPaint ( bool bNew ) { bPaint = bNew; }
@@ -197,8 +191,6 @@ class SwLayIdle
bool m_bIndicator;
#endif
-#ifdef _LAYACT_CXX
-
#ifdef DBG_UTIL
void ShowIdle( ColorData eName );
#endif
@@ -207,8 +199,6 @@ class SwLayIdle
bool _DoIdleJob( const SwCntntFrm*, IdleJobType );
bool DoIdleJob( IdleJobType, bool bVisAreaOnly );
-#endif
-
public:
SwLayIdle( SwRootFrm *pRt, SwViewImp *pImp );
~SwLayIdle();
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index 9f8de67..dce0dd6 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -40,7 +40,6 @@
#include <editeng/opaqitem.hxx>
#include <SwSmartTagMgr.hxx>
-#define _LAYACT_CXX
#include "layact.hxx"
#include <swwait.hxx>
#include <fmtsrnd.hxx>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
