diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2014-06-03 22:45:34 +0200 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2014-06-06 22:15:20 +0000 |
| commit | 4c3b36073ae542fc5a8ccffa685a4105525b3394 (patch) | |
| tree | 35b9a73888371dafd48b95305919909fa817676c /sw | |
| parent | cae83eb8b6906bba4abf9b625b84364e5f6e36ca (diff) | |
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 <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/inc/layact.hxx | 10 | ||||
| -rw-r--r-- | sw/source/core/layout/layact.cxx | 1 |
2 files changed, 0 insertions, 11 deletions
diff --git a/sw/source/core/inc/layact.hxx b/sw/source/core/inc/layact.hxx index ac87a66bd084..0c83a387f1c5 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 9f8de677efb3..dce0dd6bec49 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> |