-Wunused-macros

Change-Id: Ifaa1637122d6f9cae1e29b77ac36ca5d1f220aed

24 files changed, 6 insertions, 98 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>
diff --git a/sw/source/filter/html/htmldraw.cxx b/sw/source/filter/html/htmldraw.cxx
index ff387574ea63..f68174316935 100644
--- a/sw/source/filter/html/htmldraw.cxx
+++ b/sw/source/filter/html/htmldraw.cxx
@@ -25,11 +25,7 @@
 #include <svx/svdobj.hxx>
 #include <svx/svdotext.hxx>
 #include <editeng/eeitem.hxx>
-
-#ifndef _OUTLINER_HXX //autogen
-#define _EEITEMID_HXX
 #include <editeng/outliner.hxx>
-#endif
 #include <svx/xfillit.hxx>
 #include <editeng/colritem.hxx>
 #include <editeng/brushitem.hxx>
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 876f33e73a6f..01dd8bd51ef1 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -108,7 +108,6 @@
 #define HTML_ESC_SUPER DFLT_ESC_SUPER
 #define HTML_ESC_SUB DFLT_ESC_SUB
 
-#define HTML_SPTYPE_NONE 0
 #define HTML_SPTYPE_BLOCK 1
 #define HTML_SPTYPE_HORI 2
 #define HTML_SPTYPE_VERT 3
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 9474dd1772c3..3e48044e8b27 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -73,7 +73,6 @@
 #include <svx/svdograf.hxx>
 #include <sfx2/docfilt.hxx> // #i70748#
 #include <istyleaccess.hxx>
-#define LOGFILE_AUTHOR "mb93740"
 
 #include <sfx2/DocumentMetadataAccess.hxx>
 
@@ -142,7 +141,7 @@ sal_Int32 ReadThroughComponent(
     OSL_ENSURE(rFactory.is(), "factory missing");
     OSL_ENSURE(NULL != pFilterName,"I need a service name for the component!");
 
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "sw", LOGFILE_AUTHOR, "ReadThroughComponent" );
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "sw", "mb93740", "ReadThroughComponent" );
 
     // prepare ParserInputSrouce
     xml::sax::InputSource aParserInput;
