diff options
169 files changed, 0 insertions, 182 deletions
diff --git a/sd/inc/CustomAnimationPreset.hxx b/sd/inc/CustomAnimationPreset.hxx index fb605f5415d8..9eb7f10f8af8 100644 --- a/sd/inc/CustomAnimationPreset.hxx +++ b/sd/inc/CustomAnimationPreset.hxx @@ -28,15 +28,11 @@ #ifndef _SD_CUSTOMANIMATIONPRESET_HXX #define _SD_CUSTOMANIMATIONPRESET_HXX -#ifndef BOOST_SHARED_PTR_HPP_INCLUDED #include <boost/shared_ptr.hpp> -#endif #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/animations/AnimationNodeType.hpp> -#ifndef _UTL_STLTYPES_HXX_ #include <comphelper/stl_types.hxx> -#endif #include <CustomAnimationEffect.hxx> #include <hash_map> diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx index dfc7e3e3bf88..dfc7e3e3bf88 100755..100644 --- a/sd/inc/Outliner.hxx +++ b/sd/inc/Outliner.hxx diff --git a/sd/inc/OutlinerIterator.hxx b/sd/inc/OutlinerIterator.hxx index 92301f06289c..92301f06289c 100755..100644 --- a/sd/inc/OutlinerIterator.hxx +++ b/sd/inc/OutlinerIterator.hxx diff --git a/sd/inc/SdShapeTypes.hxx b/sd/inc/SdShapeTypes.hxx index c582be79abfe..18ec8a6cc41b 100644 --- a/sd/inc/SdShapeTypes.hxx +++ b/sd/inc/SdShapeTypes.hxx @@ -28,9 +28,7 @@ #ifndef _SD_SD_SHAPE_TYPES_HXX #define _SD_SD_SHAPE_TYPES_HXX -#ifndef _SVX_ACCESSIBILITY_ACCESSIBLE_SHAPE_TYPE_HANDLERHXX #include <svx/ShapeTypeHandler.hxx> -#endif #include <svx/AccessibleShape.hxx> #include <com/sun/star/accessibility/XAccessible.hpp> diff --git a/sd/inc/TransitionPreset.hxx b/sd/inc/TransitionPreset.hxx index 7cee414710b6..63aca1a49c3e 100644 --- a/sd/inc/TransitionPreset.hxx +++ b/sd/inc/TransitionPreset.hxx @@ -28,14 +28,10 @@ #ifndef _SD_TRANSITIONPRESET_HXX #define _SD_TRANSITIONPRESET_HXX -#ifndef BOOST_SHARED_PTR_HPP_INCLUDED #include <boost/shared_ptr.hpp> -#endif #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#ifndef _UTL_STLTYPES_HXX_ #include <comphelper/stl_types.hxx> -#endif #include <list> #include <hash_map> diff --git a/sd/inc/cusshow.hxx b/sd/inc/cusshow.hxx index e2aae99cf673..e2aae99cf673 100755..100644 --- a/sd/inc/cusshow.hxx +++ b/sd/inc/cusshow.hxx diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx index 6811da762934..6811da762934 100755..100644 --- a/sd/inc/drawdoc.hxx +++ b/sd/inc/drawdoc.hxx diff --git a/sd/inc/glob.hxx b/sd/inc/glob.hxx index 278aef490fdb..278aef490fdb 100755..100644 --- a/sd/inc/glob.hxx +++ b/sd/inc/glob.hxx diff --git a/sd/inc/pres.hxx b/sd/inc/pres.hxx index a51083133185..a51083133185 100755..100644 --- a/sd/inc/pres.hxx +++ b/sd/inc/pres.hxx diff --git a/sd/inc/sd_primitivetypes2d.hxx b/sd/inc/sd_primitivetypes2d.hxx index fab81717c5c5..f12d423fc278 100644 --- a/sd/inc/sd_primitivetypes2d.hxx +++ b/sd/inc/sd_primitivetypes2d.hxx @@ -28,9 +28,7 @@ #ifndef INCLUDED_SD_PRIMITIVETYPES2D_HXX #define INCLUDED_SD_PRIMITIVETYPES2D_HXX -#ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_PRIMITIVETYPES2D_HXX #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx> -#endif ////////////////////////////////////////////////////////////////////////////// diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx index f265314fa6e9..f265314fa6e9 100755..100644 --- a/sd/inc/sdabstdlg.hxx +++ b/sd/inc/sdabstdlg.hxx diff --git a/sd/inc/sdattr.hxx b/sd/inc/sdattr.hxx index 85e231f0a357..e370f8ab7db6 100644 --- a/sd/inc/sdattr.hxx +++ b/sd/inc/sdattr.hxx @@ -34,9 +34,7 @@ #include <svl/stritem.hxx> #include <sfx2/sfx.hrc> -#ifndef _SDATTR_HRC #include "sdattr.hrc" -#endif #include "glob.hxx" #include "fadedef.h" #include "diadef.h" diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx index f0d5cc64a3c4..f0d5cc64a3c4 100755..100644 --- a/sd/inc/sdmod.hxx +++ b/sd/inc/sdmod.hxx diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx index e4125051c526..3999b220a1f3 100755..100644 --- a/sd/inc/sdpage.hxx +++ b/sd/inc/sdpage.hxx @@ -28,9 +28,7 @@ #ifndef _SDPAGE_HXX #define _SDPAGE_HXX -#ifndef BOOST_SHARED_PTR_HPP_INCLUDED #include <boost/shared_ptr.hpp> -#endif #ifndef INCLUDED_FUNCTIONAL #include <functional> @@ -44,9 +42,7 @@ #include <functional> #include <vector> #include <svx/svdobj.hxx> -#ifndef _FM_FMPAGE_HXX //autogen #include <svx/fmpage.hxx> -#endif #include "fadedef.h" #include "diadef.h" #ifndef _PRESENTATION diff --git a/sd/inc/sdresid.hxx b/sd/inc/sdresid.hxx index db41ccdb689c..96879ba12976 100644 --- a/sd/inc/sdresid.hxx +++ b/sd/inc/sdresid.hxx @@ -28,9 +28,7 @@ #ifndef SD_RESID_HXX #define SD_RESID_HXX -#ifndef _RESID_HXX //autogen #include <tools/resid.hxx> -#endif #include "sddllapi.h" class SD_DLLPUBLIC SdResId : public ResId diff --git a/sd/inc/shapelist.hxx b/sd/inc/shapelist.hxx index 1b87a6a9e10f..1b87a6a9e10f 100755..100644 --- a/sd/inc/shapelist.hxx +++ b/sd/inc/shapelist.hxx diff --git a/sd/inc/stlpool.hxx b/sd/inc/stlpool.hxx index fd9dbeae5977..fd9dbeae5977 100755..100644 --- a/sd/inc/stlpool.hxx +++ b/sd/inc/stlpool.hxx diff --git a/sd/inc/textapi.hxx b/sd/inc/textapi.hxx index 6fa186596fba..6fa186596fba 100755..100644 --- a/sd/inc/textapi.hxx +++ b/sd/inc/textapi.hxx diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx index 3d8797beb328..e7a754007b25 100755..100644 --- a/sd/source/filter/eppt/eppt.hxx +++ b/sd/source/filter/eppt/eppt.hxx @@ -28,9 +28,7 @@ #ifndef _EPPT_HXX_ #define _EPPT_HXX_ #include <vector> -#ifndef _PptEscherEx_HXX #include "escherex.hxx" -#endif #include <tools/solar.h> #include <sot/storage.hxx> #include <tools/gen.hxx> diff --git a/sd/source/filter/eppt/pptexanimations.hxx b/sd/source/filter/eppt/pptexanimations.hxx index b0f38519366d..63fbda587630 100644 --- a/sd/source/filter/eppt/pptexanimations.hxx +++ b/sd/source/filter/eppt/pptexanimations.hxx @@ -31,9 +31,7 @@ #include <com/sun/star/animations/XTimeContainer.hpp> #include <com/sun/star/drawing/XDrawPage.hpp> #include <com/sun/star/animations/XAnimate.hpp> -#ifndef _SD_PPTANIMATIONS_HXX #include "../ppt/pptanimations.hxx" -#endif #include <pptexsoundcollection.hxx> #include <filter/msfilter/escherex.hxx> @@ -41,9 +39,7 @@ #include <stdio.h> #endif -#ifndef BOOST_SHARED_PTR_HPP_INCLUDED #include <boost/shared_ptr.hpp> -#endif #include <list> diff --git a/sd/source/filter/eppt/pptexsoundcollection.hxx b/sd/source/filter/eppt/pptexsoundcollection.hxx index 88965abe71ef..a9acaa7bc6c5 100644 --- a/sd/source/filter/eppt/pptexsoundcollection.hxx +++ b/sd/source/filter/eppt/pptexsoundcollection.hxx @@ -33,9 +33,7 @@ #endif #include <tools/string.hxx> #include <tools/stream.hxx> -#ifndef BOOST_SHARED_PTR_HPP_INCLUDED #include <boost/shared_ptr.hpp> -#endif #include <list> diff --git a/sd/source/filter/html/htmlattr.hxx b/sd/source/filter/html/htmlattr.hxx index 1caa16822ab1..1caa16822ab1 100755..100644 --- a/sd/source/filter/html/htmlattr.hxx +++ b/sd/source/filter/html/htmlattr.hxx diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx index 43bc12419f84..68da494c69a2 100755..100644 --- a/sd/source/filter/html/htmlex.hxx +++ b/sd/source/filter/html/htmlex.hxx @@ -42,9 +42,7 @@ #include "ViewShell.hxx" #include "assclass.hxx" -#ifndef _SD_RESID_HXX #include "sdresid.hxx" -#endif #include "pubdlg.hxx" #include <vector> diff --git a/sd/source/filter/ppt/ppt97animations.hxx b/sd/source/filter/ppt/ppt97animations.hxx index c68ba9a19382..c68ba9a19382 100755..100644 --- a/sd/source/filter/ppt/ppt97animations.hxx +++ b/sd/source/filter/ppt/ppt97animations.hxx diff --git a/sd/source/filter/ppt/pptatom.hxx b/sd/source/filter/ppt/pptatom.hxx index d430b7bffb7a..d430b7bffb7a 100755..100644 --- a/sd/source/filter/ppt/pptatom.hxx +++ b/sd/source/filter/ppt/pptatom.hxx diff --git a/sd/source/filter/ppt/pptinanimations.hxx b/sd/source/filter/ppt/pptinanimations.hxx index 24f423029e82..24f423029e82 100755..100644 --- a/sd/source/filter/ppt/pptinanimations.hxx +++ b/sd/source/filter/ppt/pptinanimations.hxx diff --git a/sd/source/ui/animations/CustomAnimationList.hxx b/sd/source/ui/animations/CustomAnimationList.hxx index 2fe96440030e..fcb91aa6a8b6 100644 --- a/sd/source/ui/animations/CustomAnimationList.hxx +++ b/sd/source/ui/animations/CustomAnimationList.hxx @@ -32,9 +32,7 @@ #include <svtools/svtreebx.hxx> #include <CustomAnimationEffect.hxx> #include "CustomAnimationPreset.hxx" -#ifndef _SD_CUSTOMANIMATION_HRC #include "CustomAnimation.hrc" -#endif namespace sd { diff --git a/sd/source/ui/animations/STLPropertySet.hxx b/sd/source/ui/animations/STLPropertySet.hxx index 2d5d95b5d7f4..08edb6dce20d 100644 --- a/sd/source/ui/animations/STLPropertySet.hxx +++ b/sd/source/ui/animations/STLPropertySet.hxx @@ -30,9 +30,7 @@ #include <com/sun/star/beans/PropertyValue.hpp> -#ifndef _UTL_STLTYPES_HXX_ #include <comphelper/stl_types.hxx> -#endif #include <list> #include <map> diff --git a/sd/source/ui/annotations/annotationmanagerimpl.hxx b/sd/source/ui/annotations/annotationmanagerimpl.hxx index 70b95c2a509b..70b95c2a509b 100755..100644 --- a/sd/source/ui/annotations/annotationmanagerimpl.hxx +++ b/sd/source/ui/annotations/annotationmanagerimpl.hxx diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx index 264cb2fa1afe..264cb2fa1afe 100755..100644 --- a/sd/source/ui/annotations/annotationwindow.hxx +++ b/sd/source/ui/annotations/annotationwindow.hxx diff --git a/sd/source/ui/dlg/dlgassim.hxx b/sd/source/ui/dlg/dlgassim.hxx index 35bbd41de448..35bbd41de448 100755..100644 --- a/sd/source/ui/dlg/dlgassim.hxx +++ b/sd/source/ui/dlg/dlgassim.hxx diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx index fa5e53ebac54..fa5e53ebac54 100755..100644 --- a/sd/source/ui/dlg/sddlgfact.hxx +++ b/sd/source/ui/dlg/sddlgfact.hxx diff --git a/sd/source/ui/framework/configuration/ConfigurationTracer.hxx b/sd/source/ui/framework/configuration/ConfigurationTracer.hxx index b04206fd65e1..b04206fd65e1 100755..100644 --- a/sd/source/ui/framework/configuration/ConfigurationTracer.hxx +++ b/sd/source/ui/framework/configuration/ConfigurationTracer.hxx diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx index a9f3e09f2a64..a9f3e09f2a64 100755..100644 --- a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx +++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.hxx b/sd/source/ui/framework/factories/BasicPaneFactory.hxx index 9b41866180fc..9b41866180fc 100755..100644 --- a/sd/source/ui/framework/factories/BasicPaneFactory.hxx +++ b/sd/source/ui/framework/factories/BasicPaneFactory.hxx diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.hxx b/sd/source/ui/framework/factories/BasicToolBarFactory.hxx index 686de897c179..686de897c179 100755..100644 --- a/sd/source/ui/framework/factories/BasicToolBarFactory.hxx +++ b/sd/source/ui/framework/factories/BasicToolBarFactory.hxx diff --git a/sd/source/ui/framework/factories/BasicViewFactory.hxx b/sd/source/ui/framework/factories/BasicViewFactory.hxx index 74bb04de36e3..74bb04de36e3 100755..100644 --- a/sd/source/ui/framework/factories/BasicViewFactory.hxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.hxx diff --git a/sd/source/ui/framework/factories/ChildWindowPane.hxx b/sd/source/ui/framework/factories/ChildWindowPane.hxx index 4d2f154a327f..d90ef7f0136e 100644 --- a/sd/source/ui/framework/factories/ChildWindowPane.hxx +++ b/sd/source/ui/framework/factories/ChildWindowPane.hxx @@ -31,21 +31,11 @@ #include "framework/Pane.hxx" #include "PaneShells.hxx" -#ifndef _COM_SUN_STAR_LANG_XEVENTLISTENER_HPP_ #include <com/sun/star/lang/XEventListener.hpp> -#endif -#ifndef _COM_SUN_STAR_DRAWING_FRAMEWORK_XRESOURCEID_HPP_ #include <com/sun/star/drawing/framework/XResourceId.hpp> -#endif -#ifndef _COM_SUN_STAR_AWT_XWINDOW_HPP_ #include <com/sun/star/awt/XWindow.hpp> -#endif -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include <cppuhelper/implbase1.hxx> -#endif -#ifndef _COMPHELPER_UNO3_HXX_ #include <comphelper/uno3.hxx> -#endif #include <tools/link.hxx> #include <memory> diff --git a/sd/source/ui/framework/factories/FrameWindowPane.hxx b/sd/source/ui/framework/factories/FrameWindowPane.hxx index 9fbc153f59ce..a5ba264d73ea 100644 --- a/sd/source/ui/framework/factories/FrameWindowPane.hxx +++ b/sd/source/ui/framework/factories/FrameWindowPane.hxx @@ -30,9 +30,7 @@ #include "framework/Pane.hxx" -#ifndef _COM_SUN_STAR_DRAWING_FRAMEWORK_XRESOURCEID_HPP_ #include <com/sun/star/drawing/framework/XResourceId.hpp> -#endif namespace sd { namespace framework { diff --git a/sd/source/ui/framework/factories/TaskPanelFactory.hxx b/sd/source/ui/framework/factories/TaskPanelFactory.hxx index 086788a6763e..086788a6763e 100755..100644 --- a/sd/source/ui/framework/factories/TaskPanelFactory.hxx +++ b/sd/source/ui/framework/factories/TaskPanelFactory.hxx diff --git a/sd/source/ui/framework/module/ReadOnlyModeObserver.hxx b/sd/source/ui/framework/module/ReadOnlyModeObserver.hxx index d783d6d83abf..d783d6d83abf 100755..100644 --- a/sd/source/ui/framework/module/ReadOnlyModeObserver.hxx +++ b/sd/source/ui/framework/module/ReadOnlyModeObserver.hxx diff --git a/sd/source/ui/framework/module/ResourceManager.hxx b/sd/source/ui/framework/module/ResourceManager.hxx index d00ee78c2de3..d00ee78c2de3 100755..100644 --- a/sd/source/ui/framework/module/ResourceManager.hxx +++ b/sd/source/ui/framework/module/ResourceManager.hxx diff --git a/sd/source/ui/func/fuprobjs.cxx b/sd/source/ui/func/fuprobjs.cxx index 73e85eebdf6d..3b57421d4315 100644 --- a/sd/source/ui/func/fuprobjs.cxx +++ b/sd/source/ui/func/fuprobjs.cxx @@ -44,9 +44,7 @@ #include "sdresid.hxx" #include "drawdoc.hxx" -#ifndef SD_OUTLINE_VIEW_SHELL_HX #include "OutlineViewShell.hxx" -#endif #include "ViewShell.hxx" #include "Window.hxx" #include "glob.hxx" diff --git a/sd/source/ui/inc/AccessibleViewForwarder.hxx b/sd/source/ui/inc/AccessibleViewForwarder.hxx index 5c8fba1e6b2d..5c8fba1e6b2d 100755..100644 --- a/sd/source/ui/inc/AccessibleViewForwarder.hxx +++ b/sd/source/ui/inc/AccessibleViewForwarder.hxx diff --git a/sd/source/ui/inc/BreakDlg.hxx b/sd/source/ui/inc/BreakDlg.hxx index ee5ee7b1db0a..e5b3b59084b2 100644 --- a/sd/source/ui/inc/BreakDlg.hxx +++ b/sd/source/ui/inc/BreakDlg.hxx @@ -29,9 +29,7 @@ #define SD_BREAK_DLG_HXX #include <vcl/group.hxx> -#ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <svx/dlgctrl.hxx> #include <vcl/field.hxx> #include <vcl/fixed.hxx> diff --git a/sd/source/ui/inc/Client.hxx b/sd/source/ui/inc/Client.hxx index 8370b31435c3..5428b5e10665 100644 --- a/sd/source/ui/inc/Client.hxx +++ b/sd/source/ui/inc/Client.hxx @@ -29,9 +29,7 @@ #define SD_CLIENT_HXX -#ifndef _SFX_CLIENTSH_HXX //autogen #include <sfx2/ipclient.hxx> -#endif class SdrGrafObj; class SdrOle2Obj; class OutlinerParaObject; diff --git a/sd/source/ui/inc/CustomAnimation.hxx b/sd/source/ui/inc/CustomAnimation.hxx index 84a9f848f612..f374241f2e94 100644 --- a/sd/source/ui/inc/CustomAnimation.hxx +++ b/sd/source/ui/inc/CustomAnimation.hxx @@ -28,9 +28,7 @@ #ifndef _SD_CUSTOMANIMATION_HXX_ #define _SD_CUSTOMANIMATION_HXX_ -#ifndef _COM_SUN_STAR_FRAME_XModel_HPP_ #include <com/sun/star/frame/XModel.hpp> -#endif class Window; diff --git a/sd/source/ui/inc/DrawController.hxx b/sd/source/ui/inc/DrawController.hxx index da0b6ade7327..da0b6ade7327 100755..100644 --- a/sd/source/ui/inc/DrawController.hxx +++ b/sd/source/ui/inc/DrawController.hxx diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx index 4ad4b0d09392..4ad4b0d09392 100755..100644 --- a/sd/source/ui/inc/DrawDocShell.hxx +++ b/sd/source/ui/inc/DrawDocShell.hxx diff --git a/sd/source/ui/inc/DrawSubController.hxx b/sd/source/ui/inc/DrawSubController.hxx index 22d3afb5dd4a..22d3afb5dd4a 100755..100644 --- a/sd/source/ui/inc/DrawSubController.hxx +++ b/sd/source/ui/inc/DrawSubController.hxx diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx index 4abb1a22946d..4abb1a22946d 100755..100644 --- a/sd/source/ui/inc/DrawViewShell.hxx +++ b/sd/source/ui/inc/DrawViewShell.hxx diff --git a/sd/source/ui/inc/GraphicViewShell.hxx b/sd/source/ui/inc/GraphicViewShell.hxx index 6b5d96be95c6..6b5d96be95c6 100755..100644 --- a/sd/source/ui/inc/GraphicViewShell.hxx +++ b/sd/source/ui/inc/GraphicViewShell.hxx diff --git a/sd/source/ui/inc/LayerDialogContent.hxx b/sd/source/ui/inc/LayerDialogContent.hxx index 3c0b00025307..0ffa5aadb46c 100755..100644 --- a/sd/source/ui/inc/LayerDialogContent.hxx +++ b/sd/source/ui/inc/LayerDialogContent.hxx @@ -30,9 +30,7 @@ #include <sfx2/dockwin.hxx> #include "LayerTabBar.hxx" -#ifndef _SD_SDRESID_HXX #include "sdresid.hxx" -#endif namespace sd { diff --git a/sd/source/ui/inc/MasterPageObserver.hxx b/sd/source/ui/inc/MasterPageObserver.hxx index caaa8c175f68..caaa8c175f68 100755..100644 --- a/sd/source/ui/inc/MasterPageObserver.hxx +++ b/sd/source/ui/inc/MasterPageObserver.hxx diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx index 78481294bf94..78481294bf94 100755..100644 --- a/sd/source/ui/inc/OutlineView.hxx +++ b/sd/source/ui/inc/OutlineView.hxx diff --git a/sd/source/ui/inc/OutlineViewShell.hxx b/sd/source/ui/inc/OutlineViewShell.hxx index 6c3848f39926..6c3848f39926 100755..100644 --- a/sd/source/ui/inc/OutlineViewShell.hxx +++ b/sd/source/ui/inc/OutlineViewShell.hxx diff --git a/sd/source/ui/inc/PaneChildWindows.hxx b/sd/source/ui/inc/PaneChildWindows.hxx index 9ba0a1f03720..9ba0a1f03720 100755..100644 --- a/sd/source/ui/inc/PaneChildWindows.hxx +++ b/sd/source/ui/inc/PaneChildWindows.hxx diff --git a/sd/source/ui/inc/PaneDockingWindow.hxx b/sd/source/ui/inc/PaneDockingWindow.hxx index 1874df10dd53..1874df10dd53 100755..100644 --- a/sd/source/ui/inc/PaneDockingWindow.hxx +++ b/sd/source/ui/inc/PaneDockingWindow.hxx diff --git a/sd/source/ui/inc/PaneShells.hxx b/sd/source/ui/inc/PaneShells.hxx index de410c2565bf..de410c2565bf 100755..100644 --- a/sd/source/ui/inc/PaneShells.hxx +++ b/sd/source/ui/inc/PaneShells.hxx diff --git a/sd/source/ui/inc/SdUnoDrawView.hxx b/sd/source/ui/inc/SdUnoDrawView.hxx index d29ca3b09d32..d29ca3b09d32 100755..100644 --- a/sd/source/ui/inc/SdUnoDrawView.hxx +++ b/sd/source/ui/inc/SdUnoDrawView.hxx diff --git a/sd/source/ui/inc/SdUnoOutlineView.hxx b/sd/source/ui/inc/SdUnoOutlineView.hxx index d2a4d4bfd39d..d2a4d4bfd39d 100755..100644 --- a/sd/source/ui/inc/SdUnoOutlineView.hxx +++ b/sd/source/ui/inc/SdUnoOutlineView.hxx diff --git a/sd/source/ui/inc/SdUnoSlideView.hxx b/sd/source/ui/inc/SdUnoSlideView.hxx index 6005704ec895..6005704ec895 100755..100644 --- a/sd/source/ui/inc/SdUnoSlideView.hxx +++ b/sd/source/ui/inc/SdUnoSlideView.hxx diff --git a/sd/source/ui/inc/SlideSorterViewShell.hxx b/sd/source/ui/inc/SlideSorterViewShell.hxx index 4e6033d67ad1..4e6033d67ad1 100755..100644 --- a/sd/source/ui/inc/SlideSorterViewShell.hxx +++ b/sd/source/ui/inc/SlideSorterViewShell.hxx diff --git a/sd/source/ui/inc/SlideView.hxx b/sd/source/ui/inc/SlideView.hxx index 17f7f17e3a9a..17f7f17e3a9a 100755..100644 --- a/sd/source/ui/inc/SlideView.hxx +++ b/sd/source/ui/inc/SlideView.hxx diff --git a/sd/source/ui/inc/SpellDialogChildWindow.hxx b/sd/source/ui/inc/SpellDialogChildWindow.hxx index 4e08dd99b063..4e08dd99b063 100755..100644 --- a/sd/source/ui/inc/SpellDialogChildWindow.hxx +++ b/sd/source/ui/inc/SpellDialogChildWindow.hxx diff --git a/sd/source/ui/inc/ToolBarManager.hxx b/sd/source/ui/inc/ToolBarManager.hxx index d8b84d1d7b61..d8b84d1d7b61 100755..100644 --- a/sd/source/ui/inc/ToolBarManager.hxx +++ b/sd/source/ui/inc/ToolBarManager.hxx diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx index 743c3dc61bf5..743c3dc61bf5 100755..100644 --- a/sd/source/ui/inc/View.hxx +++ b/sd/source/ui/inc/View.hxx diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index ffefb9de7359..5dd45e48fcc8 100755..100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -39,9 +39,7 @@ #include "glob.hxx" #include "pres.hxx" #include "cfgids.hxx" -#ifndef _SD_VIEW_HXX #include "View.hxx" -#endif #include "sddllapi.h" #include <com/sun/star/drawing/XDrawSubController.hpp> diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx index 38f7223f1d83..38f7223f1d83 100755..100644 --- a/sd/source/ui/inc/ViewShellBase.hxx +++ b/sd/source/ui/inc/ViewShellBase.hxx diff --git a/sd/source/ui/inc/ViewShellImplementation.hxx b/sd/source/ui/inc/ViewShellImplementation.hxx index f4f07b5549dd..f4f07b5549dd 100755..100644 --- a/sd/source/ui/inc/ViewShellImplementation.hxx +++ b/sd/source/ui/inc/ViewShellImplementation.hxx diff --git a/sd/source/ui/inc/ViewShellManager.hxx b/sd/source/ui/inc/ViewShellManager.hxx index d674e7d07eff..d674e7d07eff 100755..100644 --- a/sd/source/ui/inc/ViewShellManager.hxx +++ b/sd/source/ui/inc/ViewShellManager.hxx diff --git a/sd/source/ui/inc/ViewTabBar.hxx b/sd/source/ui/inc/ViewTabBar.hxx index 9c6077936f2c..6c3c476df901 100644 --- a/sd/source/ui/inc/ViewTabBar.hxx +++ b/sd/source/ui/inc/ViewTabBar.hxx @@ -36,9 +36,7 @@ #include <com/sun/star/drawing/framework/XConfigurationController.hpp> #include <com/sun/star/drawing/framework/XConfigurationChangeListener.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> -#ifndef _VCL_TABCTRL_HXX_ #include <vcl/tabctrl.hxx> -#endif #include <cppuhelper/compbase4.hxx> #include "MutexOwner.hxx" diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx index 8dd522d8212d..8dd522d8212d 100755..100644 --- a/sd/source/ui/inc/Window.hxx +++ b/sd/source/ui/inc/Window.hxx diff --git a/sd/source/ui/inc/animobjs.hxx b/sd/source/ui/inc/animobjs.hxx index 7a7a34362c48..6cab40cea139 100755..100644 --- a/sd/source/ui/inc/animobjs.hxx +++ b/sd/source/ui/inc/animobjs.hxx @@ -34,9 +34,7 @@ #include <vcl/group.hxx> #include <sfx2/ctrlitem.hxx> -#ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <vcl/field.hxx> #include <svx/dlgctrl.hxx> #include <sfx2/progress.hxx> @@ -44,9 +42,7 @@ #include <vcl/lstbox.hxx> -#ifndef _SD_SDRESID_HXX #include "sdresid.hxx" -#endif #include "misc/scopelock.hxx" class SdDrawDocument; diff --git a/sd/source/ui/inc/annotationmanager.hxx b/sd/source/ui/inc/annotationmanager.hxx index 6f0fdaa11180..6f0fdaa11180 100755..100644 --- a/sd/source/ui/inc/annotationmanager.hxx +++ b/sd/source/ui/inc/annotationmanager.hxx diff --git a/sd/source/ui/inc/bmcache.hxx b/sd/source/ui/inc/bmcache.hxx index c04f7d2ed2c4..c04f7d2ed2c4 100755..100644 --- a/sd/source/ui/inc/bmcache.hxx +++ b/sd/source/ui/inc/bmcache.hxx diff --git a/sd/source/ui/inc/copydlg.hxx b/sd/source/ui/inc/copydlg.hxx index 2732f4f76c38..4f2cdf79b1b7 100644 --- a/sd/source/ui/inc/copydlg.hxx +++ b/sd/source/ui/inc/copydlg.hxx @@ -29,9 +29,7 @@ #define SD_COPY_DLG_HXX #include <vcl/group.hxx> -#ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <svx/dlgctrl.hxx> #include <vcl/field.hxx> #include <vcl/fixed.hxx> diff --git a/sd/source/ui/inc/custsdlg.hxx b/sd/source/ui/inc/custsdlg.hxx index 020232ddced3..784288b2add5 100644 --- a/sd/source/ui/inc/custsdlg.hxx +++ b/sd/source/ui/inc/custsdlg.hxx @@ -29,9 +29,7 @@ #ifndef _SD_CUSTSDLG_HXX #define _SD_CUSTSDLG_HXX -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <vcl/lstbox.hxx> #include <vcl/fixed.hxx> #include <vcl/edit.hxx> diff --git a/sd/source/ui/inc/dlgass.hxx b/sd/source/ui/inc/dlgass.hxx index 523b86cf66a8..3755922bc340 100755..100644 --- a/sd/source/ui/inc/dlgass.hxx +++ b/sd/source/ui/inc/dlgass.hxx @@ -28,21 +28,11 @@ #ifndef INC_DLGASS #define INC_DLGASS -#ifndef _GROUP_HXX #include <vcl/group.hxx> -#endif -#ifndef _EDIT_HXX #include <vcl/edit.hxx> -#endif -#ifndef _FIXED_HXX #include <vcl/fixed.hxx> -#endif -#ifndef _BUTTON_HXX #include <vcl/button.hxx> -#endif -#ifndef _DIALOG_HXX #include <vcl/dialog.hxx> -#endif #include <svtools/svmedit.hxx> #include "assclass.hxx" #include <vcl/lstbox.hxx> diff --git a/sd/source/ui/inc/dlgctrls.hxx b/sd/source/ui/inc/dlgctrls.hxx index 72b5921d8e86..7dd38e5d8ec9 100755..100644 --- a/sd/source/ui/inc/dlgctrls.hxx +++ b/sd/source/ui/inc/dlgctrls.hxx @@ -32,9 +32,7 @@ #include "TransitionPreset.hxx" #include <vcl/lstbox.hxx> -#ifndef _SD_SDRESID_HXX #include "sdresid.hxx" -#endif #include "fadedef.h" #include "sddllapi.h" diff --git a/sd/source/ui/inc/dlgfield.hxx b/sd/source/ui/inc/dlgfield.hxx index b7f87348ad76..c066486476f2 100644 --- a/sd/source/ui/inc/dlgfield.hxx +++ b/sd/source/ui/inc/dlgfield.hxx @@ -30,21 +30,11 @@ #define _SD_DLGFIELD_HXX -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif -#ifndef _GROUP_HXX //autogen #include <vcl/group.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _DIALOG_HXX //autogen #include <vcl/dialog.hxx> -#endif #include <svx/langbox.hxx> class SvxFieldData; diff --git a/sd/source/ui/inc/dlgsnap.hxx b/sd/source/ui/inc/dlgsnap.hxx index 970a54b24339..3e5f8ef35544 100644 --- a/sd/source/ui/inc/dlgsnap.hxx +++ b/sd/source/ui/inc/dlgsnap.hxx @@ -30,25 +30,13 @@ #define _SD_DLGSNAP_HXX -#ifndef _IMAGEBTN_HXX //autogen #include <vcl/imagebtn.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif -#ifndef _GROUP_HXX //autogen #include <vcl/group.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <tools/fract.hxx> -#ifndef _DIALOG_HXX //autogen #include <vcl/dialog.hxx> -#endif #include "sdenumdef.hxx" /************************************************************************/ diff --git a/sd/source/ui/inc/docprev.hxx b/sd/source/ui/inc/docprev.hxx index 76b8fe06f318..76b8fe06f318 100755..100644 --- a/sd/source/ui/inc/docprev.hxx +++ b/sd/source/ui/inc/docprev.hxx diff --git a/sd/source/ui/inc/filedlg.hxx b/sd/source/ui/inc/filedlg.hxx index 2aaa7be9f123..2aaa7be9f123 100755..100644 --- a/sd/source/ui/inc/filedlg.hxx +++ b/sd/source/ui/inc/filedlg.hxx diff --git a/sd/source/ui/inc/framework/FrameworkHelper.hxx b/sd/source/ui/inc/framework/FrameworkHelper.hxx index 58c663449bbc..58c663449bbc 100755..100644 --- a/sd/source/ui/inc/framework/FrameworkHelper.hxx +++ b/sd/source/ui/inc/framework/FrameworkHelper.hxx diff --git a/sd/source/ui/inc/framework/PresentationFactory.hxx b/sd/source/ui/inc/framework/PresentationFactory.hxx index a607542f2df0..a607542f2df0 100755..100644 --- a/sd/source/ui/inc/framework/PresentationFactory.hxx +++ b/sd/source/ui/inc/framework/PresentationFactory.hxx diff --git a/sd/source/ui/inc/framework/ResourceId.hxx b/sd/source/ui/inc/framework/ResourceId.hxx index e8124e895ee6..e8124e895ee6 100755..100644 --- a/sd/source/ui/inc/framework/ResourceId.hxx +++ b/sd/source/ui/inc/framework/ResourceId.hxx diff --git a/sd/source/ui/inc/framework/ViewShellWrapper.hxx b/sd/source/ui/inc/framework/ViewShellWrapper.hxx index 12483f462d5e..12483f462d5e 100755..100644 --- a/sd/source/ui/inc/framework/ViewShellWrapper.hxx +++ b/sd/source/ui/inc/framework/ViewShellWrapper.hxx diff --git a/sd/source/ui/inc/fuconstr.hxx b/sd/source/ui/inc/fuconstr.hxx index 390060a16e3c..390060a16e3c 100755..100644 --- a/sd/source/ui/inc/fuconstr.hxx +++ b/sd/source/ui/inc/fuconstr.hxx diff --git a/sd/source/ui/inc/fudraw.hxx b/sd/source/ui/inc/fudraw.hxx index 23f68eda327b..d5e78285d71f 100755..100644 --- a/sd/source/ui/inc/fudraw.hxx +++ b/sd/source/ui/inc/fudraw.hxx @@ -28,9 +28,7 @@ #ifndef SD_FU_DRAW_HXX #define SD_FU_DRAW_HXX -#ifndef _SV_POINTR_HXX //autogen #include <vcl/pointr.hxx> -#endif #include "fupoor.hxx" struct SdrViewEvent; diff --git a/sd/source/ui/inc/fuhhconv.hxx b/sd/source/ui/inc/fuhhconv.hxx index 6f8f9365ed1d..078f353dcca1 100644 --- a/sd/source/ui/inc/fuhhconv.hxx +++ b/sd/source/ui/inc/fuhhconv.hxx @@ -28,9 +28,7 @@ #ifndef _SD_FUHHCONV_HXX #define _SD_FUHHCONV_HXX -#ifndef _SD_FUPOOR_HXX #include "fupoor.hxx" -#endif namespace sd { diff --git a/sd/source/ui/inc/fuoutl.hxx b/sd/source/ui/inc/fuoutl.hxx index 92299387849a..92299387849a 100755..100644 --- a/sd/source/ui/inc/fuoutl.hxx +++ b/sd/source/ui/inc/fuoutl.hxx diff --git a/sd/source/ui/inc/fupage.hxx b/sd/source/ui/inc/fupage.hxx index a0cd7b4d2e0a..a0cd7b4d2e0a 100755..100644 --- a/sd/source/ui/inc/fupage.hxx +++ b/sd/source/ui/inc/fupage.hxx diff --git a/sd/source/ui/inc/fupoor.hxx b/sd/source/ui/inc/fupoor.hxx index 2650e99767b5..6381ef58549e 100755..100644 --- a/sd/source/ui/inc/fupoor.hxx +++ b/sd/source/ui/inc/fupoor.hxx @@ -35,9 +35,7 @@ #include <vcl/event.hxx> #include <rtl/ref.hxx> -#ifndef _SALHELPER_SIMPLEREFERENCECOMPONENT_HXX_ #include "helper/simplereferencecomponent.hxx" -#endif class SdDrawDocument; class SfxRequest; diff --git a/sd/source/ui/inc/futext.hxx b/sd/source/ui/inc/futext.hxx index 052f4099ef21..b81148cb82d1 100644 --- a/sd/source/ui/inc/futext.hxx +++ b/sd/source/ui/inc/futext.hxx @@ -28,9 +28,7 @@ #ifndef SD_FU_TEXT_HXX #define SD_FU_TEXT_HXX -#ifndef _EDITDATA_HXX #include <editeng/editdata.hxx> -#endif #include "fuconstr.hxx" #include <svx/svdotext.hxx> diff --git a/sd/source/ui/inc/futransf.hxx b/sd/source/ui/inc/futransf.hxx index 85041334c7f0..82dfa1ddab5d 100755..100644 --- a/sd/source/ui/inc/futransf.hxx +++ b/sd/source/ui/inc/futransf.hxx @@ -28,9 +28,7 @@ #ifndef SD_FU_TRANSFORM_HXX #define SD_FU_TRANSFORM_HXX -#ifndef _SVX_RETENUM_HXX #include <svx/rectenum.hxx> -#endif #include "fupoor.hxx" namespace sd { diff --git a/sd/source/ui/inc/fuzoom.hxx b/sd/source/ui/inc/fuzoom.hxx index 31d465646a96..f7d1520b67e2 100644 --- a/sd/source/ui/inc/fuzoom.hxx +++ b/sd/source/ui/inc/fuzoom.hxx @@ -28,9 +28,7 @@ #ifndef SD_FU_ZOOM_HXX #define SD_FU_ZOOM_HXX -#ifndef _SV_POINTR_HXX //autogen #include <vcl/pointr.hxx> -#endif #include "fupoor.hxx" namespace sd { diff --git a/sd/source/ui/inc/headerfooterdlg.hxx b/sd/source/ui/inc/headerfooterdlg.hxx index fa0c4d9282c0..cb6db2901593 100755..100644 --- a/sd/source/ui/inc/headerfooterdlg.hxx +++ b/sd/source/ui/inc/headerfooterdlg.hxx @@ -28,9 +28,7 @@ #define _SD_HEADERFOOTER_DIALOG_HXX #include <vcl/tabdlg.hxx> -#ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <vcl/tabctrl.hxx> #include <vcl/tabpage.hxx> diff --git a/sd/source/ui/inc/inspagob.hxx b/sd/source/ui/inc/inspagob.hxx index 3f8046462df7..37c9c4ff8415 100644 --- a/sd/source/ui/inc/inspagob.hxx +++ b/sd/source/ui/inc/inspagob.hxx @@ -28,9 +28,7 @@ #ifndef _SD_INSPAGOB_HXX #define _SD_INSPAGOB_HXX -#ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <vcl/dialog.hxx> #include "sdtreelb.hxx" diff --git a/sd/source/ui/inc/masterlayoutdlg.hxx b/sd/source/ui/inc/masterlayoutdlg.hxx index a7b5908367fc..a04ecf51977b 100644 --- a/sd/source/ui/inc/masterlayoutdlg.hxx +++ b/sd/source/ui/inc/masterlayoutdlg.hxx @@ -29,9 +29,7 @@ #include <vcl/dialog.hxx> -#ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <vcl/fixed.hxx> #include "sdpage.hxx" diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx index aa5feddd4c23..38ddebf7351c 100644 --- a/sd/source/ui/inc/navigatr.hxx +++ b/sd/source/ui/inc/navigatr.hxx @@ -30,9 +30,7 @@ #include <vcl/window.hxx> #include <vcl/lstbox.hxx> -#ifndef _TOOLBOX_HXX //autogen #include <vcl/toolbox.hxx> -#endif #include <sfx2/ctrlitem.hxx> #include "sdtreelb.hxx" #include "pres.hxx" diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx index 13088dfc64cb..13088dfc64cb 100755..100644 --- a/sd/source/ui/inc/optsitem.hxx +++ b/sd/source/ui/inc/optsitem.hxx diff --git a/sd/source/ui/inc/present.hxx b/sd/source/ui/inc/present.hxx index 8350bc114de5..5d6a99b75d2c 100644 --- a/sd/source/ui/inc/present.hxx +++ b/sd/source/ui/inc/present.hxx @@ -29,22 +29,12 @@ #ifndef _SD_PRESENT_HXX_ #define _SD_PRESENT_HXX_ -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif #include <vcl/fixed.hxx> -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _DIALOG_HXX //autogen #include <vcl/dialog.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif class SfxItemSet; class List; diff --git a/sd/source/ui/inc/prltempl.hxx b/sd/source/ui/inc/prltempl.hxx index 33a7df247c7e..0452e668e241 100644 --- a/sd/source/ui/inc/prltempl.hxx +++ b/sd/source/ui/inc/prltempl.hxx @@ -29,9 +29,7 @@ #ifndef SD_PRLTEMPL_HXX #define SD_PRLTEMPL_HXX -#ifndef _SD_SDRESID_HXX #include "sdresid.hxx" -#endif #include <sfx2/tabdlg.hxx> #include <svx/tabarea.hxx> diff --git a/sd/source/ui/inc/prntopts.hxx b/sd/source/ui/inc/prntopts.hxx index da9bc20c02d6..fec02268179b 100755..100644 --- a/sd/source/ui/inc/prntopts.hxx +++ b/sd/source/ui/inc/prntopts.hxx @@ -30,9 +30,7 @@ #include <vcl/group.hxx> -#ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <sfx2/tabdlg.hxx> #include <vcl/fixed.hxx> diff --git a/sd/source/ui/inc/pubdlg.hxx b/sd/source/ui/inc/pubdlg.hxx index dbdddfd5d112..26c233b8454f 100644 --- a/sd/source/ui/inc/pubdlg.hxx +++ b/sd/source/ui/inc/pubdlg.hxx @@ -30,21 +30,11 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <vcl/fixed.hxx> -#ifndef _GROUP_HXX //autogen #include <vcl/group.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif -#ifndef _DIALOG_HXX //autogen #include <vcl/dialog.hxx> -#endif #include "resltn.hxx" // enum PublishingResolution #include "pres.hxx" #include "assclass.hxx" diff --git a/sd/source/ui/inc/sdpreslt.hxx b/sd/source/ui/inc/sdpreslt.hxx index d3f2f5039526..67d8d0dd5d88 100644 --- a/sd/source/ui/inc/sdpreslt.hxx +++ b/sd/source/ui/inc/sdpreslt.hxx @@ -29,9 +29,7 @@ #define SD_PRES_LAYOUT_DLG_HXX #include <vcl/dialog.hxx> -#ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <vcl/fixed.hxx> #include <svtools/valueset.hxx> diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx index dc98929a9ed1..8e6785ee3bc5 100755..100644 --- a/sd/source/ui/inc/sdtreelb.hxx +++ b/sd/source/ui/inc/sdtreelb.hxx @@ -30,9 +30,7 @@ #include <svtools/transfer.hxx> -#ifndef _SD_SDRESID_HXX #include "sdresid.hxx" -#endif #include "pres.hxx" #include "sddllapi.h" #include <tools/string.hxx> diff --git a/sd/source/ui/inc/sdundogr.hxx b/sd/source/ui/inc/sdundogr.hxx index f02977234475..f02977234475 100755..100644 --- a/sd/source/ui/inc/sdundogr.hxx +++ b/sd/source/ui/inc/sdundogr.hxx diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx index eda80feeb825..eda80feeb825 100755..100644 --- a/sd/source/ui/inc/slideshow.hxx +++ b/sd/source/ui/inc/slideshow.hxx diff --git a/sd/source/ui/inc/smarttag.hxx b/sd/source/ui/inc/smarttag.hxx index 15544c2b5221..15544c2b5221 100755..100644 --- a/sd/source/ui/inc/smarttag.hxx +++ b/sd/source/ui/inc/smarttag.hxx diff --git a/sd/source/ui/inc/taskpane/ControlContainer.hxx b/sd/source/ui/inc/taskpane/ControlContainer.hxx index 9c1652f05887..9c1652f05887 100755..100644 --- a/sd/source/ui/inc/taskpane/ControlContainer.hxx +++ b/sd/source/ui/inc/taskpane/ControlContainer.hxx diff --git a/sd/source/ui/inc/taskpane/ILayoutableWindow.hxx b/sd/source/ui/inc/taskpane/ILayoutableWindow.hxx index 5aad9fa29f78..5aad9fa29f78 100755..100644 --- a/sd/source/ui/inc/taskpane/ILayoutableWindow.hxx +++ b/sd/source/ui/inc/taskpane/ILayoutableWindow.hxx diff --git a/sd/source/ui/inc/taskpane/ScrollPanel.hxx b/sd/source/ui/inc/taskpane/ScrollPanel.hxx index f820edc69f09..f820edc69f09 100755..100644 --- a/sd/source/ui/inc/taskpane/ScrollPanel.hxx +++ b/sd/source/ui/inc/taskpane/ScrollPanel.hxx diff --git a/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx b/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx index 933a25f4067d..933a25f4067d 100755..100644 --- a/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx +++ b/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx diff --git a/sd/source/ui/inc/taskpane/SubToolPanel.hxx b/sd/source/ui/inc/taskpane/SubToolPanel.hxx index 669c51cfcfad..669c51cfcfad 100755..100644 --- a/sd/source/ui/inc/taskpane/SubToolPanel.hxx +++ b/sd/source/ui/inc/taskpane/SubToolPanel.hxx diff --git a/sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx b/sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx index c86c496a770d..c86c496a770d 100755..100644 --- a/sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx +++ b/sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx diff --git a/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx b/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx index a1a430c49328..a1a430c49328 100755..100644 --- a/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx +++ b/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx diff --git a/sd/source/ui/inc/taskpane/TitleBar.hxx b/sd/source/ui/inc/taskpane/TitleBar.hxx index 995117516529..995117516529 100755..100644 --- a/sd/source/ui/inc/taskpane/TitleBar.hxx +++ b/sd/source/ui/inc/taskpane/TitleBar.hxx diff --git a/sd/source/ui/inc/taskpane/TitledControl.hxx b/sd/source/ui/inc/taskpane/TitledControl.hxx index cb7cd3b2159c..ed9e06c7c3d5 100755..100644 --- a/sd/source/ui/inc/taskpane/TitledControl.hxx +++ b/sd/source/ui/inc/taskpane/TitledControl.hxx @@ -34,9 +34,7 @@ #include <com/sun/star/drawing/framework/XResourceId.hpp> #include <tools/string.hxx> #include <tools/gen.hxx> -#ifndef SD_WINDOW_HXX #include <vcl/window.hxx> -#endif #include <memory> #include <boost/function.hpp> diff --git a/sd/source/ui/inc/tools/PropertySet.hxx b/sd/source/ui/inc/tools/PropertySet.hxx index 998b4f0e2142..998b4f0e2142 100755..100644 --- a/sd/source/ui/inc/tools/PropertySet.hxx +++ b/sd/source/ui/inc/tools/PropertySet.hxx diff --git a/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx b/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx index d0661a61636b..d0661a61636b 100755..100644 --- a/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx +++ b/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx diff --git a/sd/source/ui/inc/tools/SlotStateListener.hxx b/sd/source/ui/inc/tools/SlotStateListener.hxx index 1f45aef331ab..c8cb0be462e2 100755..100644 --- a/sd/source/ui/inc/tools/SlotStateListener.hxx +++ b/sd/source/ui/inc/tools/SlotStateListener.hxx @@ -33,9 +33,7 @@ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/FeatureStateEvent.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> -#ifndef _COM_SUN_STAR_LANG_DISPOSEDEXCEPTIOIN_HPP_ #include <com/sun/star/lang/DisposedException.hpp> -#endif #include <com/sun/star/lang/XComponent.hpp> #include <cppuhelper/compbase1.hxx> #include <tools/link.hxx> diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx index 2ee8bbe6771a..2ee8bbe6771a 100755..100644 --- a/sd/source/ui/inc/tpaction.hxx +++ b/sd/source/ui/inc/tpaction.hxx diff --git a/sd/source/ui/inc/tpoption.hxx b/sd/source/ui/inc/tpoption.hxx index e8e17f335a76..0854f96f19f1 100644 --- a/sd/source/ui/inc/tpoption.hxx +++ b/sd/source/ui/inc/tpoption.hxx @@ -29,21 +29,11 @@ #define _SD_TPOPTION_HXX -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif -#ifndef _GROUP_HXX //autogen #include <vcl/group.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <svtools/stdctrl.hxx> #include <sfx2/tabdlg.hxx> #include <svx/optgrid.hxx> diff --git a/sd/source/ui/inc/unoaprms.hxx b/sd/source/ui/inc/unoaprms.hxx index a2a80963ad63..a2a80963ad63 100755..100644 --- a/sd/source/ui/inc/unoaprms.hxx +++ b/sd/source/ui/inc/unoaprms.hxx diff --git a/sd/source/ui/inc/unosrch.hxx b/sd/source/ui/inc/unosrch.hxx index b19f3751e836..b19f3751e836 100755..100644 --- a/sd/source/ui/inc/unosrch.hxx +++ b/sd/source/ui/inc/unosrch.hxx diff --git a/sd/source/ui/inc/view/viewoverlaymanager.hxx b/sd/source/ui/inc/view/viewoverlaymanager.hxx index 9b56267ff327..9b56267ff327 100755..100644 --- a/sd/source/ui/inc/view/viewoverlaymanager.hxx +++ b/sd/source/ui/inc/view/viewoverlaymanager.hxx diff --git a/sd/source/ui/inc/zoomlist.hxx b/sd/source/ui/inc/zoomlist.hxx index 6957bfed25ce..6957bfed25ce 100755..100644 --- a/sd/source/ui/inc/zoomlist.hxx +++ b/sd/source/ui/inc/zoomlist.hxx diff --git a/sd/source/ui/notes/EditWindow.hxx b/sd/source/ui/notes/EditWindow.hxx index 010a6bd09697..010a6bd09697 100755..100644 --- a/sd/source/ui/notes/EditWindow.hxx +++ b/sd/source/ui/notes/EditWindow.hxx diff --git a/sd/source/ui/notes/NotesDockingWindow.hxx b/sd/source/ui/notes/NotesDockingWindow.hxx index b26756c14e30..b26756c14e30 100755..100644 --- a/sd/source/ui/notes/NotesDockingWindow.hxx +++ b/sd/source/ui/notes/NotesDockingWindow.hxx diff --git a/sd/source/ui/slideshow/showwindow.hxx b/sd/source/ui/slideshow/showwindow.hxx index 9521b6946138..61d99229cb0a 100644 --- a/sd/source/ui/slideshow/showwindow.hxx +++ b/sd/source/ui/slideshow/showwindow.hxx @@ -33,9 +33,7 @@ #include <vcl/timer.hxx> #include <vcl/graph.hxx> -#ifndef SD_WINDOW_HXX #include "Window.hxx" -#endif #include "slideshowimpl.hxx" diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index cb33c4a740c7..50cb0a60cd56 100755..100644 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -68,9 +68,7 @@ #include <svx/svdpagv.hxx> #include <svx/fmshell.hxx> -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include "sdmod.hxx" #include "cusshow.hxx" #include "ViewShellBase.hxx" @@ -85,9 +83,7 @@ #include "FrameView.hxx" #include "DrawDocShell.hxx" -#ifndef _SD_APP_HRC_ #include "app.hrc" -#endif #include "slideshow.hxx" diff --git a/sd/source/ui/slideshow/slideshowviewimpl.hxx b/sd/source/ui/slideshow/slideshowviewimpl.hxx index 8e22a5d9fd7f..99d2d074d94c 100644 --- a/sd/source/ui/slideshow/slideshowviewimpl.hxx +++ b/sd/source/ui/slideshow/slideshowviewimpl.hxx @@ -62,9 +62,7 @@ #include <svx/svdpagv.hxx> #include <svx/fmshell.hxx> -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include "sdmod.hxx" #include "cusshow.hxx" #include "ViewShellBase.hxx" @@ -78,9 +76,7 @@ #include "FrameView.hxx" #include "DrawDocShell.hxx" -#ifndef _SD_APP_HRC_ #include "app.hrc" -#endif namespace sd { diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx index 2c33e042342f..2c33e042342f 100755..100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx diff --git a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx index 89fc657004e8..89fc657004e8 100755..100644 --- a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx +++ b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx diff --git a/sd/source/ui/slidesorter/controller/SlsListener.hxx b/sd/source/ui/slidesorter/controller/SlsListener.hxx index 5613452a1b59..f3957add713f 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.hxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.hxx @@ -31,9 +31,7 @@ #include "MutexOwner.hxx" #include "controller/SlideSorterController.hxx" #include <com/sun/star/document/XEventListener.hpp> -#ifndef _COM_SUN_STAR_DOCUMENT_XPROPERTYCHANGELISTENER_HPP_ #include <com/sun/star/beans/XPropertyChangeListener.hpp> -#endif #include <com/sun/star/accessibility/XAccessibleEventListener.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx b/sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx index 7a9d0f27369e..7a9d0f27369e 100755..100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx diff --git a/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx b/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx index 4a5c2b51ac28..4a5c2b51ac28 100755..100644 --- a/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx +++ b/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx index 667aa768ee8f..667aa768ee8f 100755..100644 --- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx diff --git a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx index 57aaf9293301..57aaf9293301 100755..100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx diff --git a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx index c93ed7708650..c93ed7708650 100755..100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx index 79b8a1ff5d44..79b8a1ff5d44 100755..100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx index 5b8c7d9a08b6..5b8c7d9a08b6 100755..100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx index 0e58d5d3b411..0e58d5d3b411 100755..100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx diff --git a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx index 4ade19087304..4ade19087304 100755..100644 --- a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx index 81877ce7465c..81877ce7465c 100755..100644 --- a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx diff --git a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx index 2ef520b1df89..2ef520b1df89 100755..100644 --- a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx diff --git a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx index 9b1fd996e9c0..9b1fd996e9c0 100755..100644 --- a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewContact.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewContact.hxx index 31899d3b3e44..31899d3b3e44 100755..100644 --- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewContact.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewContact.hxx diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx index 9af239c64fd1..9af239c64fd1 100755..100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx diff --git a/sd/source/ui/toolpanel/ControlContainerDescriptor.hxx b/sd/source/ui/toolpanel/ControlContainerDescriptor.hxx index 3557200880d2..79e040ae294a 100644 --- a/sd/source/ui/toolpanel/ControlContainerDescriptor.hxx +++ b/sd/source/ui/toolpanel/ControlContainerDescriptor.hxx @@ -32,9 +32,7 @@ #include "taskpane/TitleBar.hxx" #include <tools/string.hxx> #include <tools/gen.hxx> -#ifndef SD_WINDOW_HXX #include <vcl/window.hxx> -#endif #include <memory> class Window; diff --git a/sd/source/ui/toolpanel/LayoutMenu.hxx b/sd/source/ui/toolpanel/LayoutMenu.hxx index 627a363fb576..b011f6a90bbf 100755..100644 --- a/sd/source/ui/toolpanel/LayoutMenu.hxx +++ b/sd/source/ui/toolpanel/LayoutMenu.hxx @@ -30,9 +30,7 @@ #include "taskpane/TaskPaneTreeNode.hxx" -#ifndef _COM_SUN_STAR_FRAME_XSTATUS_LISTENER_HPP_ #include <com/sun/star/frame/XStatusListener.hpp> -#endif #include "glob.hxx" #include "pres.hxx" diff --git a/sd/source/ui/toolpanel/TaskPaneShellManager.hxx b/sd/source/ui/toolpanel/TaskPaneShellManager.hxx index 92e7b6b83b8d..92e7b6b83b8d 100755..100644 --- a/sd/source/ui/toolpanel/TaskPaneShellManager.hxx +++ b/sd/source/ui/toolpanel/TaskPaneShellManager.hxx diff --git a/sd/source/ui/toolpanel/TestMenu.hxx b/sd/source/ui/toolpanel/TestMenu.hxx index 0c4b3bfe6530..0c4b3bfe6530 100755..100644 --- a/sd/source/ui/toolpanel/TestMenu.hxx +++ b/sd/source/ui/toolpanel/TestMenu.hxx diff --git a/sd/source/ui/toolpanel/TestPanel.hxx b/sd/source/ui/toolpanel/TestPanel.hxx index 494e5086b179..494e5086b179 100755..100644 --- a/sd/source/ui/toolpanel/TestPanel.hxx +++ b/sd/source/ui/toolpanel/TestPanel.hxx diff --git a/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.hxx b/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.hxx index dd3388fb0342..dd3388fb0342 100755..100644 --- a/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.hxx +++ b/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.hxx diff --git a/sd/source/ui/toolpanel/controls/CustomAnimationPanel.hxx b/sd/source/ui/toolpanel/controls/CustomAnimationPanel.hxx index 864ba637b94d..864ba637b94d 100755..100644 --- a/sd/source/ui/toolpanel/controls/CustomAnimationPanel.hxx +++ b/sd/source/ui/toolpanel/controls/CustomAnimationPanel.hxx diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainer.hxx b/sd/source/ui/toolpanel/controls/MasterPageContainer.hxx index 60f760f63e34..60f760f63e34 100755..100644 --- a/sd/source/ui/toolpanel/controls/MasterPageContainer.hxx +++ b/sd/source/ui/toolpanel/controls/MasterPageContainer.hxx diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.hxx b/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.hxx index 071b23cdbb16..071b23cdbb16 100755..100644 --- a/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.hxx +++ b/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.hxx diff --git a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx index 0303989e3379..0303989e3379 100755..100644 --- a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx +++ b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx diff --git a/sd/source/ui/toolpanel/controls/MasterPagesPanel.hxx b/sd/source/ui/toolpanel/controls/MasterPagesPanel.hxx index 932007802ebf..932007802ebf 100755..100644 --- a/sd/source/ui/toolpanel/controls/MasterPagesPanel.hxx +++ b/sd/source/ui/toolpanel/controls/MasterPagesPanel.hxx diff --git a/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx b/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx index a2df51f2bd4b..a2df51f2bd4b 100755..100644 --- a/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx +++ b/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx diff --git a/sd/source/ui/toolpanel/controls/SlideTransitionPanel.hxx b/sd/source/ui/toolpanel/controls/SlideTransitionPanel.hxx index f62cb918806b..f62cb918806b 100755..100644 --- a/sd/source/ui/toolpanel/controls/SlideTransitionPanel.hxx +++ b/sd/source/ui/toolpanel/controls/SlideTransitionPanel.hxx diff --git a/sd/source/ui/toolpanel/controls/TableDesignPanel.hxx b/sd/source/ui/toolpanel/controls/TableDesignPanel.hxx index a3620df2ef68..a3620df2ef68 100755..100644 --- a/sd/source/ui/toolpanel/controls/TableDesignPanel.hxx +++ b/sd/source/ui/toolpanel/controls/TableDesignPanel.hxx diff --git a/sd/source/ui/unoidl/unocpres.hxx b/sd/source/ui/unoidl/unocpres.hxx index 615d5ba7007c..615d5ba7007c 100755..100644 --- a/sd/source/ui/unoidl/unocpres.hxx +++ b/sd/source/ui/unoidl/unocpres.hxx diff --git a/sd/source/ui/unoidl/unoobj.hxx b/sd/source/ui/unoidl/unoobj.hxx index 0e472f41ff16..0e472f41ff16 100755..100644 --- a/sd/source/ui/unoidl/unoobj.hxx +++ b/sd/source/ui/unoidl/unoobj.hxx diff --git a/sd/source/ui/unoidl/unopage.hxx b/sd/source/ui/unoidl/unopage.hxx index e3fda70c0f11..fea13bdbc649 100755..100644 --- a/sd/source/ui/unoidl/unopage.hxx +++ b/sd/source/ui/unoidl/unopage.hxx @@ -38,9 +38,7 @@ #include <svl/itemprop.hxx> -#ifndef _SVX_UNOPAGE_HXX #include <svx/unopage.hxx> -#endif #include <svx/fmdpage.hxx> #include <svx/svdpool.hxx> diff --git a/sd/source/ui/unoidl/unowcntr.hxx b/sd/source/ui/unoidl/unowcntr.hxx index a35c27cfd583..a35c27cfd583 100755..100644 --- a/sd/source/ui/unoidl/unowcntr.hxx +++ b/sd/source/ui/unoidl/unowcntr.hxx |