diff options
Diffstat (limited to 'sw/source/core')
-rw-r--r-- | sw/source/core/doc/docredln.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/frmedt/tblsel.cxx | 1 | ||||
-rw-r--r-- | sw/source/core/layout/layact.cxx | 12 | ||||
-rw-r--r-- | sw/source/core/sw3io/sw3convert.cxx | 1 | ||||
-rw-r--r-- | sw/source/core/swg/SwXMLTextBlocks.cxx | 3 | ||||
-rw-r--r-- | sw/source/core/swg/SwXMLTextBlocks1.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/text/txtio.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/unocore/unoportenum.cxx | 6 | ||||
-rw-r--r-- | sw/source/core/view/viewsh.cxx | 4 |
9 files changed, 2 insertions, 37 deletions
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx index 4976fb1555df..5c492667ca36 100644 --- a/sw/source/core/doc/docredln.cxx +++ b/sw/source/core/doc/docredln.cxx @@ -135,13 +135,9 @@ TYPEINIT1(SwRedlineHint, SfxHint); } } - #define _DEBUG_REDLINE( pDoc ) sw_DebugRedline( pDoc ); - - #else #define _CHECK_REDLINE( pDoc ) - #define _DEBUG_REDLINE( pDoc ) #endif diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx index e08bc421f2b3..f6e6c5a370f7 100644 --- a/sw/source/core/frmedt/tblsel.cxx +++ b/sw/source/core/frmedt/tblsel.cxx @@ -64,7 +64,6 @@ #undef DEL_ONLY_EMPTY_LINES #undef DEL_EMPTY_BOXES_AT_START_AND_END -#define DEL_ALL_EMPTY_BOXES struct _CmpLPt { diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx index 79f8f561eef4..8e189e38165c 100644 --- a/sw/source/core/layout/layact.cxx +++ b/sw/source/core/layout/layact.cxx @@ -98,13 +98,6 @@ static void BreakPoint() return; } -#define CHECKPAGE \ - { if ( IsAgain() ) \ - { BreakPoint(); \ - return; \ - } \ - } - #define XCHECKPAGE \ { if ( IsAgain() ) \ { BreakPoint(); \ @@ -114,11 +107,6 @@ static void BreakPoint() } \ } #else -#define CHECKPAGE \ - { if ( IsAgain() ) \ - return; \ - } - #define XCHECKPAGE \ { if ( IsAgain() ) \ { \ diff --git a/sw/source/core/sw3io/sw3convert.cxx b/sw/source/core/sw3io/sw3convert.cxx index ca6b62294234..d0a47bd0a5d3 100644 --- a/sw/source/core/sw3io/sw3convert.cxx +++ b/sw/source/core/sw3io/sw3convert.cxx @@ -50,7 +50,6 @@ //really used ids from old sw3ids.hxx #define SWG_INETBROWSER 0x000e // URL-Grf-Nodes, Browse-Flag, Format-Ums. #define SWG_NEWFIELDS 0x0200 // Felder mit Numberformatter-Zahlenformat -#define SWG_EXPORT40 0x0110 // Version fuer 4.0-Export ab 5.0 using namespace nsSwDocInfoSubType; diff --git a/sw/source/core/swg/SwXMLTextBlocks.cxx b/sw/source/core/swg/SwXMLTextBlocks.cxx index f8759ae859f7..0d3b03a23e1f 100644 --- a/sw/source/core/swg/SwXMLTextBlocks.cxx +++ b/sw/source/core/swg/SwXMLTextBlocks.cxx @@ -41,9 +41,6 @@ #include <SwXMLBlockExport.hxx> #include <swerror.h> -#define STREAM_STGREAD ( STREAM_READ | STREAM_SHARE_DENYWRITE | STREAM_NOCREATE ) -#define STREAM_STGWRITE ( STREAM_READ | STREAM_WRITE | STREAM_SHARE_DENYWRITE ) - using namespace ::com::sun::star; diff --git a/sw/source/core/swg/SwXMLTextBlocks1.cxx b/sw/source/core/swg/SwXMLTextBlocks1.cxx index bcb26b4a01f5..1b6ef4ea75c3 100644 --- a/sw/source/core/swg/SwXMLTextBlocks1.cxx +++ b/sw/source/core/swg/SwXMLTextBlocks1.cxx @@ -39,10 +39,6 @@ #include <swevent.hxx> #include <swerror.h> - -#define STREAM_STGREAD ( STREAM_READ | STREAM_SHARE_DENYWRITE | STREAM_NOCREATE ) -#define STREAM_STGWRITE ( STREAM_READ | STREAM_WRITE | STREAM_SHARE_DENYWRITE ) - const char XMLN_BLOCKLIST[] = "BlockList.xml"; using namespace ::com::sun::star; diff --git a/sw/source/core/text/txtio.cxx b/sw/source/core/text/txtio.cxx index 8ff53f1d5d3d..5c17981a20fe 100644 --- a/sw/source/core/text/txtio.cxx +++ b/sw/source/core/text/txtio.cxx @@ -44,8 +44,6 @@ #include "pormulti.hxx" #include "ndhints.hxx" -#define CONSTCHAR( name, string ) static const sal_Char name[] = string - SvStream &operator<<( SvStream &rOs, const SwpHints & ) //$ ostream { rOs << " {HINTS:"; @@ -126,6 +124,8 @@ const char *GetPrepName( const PrepareHint ) #include "swtypes.hxx" // ZTCCONST #include "swfont.hxx" // SwDropPortion +#define CONSTCHAR( name, string ) static const sal_Char name[] = string + CONSTCHAR( pClose, "} " ); /************************************************************************* diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx index 78be1234eef2..dcc7563bd671 100644 --- a/sw/source/core/unocore/unoportenum.cxx +++ b/sw/source/core/unocore/unoportenum.cxx @@ -588,12 +588,6 @@ lcl_ExportSoftPageBreak( } } -#define REDLINE_PORTION_START_REMOVE 0//removed redlines are visible -#define REDLINE_PORTION_END_REMOVE 1//removed redlines are visible -#define REDLINE_PORTION_REMOVE 2//removed redlines are NOT visible -#define REDLINE_PORTION_INSERT_START 3 -#define REDLINE_PORTION_INSERT_END 4 - struct SwXRedlinePortion_Impl { const SwRedline* m_pRedline; diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index 4319c938183b..3ddb9cba052d 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -#define _SVX_PARAITEM_HXX -#define _SVX_TEXTITEM_HXX - #include <com/sun/star/accessibility/XAccessible.hpp> #include <sfx2/viewfrm.hxx> |