Remove some unused defines and controls

Change-Id: I96f76ed6b33f5c786d1e3ab3981a535037a9c1b5

7 files changed, 1 insertions, 20 deletions

diff --git a/sw/source/ui/app/apphdl.cxx b/sw/source/ui/app/apphdl.cxx
index 98eeccf89b2c..45702965b387 100644
--- a/sw/source/ui/app/apphdl.cxx
+++ b/sw/source/ui/app/apphdl.cxx
@@ -123,8 +123,6 @@ using namespace ::com::sun::star;
 #define ViewSettings
 #define WebViewSettings
 #define PrintSettings
-#define _ExecAddress ExecOther
-#define _StateAddress StateOther
 #include <sfx2/msg.hxx>
 #include "swslots.hxx"
 #include <cfgid.h>
diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx
index a59932199334..0172e05684b6 100644
--- a/sw/source/ui/fldui/changedb.cxx
+++ b/sw/source/ui/fldui/changedb.cxx
@@ -32,9 +32,6 @@
 #undef SW_DLLIMPLEMENTATION
 #endif
 
-
-#define _CHANGEDB_CXX
-
 #include <svtools/stdctrl.hxx>
 #include <vcl/msgbox.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/sw/source/ui/fldui/fldui.src b/sw/source/ui/fldui/fldui.src
index e3d99725761e..1b17447944fe 100644
--- a/sw/source/ui/fldui/fldui.src
+++ b/sw/source/ui/fldui/fldui.src
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#define _FLDUI_SRC
+
 #include "index.hrc"
 #include "fldui.hrc"
 #include "helpid.h"
diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx
index 60d957a50c1e..5f893dadbbad 100644
--- a/sw/source/ui/fldui/javaedit.cxx
+++ b/sw/source/ui/fldui/javaedit.cxx
@@ -31,14 +31,8 @@
 #undef SW_DLLIMPLEMENTATION
 #endif
 
-// include ---------------------------------------------------------------
-
-
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
-
-#define _JAVAEDIT_CXX
 #include <hintids.hxx>
-
 #include <vcl/msgbox.hxx>
 #include <vcl/svapp.hxx>
 #include <svl/urihelper.hxx>
diff --git a/sw/source/ui/misc/redlndlg.cxx b/sw/source/ui/misc/redlndlg.cxx
index 61618863517f..df8c355bc450 100644
--- a/sw/source/ui/misc/redlndlg.cxx
+++ b/sw/source/ui/misc/redlndlg.cxx
@@ -39,10 +39,7 @@
 #include <wrtsh.hxx>
 #include <view.hxx>
 #include <swmodule.hxx>
-#ifndef _REDLNDLG_HXX
-#define _REDLNACCEPTDLG
 #include <redlndlg.hxx>
-#endif
 #include <swwait.hxx>
 #include <uitool.hxx>
 
diff --git a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx
index 4cf670169111..53444dd5398a 100644
--- a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx
+++ b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx
@@ -52,10 +52,7 @@
 #include <shells.hrc>
 
 #include <vector>
-#ifndef _REDLNDLG_HXX
-#define _REDLNACCEPTDLG
 #include <redlndlg.hxx>
-#endif
 #include "swmodalredlineacceptdlg.hxx"
 
 #include <unomid.h>
diff --git a/sw/source/ui/uno/swdet2.cxx b/sw/source/ui/uno/swdet2.cxx
index 40e4be543d12..cfe82cd74770 100644
--- a/sw/source/ui/uno/swdet2.cxx
+++ b/sw/source/ui/uno/swdet2.cxx
@@ -26,8 +26,6 @@
  *
  ************************************************************************/
 
-
-#define _SWLIB_CXX
 #include <sfx2/docfac.hxx>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/fcontnr.hxx>