@@ -175,7 +174,7 @@ sal_Int32 ReadThroughComponent(
     // if we do profiling, we want to know the stream
     rtl::OString aString(rtl::OUStringToOString(rStreamName,
         RTL_TEXTENCODING_ASCII_US));
-    RTL_LOGFILE_TRACE_AUTHOR1( "sw", LOGFILE_AUTHOR,
+    RTL_LOGFILE_TRACE_AUTHOR1( "sw", "mb93740",
         "ReadThroughComponent : parsing \"%s\"", aString.getStr() );
 #endif
 
diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx
index 0d2abe0cee99..11ccee0b9bb8 100644
--- a/sw/source/filter/xml/wrtxml.cxx
+++ b/sw/source/filter/xml/wrtxml.cxx
@@ -61,8 +61,6 @@ using namespace ::com::sun::star::document;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::lang;
 
-#define LOGFILE_AUTHOR "mb93740"
-
 SwXMLWriter::SwXMLWriter( const String& rBaseURL )
 {
     SetBaseURL( rBaseURL );
@@ -506,7 +504,7 @@ bool SwXMLWriter::WriteThroughComponent(
     OSL_ENSURE( NULL != pStreamName, "Need stream name!" );
     OSL_ENSURE( NULL != pServiceName, "Need service name!" );
 
-    RTL_LOGFILE_TRACE_AUTHOR1( "sw", LOGFILE_AUTHOR,
+    RTL_LOGFILE_TRACE_AUTHOR1( "sw", "mb93740",
                                "SwXMLWriter::WriteThroughComponent : stream %s",
                                pStreamName );
 
@@ -574,7 +572,7 @@ bool SwXMLWriter::WriteThroughComponent(
     OSL_ENSURE( xComponent.is(), "Need component!" );
     OSL_ENSURE( NULL != pServiceName, "Need component name!" );
 
-    RTL_LOGFILE_CONTEXT_AUTHOR( aFilterLog, "sw", LOGFILE_AUTHOR,
+    RTL_LOGFILE_CONTEXT_AUTHOR( aFilterLog, "sw", "mb93740",
                                 "SwXMLWriter::WriteThroughComponent" );
 
     // get component
diff --git a/sw/source/ui/app/apphdl.cxx b/sw/source/ui/app/apphdl.cxx
index c456d72e2c6c..cefbc1435064 100644
--- a/sw/source/ui/app/apphdl.cxx
+++ b/sw/source/ui/app/apphdl.cxx
@@ -107,8 +107,6 @@ using namespace ::com::sun::star;
 // here are the SlotID's being included
 // see Idl-file
 #define SwModule
-#define ViewSettings
-#define PrintSettings
 #include <sfx2/msg.hxx>
 #include "swslots.hxx"
 #include <cfgid.h>
diff --git a/sw/source/ui/config/uinums.cxx b/sw/source/ui/config/uinums.cxx
index 8e416d74c4c1..b9207bb3cf7f 100644
--- a/sw/source/ui/config/uinums.cxx
+++ b/sw/source/ui/config/uinums.cxx
@@ -43,7 +43,6 @@ using namespace ::com::sun::star;
 #define VERSION_30B     ((sal_uInt16)250)
 #define VERSION_31B     ((sal_uInt16)326)
 #define VERSION_40A     ((sal_uInt16)364)
-#define VERSION_50A     ((sal_uInt16)373)
 #define VERSION_53A     ((sal_uInt16)596)
 #define ACT_NUM_VERSION VERSION_53A
 
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index f9831bc717e3..f0069317db12 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -64,7 +64,6 @@
 
 #define POS_CONTENT 0
 #define POS_INDEX   1
-#define POS_USER    2
 
 static sal_uInt16 nTypePos = 1; // TOX_INDEX as standard
 static sal_uInt16 nKey1Pos = USHRT_MAX;
diff --git a/sw/source/ui/misc/swruler.cxx b/sw/source/ui/misc/swruler.cxx
index 47508fffb587..a41fc0bcf5d3 100644
--- a/sw/source/ui/misc/swruler.cxx
+++ b/sw/source/ui/misc/swruler.cxx
@@ -30,10 +30,8 @@
 #define CONTROL_LEFT_OFFSET     6
 #define CONTROL_RIGHT_OFFSET    3
 #define CONTROL_TOP_OFFSET      4
-#define CONTROL_BOTTOM_OFFSET   4
 
 #define CONTROL_TRIANGLE_WIDTH  4
-#define CONTROL_TRIANGLE_HEIGHT 7
 #define CONTROL_TRIANGLE_PAD    3
 
 // Constructor
diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx
index 3123b4fa53db..c36def954fff 100644
--- a/sw/source/ui/shells/basesh.cxx
+++ b/sw/source/ui/shells/basesh.cxx
@@ -123,7 +123,6 @@ static sal_uInt8 nHeaderPos;
 static sal_uInt8 nFooterPos;
 
 #define SwBaseShell
-#define Shadow
 #include <sfx2/msg.hxx>
 #include "swslots.hxx"
 
diff --git a/sw/source/ui/shells/slotadd.cxx b/sw/source/ui/shells/slotadd.cxx
index a8c365f92798..b05002af8604 100644
--- a/sw/source/ui/shells/slotadd.cxx
+++ b/sw/source/ui/shells/slotadd.cxx
@@ -125,7 +125,6 @@
 
 #define SvxDrawToolItem  SfxAllEnumItem
 #define SvxDrawAlignItem SfxAllEnumItem
-#define SvxDrawBezierItem SfxAllEnumItem
 #define avmedia_MediaItem ::avmedia::MediaItem
 
 #define SFX_TYPEMAP
diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx
index 26f6e02963bf..b106ceb1fdea 100644
--- a/sw/source/ui/shells/textsh.cxx
+++ b/sw/source/ui/shells/textsh.cxx
@@ -17,9 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
-
-#define _SW_FRMVALID_HXX
 #include <hintids.hxx>
 #include <comphelper/string.hxx>
 #include <svl/globalnameitem.hxx>
@@ -99,10 +96,6 @@
 #include <chartins.hxx>
 
 #define SwTextShell
-#define Paragraph
-#define HyphenZone
-#define TextFont
-#define DropCap
 #include <sfx2/msg.hxx>
 #include <swslots.hxx>
 #include <SwRewriter.hxx>
diff --git a/sw/source/ui/uiview/view0.cxx b/sw/source/ui/uiview/view0.cxx
index 4a82653125a0..d43bece4d415 100644
--- a/sw/source/ui/uiview/view0.cxx
+++ b/sw/source/ui/uiview/view0.cxx
@@ -54,18 +54,9 @@
 #include "wview.hxx"
 #include "shells.hrc"
 
-#define OLEObjects
 #define SwView
-#define Frames
-#define Graphics
-#define Tables
-#define Controls
 #define GlobalContents
 #define Text
-#define Frame
-#define Graphic
-#define Object
-#define Draw
 #define TextDrawText
 #define TextInTable
 #define ListInText
@@ -73,7 +64,6 @@
 #define WebTextInTable
 #define WebListInText
 #define WebListInTable
-#define TextPage
 #include <sfx2/msg.hxx>
 #include "swslots.hxx"
 #include <PostItMgr.hxx>
diff --git a/sw/source/ui/vba/vbaapplication.cxx b/sw/source/ui/vba/vbaapplication.cxx
index 918b11efe1d4..88cf4786edb0 100644
--- a/sw/source/ui/vba/vbaapplication.cxx
+++ b/sw/source/ui/vba/vbaapplication.cxx
@@ -44,16 +44,6 @@ using ::com::sun::star::uno::UNO_QUERY_THROW;
 using ::com::sun::star::uno::UNO_QUERY;
 using ::rtl::OUString;
 
-// #TODO is this defined somewhere else?
-#if ( defined UNX )
-#define FILE_PATH_SEPERATOR "/"
-#else // windows
-#define FILE_PATH_SEPERATOR "\\"
-#endif
-
-#define EXCELVERSION "11.0"
-
-
 SwVbaApplication::SwVbaApplication( uno::Reference<uno::XComponentContext >& xContext ): SwVbaApplication_BASE( xContext )
 {
 }
diff --git a/sw/source/ui/web/wtextsh.cxx b/sw/source/ui/web/wtextsh.cxx
index d433a6e9965b..00ce8a75a814 100644
--- a/sw/source/ui/web/wtextsh.cxx
+++ b/sw/source/ui/web/wtextsh.cxx
@@ -38,10 +38,6 @@
 
 // STATIC DATA
 #define SwWebTextShell
-#define Paragraph
-#define HyphenZone
-#define TextFont
-#define DropCap
 #include <sfx2/msg.hxx>
 #include "swslots.hxx"
 
diff --git a/sw/source/ui/web/wview.cxx b/sw/source/ui/web/wview.cxx
index 072d92aa89ed..68df58e95b88 100644
--- a/sw/source/ui/web/wview.cxx
+++ b/sw/source/ui/web/wview.cxx
@@ -59,20 +59,10 @@
 #include <shells.hrc>
 
 #define SwWebView
-#define Frames
-#define Graphics
-#define OLEObjects
-#define Controls
 #define Text
-#define Frame
-#define Graphic
-#define Object
-#define Draw
-#define DrawText
 #define TextInTable
 #define ListInText
 #define ListInTable
-#define Page
 #include <swslots.hxx>