cleanup

Change-Id: I7bfd221f89718ba8634417c93a26b3a199178694

12 files changed, 0 insertions, 29 deletions

diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx
index 0cc72cfc9a54..5ec9de36d69d 100644
--- a/sd/inc/sdpage.hxx
+++ b/sd/inc/sdpage.hxx
@@ -33,9 +33,7 @@
 #include <svx/fmpage.hxx>
 #include "fadedef.h"
 #include "diadef.h"
-#ifndef _PRESENTATION
 #include "pres.hxx"
-#endif
 #include "shapelist.hxx"
 #include "misc/scopelock.hxx"
 #include "sddllapi.h"
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index c518453a7bb8..97823aa055fa 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -44,9 +44,7 @@
 #include <com/sun/star/style/ParagraphAdjust.hpp>
 #include <com/sun/star/style/LineSpacing.hpp>
 #include <com/sun/star/style/LineSpacingMode.hpp>
-#ifndef _COM_SUN_STAR_STYLE_XSTYLEFAMILIESSUPPLIER_PP_
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
-#endif
 #include <com/sun/star/style/XStyle.hpp>
 #include <com/sun/star/drawing/PointSequence.hpp>
 #include <com/sun/star/drawing/FlagSequence.hpp>
diff --git a/sd/source/ui/inc/PresentationViewShell.hxx b/sd/source/ui/inc/PresentationViewShell.hxx
index 49d9a74f9c59..0a10c5eba61a 100644
--- a/sd/source/ui/inc/PresentationViewShell.hxx
+++ b/sd/source/ui/inc/PresentationViewShell.hxx
@@ -20,9 +20,7 @@
 #ifndef SD_PRESENTATION_VIEW_SHELL_HXX
 #define SD_PRESENTATION_VIEW_SHELL_HXX
 
-#ifndef SD_DRAW_VIEW_SHELL
 #include "DrawViewShell.hxx"
-#endif
 
 namespace sd {
 
diff --git a/sd/source/ui/view/OutlinerIterator.cxx b/sd/source/ui/view/OutlinerIterator.cxx
index b1b39aaba3c8..8ac476bb2fcc 100644
--- a/sd/source/ui/view/OutlinerIterator.cxx
+++ b/sd/source/ui/view/OutlinerIterator.cxx
@@ -29,9 +29,7 @@
 #include "DrawViewShell.hxx"
 #include "drawview.hxx"
 #include "sdpage.hxx"
-#ifndef SD_FRAME_VIEW
 #include "FrameView.hxx"
-#endif
 #include "DrawDocShell.hxx"
 #include "Window.hxx"
 
diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx
index 2ee5aa8a090b..18c7a088518a 100644
--- a/sd/source/ui/view/drawview.cxx
+++ b/sd/source/ui/view/drawview.cxx
@@ -57,9 +57,7 @@
 #include "sdresid.hxx"
 #include "Window.hxx"
 #include "unchss.hxx"
-#ifndef SD_FRAME_VIEW
 #include "FrameView.hxx"
-#endif
 #include "anminfo.hxx"
 #include "slideshow.hxx"
 #include <vcl/virdev.hxx>
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx
index 3607995eea2a..31e89a4b8e36 100644
--- a/sd/source/ui/view/drviews3.cxx
+++ b/sd/source/ui/view/drviews3.cxx
@@ -61,9 +61,7 @@
 #include "sdmod.hxx"
 #include "fupoor.hxx"
 #include "slideshow.hxx"
-#ifndef SD_FRAME_VIEW
 #include "FrameView.hxx"
-#endif
 #include "sdpage.hxx"
 #include "Window.hxx"
 #include "sdresid.hxx"
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 18dd7d1056f3..a836a22d57f5 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -22,13 +22,9 @@
 #include <com/sun/star/scanner/ScannerManager.hpp>
 #include <cppuhelper/implbase1.hxx>
 #include <comphelper/processfactory.hxx>
-#ifndef _SVX_SIZEITEM
 #include <editeng/sizeitem.hxx>
-#endif
 #include <svx/svdlayer.hxx>
-#ifndef _SVX_ZOOMITEM
 #include <sfx2/zoomitem.hxx>
-#endif
 #include <svx/svdpagv.hxx>
 #include <svl/ptitem.hxx>
 #include <svl/stritem.hxx>
diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx
index 35ef90062287..6ed5dbc46fee 100644
--- a/sd/source/ui/view/drviewsf.cxx
+++ b/sd/source/ui/view/drviewsf.cxx
@@ -42,9 +42,7 @@
 #include <svx/fmshell.hxx>
 #include <svl/cjkoptions.hxx>
 
-#ifndef SD_FRAME_VIEW
 #include "FrameView.hxx"
-#endif
 #include "Outliner.hxx"
 #include "app.hrc"
 
diff --git a/sd/source/ui/view/drviewsg.cxx b/sd/source/ui/view/drviewsg.cxx
index 3de6c84f636a..9d9395558682 100644
--- a/sd/source/ui/view/drviewsg.cxx
+++ b/sd/source/ui/view/drviewsg.cxx
@@ -37,11 +37,8 @@
 #include "imapinfo.hxx"
 #include "sdmod.hxx"
 #include "optsitem.hxx"
-#ifndef SD_FRAME_VIEW
 #include "FrameView.hxx"
-#endif
 #include "drawview.hxx"
-
 #include "fupoor.hxx"
 
 namespace sd {
diff --git a/sd/source/ui/view/drviewsh.cxx b/sd/source/ui/view/drviewsh.cxx
index 16c89f736fe3..7608c00479bc 100644
--- a/sd/source/ui/view/drviewsh.cxx
+++ b/sd/source/ui/view/drviewsh.cxx
@@ -31,9 +31,7 @@
 #include "app.hrc"
 #include "strings.hrc"
 #include "sdpage.hxx"
-#ifndef SD_FRAME_VIEW
 #include "FrameView.hxx"
-#endif
 #include "sdresid.hxx"
 #include "drawdoc.hxx"
 #include "DrawDocShell.hxx"
diff --git a/sd/source/ui/view/presvish.cxx b/sd/source/ui/view/presvish.cxx
index a2a467cc4622..1bc08e04db3d 100644
--- a/sd/source/ui/view/presvish.cxx
+++ b/sd/source/ui/view/presvish.cxx
@@ -33,9 +33,7 @@
 #include <sfx2/objface.hxx>
 
 #include <svx/svxids.hrc>
-#ifndef SD_FRAME_VIEW
 #include "FrameView.hxx"
-#endif
 #include "sdresid.hxx"
 #include "DrawDocShell.hxx"
 #include "slideshow.hxx"
diff --git a/sd/source/ui/view/unmodpg.cxx b/sd/source/ui/view/unmodpg.cxx
index 580c71c5c277..13df39611912 100644
--- a/sd/source/ui/view/unmodpg.cxx
+++ b/sd/source/ui/view/unmodpg.cxx
@@ -17,14 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
-#ifndef _SVDLAYER
 #include <svx/svdlayer.hxx>
-#endif
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
 
-
 #include "strings.hrc"
 #include "glob.hxx"
 #include "glob.hrc"         // STR_BCKGRND, STR_BCKGRNDOBJ