diff options
| author | Petr Mladek <pmladek@suse.cz> | 2010-10-04 16:59:14 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2010-10-05 18:20:54 +0200 |
| commit | 8e7505f5f5ee1298e9621a25e56afe2fbe1a248e (patch) | |
| tree | 7e493542b0bdd7de5a929ddf94428a36bd36e69d | |
| parent | c6ecc0827e13d6882dd77f6696a226e94d7bbae4 (diff) | |
remove include guards using fixguard.py
260 files changed, 0 insertions, 420 deletions
diff --git a/sd/source/core/CustomAnimationCloner.cxx b/sd/source/core/CustomAnimationCloner.cxx index a6a925ab63d2..9a7a039e7928 100644 --- a/sd/source/core/CustomAnimationCloner.cxx +++ b/sd/source/core/CustomAnimationCloner.cxx @@ -29,22 +29,12 @@ #include "precompiled_sd.hxx" #include <com/sun/star/animations/XAnimationNode.hpp> #include <com/sun/star/animations/Event.hpp> -#ifndef _COM_SUN_STAR_ANIMATIONS_XAnimateColor_HPP_ #include <com/sun/star/animations/XAnimateColor.hpp> -#endif -#ifndef _COM_SUN_STAR_ANIMATIONS_XAnimateSet_HPP_ #include <com/sun/star/animations/XAnimateSet.hpp> -#endif #include <com/sun/star/animations/XCommand.hpp> -#ifndef _COM_SUN_STAR_ANIMATIONS_XAnimateMotion_HPP_ #include <com/sun/star/animations/XAnimateMotion.hpp> -#endif -#ifndef _COM_SUN_STAR_ANIMATIONS_XAnimateTransform_HPP_ #include <com/sun/star/animations/XAnimateTransform.hpp> -#endif -#ifndef _COM_SUN_STAR_ANIMATIONS_XTransitionFilter_HPP_ #include <com/sun/star/animations/XTransitionFilter.hpp> -#endif #include <com/sun/star/animations/XIterateContainer.hpp> #include <com/sun/star/animations/XAudio.hpp> #include <com/sun/star/animations/AnimationNodeType.hpp> diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx index 33b9c233909b..9c0edb2a041d 100755..100644 --- a/sd/source/core/CustomAnimationEffect.cxx +++ b/sd/source/core/CustomAnimationEffect.cxx @@ -57,9 +57,7 @@ #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/i18n/XBreakIterator.hpp> #include <com/sun/star/i18n/CharacterIteratorMode.hpp> -#ifndef _COM_SUN_STAR_TEXT_WORDTYPE_HPP_ #include <com/sun/star/i18n/WordType.hpp> -#endif #include <com/sun/star/presentation/TextAnimationType.hpp> #include <basegfx/polygon/b2dpolypolygon.hxx> diff --git a/sd/source/core/TransitionPreset.cxx b/sd/source/core/TransitionPreset.cxx index c6f5c11a9164..4ff293f9c438 100644 --- a/sd/source/core/TransitionPreset.cxx +++ b/sd/source/core/TransitionPreset.cxx @@ -46,9 +46,7 @@ #include <rtl/uri.hxx> #include <tools/debug.hxx> -#ifndef _SD_CUSTOMANIMATIONPRESET_HXX #include <TransitionPreset.hxx> -#endif #include <unotools/ucbstreamhelper.hxx> #include <algorithm> diff --git a/sd/source/core/cusshow.cxx b/sd/source/core/cusshow.cxx index b9f23daedd90..b9f23daedd90 100755..100644 --- a/sd/source/core/cusshow.cxx +++ b/sd/source/core/cusshow.cxx diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index e2fdc2f805e5..4aec32bd17ca 100644 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.cxx @@ -69,9 +69,7 @@ #include <i18npool/mslangid.hxx> #include <unotools/charclass.hxx> #include <comphelper/processfactory.hxx> -#ifndef _SVTOOLS_PATHOPTIONS_HXX_ #include <unotools/pathoptions.hxx> -#endif #include <unotools/lingucfg.hxx> #include <unotools/linguprops.hxx> diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx index 74a1bde5f5f8..1758b1d95c1b 100755..100644 --- a/sd/source/core/drawdoc2.cxx +++ b/sd/source/core/drawdoc2.cxx @@ -34,9 +34,7 @@ #include <vcl/wrkwin.hxx> #include <sfx2/printer.hxx> #include <sfx2/app.hxx> -#ifndef SD_OUTLINE_HXX #include "Outliner.hxx" -#endif #include <editeng/paperinf.hxx> #include <svx/svdopage.hxx> #include <svx/svdoole2.hxx> diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index 89f74de30494..54c86b4ab544 100755..100644 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -72,9 +72,7 @@ #include <editeng/crsditem.hxx> #include <editeng/udlnitem.hxx> #include <editeng/cntritem.hxx> -#ifndef _SVX_EMPHITEM_HXX #include <editeng/emphitem.hxx> -#endif #include <editeng/fontitem.hxx> #include <editeng/shdditem.hxx> #include <svx/xbtmpit.hxx> diff --git a/sd/source/core/pglink.cxx b/sd/source/core/pglink.cxx index 61988c886feb..31cad5604463 100644 --- a/sd/source/core/pglink.cxx +++ b/sd/source/core/pglink.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sd.hxx" -#ifndef _SVXLINK_HXX #include <sfx2/linkmgr.hxx> -#endif #include "pglink.hxx" #include "sdpage.hxx" diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 971bb2340069..5478c6d9a463 100755..100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -54,9 +54,7 @@ #include <svl/smplhint.hxx> #include <editeng/adjitem.hxx> #include <editeng/editobj.hxx> -#ifndef _SVX_SRIPTTYPEITEM_HXX #include <editeng/scripttypeitem.hxx> -#endif #include <svx/unopage.hxx> #include <editeng/flditem.hxx> #include <svx/sdr/contact/displayinfo.hxx> diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx index 7b7bce6f679e..5a5d266c4182 100644 --- a/sd/source/core/sdpage2.cxx +++ b/sd/source/core/sdpage2.cxx @@ -30,9 +30,7 @@ #include <sfx2/docfile.hxx> #include <vcl/svapp.hxx> #include <editeng/outliner.hxx> -#ifndef _SVXLINK_HXX #include <sfx2/linkmgr.hxx> -#endif #include <svx/svdotext.hxx> #include <tools/urlobj.hxx> #include <editeng/outlobj.hxx> diff --git a/sd/source/core/shapelist.cxx b/sd/source/core/shapelist.cxx index bf5b98471b53..bf5b98471b53 100755..100644 --- a/sd/source/core/shapelist.cxx +++ b/sd/source/core/shapelist.cxx diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx index e89520d493f5..0f48410c53be 100755..100644 --- a/sd/source/core/stlpool.cxx +++ b/sd/source/core/stlpool.cxx @@ -49,9 +49,7 @@ #include <svl/smplhint.hxx> #include <editeng/langitem.hxx> #include <editeng/charreliefitem.hxx> -#ifndef _SVX_EMPHITEM_HXX #include <editeng/emphitem.hxx> -#endif #include <svx/sdr/table/tabledesign.hxx> #include <editeng/akrnitem.hxx> diff --git a/sd/source/core/text/textapi.cxx b/sd/source/core/text/textapi.cxx index ab6c69ee8fdc..ab6c69ee8fdc 100755..100644 --- a/sd/source/core/text/textapi.cxx +++ b/sd/source/core/text/textapi.cxx diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index 772fa13bd85c..12e537c7e493 100755..100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -30,9 +30,7 @@ #include <osl/endian.h> #include <eppt.hxx> #include "epptdef.hxx" -#ifndef _PptEscherEx_HXX #include "escherex.hxx" -#endif #include <tools/poly.hxx> #include <vcl/bmpacc.hxx> #include <vcl/gradient.hxx> @@ -51,12 +49,8 @@ #include <com/sun/star/container/XIndexReplace.hpp> #include <com/sun/star/presentation/XPresentationPage.hpp> #include <com/sun/star/awt/XFont.hpp> -#ifndef _COM_SUN_STAR_AWT_XFONTWEIGHT_HPP_ #include <com/sun/star/awt/FontWeight.hpp> -#endif -#ifndef _COM_SUN_STAR_AWT_XFONTUNDERLINE_HPP_ #include <com/sun/star/awt/FontUnderline.hpp> -#endif #include <com/sun/star/style/ParagraphAdjust.hpp> #include <com/sun/star/style/LineSpacing.hpp> #include <com/sun/star/style/LineSpacingMode.hpp> @@ -78,21 +72,11 @@ #include <com/sun/star/embed/Aspects.hpp> #include <vcl/cvtgrf.hxx> #include <tools/urlobj.hxx> -#ifndef _CPPUHELPER_EXTRACT_HXX_ #include <comphelper/extract.hxx> -#endif -#ifndef _CPPUHELPER_PROPTYPEHLP_HXX_ #include <cppuhelper/proptypehlp.hxx> -#endif -#ifndef _UCBHELPER_CONTENT_HXX_ #include <ucbhelper/content.hxx> -#endif -#ifndef _UCBHELPER_CONTENTBROKER_HXX_ #include <ucbhelper/contentbroker.hxx> -#endif -#ifndef _TOOLKIT_UNOHLP_HXX #include <toolkit/unohlp.hxx> -#endif #include <rtl/crc.h> #include <sot/clsids.hxx> #include <unotools/ucbstreamhelper.hxx> diff --git a/sd/source/filter/eppt/escherex.cxx b/sd/source/filter/eppt/escherex.cxx index fbb94de67ae7..c1e03376cac6 100644 --- a/sd/source/filter/eppt/escherex.cxx +++ b/sd/source/filter/eppt/escherex.cxx @@ -29,9 +29,7 @@ #include "precompiled_sd.hxx" -#ifndef _PptEscherEx_HXX #include "escherex.hxx" -#endif // --------------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------------- diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx index 4e4b50007443..216e7a1be873 100644 --- a/sd/source/filter/eppt/pptexanimations.cxx +++ b/sd/source/filter/eppt/pptexanimations.cxx @@ -66,9 +66,7 @@ #include <com/sun/star/container/XChild.hpp> #include <comphelper/processfactory.hxx> #include <rtl/ustrbuf.hxx> -#ifndef _RTL_MEMORY_H_ #include <rtl/memory.hxx> -#endif #include <vcl/vclenum.hxx> #include <svx/svdotext.hxx> diff --git a/sd/source/filter/eppt/pptexsoundcollection.cxx b/sd/source/filter/eppt/pptexsoundcollection.cxx index 9510da8757e3..4a5ea4b66c64 100644 --- a/sd/source/filter/eppt/pptexsoundcollection.cxx +++ b/sd/source/filter/eppt/pptexsoundcollection.cxx @@ -30,15 +30,9 @@ #include <pptexsoundcollection.hxx> #include "epptdef.hxx" #include <tools/urlobj.hxx> -#ifndef _UCBHELPER_CONTENT_HXX_ #include <ucbhelper/content.hxx> -#endif -#ifndef _UCBHELPER_CONTENTBROKER_HXX_ #include <ucbhelper/contentbroker.hxx> -#endif -#ifndef _CPPUHELPER_PROPTYPEHLP_HXX_ #include <cppuhelper/proptypehlp.hxx> -#endif #include <unotools/ucbstreamhelper.hxx> namespace ppt diff --git a/sd/source/filter/html/htmlattr.cxx b/sd/source/filter/html/htmlattr.cxx index 4bcb73535ba1..4bcb73535ba1 100755..100644 --- a/sd/source/filter/html/htmlattr.cxx +++ b/sd/source/filter/html/htmlattr.cxx diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index 9de46771e14c..2fb5e2a3d849 100755..100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -39,9 +39,7 @@ #include <tools/fsys.hxx> #include <unotools/pathoptions.hxx> #include <svtools/FilterConfigItem.hxx> -#ifndef _UNOTOOLS_UCBSTREAMHELPER_HXX #include <unotools/ucbstreamhelper.hxx> -#endif #include <unotools/localfilehelper.hxx> #include <com/sun/star/frame/XStorable.hpp> #include <sfx2/progress.hxx> diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index 8079238bc1dc..c4216e8ab431 100755..100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -35,9 +35,7 @@ #include <unotools/ucbstreamhelper.hxx> #include <vcl/lstbox.hxx> #include <svtools/FilterConfigItem.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/fixed.hxx> #include <vcl/combobox.hxx> #include <svtools/svmedit.hxx> diff --git a/sd/source/filter/ppt/ppt97animations.cxx b/sd/source/filter/ppt/ppt97animations.cxx index 25ac858ca319..25ac858ca319 100755..100644 --- a/sd/source/filter/ppt/ppt97animations.cxx +++ b/sd/source/filter/ppt/ppt97animations.cxx diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 6a5ce08bc912..6a5ce08bc912 100755..100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx index 10b0b152b8f4..10b0b152b8f4 100755..100644 --- a/sd/source/filter/ppt/pptinanimations.cxx +++ b/sd/source/filter/ppt/pptinanimations.cxx diff --git a/sd/source/filter/ppt/propread.cxx b/sd/source/filter/ppt/propread.cxx index ff1250bdf090..ff1250bdf090 100755..100644 --- a/sd/source/filter/ppt/propread.cxx +++ b/sd/source/filter/ppt/propread.cxx diff --git a/sd/source/helper/simplereferencecomponent.cxx b/sd/source/helper/simplereferencecomponent.cxx index 032373c03671..7434d1c2363b 100644 --- a/sd/source/helper/simplereferencecomponent.cxx +++ b/sd/source/helper/simplereferencecomponent.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sd.hxx" -#ifndef _SALHELPER_SIMPLEREFERENCECOMPONENT_HXX_ #include "helper/simplereferencecomponent.hxx" -#endif #include "com/sun/star/uno/RuntimeException.hpp" #include "osl/diagnose.h" diff --git a/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx b/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx index 6862634df9a0..8030c6ba0128 100644 --- a/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx +++ b/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx @@ -30,9 +30,7 @@ #include <editeng/unoedhlp.hxx> #include <svx/svdoutl.hxx> -#ifndef SD_ACCESSIBILITY_ACCESSIBLE_OUTLINE_EDIT_SOURCE_HXX #include <AccessibleOutlineEditSource.hxx> -#endif #include "OutlineView.hxx" #include <svx/sdrpaintwindow.hxx> diff --git a/sd/source/ui/accessibility/AccessibleOutlineView.cxx b/sd/source/ui/accessibility/AccessibleOutlineView.cxx index f61e09d743f7..1ed3d4f9cc6f 100644 --- a/sd/source/ui/accessibility/AccessibleOutlineView.cxx +++ b/sd/source/ui/accessibility/AccessibleOutlineView.cxx @@ -35,17 +35,11 @@ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/document/XEventBroadcaster.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#ifndef _COM_SUN_STAR_ACCESSIBLE_ACCESSIBLEEVENTID_HPP_ #include <com/sun/star/accessibility/AccessibleEventId.hpp> -#endif #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> -#ifndef _COM_SUN_STAR_LANG_XMULSTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif #include <rtl/ustring.h> -#ifndef _SFXFRAME_HXX #include<sfx2/viewfrm.hxx> -#endif #include <svx/AccessibleShape.hxx> diff --git a/sd/source/ui/accessibility/AccessiblePageShape.cxx b/sd/source/ui/accessibility/AccessiblePageShape.cxx index 560e0654af60..b176c2c60f94 100644 --- a/sd/source/ui/accessibility/AccessiblePageShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePageShape.cxx @@ -30,12 +30,8 @@ #include "AccessiblePageShape.hxx" #include <svx/AccessibleShapeInfo.hxx> -#ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLE_ROLE_HPP_ #include <com/sun/star/accessibility/AccessibleRole.hpp> -#endif -#ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLE_STATE_TYPE_HPP_ #include <com/sun/star/accessibility/AccessibleStateType.hpp> -#endif #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/drawing/XShapes.hpp> diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx index ae1f6f633edc..ae1f6f633edc 100755..100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx index 9fdb6b28db7d..9fdb6b28db7d 100755..100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx diff --git a/sd/source/ui/accessibility/AccessibleTreeNode.cxx b/sd/source/ui/accessibility/AccessibleTreeNode.cxx index 5c7462581d0b..5c7462581d0b 100755..100644 --- a/sd/source/ui/accessibility/AccessibleTreeNode.cxx +++ b/sd/source/ui/accessibility/AccessibleTreeNode.cxx diff --git a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx index de5342afd23f..969865f14608 100755..100644 --- a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx +++ b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sd.hxx" -#ifndef _SVX_ACCESSIBILITY_ACCESSIBLE_VIEW_FORWARDER_HXX #include "AccessibleViewForwarder.hxx" -#endif #include <svx/svdpntv.hxx> #include <vcl/outdev.hxx> #include <svx/sdrpaintwindow.hxx> diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx index f76b84d29826..4f214dbaf48e 100755..100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx @@ -28,20 +28,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sd.hxx" -#ifndef _COM_SUN_STAR_UTIL_XCOLLATOR_HPP_ #include <com/sun/star/i18n/XCollator.hpp> -#endif -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> -#endif #include <vcl/svapp.hxx> #include <vcl/tabctrl.hxx> #include <vcl/tabpage.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/fixed.hxx> #include <vcl/lstbox.hxx> #include <vcl/combobox.hxx> @@ -53,12 +47,8 @@ #include <unotools/viewoptions.hxx> #include <com/sun/star/presentation/EffectNodeType.hpp> #include "CustomAnimationCreateDialog.hxx" -#ifndef _SD_CUSTOMANIMATIONCREATEDIALOG_HRC #include "CustomAnimationCreateDialog.hrc" -#endif -#ifndef _SD_CUSTOMANIMATION_HRC #include "CustomAnimation.hrc" -#endif #include "CustomAnimationPane.hxx" #include "optsitem.hxx" #include "sddll.hxx" diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index 7f942562b951..c629762eeffd 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -42,13 +42,9 @@ #include <com/sun/star/media/XManager.hpp> #include <com/sun/star/media/XPlayer.hpp> -#ifndef BOOST_SHARED_PTR_HPP_INCLUDED #include <boost/shared_ptr.hpp> -#endif -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> -#endif #include <unotools/pathoptions.hxx> #include <vcl/tabctrl.hxx> #include <vcl/tabpage.hxx> @@ -65,9 +61,7 @@ #include <svtools/ctrltool.hxx> #include <sfx2/objsh.hxx> -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <svx/dialmgr.hxx> #include <editeng/flstitem.hxx> #include <svx/drawitem.hxx> @@ -75,19 +69,13 @@ #include <svx/xtable.hxx> #include <svx/gallery.hxx> -#ifndef _SVX_DIALOGS_HRC #include <svx/dialogs.hrc> -#endif #include "sdresid.hxx" #include "glob.hrc" #include "CustomAnimationDialog.hxx" -#ifndef _SD_CUSTOMANIMATIONDIALOG_HRC #include "CustomAnimationDialog.hrc" -#endif -#ifndef _SD_CUSTOMANIMATION_HRC #include "CustomAnimation.hrc" -#endif #include "STLPropertySet.hxx" #include <avmedia/mediawindow.hxx> diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx index 7c07ec76127a..93dd316aa404 100644 --- a/sd/source/ui/animations/CustomAnimationList.cxx +++ b/sd/source/ui/animations/CustomAnimationList.cxx @@ -40,12 +40,8 @@ #include <com/sun/star/drawing/XDrawPage.hpp> #include <svx/ShapeTypeHandler.hxx> #include "CustomAnimationList.hxx" -#ifndef _SD_CUSTOMANIMATIONPANE_HRC #include "CustomAnimationPane.hrc" -#endif -#ifndef _SD_CUSTOMANIMATION_HRC #include "CustomAnimation.hrc" -#endif #include "CustomAnimationPreset.hxx" #include <svtools/treelist.hxx> #include <vcl/svapp.hxx> diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index 9c12692c6597..1f5e83d0f4b6 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -44,9 +44,7 @@ #include "DrawController.hxx" #include <com/sun/star/beans/XPropertySet.hpp> -#ifndef _SVT_CONTROLDIMS_HRC_ #include <svtools/controldims.hrc> -#endif #include <svx/gallery.hxx> #include <unotools/pathoptions.hxx> #include <vcl/msgbox.hxx> diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index 33bc6d87849d..33bc6d87849d 100755..100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index a4642bb68096..a4642bb68096 100755..100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx index 4355da3011c9..0e133b408c2c 100755..100644 --- a/sd/source/ui/app/optsitem.cxx +++ b/sd/source/ui/app/optsitem.cxx @@ -30,9 +30,7 @@ #include <svx/svdmodel.hxx> #include <sfx2/app.hxx> #include <sfx2/sfx.hrc> -#ifndef _SV_SALBTYPE_HRC //autogen #include <vcl/salbtype.hxx> -#endif #include <unotools/syslocale.hxx> #include "app.hxx" diff --git a/sd/source/ui/app/sddll1.cxx b/sd/source/ui/app/sddll1.cxx index 53a2b4e9b1e9..53a2b4e9b1e9 100755..100644 --- a/sd/source/ui/app/sddll1.cxx +++ b/sd/source/ui/app/sddll1.cxx diff --git a/sd/source/ui/app/sddll2.cxx b/sd/source/ui/app/sddll2.cxx index 3b576c8c668b..3b576c8c668b 100755..100644 --- a/sd/source/ui/app/sddll2.cxx +++ b/sd/source/ui/app/sddll2.cxx diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx index ccbc7c8f5665..3b261297f2b3 100755..100644 --- a/sd/source/ui/app/sdmod.cxx +++ b/sd/source/ui/app/sdmod.cxx @@ -29,9 +29,7 @@ #include "precompiled_sd.hxx" #include <unotools/pathoptions.hxx> #include <svl/languageoptions.hxx> -#ifndef _UNOTOOLS_UCBSTREAMHELPER_HXX #include <unotools/ucbstreamhelper.hxx> -#endif #include <tools/urlobj.hxx> #include <vcl/virdev.hxx> #include <sfx2/app.hxx> diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx index 3c1abc0c7d22..46232719748b 100755..100644 --- a/sd/source/ui/app/sdmod1.cxx +++ b/sd/source/ui/app/sdmod1.cxx @@ -68,9 +68,7 @@ #include "sdresid.hxx" #include "OutlineViewShell.hxx" #include "ViewShellBase.hxx" -#ifndef SD_FRAMW_VIEW_HXX #include "FrameView.hxx" -#endif #include "FactoryIds.hxx" #include "sdabstdlg.hxx" #include <memory> diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx index 58aba6823d3a..4049c915b63f 100755..100644 --- a/sd/source/ui/app/sdmod2.cxx +++ b/sd/source/ui/app/sdmod2.cxx @@ -62,9 +62,7 @@ #include "strings.hrc" #include "res_bmp.hrc" #include "ViewShell.hxx" -#ifndef SD_FRAMW_VIEW_HXX #include "FrameView.hxx" -#endif #include "sdattr.hxx" #include "tpoption.hrc" #include "optsitem.hxx" diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx index 459ba2bcb358..fc62746fcd9a 100644 --- a/sd/source/ui/app/sdxfer.cxx +++ b/sd/source/ui/app/sdxfer.cxx @@ -33,9 +33,7 @@ #include <com/sun/star/lang/XComponent.hpp> #include <vos/mutex.hxx> #include <unotools/ucbstreamhelper.hxx> -#ifndef _UNTOOLS_TEMPFILE_HXX #include <unotools/tempfile.hxx> -#endif #include <editeng/eeitem.hxx> #include <editeng/flditem.hxx> #include <svx/svdpagv.hxx> diff --git a/sd/source/ui/app/tbxww.cxx b/sd/source/ui/app/tbxww.cxx index 80bd3a5ac8b9..28b9ec602743 100644 --- a/sd/source/ui/app/tbxww.cxx +++ b/sd/source/ui/app/tbxww.cxx @@ -34,9 +34,7 @@ #include <svx/grafctrl.hxx> #include <svl/cjkoptions.hxx> #include <sfx2/viewsh.hxx> -#ifndef _SFX_IMAGEMGR_HXX #include <sfx2/imagemgr.hxx> -#endif #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> diff --git a/sd/source/ui/dlg/LayerDialogContent.cxx b/sd/source/ui/dlg/LayerDialogContent.cxx index 975d277c7dff..975d277c7dff 100755..100644 --- a/sd/source/ui/dlg/LayerDialogContent.cxx +++ b/sd/source/ui/dlg/LayerDialogContent.cxx diff --git a/sd/source/ui/dlg/PaneChildWindows.cxx b/sd/source/ui/dlg/PaneChildWindows.cxx index 181fc8433c22..181fc8433c22 100755..100644 --- a/sd/source/ui/dlg/PaneChildWindows.cxx +++ b/sd/source/ui/dlg/PaneChildWindows.cxx diff --git a/sd/source/ui/dlg/PaneDockingWindow.cxx b/sd/source/ui/dlg/PaneDockingWindow.cxx index c1dedd5d8293..c1dedd5d8293 100755..100644 --- a/sd/source/ui/dlg/PaneDockingWindow.cxx +++ b/sd/source/ui/dlg/PaneDockingWindow.cxx diff --git a/sd/source/ui/dlg/PaneShells.cxx b/sd/source/ui/dlg/PaneShells.cxx index bb1023482ea0..bb1023482ea0 100755..100644 --- a/sd/source/ui/dlg/PaneShells.cxx +++ b/sd/source/ui/dlg/PaneShells.cxx diff --git a/sd/source/ui/dlg/SpellDialogChildWindow.cxx b/sd/source/ui/dlg/SpellDialogChildWindow.cxx index 7aee12f23bbd..7aee12f23bbd 100755..100644 --- a/sd/source/ui/dlg/SpellDialogChildWindow.cxx +++ b/sd/source/ui/dlg/SpellDialogChildWindow.cxx diff --git a/sd/source/ui/dlg/TemplateScanner.cxx b/sd/source/ui/dlg/TemplateScanner.cxx index 9f510f20c55d..105837787b3c 100644 --- a/sd/source/ui/dlg/TemplateScanner.cxx +++ b/sd/source/ui/dlg/TemplateScanner.cxx @@ -30,9 +30,7 @@ #include "TemplateScanner.hxx" -#ifndef _COMPHELPER_SERVICEFACTORY_HXX #include <comphelper/processfactory.hxx> -#endif #include <comphelper/documentconstants.hxx> #include <tools/debug.hxx> diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index e179a0ba9f86..9eab720915cf 100755..100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -55,9 +55,7 @@ #include "res_bmp.hrc" #include "ViewShell.hxx" -#ifndef _SV_SVAPP_HXX_ #include <vcl/svapp.hxx> -#endif #include <string> #include <algorithm> diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx index b8c92dee3a6e..b8c92dee3a6e 100755..100644 --- a/sd/source/ui/dlg/custsdlg.cxx +++ b/sd/source/ui/dlg/custsdlg.cxx diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx index 1eb3a3d0cedc..cd003e8c0ed8 100755..100644 --- a/sd/source/ui/dlg/dlgass.cxx +++ b/sd/source/ui/dlg/dlgass.cxx @@ -74,12 +74,8 @@ #include "dlgass.hrc" #include "dlgass.hxx" #include "dlgctrls.hxx" -#ifndef _SD_CFGID_HXX #include "strings.hrc" -#endif -#ifndef _DATETIMEITEM_HXX #include "dlgassim.hxx" -#endif #include "TemplateScanner.hxx" #include "WindowUpdater.hxx" diff --git a/sd/source/ui/dlg/dlgassim.cxx b/sd/source/ui/dlg/dlgassim.cxx index f9dcf5046189..f9dcf5046189 100755..100644 --- a/sd/source/ui/dlg/dlgassim.cxx +++ b/sd/source/ui/dlg/dlgassim.cxx diff --git a/sd/source/ui/dlg/dlgctrls.cxx b/sd/source/ui/dlg/dlgctrls.cxx index 1a5a612d37ad..1a5a612d37ad 100755..100644 --- a/sd/source/ui/dlg/dlgctrls.cxx +++ b/sd/source/ui/dlg/dlgctrls.cxx diff --git a/sd/source/ui/dlg/dlgolbul.cxx b/sd/source/ui/dlg/dlgolbul.cxx index bbd32f6bd807..4ff4c0ea6247 100644 --- a/sd/source/ui/dlg/dlgolbul.cxx +++ b/sd/source/ui/dlg/dlgolbul.cxx @@ -34,9 +34,7 @@ #include "OutlineBulletDlg.hxx" -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <sfx2/objsh.hxx> #include <svx/drawitem.hxx> #include <editeng/bulitem.hxx> @@ -52,9 +50,7 @@ #include <svl/style.hxx> #include <drawdoc.hxx> -#ifndef _SD_SDRESID_HXX #include "sdresid.hxx" -#endif #include "glob.hrc" #include "dlgolbul.hrc" diff --git a/sd/source/ui/dlg/dlgpage.cxx b/sd/source/ui/dlg/dlgpage.cxx index f2dea0f67e2f..1938918048ae 100644 --- a/sd/source/ui/dlg/dlgpage.cxx +++ b/sd/source/ui/dlg/dlgpage.cxx @@ -33,15 +33,11 @@ #endif #include <svl/intitem.hxx> -#ifndef _SVX_DIALOGS_HRC #include <svx/dialogs.hrc> -#endif #include <svx/tabarea.hxx> #include <svx/drawitem.hxx> -#ifndef _SD_SDRESID_HXX #include "sdresid.hxx" -#endif #include "dlgpage.hxx" #include "DrawDocShell.hxx" diff --git a/sd/source/ui/dlg/dlgsnap.cxx b/sd/source/ui/dlg/dlgsnap.cxx index 6cd220d5a5bc..6cd220d5a5bc 100755..100644 --- a/sd/source/ui/dlg/dlgsnap.cxx +++ b/sd/source/ui/dlg/dlgsnap.cxx diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx index a42ce43a2c6d..a42ce43a2c6d 100755..100644 --- a/sd/source/ui/dlg/docprev.cxx +++ b/sd/source/ui/dlg/docprev.cxx diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx index 71fad02f24a7..71fad02f24a7 100755..100644 --- a/sd/source/ui/dlg/filedlg.cxx +++ b/sd/source/ui/dlg/filedlg.cxx diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx index b48a1682bba6..699cfc346c09 100755..100644 --- a/sd/source/ui/dlg/headerfooterdlg.cxx +++ b/sd/source/ui/dlg/headerfooterdlg.cxx @@ -32,9 +32,7 @@ #undef SD_DLLIMPLEMENTATION #endif -#ifndef _SVX_DIALOGS_HRC #include <svx/dialogs.hrc> -#endif #include <editeng/eeitem.hxx> #include <editeng/flditem.hxx> #include <editeng/langitem.hxx> @@ -43,9 +41,7 @@ #include <editeng/editeng.hxx> #include <sfx2/viewfrm.hxx> -#ifndef _SD_SDRESID_HXX #include "sdresid.hxx" -#endif #include <vcl/fixed.hxx> #include <vcl/button.hxx> @@ -64,9 +60,7 @@ // preview control for presentation layout /////////////////////////////////////////////////////////////////////// #include <vcl/ctrl.hxx> -#ifndef _SV_COLOR_HXX #include <tools/color.hxx> -#endif #include <i18npool/mslangid.hxx> #include <svtools/colorcfg.hxx> #include <svx/xlndsit.hxx> diff --git a/sd/source/ui/dlg/inspagob.cxx b/sd/source/ui/dlg/inspagob.cxx index 5d260367f383..5d260367f383 100755..100644 --- a/sd/source/ui/dlg/inspagob.cxx +++ b/sd/source/ui/dlg/inspagob.cxx diff --git a/sd/source/ui/dlg/masterlayoutdlg.cxx b/sd/source/ui/dlg/masterlayoutdlg.cxx index 601b1d1cf72c..ee19066531f9 100644 --- a/sd/source/ui/dlg/masterlayoutdlg.cxx +++ b/sd/source/ui/dlg/masterlayoutdlg.cxx @@ -32,13 +32,9 @@ #undef SD_DLLIMPLEMENTATION #endif -#ifndef _SVX_DIALOGS_HRC #include <svx/dialogs.hrc> -#endif -#ifndef _SD_SDRESID_HXX #include "sdresid.hxx" -#endif #include "strings.hrc" #include "dialogs.hrc" diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx index 3c9aad38c332..3c9aad38c332 100755..100644 --- a/sd/source/ui/dlg/prntopts.cxx +++ b/sd/source/ui/dlg/prntopts.cxx diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx index aa0bb5ce9f27..aa0bb5ce9f27 100755..100644 --- a/sd/source/ui/dlg/sddlgfact.cxx +++ b/sd/source/ui/dlg/sddlgfact.cxx diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index 275d39af4ea5..36d9a19a972b 100755..100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -49,9 +49,7 @@ #include "sdpage.hxx" #include "sdresid.hxx" #include "navigatr.hxx" -#ifndef _SD_CFGID_HXX #include "strings.hrc" -#endif #include "res_bmp.hrc" #include <com/sun/star/embed/XEmbedPersist.hpp> diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index af2668fc9dad..22db86d30027 100755..100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -36,9 +36,7 @@ #include <com/sun/star/presentation/AnimationEffect.hpp> #include <com/sun/star/presentation/ClickAction.hpp> #include <com/sun/star/presentation/AnimationSpeed.hpp> -#ifndef _COM_SUN_STAR_EMBED_VERBDESCR_HPP_ #include <com/sun/star/embed/VerbDescriptor.hpp> -#endif #include <com/sun/star/embed/EmbedStates.hpp> #include <com/sun/star/uri/XUriReferenceFactory.hpp> #include <com/sun/star/uri/XVndSunStarScriptUrl.hpp> diff --git a/sd/source/ui/docshell/docshel2.cxx b/sd/source/ui/docshell/docshel2.cxx index 841018aa9444..96270f10711d 100644 --- a/sd/source/ui/docshell/docshel2.cxx +++ b/sd/source/ui/docshell/docshel2.cxx @@ -37,16 +37,12 @@ #include "helpids.h" #include "ViewShell.hxx" #include "drawview.hxx" -#ifndef SD_FRAMW_VIEW_HXX #include "FrameView.hxx" -#endif #include "drawdoc.hxx" #include "sdpage.hxx" #include "View.hxx" #include "ClientView.hxx" -#ifndef SD_WINDOW_SHELL_HXX #include "Window.hxx" -#endif #include "strings.hrc" #include "res_bmp.hrc" #include "sdresid.hxx" diff --git a/sd/source/ui/docshell/docshel3.cxx b/sd/source/ui/docshell/docshel3.cxx index 6bcdbe76accf..1d265b600d2d 100644 --- a/sd/source/ui/docshell/docshel3.cxx +++ b/sd/source/ui/docshell/docshel3.cxx @@ -32,12 +32,8 @@ #include "app.hrc" -#ifndef _SVXIDS_HRC #include <svx/svxids.hrc> -#endif -#ifndef _SVX_DIALOGS_HRC #include <svx/dialogs.hrc> -#endif #include <svx/ofaitem.hxx> #include <svx/svxerr.hxx> diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index cd8b7544f224..67e50e2da013 100755..100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -33,9 +33,7 @@ #include <tools/urlobj.hxx> #include <sfx2/progress.hxx> #include <vcl/waitobj.hxx> -#ifndef _SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <editeng/flstitem.hxx> #include <editeng/eeitem.hxx> #include <svl/aeitem.hxx> @@ -43,16 +41,12 @@ #include <sot/storage.hxx> #include <sfx2/docfile.hxx> #include <sfx2/docfilt.hxx> -#ifndef _DISPATCH_HXX //autogen #include <sfx2/dispatch.hxx> -#endif #include <svx/svdotext.hxx> #include <svl/style.hxx> #include <sfx2/printer.hxx> #include <svtools/ctrltool.hxx> -#ifndef _SFX_ECODE_HXX //autogen #include <svtools/sfxecode.hxx> -#endif #include <sot/clsids.hxx> #include <sot/formats.hxx> #include <sfx2/request.hxx> @@ -72,9 +66,7 @@ #include "glob.hrc" #include "strings.hrc" #include "strmname.h" -#ifndef SD_FRAMW_VIEW_HXX #include "FrameView.hxx" -#endif #include "optsitem.hxx" #include "Outliner.hxx" #include "sdattr.hxx" diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx index 78b1b9434ad0..96a81a33b988 100755..100644 --- a/sd/source/ui/docshell/docshell.cxx +++ b/sd/source/ui/docshell/docshell.cxx @@ -35,18 +35,14 @@ #include <sfx2/docfac.hxx> #include <sfx2/objface.hxx> -#ifndef _SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <svl/srchitem.hxx> #include <svx/srchdlg.hxx> #include <editeng/flstitem.hxx> #include <svl/eitem.hxx> #include <svl/intitem.hxx> #include <sfx2/printer.hxx> -#ifndef _SFX_DOCFILE_HXX //autogen #include <sfx2/docfile.hxx> -#endif #include <svx/drawitem.hxx> #include <editeng/flstitem.hxx> #include <svx/drawitem.hxx> @@ -56,9 +52,7 @@ #include <svl/itempool.hxx> #include <svtools/ctrltool.hxx> #include <svtools/filter.hxx> -#ifndef _SO_CLSIDS_HXX #include <sot/clsids.hxx> -#endif #include <svl/cjkoptions.hxx> #include <svl/visitem.hxx> @@ -80,13 +74,9 @@ #include "fusearch.hxx" #include "ViewShell.hxx" #include "sdresid.hxx" -#ifndef SD_FU_SLIDE_SHOW_DLG_HXX #include "slideshow.hxx" -#endif #include "drawview.hxx" -#ifndef SD_FRAMW_VIEW_HXX #include "FrameView.hxx" -#endif #include "unomodel.hxx" #include "undo/undomanager.hxx" #include "undo/undofactory.hxx" diff --git a/sd/source/ui/docshell/grdocsh.cxx b/sd/source/ui/docshell/grdocsh.cxx index d5e7315144c0..7ff2081ea483 100644 --- a/sd/source/ui/docshell/grdocsh.cxx +++ b/sd/source/ui/docshell/grdocsh.cxx @@ -28,16 +28,12 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sd.hxx" -#ifndef _SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <sfx2/app.hxx> #include <svl/srchitem.hxx> #include <tools/globname.hxx> -#ifndef _SO_CLSIDS_HXX //autogen #include <sot/clsids.hxx> -#endif #include <sfx2/objface.hxx> diff --git a/sd/source/ui/docshell/sdclient.cxx b/sd/source/ui/docshell/sdclient.cxx index bb1cd14f87f5..5420cf600e54 100644 --- a/sd/source/ui/docshell/sdclient.cxx +++ b/sd/source/ui/docshell/sdclient.cxx @@ -40,10 +40,8 @@ #include "misc.hxx" #ifdef STARIMAGE_AVAILABLE -#ifndef _SIMDLL_HXX #include <sim2/simdll.hxx> #endif -#endif #include "strings.hrc" #include "ViewShell.hxx" diff --git a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx index 55e22361ad3a..55e22361ad3a 100755..100644 --- a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx index 2f846e50be25..2f846e50be25 100755..100644 --- a/sd/source/ui/framework/configuration/ConfigurationController.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx index ff167f07520a..ff167f07520a 100755..100644 --- a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx index 93ff7ee54e00..93ff7ee54e00 100755..100644 --- a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx diff --git a/sd/source/ui/framework/configuration/ConfigurationTracer.cxx b/sd/source/ui/framework/configuration/ConfigurationTracer.cxx index b9552940060e..b9552940060e 100755..100644 --- a/sd/source/ui/framework/configuration/ConfigurationTracer.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationTracer.cxx diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx index 4ab361a9490d..4ab361a9490d 100755..100644 --- a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx diff --git a/sd/source/ui/framework/configuration/ResourceId.cxx b/sd/source/ui/framework/configuration/ResourceId.cxx index 15d7c3a6f4ec..15d7c3a6f4ec 100755..100644 --- a/sd/source/ui/framework/configuration/ResourceId.cxx +++ b/sd/source/ui/framework/configuration/ResourceId.cxx diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx b/sd/source/ui/framework/factories/BasicPaneFactory.cxx index f406501bd114..f406501bd114 100755..100644 --- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx +++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx index d353cfc58c1f..d353cfc58c1f 100755..100644 --- a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx +++ b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx index ef686324bc39..ef686324bc39 100755..100644 --- a/sd/source/ui/framework/factories/BasicViewFactory.cxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx diff --git a/sd/source/ui/framework/factories/ChildWindowPane.cxx b/sd/source/ui/framework/factories/ChildWindowPane.cxx index 5e4e6df987f0..5e4e6df987f0 100755..100644 --- a/sd/source/ui/framework/factories/ChildWindowPane.cxx +++ b/sd/source/ui/framework/factories/ChildWindowPane.cxx diff --git a/sd/source/ui/framework/factories/PresentationFactory.cxx b/sd/source/ui/framework/factories/PresentationFactory.cxx index 6f22f1484627..6f22f1484627 100755..100644 --- a/sd/source/ui/framework/factories/PresentationFactory.cxx +++ b/sd/source/ui/framework/factories/PresentationFactory.cxx diff --git a/sd/source/ui/framework/factories/TaskPanelFactory.cxx b/sd/source/ui/framework/factories/TaskPanelFactory.cxx index d7c45ceb803b..d7c45ceb803b 100755..100644 --- a/sd/source/ui/framework/factories/TaskPanelFactory.cxx +++ b/sd/source/ui/framework/factories/TaskPanelFactory.cxx diff --git a/sd/source/ui/framework/factories/ViewShellWrapper.cxx b/sd/source/ui/framework/factories/ViewShellWrapper.cxx index a1c0bd525c9e..a1c0bd525c9e 100755..100644 --- a/sd/source/ui/framework/factories/ViewShellWrapper.cxx +++ b/sd/source/ui/framework/factories/ViewShellWrapper.cxx diff --git a/sd/source/ui/framework/module/ImpressModule.cxx b/sd/source/ui/framework/module/ImpressModule.cxx index a5856bc3ebc9..a5856bc3ebc9 100755..100644 --- a/sd/source/ui/framework/module/ImpressModule.cxx +++ b/sd/source/ui/framework/module/ImpressModule.cxx diff --git a/sd/source/ui/framework/module/ModuleController.cxx b/sd/source/ui/framework/module/ModuleController.cxx index e910a8df7496..e910a8df7496 100755..100644 --- a/sd/source/ui/framework/module/ModuleController.cxx +++ b/sd/source/ui/framework/module/ModuleController.cxx diff --git a/sd/source/ui/framework/module/PresentationModule.cxx b/sd/source/ui/framework/module/PresentationModule.cxx index 6a5ba5dc5e7f..6a5ba5dc5e7f 100755..100644 --- a/sd/source/ui/framework/module/PresentationModule.cxx +++ b/sd/source/ui/framework/module/PresentationModule.cxx diff --git a/sd/source/ui/framework/module/ReadOnlyModeObserver.cxx b/sd/source/ui/framework/module/ReadOnlyModeObserver.cxx index 090247e7f68c..090247e7f68c 100755..100644 --- a/sd/source/ui/framework/module/ReadOnlyModeObserver.cxx +++ b/sd/source/ui/framework/module/ReadOnlyModeObserver.cxx diff --git a/sd/source/ui/framework/module/ResourceManager.cxx b/sd/source/ui/framework/module/ResourceManager.cxx index fcd90ca6454b..fcd90ca6454b 100755..100644 --- a/sd/source/ui/framework/module/ResourceManager.cxx +++ b/sd/source/ui/framework/module/ResourceManager.cxx diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx index 078f86a88d86..078f86a88d86 100755..100644 --- a/sd/source/ui/framework/tools/FrameworkHelper.cxx +++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx diff --git a/sd/source/ui/func/bulmaper.cxx b/sd/source/ui/func/bulmaper.cxx index 1a6e8992a10e..e2a1c16d1fbf 100644 --- a/sd/source/ui/func/bulmaper.cxx +++ b/sd/source/ui/func/bulmaper.cxx @@ -32,9 +32,7 @@ #undef SD_DLLIMPLEMENTATION #endif -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif //-> Fonts & Items #include <vcl/font.hxx> diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx index 92b1450624e1..83a640186205 100644 --- a/sd/source/ui/func/fubullet.cxx +++ b/sd/source/ui/func/fubullet.cxx @@ -31,9 +31,7 @@ #include "fubullet.hxx" -#ifndef _BINDING_HXX //autogen #include <sfx2/bindings.hxx> -#endif #include <editeng/eeitem.hxx> #include <svl/poolitem.hxx> #include <editeng/fontitem.hxx> diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx index c0d8235e97fb..c0d8235e97fb 100755..100644 --- a/sd/source/ui/func/fuconstr.cxx +++ b/sd/source/ui/func/fuconstr.cxx diff --git a/sd/source/ui/func/fuconuno.cxx b/sd/source/ui/func/fuconuno.cxx index fffcaf3c0b9f..d45479c9de66 100644 --- a/sd/source/ui/func/fuconuno.cxx +++ b/sd/source/ui/func/fuconuno.cxx @@ -47,9 +47,7 @@ class SbModule; #include "glob.hrc" #include "ViewShell.hxx" #include "View.hxx" -#ifndef SD_WINDOW_SHELL_HXX #include "Window.hxx" -#endif #include "ViewShellBase.hxx" #include "ToolBarManager.hxx" #include "drawdoc.hxx" diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx index 5cc3cc49ca88..e80dbe707948 100755..100644 --- a/sd/source/ui/func/fudraw.cxx +++ b/sd/source/ui/func/fudraw.cxx @@ -64,9 +64,7 @@ #include "ViewShell.hxx" #include "FrameView.hxx" #include "View.hxx" -#ifndef SD_WINDOW_SHELL_HXX #include "Window.hxx" -#endif #include "drawdoc.hxx" #include "DrawDocShell.hxx" #include "Client.hxx" diff --git a/sd/source/ui/func/fudspord.cxx b/sd/source/ui/func/fudspord.cxx index 2e6ad66e11f1..0af5d9b00641 100644 --- a/sd/source/ui/func/fudspord.cxx +++ b/sd/source/ui/func/fudspord.cxx @@ -39,9 +39,7 @@ #include "fupoor.hxx" #include "ViewShell.hxx" #include "View.hxx" -#ifndef SD_WINDOW_SHELL_HXX #include "Window.hxx" -#endif #include "drawdoc.hxx" namespace sd { diff --git a/sd/source/ui/func/fuediglu.cxx b/sd/source/ui/func/fuediglu.cxx index ddae68d8b9ab..5ba10ee33478 100644 --- a/sd/source/ui/func/fuediglu.cxx +++ b/sd/source/ui/func/fuediglu.cxx @@ -38,13 +38,9 @@ #include "app.hrc" #include "strings.hrc" #include "res_bmp.hrc" -#ifndef SD_WINDOW_SHELL_HXX #include "Window.hxx" -#endif #include "drawdoc.hxx" -#ifndef SD_FRAMW_VIEW_HXX #include "FrameView.hxx" -#endif #include "View.hxx" #include "ViewShell.hxx" #include "ViewShellBase.hxx" diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx b/sd/source/ui/func/fuformatpaintbrush.cxx index 0d43ea73c964..e1d02aca87f4 100644 --- a/sd/source/ui/func/fuformatpaintbrush.cxx +++ b/sd/source/ui/func/fuformatpaintbrush.cxx @@ -53,9 +53,7 @@ #include "Outliner.hxx" #include "ViewShellBase.hxx" -#ifndef SD_WINDOW_SHELL_HXX #include "Window.hxx" -#endif namespace sd { diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index 6de64c70cbf2..0faaa484fc91 100755..100644 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -55,9 +55,7 @@ #include <svx/linkwarn.hxx> #include <svx/svdetc.hxx> #include <avmedia/mediawindow.hxx> -#ifndef _UNOTOOLS_UCBSTREAMHELPER_HXX #include <unotools/ucbstreamhelper.hxx> -#endif #include <sfx2/printer.hxx> #include <sot/clsids.hxx> #include <svtools/sfxecode.hxx> @@ -67,15 +65,11 @@ #include <svx/svdograf.hxx> #include <svx/svdoole2.hxx> #include <svx/svdomedia.hxx> -#ifndef _EDITENG_HXX //autogen #include <editeng/editeng.hxx> -#endif #include <sot/storage.hxx> #include <sot/formats.hxx> #include <svx/svdpagv.hxx> -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <sfx2/opengrf.hxx> #include <sfx2/viewfrm.hxx> diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx index d14a5859d47b..6b909b0362cf 100644 --- a/sd/source/ui/func/fuinsfil.cxx +++ b/sd/source/ui/func/fuinsfil.cxx @@ -32,9 +32,7 @@ #include <vcl/wrkwin.hxx> #include <sfx2/progress.hxx> #include <editeng/outliner.hxx> -#ifndef _EDITENG_HXX #include <editeng/editeng.hxx> -#endif #include <svl/stritem.hxx> #include <sfx2/request.hxx> #include <sfx2/app.hxx> diff --git a/sd/source/ui/func/fuline.cxx b/sd/source/ui/func/fuline.cxx index b14d5f6acc08..4bbb1095a89b 100644 --- a/sd/source/ui/func/fuline.cxx +++ b/sd/source/ui/func/fuline.cxx @@ -43,9 +43,7 @@ #include <sfx2/viewfrm.hxx> #include "ViewShell.hxx" #include "View.hxx" -#ifndef SD_WINDOW_SHELL_HXX #include "Window.hxx" -#endif #include "drawdoc.hxx" #include "app.hrc" #include <svx/svxdlg.hxx> diff --git a/sd/source/ui/func/fulinend.cxx b/sd/source/ui/func/fulinend.cxx index 9c53518507f3..a4f7ef736467 100644 --- a/sd/source/ui/func/fulinend.cxx +++ b/sd/source/ui/func/fulinend.cxx @@ -43,9 +43,7 @@ #include "sdresid.hxx" #include "drawdoc.hxx" #include "View.hxx" -#ifndef SD_WINDOW_SHELL_HXX #include "Window.hxx" -#endif namespace sd { diff --git a/sd/source/ui/func/fulink.cxx b/sd/source/ui/func/fulink.cxx index a87cb63883e7..4915628948d5 100644 --- a/sd/source/ui/func/fulink.cxx +++ b/sd/source/ui/func/fulink.cxx @@ -37,9 +37,7 @@ #include <svx/svxdlg.hxx> -#ifndef SD_WINDOW_SHELL_HXX #include "Window.hxx" -#endif #include "drawdoc.hxx" #include "ViewShell.hxx" #include "app.hrc" diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx index b348d6533930..d6cd2ef28f50 100644 --- a/sd/source/ui/func/fuoaprms.cxx +++ b/sd/source/ui/func/fuoaprms.cxx @@ -40,9 +40,7 @@ #include <sfx2/objsh.hxx> #include <sfx2/request.hxx> #include <sfx2/viewfrm.hxx> -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <svl/aeitem.hxx> #include "svx/xtable.hxx" diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx index 32ca9d3278b3..6207f2361c9e 100644 --- a/sd/source/ui/func/fuolbull.cxx +++ b/sd/source/ui/func/fuolbull.cxx @@ -42,9 +42,7 @@ #include "OutlineView.hxx" #include "OutlineViewShell.hxx" #include "DrawViewShell.hxx" -#ifndef SD_WINDOW_SHELL_HXX #include "Window.hxx" -#endif #include "drawdoc.hxx" #include "sdabstdlg.hxx" diff --git a/sd/source/ui/func/fuoltext.cxx b/sd/source/ui/func/fuoltext.cxx index 2797631d12db..01bdddc91033 100644 --- a/sd/source/ui/func/fuoltext.cxx +++ b/sd/source/ui/func/fuoltext.cxx @@ -42,9 +42,7 @@ #include <svx/svxids.hrc> #include "app.hrc" #include "OutlineView.hxx" -#ifndef SD_WINDOW_SHELL_HXX #include "Window.hxx" -#endif #include "DrawDocShell.hxx" #include "ViewShell.hxx" #include "OutlineViewShell.hxx" diff --git a/sd/source/ui/func/fuoutl.cxx b/sd/source/ui/func/fuoutl.cxx index c0ef53f144b3..de76b5f96b5a 100755..100644 --- a/sd/source/ui/func/fuoutl.cxx +++ b/sd/source/ui/func/fuoutl.cxx @@ -34,9 +34,7 @@ #include <editeng/outliner.hxx> #include "OutlineView.hxx" #include "OutlineViewShell.hxx" -#ifndef SD_WINDOW_SHELL_HXX #include "Window.hxx" -#endif namespace sd { diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index 3dea67412fac..6384901855e9 100755..100644 --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -38,20 +38,14 @@ #include <svx/svxids.hrc> #include <svx/dialogs.hrc> #include <svl/itempool.hxx> -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <sfx2/request.hxx> #include <svl/stritem.hxx> #include <vcl/prntypes.hxx> #include <svl/style.hxx> #include <stlsheet.hxx> -#ifndef _SVX_SVDORECT_HXX #include <svx/svdorect.hxx> -#endif -#ifndef _SVX_SVDUNDO_HXX #include <svx/svdundo.hxx> -#endif #include <editeng/eeitem.hxx> #include <editeng/frmdiritem.hxx> #include <svx/xbtmpit.hxx> diff --git a/sd/source/ui/func/fuparagr.cxx b/sd/source/ui/func/fuparagr.cxx index 68f8a3e922d0..bd5ea8a5568a 100644 --- a/sd/source/ui/func/fuparagr.cxx +++ b/sd/source/ui/func/fuparagr.cxx @@ -31,9 +31,7 @@ #include "fuparagr.hxx" #include <editeng/eeitem.hxx> -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <sfx2/bindings.hxx> #include <sfx2/request.hxx> #include <sfx2/viewfrm.hxx> diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx index 0342c5f2bbc5..0f0730218610 100755..100644 --- a/sd/source/ui/func/fupoor.cxx +++ b/sd/source/ui/func/fupoor.cxx @@ -47,17 +47,13 @@ #include <com/sun/star/drawing/XLayerManager.hpp> #include <com/sun/star/container/XChild.hpp> -#ifndef SD_FRAMW_VIEW_HXX #include "FrameView.hxx" -#endif #include "app.hrc" #include "fusel.hxx" #include "sdpage.hxx" #include "drawview.hxx" #include "DrawViewShell.hxx" -#ifndef SD_WINDOW_SHELL_HXX #include "Window.hxx" -#endif #include "drawdoc.hxx" #include "DrawDocShell.hxx" #include "zoomlist.hxx" diff --git a/sd/source/ui/func/fuprlout.cxx b/sd/source/ui/func/fuprlout.cxx index 0d6f0b5aa565..95b389d028c5 100644 --- a/sd/source/ui/func/fuprlout.cxx +++ b/sd/source/ui/func/fuprlout.cxx @@ -45,9 +45,7 @@ #include "sdpage.hxx" #include "pres.hxx" #include "DrawViewShell.hxx" -#ifndef SD_FRAMW_VIEW_HXX #include "FrameView.hxx" -#endif #include "stlpool.hxx" #include "View.hxx" #include "glob.hrc" diff --git a/sd/source/ui/func/fuprobjs.cxx b/sd/source/ui/func/fuprobjs.cxx index d65bc8aaffe3..73e85eebdf6d 100644 --- a/sd/source/ui/func/fuprobjs.cxx +++ b/sd/source/ui/func/fuprobjs.cxx @@ -30,9 +30,7 @@ #include "fuprobjs.hxx" -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <svl/style.hxx> #include <editeng/outliner.hxx> #include <svl/smplhint.hxx> diff --git a/sd/source/ui/func/fuscale.cxx b/sd/source/ui/func/fuscale.cxx index dc5677c6ef2d..52f36d4a1733 100644 --- a/sd/source/ui/func/fuscale.cxx +++ b/sd/source/ui/func/fuscale.cxx @@ -35,9 +35,7 @@ #include "app.hrc" #include "View.hxx" -#ifndef SD_WINDOW_SHELL_HXX #include "Window.hxx" -#endif #include "OutlineViewShell.hxx" #include "drawview.hxx" #include "drawdoc.hxx" @@ -45,9 +43,7 @@ #include "ViewShell.hxx" #include "fuzoom.hxx" // wegen SidArrayZoom[] -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <svx/svdpagv.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/dispatch.hxx> diff --git a/sd/source/ui/func/fusearch.cxx b/sd/source/ui/func/fusearch.cxx index 04fcf124cc14..61eb71a370c0 100755..100644 --- a/sd/source/ui/func/fusearch.cxx +++ b/sd/source/ui/func/fusearch.cxx @@ -38,9 +38,7 @@ #include <svx/srchdlg.hxx> #include <sfx2/bindings.hxx> #include "fupoor.hxx" -#ifndef SD_WINDOW_SHELL_HXX #include "Window.hxx" -#endif #include "drawdoc.hxx" #include "app.hrc" #include "app.hxx" diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx index 2ddf6a5fb885..6900bc34b40f 100644 --- a/sd/source/ui/func/fusel.cxx +++ b/sd/source/ui/func/fusel.cxx @@ -67,13 +67,9 @@ #include "fudraw.hxx" #include "ViewShell.hxx" #include "ViewShellBase.hxx" -#ifndef SD_FRAMW_VIEW_HXX #include "FrameView.hxx" -#endif #include "View.hxx" -#ifndef SD_WINDOW_SHELL_HXX #include "Window.hxx" -#endif #include "drawdoc.hxx" #include "sdpage.hxx" #include "DrawViewShell.hxx" diff --git a/sd/source/ui/func/fusldlg.cxx b/sd/source/ui/func/fusldlg.cxx index 76af1555c861..1d2701104b72 100644 --- a/sd/source/ui/func/fusldlg.cxx +++ b/sd/source/ui/func/fusldlg.cxx @@ -31,9 +31,7 @@ #include "fusldlg.hxx" #include <svl/itemset.hxx> -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include "drawdoc.hxx" #include "sdpage.hxx" diff --git a/sd/source/ui/func/fusnapln.cxx b/sd/source/ui/func/fusnapln.cxx index fad1cb324fd2..214f518843d0 100755..100644 --- a/sd/source/ui/func/fusnapln.cxx +++ b/sd/source/ui/func/fusnapln.cxx @@ -40,9 +40,7 @@ #include "View.hxx" #include "ViewShell.hxx" #include "DrawViewShell.hxx" -#ifndef SD_WINDOW_SHELL_HXX #include "Window.hxx" -#endif #include "sdenumdef.hxx" #include "sdresid.hxx" #include "sdabstdlg.hxx" diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx index 43572c2af8a4..5c5d1480b355 100644 --- a/sd/source/ui/func/futempl.cxx +++ b/sd/source/ui/func/futempl.cxx @@ -60,9 +60,7 @@ #include "stlpool.hxx" #include "app.hxx" #include "View.hxx" -#ifndef SD_WINDOW_SHELL_HXX #include "Window.hxx" -#endif #include "drawview.hxx" #include "drawdoc.hxx" #include "DrawDocShell.hxx" diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index 2f3111665692..2f3111665692 100755..100644 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx diff --git a/sd/source/ui/func/futhes.cxx b/sd/source/ui/func/futhes.cxx index 2ec18c0f019a..d5c340f47ab6 100644 --- a/sd/source/ui/func/futhes.cxx +++ b/sd/source/ui/func/futhes.cxx @@ -51,9 +51,7 @@ #include "Outliner.hxx" #include "DrawViewShell.hxx" #include "OutlineViewShell.hxx" -#ifndef SD_WINDOW_SHELL_HXX #include "Window.hxx" -#endif #include "sdresid.hxx" using ::rtl::OUString; diff --git a/sd/source/ui/func/futransf.cxx b/sd/source/ui/func/futransf.cxx index 31797f3c8a03..31797f3c8a03 100755..100644 --- a/sd/source/ui/func/futransf.cxx +++ b/sd/source/ui/func/futransf.cxx diff --git a/sd/source/ui/func/fuvect.cxx b/sd/source/ui/func/fuvect.cxx index 5a8419ba7822..2f404ba6e27d 100644 --- a/sd/source/ui/func/fuvect.cxx +++ b/sd/source/ui/func/fuvect.cxx @@ -31,16 +31,10 @@ #include "fuvect.hxx" #include <tools/poly.hxx> -#ifndef _SVDOPATH_HXX //autogen #include <svx/svdograf.hxx> -#endif #include <vcl/msgbox.hxx> -#ifndef _SVX_SVDOGRAF_HXX //autogen #include <svx/svdograf.hxx> -#endif -#ifndef _SVX_SVDEDTV_HXX //autogen #include <svx/svdedtv.hxx> -#endif #include "View.hxx" diff --git a/sd/source/ui/func/fuzoom.cxx b/sd/source/ui/func/fuzoom.cxx index 390522cc33ca..1755374dcf80 100644 --- a/sd/source/ui/func/fuzoom.cxx +++ b/sd/source/ui/func/fuzoom.cxx @@ -37,14 +37,10 @@ #include "app.hrc" #include <svx/svdpagv.hxx> -#ifndef SD_FRAMW_VIEW_HXX #include "FrameView.hxx" -#endif #include "ViewShell.hxx" #include "View.hxx" -#ifndef SD_WINDOW_SHELL_HXX #include "Window.hxx" -#endif #include "drawdoc.hxx" #include "zoomlist.hxx" diff --git a/sd/source/ui/func/sdundogr.cxx b/sd/source/ui/func/sdundogr.cxx index 7b7a361bba80..7b7a361bba80 100755..100644 --- a/sd/source/ui/func/sdundogr.cxx +++ b/sd/source/ui/func/sdundogr.cxx diff --git a/sd/source/ui/func/smarttag.cxx b/sd/source/ui/func/smarttag.cxx index a8b6c0647237..a8b6c0647237 100755..100644 --- a/sd/source/ui/func/smarttag.cxx +++ b/sd/source/ui/func/smarttag.cxx diff --git a/sd/source/ui/func/unoaprms.cxx b/sd/source/ui/func/unoaprms.cxx index 933e961ed927..933e961ed927 100755..100644 --- a/sd/source/ui/func/unoaprms.cxx +++ b/sd/source/ui/func/unoaprms.cxx diff --git a/sd/source/ui/notes/EditWindow.cxx b/sd/source/ui/notes/EditWindow.cxx index 54e3589bc87e..54e3589bc87e 100755..100644 --- a/sd/source/ui/notes/EditWindow.cxx +++ b/sd/source/ui/notes/EditWindow.cxx diff --git a/sd/source/ui/notes/NotesChildWindow.cxx b/sd/source/ui/notes/NotesChildWindow.cxx index d62fc2f25e4b..d62fc2f25e4b 100755..100644 --- a/sd/source/ui/notes/NotesChildWindow.cxx +++ b/sd/source/ui/notes/NotesChildWindow.cxx diff --git a/sd/source/ui/notes/NotesDockingWindow.cxx b/sd/source/ui/notes/NotesDockingWindow.cxx index 2464696c4eff..21cd40090ea6 100755..100644 --- a/sd/source/ui/notes/NotesDockingWindow.cxx +++ b/sd/source/ui/notes/NotesDockingWindow.cxx @@ -38,9 +38,7 @@ #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> #include "DrawViewShell.hxx" -#ifndef SD_DRAW_DOC_HXX #include "drawdoc.hxx" -#endif #include "sdresid.hxx" #include "ViewShellBase.hxx" diff --git a/sd/source/ui/notes/TextLogger.cxx b/sd/source/ui/notes/TextLogger.cxx index bf73b67aad23..bf73b67aad23 100755..100644 --- a/sd/source/ui/notes/TextLogger.cxx +++ b/sd/source/ui/notes/TextLogger.cxx diff --git a/sd/source/ui/presenter/PresenterCanvas.cxx b/sd/source/ui/presenter/PresenterCanvas.cxx index a1f583a4e40c..a1f583a4e40c 100755..100644 --- a/sd/source/ui/presenter/PresenterCanvas.cxx +++ b/sd/source/ui/presenter/PresenterCanvas.cxx diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx index ba90a92939ca..ba90a92939ca 100755..100644 --- a/sd/source/ui/presenter/PresenterTextView.cxx +++ b/sd/source/ui/presenter/PresenterTextView.cxx diff --git a/sd/source/ui/slideshow/PaneHider.cxx b/sd/source/ui/slideshow/PaneHider.cxx index 2841891f31ce..2841891f31ce 100755..100644 --- a/sd/source/ui/slideshow/PaneHider.cxx +++ b/sd/source/ui/slideshow/PaneHider.cxx diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index 6b8d212dce64..6b8d212dce64 100755..100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 5afcb65ab90c..5afcb65ab90c 100755..100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx index 1bbecbef3d66..1bbecbef3d66 100755..100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx diff --git a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx index 942a3e762acb..147668e72759 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx @@ -35,9 +35,7 @@ #include <comphelper/processfactory.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/container/XHierarchicalNameAccess.hpp> -#ifndef _COM_SUN_STAR_CONTAINER_PROPERTYVALUE_HPP_ #include <com/sun/star/beans/PropertyValue.hpp> -#endif using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx index 780a429df29e..780a429df29e 100755..100644 --- a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx +++ b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx diff --git a/sd/source/ui/slidesorter/cache/SlsPageCache.cxx b/sd/source/ui/slidesorter/cache/SlsPageCache.cxx index 714e1f008329..714e1f008329 100755..100644 --- a/sd/source/ui/slidesorter/cache/SlsPageCache.cxx +++ b/sd/source/ui/slidesorter/cache/SlsPageCache.cxx diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx index bec9c7fa369d..bec9c7fa369d 100755..100644 --- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx index 69c2a02ddc24..69c2a02ddc24 100755..100644 --- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx +++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx diff --git a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx index f5864c3307a1..f5864c3307a1 100755..100644 --- a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx diff --git a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx b/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx index dcda73d38dba..dcda73d38dba 100755..100644 --- a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx index 94b3b4afe717..94b3b4afe717 100755..100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.cxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx diff --git a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx index 0e8f5e100d1c..0e8f5e100d1c 100755..100644 --- a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx +++ b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx diff --git a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx index 5ee7f6f58b82..5ee7f6f58b82 100755..100644 --- a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionCommand.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionCommand.cxx index 687019954feb..687019954feb 100755..100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionCommand.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionCommand.cxx diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx index c1d742ce7158..c1d742ce7158 100755..100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx index f1b4cb6c39be..f1b4cb6c39be 100755..100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx diff --git a/sd/source/ui/slidesorter/controller/SlsSlideFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSlideFunction.cxx index 7fe090ad5541..7fe090ad5541 100755..100644 --- a/sd/source/ui/slidesorter/controller/SlsSlideFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlideFunction.cxx diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index e571a765bdad..e571a765bdad 100755..100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx diff --git a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx index 0bf9052f5382..0bf9052f5382 100755..100644 --- a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx +++ b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx diff --git a/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx b/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx index ffd93cbf0a13..ffd93cbf0a13 100755..100644 --- a/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx +++ b/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx index 787086b4596e..787086b4596e 100755..100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx index 1dc9dbb6426b..1dc9dbb6426b 100755..100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx index d2c2310329a6..d2c2310329a6 100755..100644 --- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx +++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx diff --git a/sd/source/ui/slidesorter/view/SlsLayouter.cxx b/sd/source/ui/slidesorter/view/SlsLayouter.cxx index 3767a655c48b..3767a655c48b 100755..100644 --- a/sd/source/ui/slidesorter/view/SlsLayouter.cxx +++ b/sd/source/ui/slidesorter/view/SlsLayouter.cxx diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectViewContact.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectViewContact.cxx index 303e78eeff61..303e78eeff61 100755..100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectViewContact.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectViewContact.cxx diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx index b1e4e80fdf1f..b1e4e80fdf1f 100755..100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx index cdba12e9887e..cdba12e9887e 100755..100644 --- a/sd/source/ui/table/TableDesignPane.cxx +++ b/sd/source/ui/table/TableDesignPane.cxx diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx index b30e259e049a..b30e259e049a 100755..100644 --- a/sd/source/ui/table/tablefunction.cxx +++ b/sd/source/ui/table/tablefunction.cxx diff --git a/sd/source/ui/toolpanel/LayoutMenu.cxx b/sd/source/ui/toolpanel/LayoutMenu.cxx index ec4eb1e43d4d..ec4eb1e43d4d 100755..100644 --- a/sd/source/ui/toolpanel/LayoutMenu.cxx +++ b/sd/source/ui/toolpanel/LayoutMenu.cxx diff --git a/sd/source/ui/toolpanel/ScrollPanel.cxx b/sd/source/ui/toolpanel/ScrollPanel.cxx index 6b10ed889424..6b10ed889424 100755..100644 --- a/sd/source/ui/toolpanel/ScrollPanel.cxx +++ b/sd/source/ui/toolpanel/ScrollPanel.cxx diff --git a/sd/source/ui/toolpanel/SlideSorterCacheDisplay.cxx b/sd/source/ui/toolpanel/SlideSorterCacheDisplay.cxx index a032b6ef02f0..a032b6ef02f0 100755..100644 --- a/sd/source/ui/toolpanel/SlideSorterCacheDisplay.cxx +++ b/sd/source/ui/toolpanel/SlideSorterCacheDisplay.cxx diff --git a/sd/source/ui/toolpanel/SubToolPanel.cxx b/sd/source/ui/toolpanel/SubToolPanel.cxx index 73783b0f0a41..73783b0f0a41 100755..100644 --- a/sd/source/ui/toolpanel/SubToolPanel.cxx +++ b/sd/source/ui/toolpanel/SubToolPanel.cxx diff --git a/sd/source/ui/toolpanel/TaskPaneControlFactory.cxx b/sd/source/ui/toolpanel/TaskPaneControlFactory.cxx index 4ad610df7f7f..4ad610df7f7f 100755..100644 --- a/sd/source/ui/toolpanel/TaskPaneControlFactory.cxx +++ b/sd/source/ui/toolpanel/TaskPaneControlFactory.cxx diff --git a/sd/source/ui/toolpanel/TaskPaneShellManager.cxx b/sd/source/ui/toolpanel/TaskPaneShellManager.cxx index 0a9667dd2431..0a9667dd2431 100755..100644 --- a/sd/source/ui/toolpanel/TaskPaneShellManager.cxx +++ b/sd/source/ui/toolpanel/TaskPaneShellManager.cxx diff --git a/sd/source/ui/toolpanel/TaskPaneTreeNode.cxx b/sd/source/ui/toolpanel/TaskPaneTreeNode.cxx index 8c69e12c504d..8c69e12c504d 100755..100644 --- a/sd/source/ui/toolpanel/TaskPaneTreeNode.cxx +++ b/sd/source/ui/toolpanel/TaskPaneTreeNode.cxx diff --git a/sd/source/ui/toolpanel/TestMenu.cxx b/sd/source/ui/toolpanel/TestMenu.cxx index a8f0b6df7893..a8f0b6df7893 100755..100644 --- a/sd/source/ui/toolpanel/TestMenu.cxx +++ b/sd/source/ui/toolpanel/TestMenu.cxx diff --git a/sd/source/ui/toolpanel/TestPanel.cxx b/sd/source/ui/toolpanel/TestPanel.cxx index 044b40dcdb4f..044b40dcdb4f 100755..100644 --- a/sd/source/ui/toolpanel/TestPanel.cxx +++ b/sd/source/ui/toolpanel/TestPanel.cxx diff --git a/sd/source/ui/toolpanel/TitleBar.cxx b/sd/source/ui/toolpanel/TitleBar.cxx index de49b7a6abb5..de49b7a6abb5 100755..100644 --- a/sd/source/ui/toolpanel/TitleBar.cxx +++ b/sd/source/ui/toolpanel/TitleBar.cxx diff --git a/sd/source/ui/toolpanel/TitledControl.cxx b/sd/source/ui/toolpanel/TitledControl.cxx index e83e6c47c10a..e83e6c47c10a 100755..100644 --- a/sd/source/ui/toolpanel/TitledControl.cxx +++ b/sd/source/ui/toolpanel/TitledControl.cxx diff --git a/sd/source/ui/toolpanel/ToolPanel.cxx b/sd/source/ui/toolpanel/ToolPanel.cxx index 6dbcae52547a..6dbcae52547a 100755..100644 --- a/sd/source/ui/toolpanel/ToolPanel.cxx +++ b/sd/source/ui/toolpanel/ToolPanel.cxx diff --git a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx index f193b2ece851..f193b2ece851 100755..100644 --- a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx +++ b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx diff --git a/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.cxx b/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.cxx index 730fc74795f2..730fc74795f2 100755..100644 --- a/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.cxx +++ b/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.cxx diff --git a/sd/source/ui/toolpanel/controls/CustomAnimationPanel.cxx b/sd/source/ui/toolpanel/controls/CustomAnimationPanel.cxx index e7edf109cffd..e7edf109cffd 100755..100644 --- a/sd/source/ui/toolpanel/controls/CustomAnimationPanel.cxx +++ b/sd/source/ui/toolpanel/controls/CustomAnimationPanel.cxx diff --git a/sd/source/ui/toolpanel/controls/DocumentHelper.cxx b/sd/source/ui/toolpanel/controls/DocumentHelper.cxx index b9040e72283f..b9040e72283f 100755..100644 --- a/sd/source/ui/toolpanel/controls/DocumentHelper.cxx +++ b/sd/source/ui/toolpanel/controls/DocumentHelper.cxx diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx b/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx index 80a094ec1a66..80a094ec1a66 100755..100644 --- a/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx b/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx index 61483f278a4f..61483f278a4f 100755..100644 --- a/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx diff --git a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx index 6871883d65f5..6871883d65f5 100755..100644 --- a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx diff --git a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx index 2ba0cc678403..2ba0cc678403 100755..100644 --- a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx diff --git a/sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx b/sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx index 8dab51e93a58..8dab51e93a58 100755..100644 --- a/sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx diff --git a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx index b321dbf8dd14..cb16dfc6392d 100755..100644 --- a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx @@ -54,9 +54,7 @@ #include <sfx2/objface.hxx> #include "sdresid.hxx" #include "TemplateScanner.hxx" -#ifndef _SD_DRAWVIEW_HXX #include "drawview.hxx" -#endif #include <vcl/image.hxx> #include <svl/languageoptions.hxx> #include <sfx2/app.hxx> diff --git a/sd/source/ui/toolpanel/controls/SlideTransitionPanel.cxx b/sd/source/ui/toolpanel/controls/SlideTransitionPanel.cxx index 4ad67b876983..4ad67b876983 100755..100644 --- a/sd/source/ui/toolpanel/controls/SlideTransitionPanel.cxx +++ b/sd/source/ui/toolpanel/controls/SlideTransitionPanel.cxx diff --git a/sd/source/ui/toolpanel/controls/TableDesignPanel.cxx b/sd/source/ui/toolpanel/controls/TableDesignPanel.cxx index d6507a25c11f..d6507a25c11f 100755..100644 --- a/sd/source/ui/toolpanel/controls/TableDesignPanel.cxx +++ b/sd/source/ui/toolpanel/controls/TableDesignPanel.cxx diff --git a/sd/source/ui/tools/ConfigurationAccess.cxx b/sd/source/ui/tools/ConfigurationAccess.cxx index bf4fbc6e6ebe..bf4fbc6e6ebe 100755..100644 --- a/sd/source/ui/tools/ConfigurationAccess.cxx +++ b/sd/source/ui/tools/ConfigurationAccess.cxx diff --git a/sd/source/ui/tools/PreviewRenderer.cxx b/sd/source/ui/tools/PreviewRenderer.cxx index c416e689efcf..c416e689efcf 100755..100644 --- a/sd/source/ui/tools/PreviewRenderer.cxx +++ b/sd/source/ui/tools/PreviewRenderer.cxx diff --git a/sd/source/ui/tools/PropertySet.cxx b/sd/source/ui/tools/PropertySet.cxx index 9cf24dccd508..9cf24dccd508 100755..100644 --- a/sd/source/ui/tools/PropertySet.cxx +++ b/sd/source/ui/tools/PropertySet.cxx diff --git a/sd/source/ui/tools/SdGlobalResourceContainer.cxx b/sd/source/ui/tools/SdGlobalResourceContainer.cxx index 4ed95bbf5b99..4ed95bbf5b99 100755..100644 --- a/sd/source/ui/tools/SdGlobalResourceContainer.cxx +++ b/sd/source/ui/tools/SdGlobalResourceContainer.cxx diff --git a/sd/source/ui/tools/SlotStateListener.cxx b/sd/source/ui/tools/SlotStateListener.cxx index b3175b7fdb4a..db310f685775 100755..100644 --- a/sd/source/ui/tools/SlotStateListener.cxx +++ b/sd/source/ui/tools/SlotStateListener.cxx @@ -31,9 +31,7 @@ #include "tools/SlotStateListener.hxx" #include <com/sun/star/frame/XStatusListener.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> -#ifndef _COM_SUN_STAR_FRAME_XDISPATCHP_HPP_ #include <com/sun/star/frame/XDispatch.hpp> -#endif #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/beans/PropertyChangeEvent.hpp> diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx index 2bc98cd66de3..2bc98cd66de3 100755..100644 --- a/sd/source/ui/unoidl/DrawController.cxx +++ b/sd/source/ui/unoidl/DrawController.cxx diff --git a/sd/source/ui/unoidl/SdUnoDrawView.cxx b/sd/source/ui/unoidl/SdUnoDrawView.cxx index 8594d4e0ebf9..8594d4e0ebf9 100755..100644 --- a/sd/source/ui/unoidl/SdUnoDrawView.cxx +++ b/sd/source/ui/unoidl/SdUnoDrawView.cxx diff --git a/sd/source/ui/unoidl/SdUnoOutlineView.cxx b/sd/source/ui/unoidl/SdUnoOutlineView.cxx index ff3e5dd501fb..ff3e5dd501fb 100755..100644 --- a/sd/source/ui/unoidl/SdUnoOutlineView.cxx +++ b/sd/source/ui/unoidl/SdUnoOutlineView.cxx diff --git a/sd/source/ui/unoidl/SdUnoSlideView.cxx b/sd/source/ui/unoidl/SdUnoSlideView.cxx index a6502711ee72..a6502711ee72 100755..100644 --- a/sd/source/ui/unoidl/SdUnoSlideView.cxx +++ b/sd/source/ui/unoidl/SdUnoSlideView.cxx diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx index ed47e57b2130..8b39841b98c7 100755..100644 --- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx +++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx @@ -45,25 +45,19 @@ #include "drawdoc.hxx" #ifndef SVX_LIGHT -#ifndef SD_DRAW_DOC_SHELL_HXX #include "DrawDocShell.hxx" #endif -#endif #include "unomodel.hxx" #ifndef SVX_LIGHT -#ifndef _SD_OPTSITEM_HXX #include "optsitem.hxx" -#endif #include <sfx2/printer.hxx> #include "sdattr.hxx" #endif #include "../inc/ViewShell.hxx" #include "../inc/FrameView.hxx" #ifndef SVX_LIGHT -#ifndef SD_OUTLINER_HXX #include "Outliner.hxx" -#endif #else #include <svx/svdoutl.hxx> #endif diff --git a/sd/source/ui/unoidl/facreg.cxx b/sd/source/ui/unoidl/facreg.cxx index 1ac245ad00d4..1ac245ad00d4 100755..100644 --- a/sd/source/ui/unoidl/facreg.cxx +++ b/sd/source/ui/unoidl/facreg.cxx diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx index 9f268dec0cfa..9f268dec0cfa 100755..100644 --- a/sd/source/ui/unoidl/sddetect.cxx +++ b/sd/source/ui/unoidl/sddetect.cxx diff --git a/sd/source/ui/unoidl/unocpres.cxx b/sd/source/ui/unoidl/unocpres.cxx index 1935c424ec03..1935c424ec03 100755..100644 --- a/sd/source/ui/unoidl/unocpres.cxx +++ b/sd/source/ui/unoidl/unocpres.cxx diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx index 5ad9fe3fd555..dd509764de19 100644 --- a/sd/source/ui/unoidl/unolayer.cxx +++ b/sd/source/ui/unoidl/unolayer.cxx @@ -42,10 +42,8 @@ #include <svx/svdlayer.hxx> #ifndef SVX_LIGHT -#ifndef SD_DRAW_DOC_SHELL_HXX #include "DrawDocShell.hxx" #endif -#endif #include <drawdoc.hxx> #include <unomodel.hxx> #include "unoprnms.hxx" diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index e11f76a64baa..19c36b975b35 100755..100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -650,9 +650,7 @@ sal_Bool SAL_CALL SdXImpressDocument::hasControllersLocked( ) return mpDoc && mpDoc->isLocked(); } -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> -#endif uno::Reference < container::XIndexAccess > SAL_CALL SdXImpressDocument::getViewData() throw( uno::RuntimeException ) { diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index f31c960d432d..b1cd8319cf56 100755..100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -72,10 +72,8 @@ #include "unokywds.hxx" #include "unopage.hxx" #ifndef SVX_LIGHT -#ifndef SD_DRAW_DOC_SHELL_HXX #include "DrawDocShell.hxx" #endif -#endif #include "helpids.h" #include "glob.hxx" #include "glob.hrc" diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index fb356087245a..0885247a0610 100755..100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -74,10 +74,8 @@ #include "misc.hxx" #include "View.hxx" #ifndef SVX_LIGHT -#ifndef SD_DRAW_DOC_SHELL_HXX #include "DrawDocShell.hxx" #endif -#endif #include "ViewShell.hxx" #include "DrawViewShell.hxx" #include "unoobj.hxx" diff --git a/sd/source/ui/unoidl/unosrch.cxx b/sd/source/ui/unoidl/unosrch.cxx index 56133e03a375..56133e03a375 100755..100644 --- a/sd/source/ui/unoidl/unosrch.cxx +++ b/sd/source/ui/unoidl/unosrch.cxx diff --git a/sd/source/ui/unoidl/unowcntr.cxx b/sd/source/ui/unoidl/unowcntr.cxx index e29ee1e1516e..e29ee1e1516e 100755..100644 --- a/sd/source/ui/unoidl/unowcntr.cxx +++ b/sd/source/ui/unoidl/unowcntr.cxx diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index 1660c05a124f..1660c05a124f 100755..100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx diff --git a/sd/source/ui/view/GraphicViewShellBase.cxx b/sd/source/ui/view/GraphicViewShellBase.cxx index 759103760bfe..759103760bfe 100755..100644 --- a/sd/source/ui/view/GraphicViewShellBase.cxx +++ b/sd/source/ui/view/GraphicViewShellBase.cxx diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index 7c94e7b27b07..7c94e7b27b07 100755..100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx diff --git a/sd/source/ui/view/OutlinerIterator.cxx b/sd/source/ui/view/OutlinerIterator.cxx index 226d767c6c91..226d767c6c91 100755..100644 --- a/sd/source/ui/view/OutlinerIterator.cxx +++ b/sd/source/ui/view/OutlinerIterator.cxx diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx index ce3064392d40..ce26333e6edd 100755..100644 --- a/sd/source/ui/view/ToolBarManager.cxx +++ b/sd/source/ui/view/ToolBarManager.cxx @@ -50,9 +50,7 @@ #include <svx/dialogs.hrc> #include <svx/extrusionbar.hxx> #include <svx/fontworkbar.hxx> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <tools/link.hxx> #include <map> diff --git a/sd/source/ui/view/ViewClipboard.cxx b/sd/source/ui/view/ViewClipboard.cxx index ab108fd1991a..ab108fd1991a 100755..100644 --- a/sd/source/ui/view/ViewClipboard.cxx +++ b/sd/source/ui/view/ViewClipboard.cxx diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx index fdd7c530137f..fdd7c530137f 100755..100644 --- a/sd/source/ui/view/ViewShellImplementation.cxx +++ b/sd/source/ui/view/ViewShellImplementation.cxx diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx index c25c0f11270a..c25c0f11270a 100755..100644 --- a/sd/source/ui/view/ViewShellManager.cxx +++ b/sd/source/ui/view/ViewShellManager.cxx diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx index a12412bf7f7d..a12412bf7f7d 100755..100644 --- a/sd/source/ui/view/ViewTabBar.cxx +++ b/sd/source/ui/view/ViewTabBar.cxx diff --git a/sd/source/ui/view/WindowUpdater.cxx b/sd/source/ui/view/WindowUpdater.cxx index 3e074e0108ad..e9171a751a06 100644 --- a/sd/source/ui/view/WindowUpdater.cxx +++ b/sd/source/ui/view/WindowUpdater.cxx @@ -34,9 +34,7 @@ #include "drawdoc.hxx" #include "View.hxx" -#ifndef _SPLIT_HXX #include <vcl/split.hxx> -#endif #include <sfx2/childwin.hxx> #include <sfx2/viewfrm.hxx> #include <svl/smplhint.hxx> diff --git a/sd/source/ui/view/bmcache.cxx b/sd/source/ui/view/bmcache.cxx index c7f313037ff8..c7f313037ff8 100755..100644 --- a/sd/source/ui/view/bmcache.cxx +++ b/sd/source/ui/view/bmcache.cxx diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx index b32cd1fe023a..d6c1313278f3 100755..100644 --- a/sd/source/ui/view/drawview.cxx +++ b/sd/source/ui/view/drawview.cxx @@ -28,19 +28,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sd.hxx" #include <sfx2/dispatch.hxx> -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <svx/svdpagv.hxx> #include <sfx2/request.hxx> #include <svl/style.hxx> #include <editeng/outliner.hxx> -#ifndef _VIEW3D_HXX //autogen #include <svx/view3d.hxx> -#endif -#ifndef _SVXIDS_HRC //autogen #include <svx/svxids.hrc> -#endif #include <svx/svdotext.hxx> #include <svx/svdograf.hxx> #include <svx/svdogrp.hxx> diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx index 9eb0a3b2ff8c..9eb0a3b2ff8c 100755..100644 --- a/sd/source/ui/view/drtxtob.cxx +++ b/sd/source/ui/view/drtxtob.cxx diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx index 4a6d83e376e7..4a6d83e376e7 100755..100644 --- a/sd/source/ui/view/drtxtob1.cxx +++ b/sd/source/ui/view/drtxtob1.cxx diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index 5fbd400d7520..116f04a4f3ff 100755..100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -39,9 +39,7 @@ #include "cppuhelper/exc_hlp.hxx" #include "rtl/ref.hxx" -#ifndef _SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <svx/svdpagv.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/bindings.hxx> @@ -61,10 +59,8 @@ #include "misc.hxx" #ifdef STARIMAGE_AVAILABLE -#ifndef _SIMDLL_HXX #include <sim2/simdll.hxx> #endif -#endif #include <svx/dialogs.hrc> @@ -84,9 +80,7 @@ #include "FrameView.hxx" #include "stlpool.hxx" #include "Window.hxx" -#ifndef SD_DRAWVIEW_HXX #include "drawview.hxx" -#endif #include "drawdoc.hxx" #include "DrawDocShell.hxx" #include "Ruler.hxx" diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 9be01df4fe7a..00b6c54e0a27 100755..100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -32,17 +32,11 @@ #include "ViewShellImplementation.hxx" #include <vcl/waitobj.hxx> #include <svx/svdograf.hxx> -#ifndef _SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <svx/svdpagv.hxx> #include <svx/svdundo.hxx> -#ifndef _ZOOMITEM_HXX #include <svx/zoomitem.hxx> -#endif -#ifndef _EDITDATA_HXX #include <editeng/editdata.hxx> -#endif #include <basic/sberrors.hxx> #include <vcl/msgbox.hxx> #include <sfx2/request.hxx> @@ -56,9 +50,7 @@ #include <svx/xlineit0.hxx> #include <svx/xfillit0.hxx> -#ifndef _SDOUTL_HXX //autogen #include <svx/svdoutl.hxx> -#endif #include <svx/xlnwtit.hxx> #include <svx/svdoattr.hxx> #include <svx/xlnstwit.hxx> diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx index 28f8d909031b..ed74ed3fb7ba 100755..100644 --- a/sd/source/ui/view/drviews3.cxx +++ b/sd/source/ui/view/drviews3.cxx @@ -37,13 +37,9 @@ #include <editeng/protitem.hxx> #include <editeng/frmdiritem.hxx> #include <svx/ruler.hxx> -#ifndef _SVX_RULERITEM_HXX #include <svx/rulritem.hxx> -#endif #include <svx/zoomitem.hxx> -#ifndef _SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <svx/svdpagv.hxx> #include <sfx2/request.hxx> #include <sfx2/dispatch.hxx> diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx index cc4aa5131fdc..a60b8885ead7 100644 --- a/sd/source/ui/view/drviews4.cxx +++ b/sd/source/ui/view/drviews4.cxx @@ -37,20 +37,12 @@ #include <svx/svdundo.hxx> #include <svx/fmglob.hxx> #include <editeng/eeitem.hxx> -#ifndef _FLDITEM_HXX #include <editeng/flditem.hxx> -#endif -#ifndef _SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <svx/ruler.hxx> -#ifndef _GLOBL3D_HXX #include <svx/globl3d.hxx> -#endif #include <editeng/outliner.hxx> -#ifndef _SFX_CLIENTSH_HXX #include <sfx2/ipclient.hxx> -#endif #include <sfx2/request.hxx> #include <sfx2/dispatch.hxx> #include <svx/svdopath.hxx> diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx index adf95b187569..38420c9c8be1 100644 --- a/sd/source/ui/view/drviews5.cxx +++ b/sd/source/ui/view/drviews5.cxx @@ -31,9 +31,7 @@ #include "DrawViewShell.hxx" #include "PresentationViewShell.hxx" #include <editeng/outliner.hxx> -#ifndef _SVXIDS_HXX #include <svx/svxids.hrc> -#endif #include <sfx2/request.hxx> #include <sfx2/dispatch.hxx> #include <svx/svdpagv.hxx> diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx index 681192ff351b..416c9dddc227 100755..100644 --- a/sd/source/ui/view/drviews6.cxx +++ b/sd/source/ui/view/drviews6.cxx @@ -35,21 +35,11 @@ #include <vcl/msgbox.hxx> #include <sfx2/viewfrm.hxx> #include <svx/svdograf.hxx> -#ifndef _SVXIDS_HXX #include <svx/svxids.hrc> -#endif -#ifndef _FONTWORK_HXX #include <svx/fontwork.hxx> -#endif -#ifndef _BMPMASK_HXX #include <svx/bmpmask.hxx> -#endif -#ifndef _SVX_GALBRWS_HXX #include <svx/galbrws.hxx> -#endif -#ifndef _IMAPDLG_HXX #include <svx/imapdlg.hxx> -#endif #include <svx/xftsfit.hxx> #include <svx/colrctrl.hxx> #include <svx/f3dchild.hxx> @@ -57,9 +47,7 @@ #include <svx/extrusionbar.hxx> #include <svx/fontworkbar.hxx> #include <svx/tbxcustomshapes.hxx> -#ifndef _AVMEDIA_MEDIAPLAYER_HXX #include <avmedia/mediaplayer.hxx> -#endif #include "app.hrc" #include "strings.hrc" diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index 5166c392292c..81e2d65aa2b8 100755..100644 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -34,12 +34,8 @@ #include <svx/globl3d.hxx> #include <svx/svdouno.hxx> #include <editeng/eeitem.hxx> -#ifndef _FLDITEM_HXX #include <editeng/flditem.hxx> -#endif -#ifndef _SVXIDS_HXX #include <svx/svxids.hrc> -#endif #include <svx/svdpagv.hxx> #include <svx/clipfmtitem.hxx> #include <svx/fmshell.hxx> diff --git a/sd/source/ui/view/drviews8.cxx b/sd/source/ui/view/drviews8.cxx index 54cd0c792c94..a7ace4f36a84 100755..100644 --- a/sd/source/ui/view/drviews8.cxx +++ b/sd/source/ui/view/drviews8.cxx @@ -32,13 +32,9 @@ #include "ViewShellHint.hxx" -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <sfx2/dispatch.hxx> -#ifndef _SVXIDS_HXX #include <svx/svxids.hrc> -#endif #include <vcl/msgbox.hxx> #include <svx/svddef.hxx> #include <sfx2/bindings.hxx> @@ -63,13 +59,9 @@ #include "fuinsert.hxx" #include "fuprlout.hxx" #include "fupage.hxx" -#ifndef SD_FU_OBJECT_ANIMATION_PARAMETERS_HXX #include "fuoaprms.hxx" -#endif #include "fucopy.hxx" -#ifndef SD_FU_LINE_END_HXX #include "fulinend.hxx" -#endif #include "fusnapln.hxx" #include "fuolbull.hxx" #include "fuinsfil.hxx" diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx index 998d723aec45..226d14aaa4c1 100644 --- a/sd/source/ui/view/drviews9.cxx +++ b/sd/source/ui/view/drviews9.cxx @@ -41,16 +41,12 @@ #include <svx/xlnwtit.hxx> #include <sfx2/bindings.hxx> -#ifndef _SFX_DISPATCH_HXX //autogen #include <sfx2/dispatch.hxx> -#endif #include <svl/intitem.hxx> #include <sfx2/app.hxx> #include <sfx2/request.hxx> #include <svl/stritem.hxx> -#ifndef _SVXIDS_HXX #include <svx/svxids.hrc> -#endif #include <svx/xtable.hxx> #include <svx/gallery.hxx> #include <vcl/graph.hxx> diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx index 3628a11ac5a1..589d3ee4f1ad 100755..100644 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -48,9 +48,7 @@ #include <svx/zoomslideritem.hxx> #include <svl/eitem.hxx> -#ifndef _SVX_DIALOGS_HRC #include <svx/dialogs.hrc> -#endif #include <svx/extrusionbar.hxx> #include <svx/fontworkbar.hxx> #include <svx/clipfmtitem.hxx> diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx index 2574032e3d99..3f4990ac123b 100644 --- a/sd/source/ui/view/drviewsb.cxx +++ b/sd/source/ui/view/drviewsb.cxx @@ -30,18 +30,14 @@ #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> #include <comphelper/processfactory.hxx> #include <svx/svdlayer.hxx> -#ifndef _SVXIDS_HXX #include <svx/svxids.hrc> -#endif #include <svx/hyprlink.hxx> #include <sfx2/viewfrm.hxx> #include <svx/hlnkitem.hxx> #include <tools/urlobj.hxx> #include <editeng/eeitem.hxx> -#ifndef _FLDITEM_HXX #include <editeng/flditem.hxx> -#endif #include <vcl/msgbox.hxx> #include <sfx2/request.hxx> #include <sfx2/dispatch.hxx> diff --git a/sd/source/ui/view/drviewsc.cxx b/sd/source/ui/view/drviewsc.cxx index eefe0680d2d4..c3e2187f24ad 100644 --- a/sd/source/ui/view/drviewsc.cxx +++ b/sd/source/ui/view/drviewsc.cxx @@ -32,22 +32,16 @@ #include "ViewShellImplementation.hxx" #include <vcl/waitobj.hxx> -#ifndef _SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <svx/dialogs.hrc> -#ifndef _IMAPDLG_HXX #include <svx/imapdlg.hxx> -#endif #include <vcl/msgbox.hxx> #include <sfx2/request.hxx> #include <svx/svdogrp.hxx> #include <svx/svdoole2.hxx> #include <svx/svdograf.hxx> #include <svx/svxdlg.hxx> -#ifndef _BINDING_HXX //autogen #include <sfx2/bindings.hxx> -#endif #include <sfx2/dispatch.hxx> #include <svx/svdoole2.hxx> #include <svl/style.hxx> diff --git a/sd/source/ui/view/drviewsd.cxx b/sd/source/ui/view/drviewsd.cxx index 7e0dff5eeede..43124f0fd9d0 100644 --- a/sd/source/ui/view/drviewsd.cxx +++ b/sd/source/ui/view/drviewsd.cxx @@ -30,9 +30,7 @@ #include "DrawViewShell.hxx" -#ifndef _SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <svl/aeitem.hxx> #include <svl/stritem.hxx> #include <sfx2/docfile.hxx> @@ -52,9 +50,7 @@ #include "slideshow.hxx" #include "pgjump.hxx" #include "NavigatorChildWindow.hxx" -#ifndef SD_NAVIGATION_HXX #include "navigatr.hxx" -#endif #include "drawview.hxx" #include "slideshow.hxx" diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index 6f6f49fdc93c..6f6f49fdc93c 100755..100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx index ac6b46f3018b..f4e20703cdb9 100755..100644 --- a/sd/source/ui/view/drviewsf.cxx +++ b/sd/source/ui/view/drviewsf.cxx @@ -32,25 +32,17 @@ #include <com/sun/star/form/FormButtonType.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#ifndef _SVXIDS_HRC #include <svx/svxids.hrc> -#endif -#ifndef _GLOBL3D_HXX #include <svx/globl3d.hxx> -#endif #include <svx/hlnkitem.hxx> #include <editeng/eeitem.hxx> -#ifndef _FLDITEM_HXX #include <editeng/flditem.hxx> -#endif #include <sfx2/viewfrm.hxx> #include <svl/whiter.hxx> #include <svl/eitem.hxx> #include <svl/itempool.hxx> #include <sfx2/tplpitem.hxx> -#ifndef _BINDING_HXX //autogen #include <sfx2/bindings.hxx> -#endif #include <sfx2/app.hxx> #include <sfx2/templdlg.hxx> #include <svx/xdef.hxx> diff --git a/sd/source/ui/view/drviewsg.cxx b/sd/source/ui/view/drviewsg.cxx index 41b43864a3c0..317812c533ba 100644 --- a/sd/source/ui/view/drviewsg.cxx +++ b/sd/source/ui/view/drviewsg.cxx @@ -31,12 +31,8 @@ #include "DrawViewShell.hxx" #include "ViewShellImplementation.hxx" -#ifndef _SVXIDS_HRC #include <svx/svxids.hrc> -#endif -#ifndef _IMAPDLG_HXX #include <svx/imapdlg.hxx> -#endif #include <sfx2/request.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> diff --git a/sd/source/ui/view/drviewsh.cxx b/sd/source/ui/view/drviewsh.cxx index 26d0a70ba9a6..7c097ad0859c 100644 --- a/sd/source/ui/view/drviewsh.cxx +++ b/sd/source/ui/view/drviewsh.cxx @@ -32,9 +32,7 @@ #include <svl/aeitem.hxx> #include <svl/itemset.hxx> #include <sfx2/request.hxx> -#ifndef _SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <svx/fmshell.hxx> diff --git a/sd/source/ui/view/drviewsi.cxx b/sd/source/ui/view/drviewsi.cxx index 17ebe33ea540..4117af1fd0aa 100644 --- a/sd/source/ui/view/drviewsi.cxx +++ b/sd/source/ui/view/drviewsi.cxx @@ -37,17 +37,13 @@ #include <svx/svditer.hxx> #include <editeng/colritem.hxx> #include <sfx2/viewfrm.hxx> -#ifndef _SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <svx/svdundo.hxx> #include <svx/view3d.hxx> #include <sfx2/dispatch.hxx> #include <svx/float3d.hxx> #include <svx/f3dchild.hxx> -#ifndef _SVX_DIALOGS_HRC //autogen #include <svx/dialogs.hrc> -#endif #include <vcl/msgbox.hxx> diff --git a/sd/source/ui/view/drviewsj.cxx b/sd/source/ui/view/drviewsj.cxx index 382ac90b094b..af29ae7a00c1 100644 --- a/sd/source/ui/view/drviewsj.cxx +++ b/sd/source/ui/view/drviewsj.cxx @@ -31,16 +31,10 @@ #include "DrawViewShell.hxx" #include <com/sun/star/embed/EmbedMisc.hpp> #include <svl/aeitem.hxx> -#ifndef _SVXIDS_HRC //autogen #include <svx/svxids.hrc> -#endif -#ifndef _GLOBL3D_HXX //autogen #include <svx/globl3d.hxx> -#endif #include <editeng/eeitem.hxx> -#ifndef _FLDITEM_HXX #include <editeng/flditem.hxx> -#endif #include <svx/svdogrp.hxx> #include <svx/svdograf.hxx> #include <svx/svdoole2.hxx> diff --git a/sd/source/ui/view/drvwshrg.cxx b/sd/source/ui/view/drvwshrg.cxx index 76590dd45003..76590dd45003 100755..100644 --- a/sd/source/ui/view/drvwshrg.cxx +++ b/sd/source/ui/view/drvwshrg.cxx diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx index aca0130624ce..d5aec86a07fb 100644 --- a/sd/source/ui/view/frmview.cxx +++ b/sd/source/ui/view/frmview.cxx @@ -30,9 +30,7 @@ #include "FrameView.hxx" -#ifndef _SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <com/sun/star/awt/Rectangle.hpp> #include <com/sun/star/drawing/framework/ResourceId.hpp> #include <rtl/ustrbuf.hxx> diff --git a/sd/source/ui/view/grviewsh.cxx b/sd/source/ui/view/grviewsh.cxx index 646a437c42bf..646a437c42bf 100755..100644 --- a/sd/source/ui/view/grviewsh.cxx +++ b/sd/source/ui/view/grviewsh.cxx diff --git a/sd/source/ui/view/outlnvs2.cxx b/sd/source/ui/view/outlnvs2.cxx index 2acf143ff0b3..23de26265e1d 100755..100644 --- a/sd/source/ui/view/outlnvs2.cxx +++ b/sd/source/ui/view/outlnvs2.cxx @@ -38,9 +38,7 @@ #include <sfx2/dispatch.hxx> #include <sfx2/request.hxx> #include <svl/eitem.hxx> -#ifndef _ZOOMITEM_HXX //autogen #include <svx/zoomitem.hxx> -#endif #include <vcl/msgbox.hxx> #include <editeng/eeitem.hxx> #include <editeng/flditem.hxx> diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index 955a9d167b49..955a9d167b49 100755..100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index dfad4b34c6f2..dfad4b34c6f2 100755..100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx diff --git a/sd/source/ui/view/presvish.cxx b/sd/source/ui/view/presvish.cxx index 11f20c7a83d4..fea88bf82561 100644 --- a/sd/source/ui/view/presvish.cxx +++ b/sd/source/ui/view/presvish.cxx @@ -38,9 +38,7 @@ #include "optsitem.hxx" #include "sddll.hxx" #include <sfx2/request.hxx> -#ifndef _SFX_DISPATCH_HXX #include <sfx2/dispatch.hxx> -#endif #include <sfx2/objface.hxx> diff --git a/sd/source/ui/view/sdruler.cxx b/sd/source/ui/view/sdruler.cxx index 679c28bb3a93..b66b473a7eae 100644 --- a/sd/source/ui/view/sdruler.cxx +++ b/sd/source/ui/view/sdruler.cxx @@ -31,9 +31,7 @@ #include "Ruler.hxx" #include <svl/ptitem.hxx> #include <svx/ruler.hxx> -#ifndef _SVXIDS_HXX //autogen #include <svx/svxids.hrc> -#endif #include <sfx2/ctrlitem.hxx> #include <sfx2/bindings.hxx> diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index 3aed9c6c0d9c..90f41c050660 100755..100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -36,9 +36,7 @@ #include <svx/obj3d.hxx> #include <svx/fmview.hxx> #include <editeng/outliner.hxx> -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <svx/svdograf.hxx> #include <svx/svdoole2.hxx> #include <svx/svdundo.hxx> diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index ea4d120b1219..8bd31525b785 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -35,9 +35,7 @@ #include <com/sun/star/embed/XEmbedPersist.hpp> #include <tools/ref.hxx> #include <tools/urlobj.hxx> -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <svx/svdetc.hxx> #include <svx/svdoole2.hxx> #include <svx/svdograf.hxx> diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx index 70f276227899..70f276227899 100755..100644 --- a/sd/source/ui/view/sdview4.cxx +++ b/sd/source/ui/view/sdview4.cxx diff --git a/sd/source/ui/view/sdview5.cxx b/sd/source/ui/view/sdview5.cxx index 156544c235ab..156544c235ab 100755..100644 --- a/sd/source/ui/view/sdview5.cxx +++ b/sd/source/ui/view/sdview5.cxx diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx index ed5dda39037c..ed5dda39037c 100755..100644 --- a/sd/source/ui/view/sdwindow.cxx +++ b/sd/source/ui/view/sdwindow.cxx diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index c1e1d9634844..c1e1d9634844 100755..100644 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx index 616516782be3..ffadb65fe344 100755..100644 --- a/sd/source/ui/view/viewshe2.cxx +++ b/sd/source/ui/view/viewshe2.cxx @@ -39,12 +39,8 @@ #include "ViewShellImplementation.hxx" #include "FactoryIds.hxx" -#ifndef _SVXIDS_HRC #include <svx/svxids.hrc> -#endif -#ifndef _SCRBAR_HXX //autogen #include <vcl/scrbar.hxx> -#endif #include <svx/svdpagv.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/app.hxx> @@ -57,9 +53,7 @@ #include <sfx2/dispatch.hxx> #include <rtl/ustrbuf.hxx> #include <unotools/moduleoptions.hxx> -#ifndef _SVX_DIALOGS_HRC #include <svx/dialogs.hrc> -#endif #include <sot/clsids.hxx> #include "misc.hxx" diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx index 8bfdefd240da..3dec619a86db 100755..100644 --- a/sd/source/ui/view/viewshe3.cxx +++ b/sd/source/ui/view/viewshe3.cxx @@ -64,9 +64,7 @@ #include <comphelper/processfactory.hxx> #include <rtl/ustrbuf.hxx> #include "stlsheet.hxx" -#ifndef SD_WINDOW_UPDATER_HXX #include "WindowUpdater.hxx" -#endif #include "DrawViewShell.hxx" #include "OutlineViewShell.hxx" #include "drawview.hxx" @@ -84,9 +82,7 @@ #include "sdresid.hxx" // #96090# -#ifndef _SVXIDS_HXX #include <svx/svxids.hrc> -#endif #include <sfx2/request.hxx> #include <svl/aeitem.hxx> #include <basic/sbstar.hxx> diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index c1f4bc070bcf..27cd2071d7c1 100755..100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -31,9 +31,7 @@ #include "ViewShell.hxx" #include "ViewShellImplementation.hxx" -#ifndef _COM_SUN_STAR_EMBED_EMBEDSTATE_HPP_ #include <com/sun/star/embed/EmbedStates.hpp> -#endif #include "ViewShellBase.hxx" #include "ShellFactory.hxx" #include "DrawController.hxx" @@ -42,18 +40,12 @@ #include <sfx2/viewfrm.hxx> #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> -#ifndef _SCRBAR_HXX //autogen #include <vcl/scrbar.hxx> -#endif #include <svl/eitem.hxx> #include <svx/ruler.hxx> -#ifndef _SVXIDS_HXX #include <svx/svxids.hrc> -#endif #include <svx/fmshell.hxx> -#ifndef SD_WINDOW_UPDATER_HXX #include "WindowUpdater.hxx" -#endif #include "GraphicViewShell.hxx" #include <sfx2/childwin.hxx> #include <sdxfer.hxx> diff --git a/sd/source/ui/view/zoomlist.cxx b/sd/source/ui/view/zoomlist.cxx index 9ae178e3d7a6..169be998f011 100755..100644 --- a/sd/source/ui/view/zoomlist.cxx +++ b/sd/source/ui/view/zoomlist.cxx @@ -30,14 +30,10 @@ #include "zoomlist.hxx" -#ifndef _SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <sfx2/bindings.hxx> #include <sfx2/viewfrm.hxx> -#ifndef _SFXVIEWSHELL_HXX #include <sfx2/viewsh.hxx> -#endif #include "ViewShell.hxx" |