diff options
| author | Petr Mladek <pmladek@suse.cz> | 2010-10-04 17:00:08 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2010-10-05 18:22:24 +0200 |
| commit | a4781ea4a180171d837bbffec5dc16b7f2bc7138 (patch) | |
| tree | d191853249137569ef8927c384ee768914cbe0d7 | |
| parent | 1592b22f8dfb80d3a26d524480d95689cc01f1d8 (diff) | |
remove include guards using fixguard.py
269 files changed, 0 insertions, 1796 deletions
diff --git a/starmath/source/config.cxx b/starmath/source/config.cxx index 16b3b97afd96..01ebc6420ec0 100644 --- a/starmath/source/config.cxx +++ b/starmath/source/config.cxx @@ -44,9 +44,7 @@ #include "config.hxx" #include "format.hxx" #include "smmod.hxx" -#ifndef _STARMATH_HRC #include "starmath.hrc" -#endif ///////////////////////////////////////////////////////////////// diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index 930b198dee97..8dcf9b73fe44 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -52,9 +52,7 @@ #include "config.hxx" #include "dialog.hxx" -#ifndef _STARMATH_HRC #include "starmath.hrc" -#endif #include "dialog.hrc" #include "smmod.hxx" diff --git a/starmath/source/math_pch.cxx b/starmath/source/math_pch.cxx index bcb768fe600b..977f6131134f 100644 --- a/starmath/source/math_pch.cxx +++ b/starmath/source/math_pch.cxx @@ -167,570 +167,194 @@ #include <svx/xpoly.hxx> #include <rect.hxx> #include <vcl/outdev.hxx> -#ifndef _SMART_COM_SUN_STAR_FRAME_XDISPATCHPROVIDERINTERCEPTOR_HXX_ #include <smart/com/sun/star/frame/XDispatchProviderInterceptor.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_FRAME_XDISPATCH_HXX_ #include <smart/com/sun/star/frame/XDispatch.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_FRAME_XDISPATCHPROVIDER_HXX_ #include <smart/com/sun/star/frame/XDispatchProvider.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_FRAME_XSTATUSLISTENER_HXX_ #include <smart/com/sun/star/frame/XStatusListener.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_FRAME_FRAMESEARCHFLAG_HXX_ #include <smart/com/sun/star/frame/FrameSearchFlag.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_FRAME_XDISPATCHPROVIDERINTERCEPTION_HXX_ #include <smart/com/sun/star/frame/XDispatchProviderInterception.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_FRAME_FEATURESTATEEVENT_HXX_ #include <smart/com/sun/star/frame/FeatureStateEvent.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_FRAME_DISPATCHDESCRIPTOR_HXX_ #include <smart/com/sun/star/frame/DispatchDescriptor.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_FRAME_XFRAMEACTIONLISTENER_HXX_ #include <smart/com/sun/star/frame/XFrameActionListener.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_FRAME_XCOMPONENTLOADER_HXX_ #include <smart/com/sun/star/frame/XComponentLoader.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_FRAME_XFRAME_HXX_ #include <smart/com/sun/star/frame/XFrame.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_FRAME_FRAMEACTIONEVENT_HXX_ #include <smart/com/sun/star/frame/FrameActionEvent.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_FRAME_FRAMEACTION_HXX_ #include <smart/com/sun/star/frame/FrameAction.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_UTIL_XURLTRANSFORMER_HXX_ #include <smart/com/sun/star/util/XURLTransformer.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_TASK_XSTATUSINDICATORFACTORY_HXX_ #include <smart/com/sun/star/task/XStatusIndicatorFactory.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_TASK_XSTATUSINDICATORSUPPLIER_HXX_ #include <smart/com/sun/star/task/XStatusIndicatorSupplier.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_TASK_XSTATUSINDICATOR_HXX_ #include <smart/com/sun/star/task/XStatusIndicator.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_FRAME_XBROWSEHISTORYREGISTRY_HXX_ #include <smart/com/sun/star/frame/XBrowseHistoryRegistry.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_IO_BUFFERSIZEEXCEEDEDEXCEPTION_HXX_ #include <smart/com/sun/star/io/BufferSizeExceededException.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_IO_NOTCONNECTEDEXCEPTION_HXX_ #include <smart/com/sun/star/io/NotConnectedException.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_IO_IOEXCEPTION_HXX_ #include <smart/com/sun/star/io/IOException.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_IO_UNEXPECTEDEOFEXCEPTION_HXX_ #include <smart/com/sun/star/io/UnexpectedEOFException.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_IO_WRONGFORMATEXCEPTION_HXX_ #include <smart/com/sun/star/io/WrongFormatException.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_LANG_SERVICENOTREGISTEREDEXCEPTION_HXX_ #include <smart/com/sun/star/lang/ServiceNotRegisteredException.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_LANG_NULLPOINTEREXCEPTION_HXX_ #include <smart/com/sun/star/lang/NullPointerException.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_LANG_CLASSNOTFOUNDEXCEPTION_HXX_ #include <smart/com/sun/star/lang/ClassNotFoundException.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_LANG_NOSUCHMETHODEXCEPTION_HXX_ #include <smart/com/sun/star/lang/NoSuchMethodException.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_LANG_SECURITYEXCEPTION_HXX_ #include <smart/com/sun/star/lang/SecurityException.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_LANG_NOSUCHFIELDEXCEPTION_HXX_ #include <smart/com/sun/star/lang/NoSuchFieldException.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_LANG_DISPOSEDEXCEPTION_HXX_ #include <smart/com/sun/star/lang/DisposedException.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_LANG_ARRAYINDEXOUTOFBOUNDSEXCEPTION_HXX_ #include <smart/com/sun/star/lang/ArrayIndexOutOfBoundsException.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_LANG_ILLEGALACCESSEXCEPTION_HXX_ #include <smart/com/sun/star/lang/IllegalAccessException.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_LANG_INDEXOUTOFBOUNDSEXCEPTION_HXX_ #include <smart/com/sun/star/lang/IndexOutOfBoundsException.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_LANG_ILLEGALARGUMENTEXCEPTION_HXX_ #include <smart/com/sun/star/lang/IllegalArgumentException.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_LANG_NOSUPPORTEXCEPTION_HXX_ #include <smart/com/sun/star/lang/NoSupportException.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_LANG_WRAPPEDTARGETEXCEPTION_HXX_ #include <smart/com/sun/star/lang/WrappedTargetException.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_REFLECTION_PARAMINFO_HXX_ #include <smart/com/sun/star/reflection/ParamInfo.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_REFLECTION_XIDLARRAY_HXX_ #include <smart/com/sun/star/reflection/XIdlArray.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_REFLECTION_XIDLCLASSPROVIDER_HXX_ #include <smart/com/sun/star/reflection/XIdlClassProvider.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_REFLECTION_FIELDACCESSMODE_HXX_ #include <smart/com/sun/star/reflection/FieldAccessMode.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_REFLECTION_XIDLCLASS_HXX_ #include <smart/com/sun/star/reflection/XIdlClass.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_REFLECTION_XIDLFIELD_HXX_ #include <smart/com/sun/star/reflection/XIdlField.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_REFLECTION_PARAMMODE_HXX_ #include <smart/com/sun/star/reflection/ParamMode.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_REFLECTION_METHODMODE_HXX_ #include <smart/com/sun/star/reflection/MethodMode.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_REFLECTION_XIDLMEMBER_HXX_ #include <smart/com/sun/star/reflection/XIdlMember.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_REFLECTION_XIDLREFLECTION_HXX_ #include <smart/com/sun/star/reflection/XIdlReflection.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_REFLECTION_XIDLMETHOD_HXX_ #include <smart/com/sun/star/reflection/XIdlMethod.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_REFLECTION_INVOCATIONTARGETEXCEPTION_HXX_ #include <smart/com/sun/star/reflection/InvocationTargetException.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_BEANS_PROPERTYVALUES_HXX_ #include <smart/com/sun/star/beans/PropertyValues.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_BEANS_XPROPERTYSET_HXX_ #include <smart/com/sun/star/beans/XPropertySet.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_BEANS_PROPERTYVALUE_HXX_ #include <smart/com/sun/star/beans/PropertyValue.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_BEANS_PROPERTYSTATE_HXX_ #include <smart/com/sun/star/beans/PropertyState.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_BEANS_XPROPERTYSETINFO_HXX_ #include <smart/com/sun/star/beans/XPropertySetInfo.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_BEANS_XMULTIPROPERTYSET_HXX_ #include <smart/com/sun/star/beans/XMultiPropertySet.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_BEANS_XFASTPROPERTYSET_HXX_ #include <smart/com/sun/star/beans/XFastPropertySet.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_BEANS_XVETOABLECHANGELISTENER_HXX_ #include <smart/com/sun/star/beans/XVetoableChangeListener.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_BEANS_XPROPERTYSTATE_HXX_ #include <smart/com/sun/star/beans/XPropertyState.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_BEANS_XPROPERTYSTATECHANGELISTENER_HXX_ #include <smart/com/sun/star/beans/XPropertyStateChangeListener.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_BEANS_PROPERTYATTRIBUTE_HXX_ #include <smart/com/sun/star/beans/PropertyAttribute.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_BEANS_XPROPERTIESCHANGELISTENER_HXX_ #include <smart/com/sun/star/beans/XPropertiesChangeListener.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_BEANS_XPROPERTYCHANGELISTENER_HXX_ #include <smart/com/sun/star/beans/XPropertyChangeListener.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_BEANS_XPROPERTYACCESS_HXX_ #include <smart/com/sun/star/beans/XPropertyAccess.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_BEANS_XPROPERTYCONTAINER_HXX_ #include <smart/com/sun/star/beans/XPropertyContainer.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_BEANS_PROPERTYSTATECHANGEEVENT_HXX_ #include <smart/com/sun/star/beans/PropertyStateChangeEvent.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_BEANS_PROPERTYCHANGEEVENT_HXX_ #include <smart/com/sun/star/beans/PropertyChangeEvent.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_BEANS_UNKNOWNPROPERTYEXCEPTION_HXX_ #include <smart/com/sun/star/beans/UnknownPropertyException.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_BEANS_INTROSPECTIONEXCEPTION_HXX_ #include <smart/com/sun/star/beans/IntrospectionException.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_BEANS_PROPERTYEXISTEXCEPTION_HXX_ #include <smart/com/sun/star/beans/PropertyExistException.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_BEANS_ILLEGALTYPEEXCEPTION_HXX_ #include <smart/com/sun/star/beans/IllegalTypeException.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_BEANS_PROPERTYVETOEXCEPTION_HXX_ #include <smart/com/sun/star/beans/PropertyVetoException.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_CONTAINER_XENUMERATIONACCESS_HXX_ #include <smart/com/sun/star/container/XEnumerationAccess.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_CONTAINER_XHIERARCHICALNAMEACCESS_HXX_ #include <smart/com/sun/star/container/XHierarchicalNameAccess.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_CONTAINER_XNAMEACCESS_HXX_ #include <smart/com/sun/star/container/XNameAccess.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_CONTAINER_XCONTENTENUMERATIONACCESS_HXX_ #include <smart/com/sun/star/container/XContentEnumerationAccess.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_CONTAINER_XENUMERATION_HXX_ #include <smart/com/sun/star/container/XEnumeration.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_CONTAINER_XELEMENTACCESS_HXX_ #include <smart/com/sun/star/container/XElementAccess.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_CONTAINER_XINDEXACCESS_HXX_ #include <smart/com/sun/star/container/XIndexAccess.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_LANG_XEVENTLISTENER_HXX_ #include <smart/com/sun/star/lang/XEventListener.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_LANG_EVENTOBJECT_HXX_ #include <smart/com/sun/star/lang/EventObject.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_SCRIPT_XALLLISTENERADAPTERSERVICE_HXX_ #include <smart/com/sun/star/script/XAllListenerAdapterService.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_SCRIPT_XALLLISTENER_HXX_ #include <smart/com/sun/star/script/XAllListener.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_SCRIPT_ALLEVENTOBJECT_HXX_ #include <smart/com/sun/star/script/AllEventObject.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_CONTAINER_XCOMPONENTENUMERATION_HXX_ #include <smart/com/sun/star/container/XComponentEnumeration.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_LANG_XCOMPONENT_HXX_ #include <smart/com/sun/star/lang/XComponent.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_CONTAINER_XCOMPONENTENUMERATIONACCESS_HXX_ #include <smart/com/sun/star/container/XComponentEnumerationAccess.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_LANG_LISTENEREXISTEXCEPTION_HXX_ #include <smart/com/sun/star/lang/ListenerExistException.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_CONTAINER_ELEMENTEXISTEXCEPTION_HXX_ #include <smart/com/sun/star/container/ElementExistException.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_LANG_INVALIDLISTENEREXCEPTION_HXX_ #include <smart/com/sun/star/lang/InvalidListenerException.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_CONTAINER_NOSUCHELEMENTEXCEPTION_HXX_ #include <smart/com/sun/star/container/NoSuchElementException.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XKEYLISTENER_HXX_ #include <smart/com/sun/star/awt/XKeyListener.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XPAINTLISTENER_HXX_ #include <smart/com/sun/star/awt/XPaintListener.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_KEYEVENT_HXX_ #include <smart/com/sun/star/awt/KeyEvent.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_KEYMODIFIER_HXX_ #include <smart/com/sun/star/awt/KeyModifier.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XMOUSEMOTIONLISTENER_HXX_ #include <smart/com/sun/star/awt/XMouseMotionListener.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_FOCUSEVENT_HXX_ #include <smart/com/sun/star/awt/FocusEvent.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XWINDOWLISTENER_HXX_ #include <smart/com/sun/star/awt/XWindowListener.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XACTIVATELISTENER_HXX_ #include <smart/com/sun/star/awt/XActivateListener.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_MOUSEEVENT_HXX_ #include <smart/com/sun/star/awt/MouseEvent.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XTOPWINDOWLISTENER_HXX_ #include <smart/com/sun/star/awt/XTopWindowListener.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_PAINTEVENT_HXX_ #include <smart/com/sun/star/awt/PaintEvent.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_INPUTEVENT_HXX_ #include <smart/com/sun/star/awt/InputEvent.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_KEYGROUP_HXX_ #include <smart/com/sun/star/awt/KeyGroup.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_KEY_HXX_ #include <smart/com/sun/star/awt/Key.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_WINDOWEVENT_HXX_ #include <smart/com/sun/star/awt/WindowEvent.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XMOUSELISTENER_HXX_ #include <smart/com/sun/star/awt/XMouseListener.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_KEYFUNCTION_HXX_ #include <smart/com/sun/star/awt/KeyFunction.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_FOCUSCHANGEREASON_HXX_ #include <smart/com/sun/star/awt/FocusChangeReason.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_MOUSEBUTTON_HXX_ #include <smart/com/sun/star/awt/MouseButton.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XFOCUSLISTENER_HXX_ #include <smart/com/sun/star/awt/XFocusListener.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XADJUSTMENTLISTENER_HXX_ #include <smart/com/sun/star/awt/XAdjustmentListener.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XACTIONLISTENER_HXX_ #include <smart/com/sun/star/awt/XActionListener.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XTEXTLISTENER_HXX_ #include <smart/com/sun/star/awt/XTextListener.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XSPINLISTENER_HXX_ #include <smart/com/sun/star/awt/XSpinListener.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XITEMLISTENER_HXX_ #include <smart/com/sun/star/awt/XItemListener.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XVCLCONTAINERLISTENER_HXX_ #include <smart/com/sun/star/awt/XVclContainerListener.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XFILEDIALOG_HXX_ #include <smart/com/sun/star/awt/XFileDialog.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XTEXTCOMPONENT_HXX_ #include <smart/com/sun/star/awt/XTextComponent.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XLISTBOX_HXX_ #include <smart/com/sun/star/awt/XListBox.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XPROGRESSMONITOR_HXX_ #include <smart/com/sun/star/awt/XProgressMonitor.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_TEXTALIGN_HXX_ #include <smart/com/sun/star/awt/TextAlign.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XSCROLLBAR_HXX_ #include <smart/com/sun/star/awt/XScrollBar.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XVCLCONTAINERPEER_HXX_ #include <smart/com/sun/star/awt/XVclContainerPeer.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XTABCONTROLLERMODEL_HXX_ #include <smart/com/sun/star/awt/XTabControllerModel.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XMESSAGEBOX_HXX_ #include <smart/com/sun/star/awt/XMessageBox.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XTEXTEDITFIELD_HXX_ #include <smart/com/sun/star/awt/XTextEditField.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_STYLE_HXX_ #include <smart/com/sun/star/awt/Style.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XTIMEFIELD_HXX_ #include <smart/com/sun/star/awt/XTimeField.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XVCLWINDOWPEER_HXX_ #include <smart/com/sun/star/awt/XVclWindowPeer.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XCONTROLMODEL_HXX_ #include <smart/com/sun/star/awt/XControlModel.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XSPINFIELD_HXX_ #include <smart/com/sun/star/awt/XSpinField.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XUNOCONTROLCONTAINER_HXX_ #include <smart/com/sun/star/awt/XUnoControlContainer.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XTEXTLAYOUTCONSTRAINS_HXX_ #include <smart/com/sun/star/awt/XTextLayoutConstrains.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XNUMERICFIELD_HXX_ #include <smart/com/sun/star/awt/XNumericField.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XBUTTON_HXX_ #include <smart/com/sun/star/awt/XButton.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XTEXTAREA_HXX_ #include <smart/com/sun/star/awt/XTextArea.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XIMAGEBUTTON_HXX_ #include <smart/com/sun/star/awt/XImageButton.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XFIXEDTEXT_HXX_ #include <smart/com/sun/star/awt/XFixedText.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XCONTROLCONTAINER_HXX_ #include <smart/com/sun/star/awt/XControlContainer.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XDIALOG_HXX_ #include <smart/com/sun/star/awt/XDialog.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_SCROLLBARORIENTATION_HXX_ #include <smart/com/sun/star/awt/ScrollBarOrientation.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XRADIOBUTTON_HXX_ #include <smart/com/sun/star/awt/XRadioButton.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XCURRENCYFIELD_HXX_ #include <smart/com/sun/star/awt/XCurrencyField.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XPATTERNFIELD_HXX_ #include <smart/com/sun/star/awt/XPatternField.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_VCLWINDOWPEERATTRIBUTE_HXX_ #include <smart/com/sun/star/awt/VclWindowPeerAttribute.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XTABCONTROLLER_HXX_ #include <smart/com/sun/star/awt/XTabController.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XVCLCONTAINER_HXX_ #include <smart/com/sun/star/awt/XVclContainer.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XDATEFIELD_HXX_ #include <smart/com/sun/star/awt/XDateField.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XCOMBOBOX_HXX_ #include <smart/com/sun/star/awt/XComboBox.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XCONTROL_HXX_ #include <smart/com/sun/star/awt/XControl.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XCHECKBOX_HXX_ #include <smart/com/sun/star/awt/XCheckBox.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_MESSAGEBOXCOMMAND_HXX_ #include <smart/com/sun/star/awt/MessageBoxCommand.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XLAYOUTCONSTRAINS_HXX_ #include <smart/com/sun/star/awt/XLayoutConstrains.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XPROGRESSBAR_HXX_ #include <smart/com/sun/star/awt/XProgressBar.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_SIMPLEFONTMETRIC_HXX_ #include <smart/com/sun/star/awt/SimpleFontMetric.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_FONTWEIGHT_HXX_ #include <smart/com/sun/star/awt/FontWeight.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_FONTSLANT_HXX_ #include <smart/com/sun/star/awt/FontSlant.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_CHARSET_HXX_ #include <smart/com/sun/star/awt/CharSet.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_FONTDESCRIPTOR_HXX_ #include <smart/com/sun/star/awt/FontDescriptor.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_FONTWIDTH_HXX_ #include <smart/com/sun/star/awt/FontWidth.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XFONT_HXX_ #include <smart/com/sun/star/awt/XFont.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_FONTTYPE_HXX_ #include <smart/com/sun/star/awt/FontType.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_FONTUNDERLINE_HXX_ #include <smart/com/sun/star/awt/FontUnderline.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_FONTSTRIKEOUT_HXX_ #include <smart/com/sun/star/awt/FontStrikeout.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_FONTFAMILY_HXX_ #include <smart/com/sun/star/awt/FontFamily.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_FONTPITCH_HXX_ #include <smart/com/sun/star/awt/FontPitch.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XTOPWINDOW_HXX_ #include <smart/com/sun/star/awt/XTopWindow.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XWINDOW_HXX_ #include <smart/com/sun/star/awt/XWindow.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_POSSIZE_HXX_ #include <smart/com/sun/star/awt/PosSize.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_VCLCONTAINEREVENT_HXX_ #include <smart/com/sun/star/awt/VclContainerEvent.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_ITEMEVENT_HXX_ #include <smart/com/sun/star/awt/ItemEvent.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_SPINEVENT_HXX_ #include <smart/com/sun/star/awt/SpinEvent.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_TEXTEVENT_HXX_ #include <smart/com/sun/star/awt/TextEvent.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_ADJUSTMENTTYPE_HXX_ #include <smart/com/sun/star/awt/AdjustmentType.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_ACTIONEVENT_HXX_ #include <smart/com/sun/star/awt/ActionEvent.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_ADJUSTMENTEVENT_HXX_ #include <smart/com/sun/star/awt/AdjustmentEvent.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_RECTANGLE_HXX_ #include <smart/com/sun/star/awt/Rectangle.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_SELECTION_HXX_ #include <smart/com/sun/star/awt/Selection.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_SIZE_HXX_ #include <smart/com/sun/star/awt/Size.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_WINDOWDESCRIPTOR_HXX_ #include <smart/com/sun/star/awt/WindowDescriptor.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_INVALIDATESTYLE_HXX_ #include <smart/com/sun/star/awt/InvalidateStyle.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XTOOLKIT_HXX_ #include <smart/com/sun/star/awt/XToolkit.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XWINDOWPEER_HXX_ #include <smart/com/sun/star/awt/XWindowPeer.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_WINDOWCLASS_HXX_ #include <smart/com/sun/star/awt/WindowClass.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XSYSTEMDEPENDENTWINDOWPEER_HXX_ #include <smart/com/sun/star/awt/XSystemDependentWindowPeer.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_WINDOWATTRIBUTE_HXX_ #include <smart/com/sun/star/awt/WindowAttribute.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XPOINTER_HXX_ #include <smart/com/sun/star/awt/XPointer.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_SYSTEMPOINTER_HXX_ #include <smart/com/sun/star/awt/SystemPointer.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XVIEW_HXX_ #include <smart/com/sun/star/awt/XView.hxx> -#endif #include <usr/refl.hxx> #include <sfx2/msg.hxx> #include <svl/itemset.hxx> diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx index 58f3d0200a57..9b5f6d6d2c41 100644 --- a/starmath/source/mathtype.cxx +++ b/starmath/source/mathtype.cxx @@ -31,9 +31,7 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ #include <mathtype.hxx> -#ifndef _TOOLS_DEBUG_H #include <tools/debug.hxx> -#endif #include <sfx2/docfile.hxx> diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx index 9c909848803b..327c133e50f1 100644 --- a/starmath/source/parse.cxx +++ b/starmath/source/parse.cxx @@ -39,12 +39,8 @@ #include <editeng/unolingu.hxx> #include <unotools/syslocale.hxx> #include "parse.hxx" -#ifndef _STARMATH_HRC #include "starmath.hrc" -#endif -#ifndef _SMDLL_HXX #include "smdll.hxx" -#endif #include "smmod.hxx" #include "config.hxx" diff --git a/starmath/source/smdetect.cxx b/starmath/source/smdetect.cxx index fbe861eed004..90ca07784b02 100644 --- a/starmath/source/smdetect.cxx +++ b/starmath/source/smdetect.cxx @@ -37,9 +37,7 @@ #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> -#endif #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/task/XInteractionHandler.hpp> @@ -50,9 +48,7 @@ #include <com/sun/star/packages/zip/ZipIOException.hpp> #include <framework/interaction.hxx> -#ifndef _TOOLKIT_UNOHLP_HXX #include <toolkit/helper/vclunohelper.hxx> -#endif #include <ucbhelper/simpleinteractionrequest.hxx> #include <rtl/ustring.h> diff --git a/starmath/source/smdll.cxx b/starmath/source/smdll.cxx index a66ec8efc608..f2d77b2b51dd 100644 --- a/starmath/source/smdll.cxx +++ b/starmath/source/smdll.cxx @@ -30,9 +30,7 @@ #include <sot/factory.hxx> -#ifndef _SVX_SVXIDS_HRC //autogen #include <svx/svxids.hrc> -#endif #include <svx/modctrl.hxx> #include <svx/zoomctrl.hxx> #include <sfx2/docfac.hxx> @@ -42,16 +40,12 @@ #include <sfx2/app.hxx> #include <sfx2/taskpane.hxx> -#ifndef _SMDLL_HXX #include <smdll.hxx> -#endif #include <document.hxx> #include <toolbox.hxx> #include <view.hxx> -#ifndef _STARMATH_HRC #include <starmath.hrc> -#endif #include <svx/xmlsecctrl.hxx> diff --git a/starmath/source/smmod.cxx b/starmath/source/smmod.cxx index f31fac02eeb3..1456f7079967 100644 --- a/starmath/source/smmod.cxx +++ b/starmath/source/smmod.cxx @@ -39,9 +39,7 @@ #include <sfx2/sfx.hrc> #include <sfx2/viewsh.hxx> #include <vcl/wrkwin.hxx> -#ifndef _SVX_SVXIDS_HRC //autogen #include <svx/svxids.hrc> -#endif #include <vcl/msgbox.hxx> #include <vcl/virdev.hxx> #include <unotools/syslocale.hxx> @@ -49,9 +47,7 @@ #include "smmod.hxx" #include "symbol.hxx" #include "config.hxx" -#ifndef _DIALOG_HXX #include "dialog.hxx" -#endif #include "edit.hxx" #include "view.hxx" #include "starmath.hrc" diff --git a/starmath/source/toolbox.cxx b/starmath/source/toolbox.cxx index 2de6c97ed5ab..337228e2c1df 100644 --- a/starmath/source/toolbox.cxx +++ b/starmath/source/toolbox.cxx @@ -38,12 +38,8 @@ #include <sfx2/imgmgr.hxx> #include <vcl/wrkwin.hxx> #include "toolbox.hxx" -#ifndef _STARMATH_HRC #include "starmath.hrc" -#endif -#ifndef _TOOLBOX_HRC_ #include "toolbox.hrc" -#endif #include "view.hxx" diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx index e0d3945e0a51..e868f1b6875c 100644 --- a/sw/source/core/access/accdoc.cxx +++ b/sw/source/core/access/accdoc.cxx @@ -44,9 +44,7 @@ #include <doc.hxx> #include <accmap.hxx> #include <accdoc.hxx> -#ifndef _ACCESS_HRC #include "access.hrc" -#endif #include <pagefrm.hxx> const sal_Char sServiceName[] = "com.sun.star.text.AccessibleTextDocumentView"; diff --git a/sw/source/core/access/accfootnote.cxx b/sw/source/core/access/accfootnote.cxx index 1fb553d58120..e90cd5953f7d 100644 --- a/sw/source/core/access/accfootnote.cxx +++ b/sw/source/core/access/accfootnote.cxx @@ -41,9 +41,7 @@ #include <viewsh.hxx> #include <accmap.hxx> #include "accfootnote.hxx" -#ifndef _ACCESS_HRC #include "access.hrc" -#endif using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sw/source/core/access/accheaderfooter.cxx b/sw/source/core/access/accheaderfooter.cxx index dada1083c810..1f4ef4320e83 100644 --- a/sw/source/core/access/accheaderfooter.cxx +++ b/sw/source/core/access/accheaderfooter.cxx @@ -37,9 +37,7 @@ #include <vcl/svapp.hxx> #include <hffrm.hxx> #include "accheaderfooter.hxx" -#ifndef _ACCESS_HRC #include "access.hrc" -#endif using namespace ::com::sun::star; using namespace ::com::sun::star::lang; diff --git a/sw/source/core/access/accpage.cxx b/sw/source/core/access/accpage.cxx index d5feca2e0ba9..cf6d21918fa4 100644 --- a/sw/source/core/access/accpage.cxx +++ b/sw/source/core/access/accpage.cxx @@ -37,9 +37,7 @@ #include <com/sun/star/accessibility/AccessibleRole.hpp> #include "accpage.hxx" -#ifndef _ACCESS_HRC #include "access.hrc" -#endif #include <pagefrm.hxx> using namespace ::com::sun::star; diff --git a/sw/source/core/access/accportions.cxx b/sw/source/core/access/accportions.cxx index 093d22136d81..bcb9eb750124 100644 --- a/sw/source/core/access/accportions.cxx +++ b/sw/source/core/access/accportions.cxx @@ -34,9 +34,7 @@ #include <txttypes.hxx> // for portion replacement in Special() -#ifndef _ACCESS_HRC #include "access.hrc" -#endif #include <tools/resid.hxx> #include "viewopt.hxx" diff --git a/sw/source/core/access/accpreview.cxx b/sw/source/core/access/accpreview.cxx index b8fabc3d5f25..96039432e32a 100644 --- a/sw/source/core/access/accpreview.cxx +++ b/sw/source/core/access/accpreview.cxx @@ -31,9 +31,7 @@ #include <vcl/svapp.hxx> #include <rtl/uuid.h> -#ifndef _ACCESS_HRC #include "access.hrc" -#endif #include <accpreview.hxx> diff --git a/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx b/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx index 7dabc18285ee..e98f9889ca78 100644 --- a/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx +++ b/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx @@ -29,9 +29,7 @@ #include "precompiled_sw.hxx" #include <fmtwrapinfluenceonobjpos.hxx> -#ifndef _UNOMID_H #include <unomid.h> -#endif using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sw/source/core/attr/swatrset.cxx b/sw/source/core/attr/swatrset.cxx index cdfa6a5f6d3f..c9fc35af619b 100644 --- a/sw/source/core/attr/swatrset.cxx +++ b/sw/source/core/attr/swatrset.cxx @@ -43,9 +43,7 @@ #include <node.hxx> #include <paratr.hxx> // fuer SetModifyAtAttr #include <cellatr.hxx> // fuer SetModifyAtAttr -#ifndef _CMDID_H #include <cmdid.h> -#endif #include <istyleaccess.hxx> #include <numrule.hxx> // --> OD 2008-03-19 #refactorlists# diff --git a/sw/source/core/bastyp/SwSmartTagMgr.cxx b/sw/source/core/bastyp/SwSmartTagMgr.cxx index ac661389ae6a..a1b20b4385b1 100644 --- a/sw/source/core/bastyp/SwSmartTagMgr.cxx +++ b/sw/source/core/bastyp/SwSmartTagMgr.cxx @@ -33,9 +33,7 @@ #include <vcl/svapp.hxx> #include <swmodule.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif using namespace com::sun::star; using namespace com::sun::star::uno; diff --git a/sw/source/core/bastyp/breakit.cxx b/sw/source/core/bastyp/breakit.cxx index 4253507b11b5..b88e1e340638 100644 --- a/sw/source/core/bastyp/breakit.cxx +++ b/sw/source/core/bastyp/breakit.cxx @@ -36,9 +36,7 @@ #endif #include <unotools/localedatawrapper.hxx> -#ifndef _SVX_LINGU_HXX #include <editeng/unolingu.hxx> -#endif #include <editeng/scripttypeitem.hxx> #include "swtypes.hxx" diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx index f837fa7a108c..9c44d3fd8f72 100644 --- a/sw/source/core/bastyp/calc.cxx +++ b/sw/source/core/bastyp/calc.cxx @@ -58,9 +58,7 @@ #include <dbfld.hxx> #include <expfld.hxx> #include <usrfld.hxx> -#ifndef _DBMGR_HXX #include <dbmgr.hxx> -#endif #include <docfld.hxx> #include <swunodef.hxx> #include <swtypes.hxx> diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx index 345dd0221ffd..2278d248967a 100644 --- a/sw/source/core/bastyp/init.cxx +++ b/sw/source/core/bastyp/init.cxx @@ -66,9 +66,7 @@ #include <editeng/charrotateitem.hxx> #include <editeng/charreliefitem.hxx> #include <editeng/frmdiritem.hxx> -#ifndef _SVX_DIALOGS_HRC #include <svx/dialogs.hrc> -#endif #include <editeng/swafopt.hxx> #include <editeng/svxacorr.hxx> #include <unotools/charclass.hxx> diff --git a/sw/source/core/bastyp/swrect.cxx b/sw/source/core/bastyp/swrect.cxx index 1213bfaea896..964ac3f4f17a 100644 --- a/sw/source/core/bastyp/swrect.cxx +++ b/sw/source/core/bastyp/swrect.cxx @@ -30,10 +30,8 @@ #ifdef DBG_UTIL -#ifndef _STREAM_HXX //autogen #include <tools/stream.hxx> #endif -#endif #include <stdlib.h> #include "swrect.hxx" #include <math.h> diff --git a/sw/source/core/crsr/findcoll.cxx b/sw/source/core/crsr/findcoll.cxx index 4bb594ceb4ca..f17fc159eac9 100644 --- a/sw/source/core/crsr/findcoll.cxx +++ b/sw/source/core/crsr/findcoll.cxx @@ -34,9 +34,7 @@ #include <pamtyp.hxx> #include <swundo.hxx> #include <undobj.hxx> -#ifndef _COMCORE_HRC #include <comcore.hrc> -#endif #include <tools/resid.hxx> //------------------ Methoden der CrsrShell --------------------------- diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx index 7637df0a67b4..79118c6d704f 100644 --- a/sw/source/core/crsr/swcrsr.cxx +++ b/sw/source/core/crsr/swcrsr.cxx @@ -58,9 +58,7 @@ #include <crsskip.hxx> #include <vcl/msgbox.hxx> #include <mdiexp.hxx> // ...Percent() -#ifndef _STATSTR_HRC #include <statstr.hrc> // ResId fuer Statusleiste -#endif #include <redline.hxx> // SwRedline diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx index 214700c5e680..a6f9367af27c 100644 --- a/sw/source/core/crsr/viscrs.cxx +++ b/sw/source/core/crsr/viscrs.cxx @@ -52,9 +52,7 @@ #include <ndtxt.hxx> #include <scriptinfo.hxx> #include <mdiexp.hxx> // GetSearchDialog -#ifndef _COMCORE_HRC #include <comcore.hrc> // ResId fuer Abfrage wenn zu Search & Replaces -#endif #include <svx/sdr/overlay/overlaymanager.hxx> #include <svx/sdrpaintwindow.hxx> diff --git a/sw/source/core/doc/SwStyleNameMapper.cxx b/sw/source/core/doc/SwStyleNameMapper.cxx index 99fd15dbc9e2..bac5f3fd4d4d 100644 --- a/sw/source/core/doc/SwStyleNameMapper.cxx +++ b/sw/source/core/doc/SwStyleNameMapper.cxx @@ -34,9 +34,7 @@ #include <svl/svstdarr.hxx> #include <tools/resmgr.hxx> #include <poolfmt.hxx> -#ifndef _RDIC_HRC #include <rcid.hrc> -#endif #include <tools/debug.hxx> extern ResMgr* pSwResMgr; // Initialise UI names to 0 diff --git a/sw/source/core/doc/docbasic.cxx b/sw/source/core/doc/docbasic.cxx index f52c7ad89dbf..682231b2bdcc 100644 --- a/sw/source/core/doc/docbasic.cxx +++ b/sw/source/core/doc/docbasic.cxx @@ -31,9 +31,7 @@ #include <hintids.hxx> -#ifndef _RTL_USTRING_HXX //autogen #include <rtl/ustring.hxx> -#endif #include <svtools/imap.hxx> #include <svtools/imapobj.hxx> #include <basic/sbx.hxx> @@ -43,9 +41,7 @@ #include <frmatr.hxx> #include <docary.hxx> #include <doc.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <swevent.hxx> using namespace ::com::sun::star::uno; diff --git a/sw/source/core/doc/docdde.cxx b/sw/source/core/doc/docdde.cxx index d21e6313a2df..a52619da3b59 100644 --- a/sw/source/core/doc/docdde.cxx +++ b/sw/source/core/doc/docdde.cxx @@ -32,9 +32,7 @@ #include <stdlib.h> -#ifndef _APP_HXX #include <vcl/svapp.hxx> -#endif #include <tools/urlobj.hxx> #define _SVSTDARR_STRINGS diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx index 0b56578e0536..b11d93afac6d 100644 --- a/sw/source/core/doc/docdesc.cxx +++ b/sw/source/core/doc/docdesc.cxx @@ -55,9 +55,7 @@ #include <frmtool.hxx> #include <pagedesc.hxx> #include <poolfmt.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <ndindex.hxx> #include <ftnidx.hxx> #include <fmtftn.hxx> @@ -69,9 +67,7 @@ #include <swwait.hxx> #include <GetMetricVal.hxx> #include <unotools/syslocale.hxx> -#ifndef _STATSTR_HRC #include <statstr.hrc> -#endif #include <SwUndoPageDesc.hxx> diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx index 1b576a87331e..999dad0f6b71 100644 --- a/sw/source/core/doc/docfld.cxx +++ b/sw/source/core/doc/docfld.cxx @@ -69,9 +69,7 @@ #include <authfld.hxx> #include <txtinet.hxx> #include <fmtcntnt.hxx> -#ifndef _POOLFMT_HRC #include <poolfmt.hrc> // fuer InitFldTypes -#endif #include <SwUndoField.hxx> diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx index 1224c5c02f17..85327954ead9 100644 --- a/sw/source/core/doc/docnum.cxx +++ b/sw/source/core/doc/docnum.cxx @@ -49,9 +49,7 @@ #include <txtfrm.hxx> #include <pamtyp.hxx> #include <redline.hxx> -#ifndef _COMCORE_HRC #include <comcore.hrc> -#endif #include <editeng/adjitem.hxx> #include <editeng/frmdiritem.hxx> #include <frmatr.hxx> diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx index d989c39ffecf..807b3dadfc2e 100644 --- a/sw/source/core/doc/docredln.cxx +++ b/sw/source/core/doc/docredln.cxx @@ -31,9 +31,7 @@ #include <hintids.hxx> #include <tools/shl.hxx> -#ifndef _SFX_ITEMITER_HXX //autogen #include <svl/itemiter.hxx> -#endif #include <sfx2/app.hxx> #include <editeng/colritem.hxx> #include <editeng/udlnitem.hxx> diff --git a/sw/source/core/doc/fmtcol.cxx b/sw/source/core/doc/fmtcol.cxx index cb0b44b66822..d87d2d58d0f6 100644 --- a/sw/source/core/doc/fmtcol.cxx +++ b/sw/source/core/doc/fmtcol.cxx @@ -44,9 +44,7 @@ #include <paratr.hxx> //--> #outlinelevel added by zhaojianwei -#ifndef _SFXINTITEM_HXX #include <svl/intitem.hxx> -#endif //<--end TYPEINIT1( SwTxtFmtColl, SwFmtColl ); diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx index a3e28fc0e425..2f3a3a1274c6 100644 --- a/sw/source/core/doc/htmltbl.cxx +++ b/sw/source/core/doc/htmltbl.cxx @@ -34,12 +34,8 @@ #ifdef TEST_DELAYED_RESIZE #include <vcl/sound.hxx> #endif -#ifndef _WRKWIN_HXX //autogen #include <vcl/wrkwin.hxx> -#endif -#ifndef _APP_HXX //autogen #include <vcl/svapp.hxx> -#endif #include <sot/storage.hxx> #include <fmtornt.hxx> #include <fmtfsize.hxx> diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx index bb10e9c1941b..59e34d74eb53 100644 --- a/sw/source/core/doc/notxtfrm.cxx +++ b/sw/source/core/doc/notxtfrm.cxx @@ -71,9 +71,7 @@ #include <poolfmt.hxx> #include <mdiexp.hxx> #include <swwait.hxx> -#ifndef _COMCORE_HRC #include <comcore.hrc> -#endif #include <accessibilityoptions.hxx> #include <com/sun/star/embed/EmbedMisc.hpp> #include <com/sun/star/embed/EmbedStates.hpp> diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx index 7af292626f06..0eebf4ab8a07 100644 --- a/sw/source/core/doc/number.cxx +++ b/sw/source/core/doc/number.cxx @@ -44,9 +44,7 @@ #include <frmfmt.hxx> #include <ndtxt.hxx> #include <docary.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <SwStyleNameMapper.hxx> // --> OD 2006-06-28 #b6440955# // Needed to load default bullet list configuration diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx index e5cfc065db2a..cf26d3560c24 100644 --- a/sw/source/core/doc/poolfmt.cxx +++ b/sw/source/core/doc/poolfmt.cxx @@ -67,9 +67,7 @@ #include <fmtcol.hxx> #include <ndtxt.hxx> #include <fmtline.hxx> -#ifndef _POOLFMT_HRC #include <poolfmt.hrc> -#endif #include <GetMetricVal.hxx> #include <numrule.hxx> diff --git a/sw/source/core/doc/swserv.cxx b/sw/source/core/doc/swserv.cxx index e40b82d673b7..64d9e97e34f8 100644 --- a/sw/source/core/doc/swserv.cxx +++ b/sw/source/core/doc/swserv.cxx @@ -41,9 +41,7 @@ #include <bookmrk.hxx> #include <pam.hxx> #include <shellio.hxx> -#ifndef _SWERROR_H #include <swerror.h> -#endif using namespace ::com::sun::star; diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx index 7633f92e7867..c78ec4a0de27 100644 --- a/sw/source/core/doc/tblafmt.cxx +++ b/sw/source/core/doc/tblafmt.cxx @@ -40,9 +40,7 @@ #include <unotools/pathoptions.hxx> #include <sfx2/app.hxx> #include <svx/dialmgr.hxx> -#ifndef _SVX_DIALOGS_HRC #include <svx/dialogs.hrc> -#endif #define READ_OLDVERS // erstmal noch alte Versionen lesen #include <swtypes.hxx> diff --git a/sw/source/core/docnode/finalthreadmanager.cxx b/sw/source/core/docnode/finalthreadmanager.cxx index f4cedbbf8cdb..0f41633fb5a5 100644 --- a/sw/source/core/docnode/finalthreadmanager.cxx +++ b/sw/source/core/docnode/finalthreadmanager.cxx @@ -27,9 +27,7 @@ #include "precompiled_sw.hxx" #include <finalthreadmanager.hxx> -#ifndef _OSL_THREAD_HXX_ #include <osl/thread.hxx> -#endif #include <errhdl.hxx> #include <pausethreadstarting.hxx> #include <swthreadjoiner.hxx> diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx index 306560272c6f..492aab5747cc 100644 --- a/sw/source/core/docnode/ndsect.cxx +++ b/sw/source/core/docnode/ndsect.cxx @@ -58,9 +58,7 @@ #include <node2lay.hxx> #include <doctxm.hxx> #include <fmtftntx.hxx> -#ifndef _COMCORE_HRC #include <comcore.hrc> -#endif // --> OD 2005-12-01 #i27138# #include <viewsh.hxx> #include <txtfrm.hxx> diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index 450d0df35ac4..e3c982cacea6 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -84,9 +84,7 @@ #include <section.hxx> #include <frmtool.hxx> #include <node2lay.hxx> -#ifndef _COMCORE_HRC #include <comcore.hrc> -#endif #include "docsh.hxx" #include <tabcol.hxx> #include <unochart.hxx> diff --git a/sw/source/core/docnode/retrieveinputstream.cxx b/sw/source/core/docnode/retrieveinputstream.cxx index 7da81735e58f..5e29509f3822 100644 --- a/sw/source/core/docnode/retrieveinputstream.cxx +++ b/sw/source/core/docnode/retrieveinputstream.cxx @@ -27,9 +27,7 @@ #include "precompiled_sw.hxx" #include <retrieveinputstream.hxx> #include <comphelper/mediadescriptor.hxx> -#ifndef _COM_SUN_STAR_IO_XSTREAM_HXX_ #include <com/sun/star/io/XStream.hpp> -#endif /** class for a thread to retrieve an input stream given by an URL diff --git a/sw/source/core/docnode/swbaslnk.cxx b/sw/source/core/docnode/swbaslnk.cxx index cb804b102c0e..4cf94fbf2d1a 100644 --- a/sw/source/core/docnode/swbaslnk.cxx +++ b/sw/source/core/docnode/swbaslnk.cxx @@ -40,9 +40,7 @@ #include <sfx2/linkmgr.hxx> #include <sfx2/objsh.hxx> #include <editeng/boxitem.hxx> -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> // fuer die EventIds -#endif #include <sfx2/linkmgr.hxx> #include <svtools/soerr.hxx> #include <fmtfsize.hxx> diff --git a/sw/source/core/draw/dpage.cxx b/sw/source/core/draw/dpage.cxx index 694599181b81..70b6133e528b 100644 --- a/sw/source/core/draw/dpage.cxx +++ b/sw/source/core/draw/dpage.cxx @@ -36,9 +36,7 @@ #include <fmturl.hxx> #include <frmfmt.hxx> #include <doc.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <shellres.hxx> #include <viewimp.hxx> #include <pagefrm.hxx> @@ -50,9 +48,7 @@ #include <dpage.hxx> #include <dcontact.hxx> #include <dflyobj.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <usrfld.hxx> #include <flyfrm.hxx> #include <ndnotxt.hxx> diff --git a/sw/source/core/draw/drawdoc.cxx b/sw/source/core/draw/drawdoc.cxx index 650edcfceaed..dc5073a2676f 100644 --- a/sw/source/core/draw/drawdoc.cxx +++ b/sw/source/core/draw/drawdoc.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sw.hxx" -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <tools/stream.hxx> #include <unotools/pathoptions.hxx> #include <sot/storage.hxx> @@ -45,9 +43,7 @@ #include <rootfrm.hxx> #include <drawdoc.hxx> #include <dpage.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <shellio.hxx> #include <hintids.hxx> #include <com/sun/star/embed/ElementModes.hpp> diff --git a/sw/source/core/edit/acorrect.cxx b/sw/source/core/edit/acorrect.cxx index b7e92570df42..c1225d3e4ad0 100644 --- a/sw/source/core/edit/acorrect.cxx +++ b/sw/source/core/edit/acorrect.cxx @@ -32,9 +32,7 @@ #define _STD_VAR_ARRAYS #include <hintids.hxx> -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <editeng/langitem.hxx> #include <fmtinfmt.hxx> #include <txtatr.hxx> diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx index 639bab3c10c5..a80f9c240f6e 100644 --- a/sw/source/core/edit/autofmt.cxx +++ b/sw/source/core/edit/autofmt.cxx @@ -72,12 +72,8 @@ #include <frmatr.hxx> #include <charatr.hxx> #include <mdiexp.hxx> -#ifndef _STATSTR_HRC #include <statstr.hrc> -#endif -#ifndef _COMCORE_HRC #include <comcore.hrc> -#endif #include <vcl/msgbox.hxx> #include <numrule.hxx> diff --git a/sw/source/core/edit/edfldexp.cxx b/sw/source/core/edit/edfldexp.cxx index 1bc78a5a7482..489dc3c55a30 100644 --- a/sw/source/core/edit/edfldexp.cxx +++ b/sw/source/core/edit/edfldexp.cxx @@ -29,9 +29,7 @@ #include "precompiled_sw.hxx" #include <editsh.hxx> #include <dbfld.hxx> -#ifndef _DBMGR_HXX #include <dbmgr.hxx> -#endif #include <com/sun/star/container/XNameAccess.hpp> #include <comphelper/processfactory.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx index c9ab4a591383..9eee918553e1 100644 --- a/sw/source/core/edit/edlingu.cxx +++ b/sw/source/core/edit/edlingu.cxx @@ -35,9 +35,7 @@ #include <unoflatpara.hxx> -#ifndef _COMCORE_HRC #include <comcore.hrc> -#endif #include <hintids.hxx> #include <linguistic/lngprops.hxx> #include <vcl/msgbox.hxx> @@ -57,9 +55,7 @@ #include <viscrs.hxx> // SwShellCrsr #include <SwGrammarMarkUp.hxx> // SwWrongList #include <mdiexp.hxx> // Statusanzeige -#ifndef _STATSTR_HRC #include <statstr.hrc> // StatLine-String -#endif #include <cntfrm.hxx> #include <crsskip.hxx> #include <splargs.hxx> diff --git a/sw/source/core/edit/edtab.cxx b/sw/source/core/edit/edtab.cxx index 76a37e4e8627..9794cf013b6b 100644 --- a/sw/source/core/edit/edtab.cxx +++ b/sw/source/core/edit/edtab.cxx @@ -35,9 +35,7 @@ #define _SVSTDARR_ULONGS #include <svl/svstdarr.hxx> -#ifndef _APP_HXX //autogen #include <vcl/svapp.hxx> -#endif #include <vcl/window.hxx> #include <editeng/boxitem.hxx> #include <swwait.hxx> diff --git a/sw/source/core/edit/edtox.cxx b/sw/source/core/edit/edtox.cxx index 230e45f71079..15f058970f1e 100644 --- a/sw/source/core/edit/edtox.cxx +++ b/sw/source/core/edit/edtox.cxx @@ -34,9 +34,7 @@ #include <tools/urlobj.hxx> #include <svtools/txtcmp.hxx> -#ifndef SVTOOLS_FSTATHELPER_HXX #include <svl/fstathelper.hxx> -#endif #include <sfx2/docfile.hxx> #include "editeng/unolingu.hxx" #include <swtypes.hxx> @@ -54,9 +52,7 @@ #include <doctxm.hxx> #include <docary.hxx> #include <mdiexp.hxx> -#ifndef _STATSTR_HRC #include <statstr.hrc> -#endif #include <bookmrk.hxx> #include <xmloff/odffields.hxx> diff --git a/sw/source/core/fields/authfld.cxx b/sw/source/core/fields/authfld.cxx index 6f0848a8693d..f018c2eda437 100644 --- a/sw/source/core/fields/authfld.cxx +++ b/sw/source/core/fields/authfld.cxx @@ -40,9 +40,7 @@ #include <editeng/langitem.hxx> #include <swtypes.hxx> #include <tools/resid.hxx> -#ifndef _COMCORE_HRC #include <comcore.hrc> -#endif #include <authfld.hxx> #include <expfld.hxx> #include <pam.hxx> @@ -54,9 +52,7 @@ #include <txtfld.hxx> #include <ndtxt.hxx> #include <doc.hxx> -#ifndef _UNOFLDMID_H #include <unofldmid.h> -#endif #include <unoprnms.hxx> #include <unomid.h> diff --git a/sw/source/core/fields/chpfld.cxx b/sw/source/core/fields/chpfld.cxx index 785a8cd1ad68..a624806e9f6d 100644 --- a/sw/source/core/fields/chpfld.cxx +++ b/sw/source/core/fields/chpfld.cxx @@ -36,9 +36,7 @@ #include <ndtxt.hxx> #include <chpfld.hxx> #include <expfld.hxx> // fuer GetBodyTxtNode -#ifndef _UNOFLDMID_H #include <unofldmid.h> -#endif #include <numrule.hxx> using namespace ::com::sun::star; diff --git a/sw/source/core/fields/dbfld.cxx b/sw/source/core/fields/dbfld.cxx index 019ac525e82d..fa2d4c3e99b3 100644 --- a/sw/source/core/fields/dbfld.cxx +++ b/sw/source/core/fields/dbfld.cxx @@ -44,15 +44,11 @@ #include <pam.hxx> #include <ndtxt.hxx> #include <dbfld.hxx> -#ifndef _DBMGR_HXX #include <dbmgr.hxx> -#endif #include <docfld.hxx> #include <expfld.hxx> #include <txtatr.hxx> -#ifndef _UNOFLDMID_H #include <unofldmid.h> -#endif using namespace ::com::sun::star::sdbc; diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx index 658482312be8..074e6d129bdd 100644 --- a/sw/source/core/fields/ddefld.cxx +++ b/sw/source/core/fields/ddefld.cxx @@ -40,9 +40,7 @@ #include <swtable.hxx> #include <swbaslnk.hxx> #include <swddetbl.hxx> -#ifndef _UNOFLDMID_H #include <unofldmid.h> -#endif #include <hints.hxx> using rtl::OUString; diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx index c3ec8b55f824..f30dd6e015fd 100644 --- a/sw/source/core/fields/fldbas.cxx +++ b/sw/source/core/fields/fldbas.cxx @@ -35,9 +35,7 @@ #include <svl/zforlist.hxx> #include <svl/zformat.hxx> #include <editeng/unolingu.hxx> -#ifndef _UNOFLDMID_H #include <unofldmid.h> -#endif #include <doc.hxx> #include <editsh.hxx> #include <frame.hxx> @@ -53,9 +51,7 @@ #include <expfld.hxx> #include <shellres.hxx> #include <calc.hxx> -#ifndef _COMCORE_HRC #include <comcore.hrc> -#endif #include <math.h> #ifdef MAC diff --git a/sw/source/core/fields/flddropdown.cxx b/sw/source/core/fields/flddropdown.cxx index fa40067ecab6..2263409a74d7 100644 --- a/sw/source/core/fields/flddropdown.cxx +++ b/sw/source/core/fields/flddropdown.cxx @@ -36,9 +36,7 @@ #endif #include <svl/poolitem.hxx> -#ifndef _UNOFLDMID_H #include <unofldmid.h> -#endif #include <unoprnms.hxx> using namespace com::sun::star; diff --git a/sw/source/core/fields/macrofld.cxx b/sw/source/core/fields/macrofld.cxx index de380c5aecf6..158f14b76780 100644 --- a/sw/source/core/fields/macrofld.cxx +++ b/sw/source/core/fields/macrofld.cxx @@ -32,9 +32,7 @@ #include <hintids.hxx> #include <doc.hxx> #include <docufld.hxx> -#ifndef _UNOFLDMID_H #include <unofldmid.h> -#endif #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/uri/XUriReferenceFactory.hpp> #include <com/sun/star/uri/XVndSunStarScriptUrl.hpp> diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx index 0581a3cc9187..22f82eb1e029 100644 --- a/sw/source/core/fields/reffld.cxx +++ b/sw/source/core/fields/reffld.cxx @@ -62,18 +62,12 @@ // <-- #include <ftnidx.hxx> #include <viewsh.hxx> -#ifndef _UNOFLDMID_H #include <unofldmid.h> -#endif #include <SwStyleNameMapper.hxx> #include <shellres.hxx> #include <poolfmt.hxx> -#ifndef _POOLFMT_HRC #include <poolfmt.hrc> -#endif -#ifndef _COMCORE_HRC #include <comcore.hrc> -#endif #include <numrule.hxx> #include <SwNodeNum.hxx> diff --git a/sw/source/core/fields/scrptfld.cxx b/sw/source/core/fields/scrptfld.cxx index e576b7810126..34aaa677f390 100644 --- a/sw/source/core/fields/scrptfld.cxx +++ b/sw/source/core/fields/scrptfld.cxx @@ -30,12 +30,8 @@ #include <docufld.hxx> -#ifndef _UNOFLDMID_H #include <unofldmid.h> -#endif -#ifndef _COMCORE_HRC #include <comcore.hrc> -#endif #include <tools/resid.hxx> using namespace ::com::sun::star; diff --git a/sw/source/core/fields/tblcalc.cxx b/sw/source/core/fields/tblcalc.cxx index a3a5b6dfee33..969ff17f6fdb 100644 --- a/sw/source/core/fields/tblcalc.cxx +++ b/sw/source/core/fields/tblcalc.cxx @@ -37,9 +37,7 @@ #include <txtfld.hxx> #include <expfld.hxx> #include <docfld.hxx> // fuer _SetGetExpFld -#ifndef _UNOFLDMID_H #include <unofldmid.h> -#endif using namespace ::com::sun::star; using ::rtl::OUString; diff --git a/sw/source/core/fields/usrfld.cxx b/sw/source/core/fields/usrfld.cxx index 23aecdfa72b8..162d3f8100df 100644 --- a/sw/source/core/fields/usrfld.cxx +++ b/sw/source/core/fields/usrfld.cxx @@ -40,9 +40,7 @@ #include <doc.hxx> #include <editsh.hxx> #include <dpage.hxx> -#ifndef _UNOFLDMID_H #include <unofldmid.h> -#endif using namespace ::com::sun::star; using ::rtl::OUString; diff --git a/sw/source/core/frmedt/feflyole.cxx b/sw/source/core/frmedt/feflyole.cxx index 070a031e83d3..89a15750c5a7 100644 --- a/sw/source/core/frmedt/feflyole.cxx +++ b/sw/source/core/frmedt/feflyole.cxx @@ -29,9 +29,7 @@ #include "precompiled_sw.hxx" #include <com/sun/star/embed/EmbedStates.hpp> -#ifndef _SFX_CLIENTSH_HXX #include <sfx2/ipclient.hxx> -#endif #include <sfx2/viewsh.hxx> #include <sfx2/app.hxx> #include <unotools/moduleoptions.hxx> diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx index 4133433702a3..182667e0b223 100644 --- a/sw/source/core/frmedt/feshview.cxx +++ b/sw/source/core/frmedt/feshview.cxx @@ -52,9 +52,7 @@ #include <svx/svdpage.hxx> #include <svx/svdpagv.hxx> -#ifndef _POOLFMT_HRC #include <poolfmt.hrc> // fuer InitFldTypes -#endif #include <frmfmt.hxx> #include <frmatr.hxx> #include <fmtfsize.hxx> diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx index ad2e077e5d7c..cb2d278c789d 100644 --- a/sw/source/core/frmedt/fetab.cxx +++ b/sw/source/core/frmedt/fetab.cxx @@ -34,9 +34,7 @@ #include <tools/errinf.hxx> #include <vcl/svapp.hxx> #include <basegfx/vector/b2dvector.hxx> -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <editeng/protitem.hxx> #include <editeng/brshitem.hxx> #include <editeng/frmdiritem.hxx> diff --git a/sw/source/core/graphic/grfatr.cxx b/sw/source/core/graphic/grfatr.cxx index b298ea474c13..cd5d6f7797a2 100644 --- a/sw/source/core/graphic/grfatr.cxx +++ b/sw/source/core/graphic/grfatr.cxx @@ -47,12 +47,8 @@ #include <grfatr.hxx> #include <swunohelper.hxx> -#ifndef _CMDID_H #include <cmdid.h> -#endif -#ifndef _UNOMID_H #include <unomid.h> -#endif using namespace ::com::sun::star; diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx index 46b92c7233d0..44cbd9543aba 100644 --- a/sw/source/core/graphic/ndgrf.cxx +++ b/sw/source/core/graphic/ndgrf.cxx @@ -31,9 +31,7 @@ #include <vcl/salbtype.hxx> // FRound #include <tools/urlobj.hxx> #include <svl/undo.hxx> -#ifndef SVTOOLS_FSTATHELPER_HXX #include <svl/fstathelper.hxx> -#endif #include <svtools/imap.hxx> #include <svtools/filter.hxx> #include <sot/storage.hxx> diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index f80b7b11b121..6e962b45d77d 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -106,9 +106,7 @@ #include <cmdid.h> #include <unomid.h> -#ifndef _COMCORE_HRC #include <comcore.hrc> -#endif #include <svx/svdundo.hxx> // #111827# // OD 2004-05-24 #i28701# #include <sortedobjs.hxx> diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx index aec3fde909f1..c97f5bd6f734 100644 --- a/sw/source/core/layout/layact.cxx +++ b/sw/source/core/layout/layact.cxx @@ -75,9 +75,7 @@ #include <fmtanchr.hxx> #include <tools/shl.hxx> #include <sfx2/progress.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include "swmodule.hxx" #include "fmtline.hxx" diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 3664c4c99615..3dc8937ae156 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -33,9 +33,7 @@ #include <hintids.hxx> -#ifndef _SOUND_HXX //autogen #include <vcl/sound.hxx> -#endif #include <tools/poly.hxx> #define _SVSTDARR_LONGS #include <svl/svstdarr.hxx> @@ -49,9 +47,7 @@ // --> collapsing borders FME 2005-05-27 #i29550# #include <svx/framelink.hxx> // <-- -#ifndef _GRAPH_HXX //autogen #include <vcl/graph.hxx> -#endif #include <svx/svdpagv.hxx> #include <tgrditem.hxx> @@ -59,9 +55,7 @@ #include <fmtsrnd.hxx> #include <fmtclds.hxx> #include <tools/shl.hxx> -#ifndef _COMCORE_HRC #include <comcore.hrc> -#endif #include <swmodule.hxx> #include <rootfrm.hxx> #include <pagefrm.hxx> @@ -89,15 +83,11 @@ #include <ptqueue.hxx> #include <noteurl.hxx> #include <virtoutp.hxx> -#ifndef _LINEINFO_HXX #include <lineinfo.hxx> -#endif #include <dbg_lay.hxx> #include <accessibilityoptions.hxx> // OD 20.12.2002 #94627# -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif // OD 28.02.2003 #b4779636#, #107692# #include <swtable.hxx> // OD 02.07.2003 #108784# diff --git a/sw/source/core/objectpositioning/anchoredobjectposition.cxx b/sw/source/core/objectpositioning/anchoredobjectposition.cxx index 71b8f1b38e18..e2a2842bcbbf 100644 --- a/sw/source/core/objectpositioning/anchoredobjectposition.cxx +++ b/sw/source/core/objectpositioning/anchoredobjectposition.cxx @@ -36,9 +36,7 @@ #include <txtfrm.hxx> #include <pagefrm.hxx> #include <frmtool.hxx> -#ifndef _SVX_SVDOBJ_HXX #include <svx/svdobj.hxx> -#endif #include <dflyobj.hxx> #include <dcontact.hxx> #include <frmfmt.hxx> diff --git a/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx b/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx index c5a51970f066..5041d7d30282 100644 --- a/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx +++ b/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx @@ -31,9 +31,7 @@ #include <frame.hxx> #include <txtfrm.hxx> #include <flyfrms.hxx> -#ifndef _SVX_SVDOBJ_HXX #include <svx/svdobj.hxx> -#endif #include <dcontact.hxx> #include <frmfmt.hxx> #include <frmatr.hxx> diff --git a/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx b/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx index 729a1eabaded..d1beaf6174c7 100644 --- a/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx +++ b/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx @@ -31,9 +31,7 @@ #include <anchoredobject.hxx> #include <frame.hxx> #include <pagefrm.hxx> -#ifndef _SVX_SVDOBJ_HXX #include <svx/svdobj.hxx> -#endif #include <frmfmt.hxx> #include <fmtanchr.hxx> #include <fmtornt.hxx> diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx index 881402efbfb2..488e2a6bac6c 100644 --- a/sw/source/core/ole/ndole.cxx +++ b/sw/source/core/ole/ndole.cxx @@ -47,9 +47,7 @@ #include <sfx2/app.hxx> #include <sfx2/linkmgr.hxx> #include <unotools/configitem.hxx> -#ifndef _OUTDEV_HXX //autogen #include <vcl/outdev.hxx> -#endif #include <fmtanchr.hxx> #include <frmfmt.hxx> #include <doc.hxx> @@ -58,9 +56,7 @@ #include <section.hxx> #include <cntfrm.hxx> #include <frmatr.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <ndole.hxx> #include <comphelper/classids.hxx> @@ -68,9 +64,7 @@ #include <sot/formats.hxx> #include <unotools/ucbstreamhelper.hxx> #include <svtools/filter.hxx> -#ifndef _COMCORE_HRC #include <comcore.hrc> -#endif using rtl::OUString; using namespace utl; diff --git a/sw/source/core/sw3io/swacorr.cxx b/sw/source/core/sw3io/swacorr.cxx index be0fdf0ac441..c119f16a690b 100644 --- a/sw/source/core/sw3io/swacorr.cxx +++ b/sw/source/core/sw3io/swacorr.cxx @@ -33,12 +33,8 @@ #include <swacorr.hxx> #include <swblocks.hxx> #include "SwXMLTextBlocks.hxx" -#ifndef _SWSERROR_H #include <swerror.h> -#endif -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <editsh.hxx> #include <sot/storage.hxx> diff --git a/sw/source/core/swg/SwXMLBlockImport.cxx b/sw/source/core/swg/SwXMLBlockImport.cxx index 9c0084eb6f4c..fef456cd2510 100644 --- a/sw/source/core/swg/SwXMLBlockImport.cxx +++ b/sw/source/core/swg/SwXMLBlockImport.cxx @@ -30,9 +30,7 @@ #include <SwXMLBlockImport.hxx> #include <xmloff/nmspmap.hxx> #include <xmloff/xmlnmspe.hxx> -#ifndef _SW_XMLBLOCKLIST_CONTEXT_HXX #include <SwXMLBlockListContext.hxx> -#endif #include <SwXMLTextBlocks.hxx> using namespace ::com::sun::star::uno; using namespace ::com::sun::star; diff --git a/sw/source/core/swg/SwXMLTextBlocks.cxx b/sw/source/core/swg/SwXMLTextBlocks.cxx index 358b00e12ca1..d85af5767761 100644 --- a/sw/source/core/swg/SwXMLTextBlocks.cxx +++ b/sw/source/core/swg/SwXMLTextBlocks.cxx @@ -39,9 +39,7 @@ #include <comphelper/storagehelper.hxx> #include <doc.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <pam.hxx> #include <swblocks.hxx> #include <ndtxt.hxx> diff --git a/sw/source/core/swg/SwXMLTextBlocks1.cxx b/sw/source/core/swg/SwXMLTextBlocks1.cxx index f46a0b642db8..d12ba28b8faa 100644 --- a/sw/source/core/swg/SwXMLTextBlocks1.cxx +++ b/sw/source/core/swg/SwXMLTextBlocks1.cxx @@ -39,9 +39,7 @@ #include <com/sun/star/xml/sax/XParser.hpp> #include <com/sun/star/document/XStorageBasedDocument.hpp> #include <doc.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <shellio.hxx> #include <SwXMLTextBlocks.hxx> #include <SwXMLBlockImport.hxx> diff --git a/sw/source/core/swg/swblocks.cxx b/sw/source/core/swg/swblocks.cxx index 4329e7345384..be796214e23a 100644 --- a/sw/source/core/swg/swblocks.cxx +++ b/sw/source/core/swg/swblocks.cxx @@ -32,9 +32,7 @@ #include <sfx2/docfilt.hxx> #include <sot/storage.hxx> #include <tools/urlobj.hxx> -#ifndef SVTOOLS_FSTATHELPER_HXX #include <svl/fstathelper.hxx> -#endif #include <svl/macitem.hxx> #include <unotools/charclass.hxx> #include <frmfmt.hxx> @@ -46,14 +44,10 @@ #include <ndtxt.hxx> #include <mdiexp.hxx> // Progress #include <SwXMLTextBlocks.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <swunohelper.hxx> -#ifndef _STATSTR_HRC #include <statstr.hrc> -#endif #include <swerror.h> SV_IMPL_OP_PTRARR_SORT( SwBlockNames, SwBlockName* ); diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx index bbb2f28ad173..baa3a1d164b3 100644 --- a/sw/source/core/text/frmpaint.cxx +++ b/sw/source/core/text/frmpaint.cxx @@ -38,12 +38,8 @@ #include <tgrditem.hxx> #include <paratr.hxx> -#ifndef _FMTLINE_HXX #include <fmtline.hxx> -#endif -#ifndef _LINEINFO_HXX #include <lineinfo.hxx> -#endif #include <charfmt.hxx> #include <pagefrm.hxx> #include <viewsh.hxx> // ViewShell diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx index 961c6a4ee560..0fccfe09f4b5 100644 --- a/sw/source/core/text/inftxt.cxx +++ b/sw/source/core/text/inftxt.cxx @@ -42,9 +42,7 @@ #include <editeng/splwrap.hxx> #include <editeng/pgrditem.hxx> // --> OD 2008-01-17 #newlistlevelattrs# -#ifndef _SVX_TSTPITEM_HXX #include <editeng/tstpitem.hxx> -#endif // <-- #include <SwSmartTagMgr.hxx> @@ -61,9 +59,7 @@ #include <viewopt.hxx> // SwViewOptions #include <frmtool.hxx> // DrawGraphic #include <IDocumentSettingAccess.hxx> -#ifndef IDOCUMENTDEVICEACCESS_HXX_INCLUDED #include <IDocumentDeviceAccess.hxx> -#endif #include <paratr.hxx> // SwFmtDrop #include <rootfrm.hxx> // SwRootFrm #include <inftxt.hxx> // SwTxtInfo diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx index 59edb6fa59c9..ad8be036e1ef 100644 --- a/sw/source/core/text/porfld.cxx +++ b/sw/source/core/text/porfld.cxx @@ -35,16 +35,10 @@ #include <com/sun/star/i18n/ScriptType.hdl> #endif -#ifndef _GRAPH_HXX //autogen #include <vcl/graph.hxx> -#endif #include <editeng/brshitem.hxx> -#ifndef _METRIC_HXX //autogen #include <vcl/metric.hxx> -#endif -#ifndef _OUTDEV_HXX //autogen #include <vcl/outdev.hxx> -#endif #include <viewopt.hxx> // SwViewOptions #include <txtcfg.hxx> #include <SwPortionHandler.hxx> @@ -54,9 +48,7 @@ #include <blink.hxx> // pBlink #include <frmtool.hxx> // DrawGraphic #include <viewsh.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <doc.hxx> #include <breakit.hxx> #include <porrst.hxx> diff --git a/sw/source/core/text/porlin.cxx b/sw/source/core/text/porlin.cxx index 862b5ce13024..ebc0287da07c 100644 --- a/sw/source/core/text/porlin.cxx +++ b/sw/source/core/text/porlin.cxx @@ -29,9 +29,7 @@ #include "precompiled_sw.hxx" -#ifndef _OUTDEV_HXX //autogen #include <vcl/outdev.hxx> -#endif #include <SwPortionHandler.hxx> #include "errhdl.hxx" // ASSERT diff --git a/sw/source/core/text/redlnitr.cxx b/sw/source/core/text/redlnitr.cxx index d789121de4b8..d088f8998ccd 100644 --- a/sw/source/core/text/redlnitr.cxx +++ b/sw/source/core/text/redlnitr.cxx @@ -48,9 +48,7 @@ #include <vcl/cmdevt.hxx> #include <vcl/settings.hxx> #include <txtfrm.hxx> // SwTxtFrm -#ifndef _APP_HXX //autogen #include <vcl/svapp.hxx> -#endif #include <redlnitr.hxx> #include <extinput.hxx> #include <sfx2/printer.hxx> diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx index a86589b64851..23378ac9f2e5 100644 --- a/sw/source/core/text/txttab.cxx +++ b/sw/source/core/text/txttab.cxx @@ -30,9 +30,7 @@ #include "hintids.hxx" #include <editeng/lrspitem.hxx> -#ifndef _SVX_TSTPITEM_HXX //autogen #include <editeng/tstpitem.hxx> -#endif #include <IDocumentSettingAccess.hxx> #include <frmatr.hxx> #include <SwPortionHandler.hxx> diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx index bc3565216ae0..6f422b28077a 100644 --- a/sw/source/core/tox/tox.cxx +++ b/sw/source/core/tox/tox.cxx @@ -39,9 +39,7 @@ #include <ndtxt.hxx> #include <txttxmrk.hxx> #include <tox.hxx> -#ifndef _POOLFMT_HRC #include <poolfmt.hrc> -#endif #include <doc.hxx> #include <docary.hxx> #include <paratr.hxx> diff --git a/sw/source/core/tox/toxhlp.cxx b/sw/source/core/tox/toxhlp.cxx index f119bf5a5540..2806ddb4903f 100644 --- a/sw/source/core/tox/toxhlp.cxx +++ b/sw/source/core/tox/toxhlp.cxx @@ -31,9 +31,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <comphelper/processfactory.hxx> -#ifndef _COM_SUN_STAR_I18N_XINDEXENTRYSUPPLIER_HPP_ #include <com/sun/star/i18n/XExtendedIndexEntrySupplier.hpp> -#endif #include <tools/string.hxx> #include <tools/debug.hxx> #include <toxwrap.hxx> diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx index 61f873b010b7..6fe3a23ac9b3 100644 --- a/sw/source/core/tox/txmsrt.cxx +++ b/sw/source/core/tox/txmsrt.cxx @@ -51,9 +51,7 @@ #include <authfld.hxx> #include <toxwrap.hxx> -#ifndef _COMCORE_HRC #include <comcore.hrc> -#endif #include <numrule.hxx> extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, xub_StrLen nMySttPos, diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx index ff79d2266ba7..f0769f113560 100644 --- a/sw/source/core/txtnode/fntcache.cxx +++ b/sw/source/core/txtnode/fntcache.cxx @@ -29,16 +29,10 @@ #include "precompiled_sw.hxx" -#ifndef _OUTDEV_HXX //autogen #include <vcl/outdev.hxx> -#endif -#ifndef _PRINT_HXX //autogen #include <vcl/print.hxx> -#endif #include <vcl/lineinfo.hxx> -#ifndef _METRIC_HXX //autogen #include <vcl/metric.hxx> -#endif #include <vcl/window.hxx> #include <vcl/svapp.hxx> #ifndef _COM_SUN_STAR_I18N_CHARACTERITERATORMODE_HDL_ @@ -68,9 +62,7 @@ #include <doc.hxx> #include <editeng/fhgtitem.hxx> #include <docsh.hxx> -#ifndef _POOLFMT_HRC #include <poolfmt.hrc> -#endif using namespace ::com::sun::star; diff --git a/sw/source/core/txtnode/fntcap.cxx b/sw/source/core/txtnode/fntcap.cxx index e38b26ecb9f7..d50a85d7954f 100644 --- a/sw/source/core/txtnode/fntcap.cxx +++ b/sw/source/core/txtnode/fntcap.cxx @@ -32,9 +32,7 @@ #include <hintids.hxx> #include <editeng/cmapitem.hxx> -#ifndef _OUTDEV_HXX //autogen #include <vcl/outdev.hxx> -#endif #ifndef _COM_SUN_STAR_I18N_CHARTYPE_HDL #include <com/sun/star/i18n/CharType.hdl> #endif @@ -42,9 +40,7 @@ #include <com/sun/star/i18n/WordType.hdl> #endif -#ifndef _PRINT_HXX //autogen #include <vcl/print.hxx> -#endif #include <errhdl.hxx> #include <fntcache.hxx> #include <swfont.hxx> diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx index 49e111e9053f..c1b8b62ea234 100644 --- a/sw/source/core/txtnode/swfont.cxx +++ b/sw/source/core/txtnode/swfont.cxx @@ -34,9 +34,7 @@ #ifndef _COM_SUN_STAR_I18N_SCRIPTTYPE_HDL_ #include <com/sun/star/i18n/ScriptType.hdl> #endif -#ifndef _OUTDEV_HXX //autogen #include <vcl/outdev.hxx> -#endif #include <unotools/localedatawrapper.hxx> #include <editeng/unolingu.hxx> #include <editeng/brshitem.hxx> @@ -50,9 +48,7 @@ #include <editeng/akrnitem.hxx> #include <editeng/shdditem.hxx> #include <editeng/charreliefitem.hxx> -#ifndef _SVX_CNTRITEM_HXX //autogen #include <editeng/cntritem.hxx> -#endif #include <editeng/colritem.hxx> #include <editeng/cscoitem.hxx> #include <editeng/crsditem.hxx> @@ -61,9 +57,7 @@ #include <editeng/postitem.hxx> #include <editeng/fhgtitem.hxx> #include <editeng/fontitem.hxx> -#ifndef _SVX_EMPHITEM_HXX //autogen #include <editeng/emphitem.hxx> -#endif #include <editeng/charscaleitem.hxx> #include <editeng/charrotateitem.hxx> #include <editeng/twolinesitem.hxx> diff --git a/sw/source/core/undo/docundo.cxx b/sw/source/core/undo/docundo.cxx index 85adbd1c7138..fa9b96a33c97 100644 --- a/sw/source/core/undo/docundo.cxx +++ b/sw/source/core/undo/docundo.cxx @@ -38,9 +38,7 @@ #include <undobj.hxx> #include <rolbck.hxx> #include <docary.hxx> -#ifndef _UNDO_HRC #include <undo.hrc> -#endif using namespace ::com::sun::star; diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx index 6df9f9aa24b8..69387e7c795f 100644 --- a/sw/source/core/undo/rolbck.cxx +++ b/sw/source/core/undo/rolbck.cxx @@ -59,13 +59,9 @@ #include <undobj.hxx> // fuer UndoDelete #include <IMark.hxx> // fuer SwBookmark #include <charfmt.hxx> // #i27615# -#ifndef _COMCORE_HRC #include <comcore.hrc> -#endif #include <tools/resid.hxx> -#ifndef _UNDO_HRC #include <undo.hrc> -#endif #include <editeng/brkitem.hxx> #include <bookmrk.hxx> diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx index 1a71a705b2fb..f0de6458516c 100644 --- a/sw/source/core/undo/undobj.cxx +++ b/sw/source/core/undo/undobj.cxx @@ -45,12 +45,8 @@ #include <mvsave.hxx> #include <redline.hxx> #include <crossrefbookmark.hxx> -#ifndef _UNDO_HRC #include <undo.hrc> -#endif -#ifndef _COMCORE_HRC #include <comcore.hrc> -#endif #include <docsh.hxx> class SwRedlineSaveData : public SwUndRng, public SwRedlineData, diff --git a/sw/source/core/undo/unsort.cxx b/sw/source/core/undo/unsort.cxx index 44b73736e458..92659a12b80e 100644 --- a/sw/source/core/undo/unsort.cxx +++ b/sw/source/core/undo/unsort.cxx @@ -34,9 +34,7 @@ #include <ndtxt.hxx> #include <undobj.hxx> #include <sortopt.hxx> -#ifndef _DOCSORT_HXX #include <docsort.hxx> -#endif #include <redline.hxx> #include <node2lay.hxx> diff --git a/sw/source/core/unocore/unobkm.cxx b/sw/source/core/unocore/unobkm.cxx index 590ddb6e803e..6baae75b28fb 100644 --- a/sw/source/core/unocore/unobkm.cxx +++ b/sw/source/core/unocore/unobkm.cxx @@ -42,9 +42,7 @@ #include <doc.hxx> #include <docary.hxx> #include <swundo.hxx> -#ifndef _COMCORE_HRC #include <comcore.hrc> -#endif #include <undobj.hxx> #include <docsh.hxx> diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx index 703389a58f7e..8ff48cefd067 100644 --- a/sw/source/core/unocore/unochart.cxx +++ b/sw/source/core/unocore/unochart.cxx @@ -56,9 +56,7 @@ #include <ndole.hxx> #include <swtable.hxx> #include <swtypes.hxx> -#ifndef _UNOCORE_HRC #include <unocore.hrc> -#endif #include <docary.hxx> diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx index 37001380df70..cc9d82930ea6 100644 --- a/sw/source/core/unocore/unocoll.cxx +++ b/sw/source/core/unocore/unocoll.cxx @@ -31,9 +31,7 @@ #include <swtypes.hxx> #include <cmdid.h> #include <hintids.hxx> -#ifndef _SVX_SVXIDS_HRC //autogen #include <svx/svxids.hrc> -#endif #include <doc.hxx> #include <docary.hxx> #include <fmtcol.hxx> diff --git a/sw/source/core/unocore/unoevent.cxx b/sw/source/core/unocore/unoevent.cxx index 79dea2e958c8..a8b6638e4c3c 100644 --- a/sw/source/core/unocore/unoevent.cxx +++ b/sw/source/core/unocore/unoevent.cxx @@ -36,15 +36,11 @@ #include "unostyle.hxx" #include "swevent.hxx" #include "docstyle.hxx" -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include "fmtinfmt.hxx" #include <svl/macitem.hxx> #include <rtl/ustrbuf.hxx> -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP #include <com/sun/star/beans/PropertyValue.hpp> -#endif using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx index f572b5f3e91c..fc23f7d7be1d 100644 --- a/sw/source/core/unocore/unoobj.cxx +++ b/sw/source/core/unocore/unoobj.cxx @@ -66,9 +66,7 @@ #include <fmtfld.hxx> #include <fmtpdsc.hxx> #include <pagedesc.hxx> -#ifndef _POOLFMT_HRC #include <poolfmt.hrc> -#endif #include <poolfmt.hxx> #include <edimp.hxx> #include <fchrfmt.hxx> diff --git a/sw/source/core/view/pagepreviewlayout.cxx b/sw/source/core/view/pagepreviewlayout.cxx index 37a880eab6f3..aa4dfa161c05 100644 --- a/sw/source/core/view/pagepreviewlayout.cxx +++ b/sw/source/core/view/pagepreviewlayout.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sw.hxx" #include <pagepreviewlayout.hxx> -#ifndef _PREVWPAGE_HXX #include <prevwpage.hxx> -#endif #include <algorithm> #include <vcl/window.hxx> @@ -40,9 +38,7 @@ #include <viewimp.hxx> #include <viewopt.hxx> #include <swregion.hxx> -#ifndef _COMCORE_HRC #include <comcore.hrc> -#endif #include <frmtool.hxx> #include <svx/zoomitem.hxx> #include <printdata.hxx> diff --git a/sw/source/core/view/viewpg.cxx b/sw/source/core/view/viewpg.cxx index 6abd0e1df67d..a4f74b8d8d4e 100644 --- a/sw/source/core/view/viewpg.cxx +++ b/sw/source/core/view/viewpg.cxx @@ -48,12 +48,8 @@ #include <hints.hxx> #include <fntcache.hxx> -#ifndef _STATSTR_HRC #include <statstr.hrc> // Text fuer SfxProgress -#endif -#ifndef _COMCORE_HRC #include <comcore.hrc> -#endif #include <IDocumentFieldsAccess.hxx> #include <IDocumentDeviceAccess.hxx> diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index 16083cf59ae2..0a59d4a271da 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -60,9 +60,7 @@ #include <fntcache.hxx> #include <ptqueue.hxx> #include <tabfrm.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <pagedesc.hxx> #include <ndole.hxx> #include <ndindex.hxx> @@ -70,12 +68,8 @@ #include <svtools/colorcfg.hxx> #include <svtools/accessibilityoptions.hxx> #include <accessibilityoptions.hxx> -#ifndef _STATSTR_HRC #include <statstr.hrc> -#endif -#ifndef _COMCORE_HRC #include <comcore.hrc> -#endif #include <pagepreviewlayout.hxx> #include <sortedobjs.hxx> #include <anchoredobject.hxx> diff --git a/sw/source/core/view/vnew.cxx b/sw/source/core/view/vnew.cxx index 12c56d5421e5..bd5765203d57 100644 --- a/sw/source/core/view/vnew.cxx +++ b/sw/source/core/view/vnew.cxx @@ -32,9 +32,7 @@ #include <sfx2/printer.hxx> #include <rtl/logfile.hxx> #include <doc.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <viewsh.hxx> #include <rootfrm.hxx> #include <viewimp.hxx> diff --git a/sw/source/filter/ascii/parasc.cxx b/sw/source/filter/ascii/parasc.cxx index 282551474e36..3e42e3349f93 100644 --- a/sw/source/filter/ascii/parasc.cxx +++ b/sw/source/filter/ascii/parasc.cxx @@ -48,9 +48,7 @@ #include <pagedesc.hxx> #include <breakit.hxx> #include <swerror.h> -#ifndef _STATSTR_HRC #include <statstr.hrc> // ResId fuer Statusleiste -#endif #include <mdiexp.hxx> // ...Percent() #include <poolfmt.hxx> diff --git a/sw/source/filter/ascii/wrtasc.cxx b/sw/source/filter/ascii/wrtasc.cxx index 5d8b0a19a4d2..38a0aea58ea4 100644 --- a/sw/source/filter/ascii/wrtasc.cxx +++ b/sw/source/filter/ascii/wrtasc.cxx @@ -39,9 +39,7 @@ #include <frmfmt.hxx> #include <wrtasc.hxx> -#ifndef _STATSTR_HRC #include <statstr.hrc> // ResId fuer Statusleiste -#endif //----------------------------------------------------------------- diff --git a/sw/source/filter/basflt/docfact.cxx b/sw/source/filter/basflt/docfact.cxx index d63d0ab3fd24..ce192bd671d2 100644 --- a/sw/source/filter/basflt/docfact.cxx +++ b/sw/source/filter/basflt/docfact.cxx @@ -32,9 +32,7 @@ #include <doc.hxx> #include <node.hxx> -#ifndef _CMDID_H #include <cmdid.h> -#endif /****************************************************************************** diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index df9f43fafa41..dbf521a81579 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -32,9 +32,7 @@ #include "hintids.hxx" #include <vcl/svapp.hxx> -#ifndef _WRKWIN_HXX //autogen #include <vcl/wrkwin.hxx> -#endif #include <editeng/boxitem.hxx> #include <editeng/brshitem.hxx> #include <editeng/adjitem.hxx> diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx index 43b83557a149..f5c726a05213 100644 --- a/sw/source/filter/html/htmltabw.cxx +++ b/sw/source/filter/html/htmltabw.cxx @@ -34,9 +34,7 @@ #include <svtools/htmlout.hxx> #include <svtools/htmltokn.h> #include <svtools/htmlkywd.hxx> -#ifndef _WRKWIN_HXX //autogen #include <vcl/wrkwin.hxx> -#endif #include <editeng/ulspitem.hxx> #include <editeng/lrspitem.hxx> #include <editeng/brshitem.hxx> @@ -65,9 +63,7 @@ #include <wrthtml.hxx> #include <wrtswtbl.hxx> #ifdef DBG_UTIL -#ifndef _VIEWSH_HXX #include <viewsh.hxx> -#endif #include <viewopt.hxx> #endif diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx index f1dd5631eca4..fc7efdd8da1c 100644 --- a/sw/source/filter/html/svxcss1.cxx +++ b/sw/source/filter/html/svxcss1.cxx @@ -31,9 +31,7 @@ #include <stdlib.h> -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <i18npool/mslangid.hxx> #include <svtools/ctrltool.hxx> #include <svl/urihelper.hxx> diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 7c5092ed26ef..9ceb16ee0ce4 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -109,9 +109,7 @@ #include <sfx2/viewfrm.hxx> -#ifndef _STATSTR_HRC #include <statstr.hrc> // ResId fuer Statusleiste -#endif #include <swerror.h> #define FONTSIZE_MASK 7 diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index ab6dfd92554a..4236cd6354ca 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -80,17 +80,13 @@ #include <swtable.hxx> #include <fldbas.hxx> #include <fmtclds.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <wrthtml.hxx> #include <htmlnum.hxx> #include <htmlfly.hxx> #include <swmodule.hxx> -#ifndef _STATSTR_HRC #include <statstr.hrc> // ResId fuer Statusleiste -#endif #include <swerror.h> #define MAX_INDENT_LEVEL 20 diff --git a/sw/source/filter/rtf/rtffld.cxx b/sw/source/filter/rtf/rtffld.cxx index 90bb9e668261..4ab593898346 100644 --- a/sw/source/filter/rtf/rtffld.cxx +++ b/sw/source/filter/rtf/rtffld.cxx @@ -35,9 +35,7 @@ #ifndef _COM_SUN_STAR_I18N_SCRIPTTYPE_HDL_ #include <com/sun/star/i18n/ScriptType.hdl> #endif -#ifndef _GRAPH_HXX //autogen #include <vcl/graph.hxx> -#endif #include <svl/urihelper.hxx> #include <svtools/rtftoken.h> #include <svl/zforlist.hxx> @@ -60,9 +58,7 @@ #include <docufld.hxx> #include <flddat.hxx> #include <charfmt.hxx> -#ifndef _fmtruby_HXX #include <fmtruby.hxx> -#endif #include <breakit.hxx> #include <reffld.hxx> #include <SwStyleNameMapper.hxx> diff --git a/sw/source/filter/rtf/rtfnum.cxx b/sw/source/filter/rtf/rtfnum.cxx index ed8faf60229f..bff84b19b927 100644 --- a/sw/source/filter/rtf/rtfnum.cxx +++ b/sw/source/filter/rtf/rtfnum.cxx @@ -29,9 +29,7 @@ #include <charfmt.hxx> #include <charatr.hxx> #include <paratr.hxx> -#ifndef _CMDID_H #include <cmdid.h> -#endif #include <numrule.hxx> #define RTF_NUMRULE_NAME "RTF_Num" diff --git a/sw/source/filter/ww1/w1class.cxx b/sw/source/filter/ww1/w1class.cxx index 90f1b4dd80ef..ba861e5b52ff 100644 --- a/sw/source/filter/ww1/w1class.cxx +++ b/sw/source/filter/ww1/w1class.cxx @@ -32,9 +32,7 @@ #include <string.h> #include <tools/stream.hxx> -#ifndef _W1CLASS_HXX #include <w1class.hxx> -#endif #ifdef DUMP diff --git a/sw/source/filter/ww1/w1filter.cxx b/sw/source/filter/ww1/w1filter.cxx index 45e94726cddc..f0f9f25097bd 100644 --- a/sw/source/filter/ww1/w1filter.cxx +++ b/sw/source/filter/ww1/w1filter.cxx @@ -33,18 +33,14 @@ #include <comphelper/string.hxx> #include <editeng/paperinf.hxx> #include <svtools/filter.hxx> -#ifndef _GRAPH_HXX //autogen #include <vcl/graph.hxx> -#endif #include <editeng/fontitem.hxx> #include <editeng/lrspitem.hxx> #include <editeng/ulspitem.hxx> #include <editeng/wghtitem.hxx> #include <editeng/postitem.hxx> #include <editeng/crsditem.hxx> -#ifndef _SVX_CNTRITEM_HXX //autogen #include <editeng/cntritem.hxx> -#endif #include <editeng/cmapitem.hxx> #include <editeng/fhgtitem.hxx> #include <editeng/udlnitem.hxx> @@ -52,9 +48,7 @@ #include <editeng/colritem.hxx> #include <editeng/kernitem.hxx> #include <editeng/escpitem.hxx> -#ifndef _SVX_TSTPITEM_HXX //autogen #include <editeng/tstpitem.hxx> -#endif #include <svl/urihelper.hxx> #include <fmtfsize.hxx> #include <doc.hxx> @@ -73,9 +67,7 @@ #include <docsh.hxx> #include <swerror.h> #include <mdiexp.hxx> -#ifndef _STATSTR_HRC #include <statstr.hrc> -#endif #if OSL_DEBUG_LEVEL > 1 #include <stdio.h> #endif diff --git a/sw/source/filter/ww1/w1par.cxx b/sw/source/filter/ww1/w1par.cxx index 7c7d0f9ed8ff..1dccf141cde0 100644 --- a/sw/source/filter/ww1/w1par.cxx +++ b/sw/source/filter/ww1/w1par.cxx @@ -34,14 +34,10 @@ #include <ndtxt.hxx> // class SwTxtNode #include <fltini.hxx> // Ww1Reader #include <w1par.hxx> -#ifndef _SWFLTOPT_HXX #include <swfltopt.hxx> -#endif #include <mdiexp.hxx> // StatLine...() #include <swerror.h> // ERR_WW1_... -#ifndef _STATSTR_HRC #include <statstr.hrc> // ResId fuer Statusleiste -#endif //---------------------------------------- // Initialisieren der Feld-FilterFlags diff --git a/sw/source/filter/xml/xmlexpit.cxx b/sw/source/filter/xml/xmlexpit.cxx index 5a8f201f7cb0..9c8f55fb9a39 100644 --- a/sw/source/filter/xml/xmlexpit.cxx +++ b/sw/source/filter/xml/xmlexpit.cxx @@ -61,9 +61,7 @@ #include "fmtornt.hxx" #include "fmtfsize.hxx" -#ifndef _FMTLSPLT_HXX #include "fmtlsplt.hxx" -#endif #include "xmlithlp.hxx" #include "fmtrowsplt.hxx" diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx index afd47a8eab1c..bdf21b0c1dca 100644 --- a/sw/source/filter/xml/xmlimpit.cxx +++ b/sw/source/filter/xml/xmlimpit.cxx @@ -53,9 +53,7 @@ #include "fmtornt.hxx" #include "fmtfsize.hxx" -#ifndef _FMTLSPLT_HXX #include "fmtlsplt.hxx" -#endif #include <xmloff/prhdlfac.hxx> #include <xmloff/xmltypes.hxx> #include "xmlithlp.hxx" diff --git a/sw/source/filter/xml/xmlitemi.cxx b/sw/source/filter/xml/xmlitemi.cxx index fa674798eef3..0906c901fa52 100644 --- a/sw/source/filter/xml/xmlitemi.cxx +++ b/sw/source/filter/xml/xmlitemi.cxx @@ -38,9 +38,7 @@ #include "xmlitem.hxx" #include <xmloff/i18nmap.hxx> #include <xmloff/xmluconv.hxx> -#ifndef _XMLOFF_FAMILIES_HXX #include <xmloff/families.hxx> -#endif #include <svx/unomid.hxx> #include <editeng/boxitem.hxx> #include <editeng/fontitem.hxx> @@ -55,9 +53,7 @@ #include "xmlbrshi.hxx" #include <paratr.hxx> #include <doc.hxx> -#ifndef _UNOMID_H #include <unomid.h> -#endif #include "xmlimp.hxx" using ::rtl::OUString; diff --git a/sw/source/filter/xml/xmlitemm.cxx b/sw/source/filter/xml/xmlitemm.cxx index e830601fcd18..094dfd297197 100644 --- a/sw/source/filter/xml/xmlitemm.cxx +++ b/sw/source/filter/xml/xmlitemm.cxx @@ -36,9 +36,7 @@ #include "xmlitmap.hxx" #include <xmloff/xmltoken.hxx> -#ifndef _UNOMID_H #include <unomid.h> -#endif using namespace ::xmloff::token; diff --git a/sw/source/filter/xml/xmlithlp.cxx b/sw/source/filter/xml/xmlithlp.cxx index 84b320fa0ada..c04715088bd8 100644 --- a/sw/source/filter/xml/xmlithlp.cxx +++ b/sw/source/filter/xml/xmlithlp.cxx @@ -42,9 +42,7 @@ #include "fmtornt.hxx" #include "fmtfsize.hxx" -#ifndef _FMTLSPLT_HXX #include "fmtlsplt.hxx" -#endif #include <xmloff/xmluconv.hxx> using ::rtl::OUString; diff --git a/sw/source/filter/xml/xmlscript.cxx b/sw/source/filter/xml/xmlscript.cxx index 48ba4971f9f5..0a8db211d50c 100644 --- a/sw/source/filter/xml/xmlscript.cxx +++ b/sw/source/filter/xml/xmlscript.cxx @@ -33,9 +33,7 @@ #include <hintids.hxx> #include <xmloff/xmlnmspe.hxx> -#ifndef _XMLOFF_XMLMETAI_HXX #include <xmloff/xmlscripti.hxx> -#endif #include "xmlimp.hxx" #include "xmlexp.hxx" diff --git a/sw/source/ui/app/appenv.cxx b/sw/source/ui/app/appenv.cxx index 8753c20a4cfe..004b6853015f 100644 --- a/sw/source/ui/app/appenv.cxx +++ b/sw/source/ui/app/appenv.cxx @@ -75,15 +75,9 @@ #include <crsskip.hxx> #include <cmdid.h> -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif -#ifndef _APP_HRC #include <app.hrc> -#endif -#ifndef _POOLFMT_HRC #include <poolfmt.hrc> -#endif #include "swabstdlg.hxx" #include "envelp.hrc" #include "envimg.hxx" diff --git a/sw/source/ui/app/apphdl.cxx b/sw/source/ui/app/apphdl.cxx index 4c1860645b85..7b620efd3c48 100644 --- a/sw/source/ui/app/apphdl.cxx +++ b/sw/source/ui/app/apphdl.cxx @@ -71,9 +71,7 @@ #include <srcview.hxx> #include <wrtsh.hxx> #include <docsh.hxx> -#ifndef _CMDID_H #include <cmdid.h> // Funktion-Ids -#endif #include <initui.hxx> #include <uitool.hxx> #include <swmodule.hxx> @@ -87,9 +85,7 @@ #include <prtopt.hxx> #include <modcfg.hxx> #include <globals.h> // globale Konstanten z.B. -#ifndef _APP_HRC #include <app.hrc> -#endif #include <fontcfg.hxx> #include <barcfg.hxx> #include <uinums.hxx> diff --git a/sw/source/ui/app/applab.cxx b/sw/source/ui/app/applab.cxx index 41f055f86050..133d06a039db 100644 --- a/sw/source/ui/app/applab.cxx +++ b/sw/source/ui/app/applab.cxx @@ -78,12 +78,8 @@ #include <pagedesc.hxx> #include <poolfmt.hxx> -#ifndef _APP_HRC #include <app.hrc> -#endif -#ifndef _POOLFMT_HRC #include <poolfmt.hrc> -#endif #include "swabstdlg.hxx" #include "envelp.hrc" #include <misc.hrc> diff --git a/sw/source/ui/app/appopt.cxx b/sw/source/ui/app/appopt.cxx index 928f50e17378..d65da7d95b70 100644 --- a/sw/source/ui/app/appopt.cxx +++ b/sw/source/ui/app/appopt.cxx @@ -28,18 +28,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sw.hxx" #include <hintids.hxx> -#ifndef _CMDID_H #include <cmdid.h> // Funktion-Ids -#endif #include <com/sun/star/i18n/ScriptType.hpp> #define _SVSTDARR_STRINGSDTOR #include <svl/svstdarr.hxx> -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <svl/eitem.hxx> #include <sfx2/request.hxx> #include <sfx2/app.hxx> @@ -47,9 +43,7 @@ #include <svx/htmlmode.hxx> #include <sfx2/bindings.hxx> #include <editeng/brshitem.hxx> -#ifndef _SVX_TSTPITEM_HXX //autogen #include <editeng/tstpitem.hxx> -#endif #include <svx/optgrid.hxx> #include <svx/svxdlg.hxx> #include <svx/dialogs.hrc> @@ -59,37 +53,25 @@ #include <optcomp.hxx> #include <edtwin.hxx> #include <swmodule.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <wrtsh.hxx> -#ifndef IDOCUMENTDEVICEACCESS_HXX_INCLUDED #include <IDocumentDeviceAccess.hxx> -#endif #include <uitool.hxx> #include <initui.hxx> // fuer ::GetGlossaries() #include <fldbas.hxx> //fuer UpdateFields -#ifndef _WVIEW_HXX #include <wview.hxx> -#endif #include <cfgitems.hxx> #include <prtopt.hxx> -#ifndef _PVIEW_HXX #include <pview.hxx> -#endif #include <usrpref.hxx> -#ifndef _MODCFG_HXX #include <modcfg.hxx> -#endif #include <glosdoc.hxx> #include <uiitems.hxx> #include <editeng/langitem.hxx> #include <unotools/lingucfg.hxx> #include <editeng/unolingu.hxx> -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif #include <globals.h> // globale Konstanten z.B. #include <svl/slstitm.hxx> #include "swabstdlg.hxx" diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx index 809f382bc584..9f6ad690a5de 100644 --- a/sw/source/ui/app/docsh2.cxx +++ b/sw/source/ui/app/docsh2.cxx @@ -44,9 +44,7 @@ #include <svl/zformat.hxx> #include <unotools/pathoptions.hxx> #include <svtools/transfer.hxx> -#ifndef _SFXSIDS_HRC //autogen #include <sfx2/dialogs.hrc> -#endif #include <sfx2/dinfdlg.hxx> #include <sfx2/request.hxx> #include <sfx2/dispatch.hxx> @@ -57,9 +55,7 @@ #include <svtools/sfxecode.hxx> #include <sfx2/docfile.hxx> #include <sfx2/docfilt.hxx> -#ifndef _SVX_SVXIDS_HRC //autogen #include <svx/svxids.hrc> -#endif #include <svx/drawitem.hxx> #include <editeng/svxacorr.hxx> #include <editeng/langitem.hxx> @@ -103,15 +99,9 @@ #include <cmdid.h> #include <globals.h> #include <helpid.h> -#ifndef _APP_HRC #include <app.hrc> -#endif -#ifndef _POOLFMT_HRC #include <poolfmt.hrc> -#endif -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif #include <com/sun/star/ui/dialogs/XFilePicker.hpp> #include <com/sun/star/ui/dialogs/XFilterManager.hpp> #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp> diff --git a/sw/source/ui/app/docshdrw.cxx b/sw/source/ui/app/docshdrw.cxx index cd6d2aee296d..33e8a06ab51f 100644 --- a/sw/source/ui/app/docshdrw.cxx +++ b/sw/source/ui/app/docshdrw.cxx @@ -31,9 +31,7 @@ #include <hintids.hxx> -#ifndef _SVX_SVXIDS_HRC //autogen #include <svx/svxids.hrc> -#endif @@ -48,9 +46,7 @@ #include <svx/svdoutl.hxx> #include <svx/xtable.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <doc.hxx> using namespace ::com::sun::star; diff --git a/sw/source/ui/app/mainwn.cxx b/sw/source/ui/app/mainwn.cxx index e6085a4a8662..9b809ed46971 100644 --- a/sw/source/ui/app/mainwn.cxx +++ b/sw/source/ui/app/mainwn.cxx @@ -33,13 +33,9 @@ #include <mdiexp.hxx> #include <tools/shl.hxx> #include <tools/string.hxx> -#ifndef _SVARRAY_HXX #include <svl/svstdarr.hxx> -#endif #include <sfx2/progress.hxx> -#ifndef _RESID_HXX //autogen #include <tools/resid.hxx> -#endif #include <docsh.hxx> #include <swmodule.hxx> #include "swtypes.hxx" diff --git a/sw/source/ui/app/swdll.cxx b/sw/source/ui/app/swdll.cxx index 71409e4dedf3..4a4c4c303b10 100644 --- a/sw/source/ui/app/swdll.cxx +++ b/sw/source/ui/app/swdll.cxx @@ -32,13 +32,9 @@ #include <svx/svdobj.hxx> #include <rtl/logfile.hxx> -#ifndef _GLOBDOC_HRC #include "globdoc.hrc" -#endif -#ifndef _SWDLL_HXX #include <swdll.hxx> -#endif #include <wdocsh.hxx> #include <globdoc.hxx> #include <initui.hxx> @@ -50,9 +46,7 @@ #include <unotools/moduleoptions.hxx> -#ifndef _FM_FMOBJFAC_HXX #include <svx/fmobjfac.hxx> -#endif #include <svx/svdfield.hxx> #include <svx/objfac3d.hxx> diff --git a/sw/source/ui/app/swmodule.cxx b/sw/source/ui/app/swmodule.cxx index 08fde4324868..6f9e81c9d8f6 100644 --- a/sw/source/ui/app/swmodule.cxx +++ b/sw/source/ui/app/swmodule.cxx @@ -30,9 +30,7 @@ #include <hintids.hxx> -#ifndef _SWERROR_H #include <swerror.h> -#endif #include <vcl/wrkwin.hxx> #include <vcl/graph.hxx> #include <svx/galbrws.hxx> @@ -70,24 +68,18 @@ #include <com/sun/star/scanner/XScannerManager.hpp> #include <com/sun/star/container/XSet.hpp> #include <comphelper/processfactory.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <swmodule.hxx> #include <swevent.hxx> #include <swacorr.hxx> -#ifndef _CMDID_H #include <cmdid.h> -#endif #include <dobjfac.hxx> #include <init.hxx> #include <pview.hxx> #include <wview.hxx> #include <wdocsh.hxx> #include <globdoc.hxx> -#ifndef _SRCVIEW_HXX //autogen #include <srcview.hxx> -#endif #include <glshell.hxx> #include <tabsh.hxx> #include <listsh.hxx> @@ -100,21 +92,11 @@ #include <beziersh.hxx> #include <wtextsh.hxx> #include <wfrmsh.hxx> -#ifndef _DRFORMSH_HXX #include <drformsh.hxx> -#endif -#ifndef _WGRFSH_HXX #include <wgrfsh.hxx> -#endif -#ifndef _WOLESH_HXX #include <wolesh.hxx> -#endif -#ifndef _WLISTSH_HXX #include <wlistsh.hxx> -#endif -#ifndef _WTABSH_HXX #include <wtabsh.hxx> -#endif #include <navipi.hxx> #include <chartins.hxx> #include <inputwin.hxx> @@ -130,12 +112,8 @@ #include <workctrl.hxx> #include <tbxanchr.hxx> #include <fldwrap.hxx> -#ifndef _REDLNDLG_HXX #include <redlndlg.hxx> -#endif -#ifndef _SYNCBTN_HXX #include <syncbtn.hxx> -#endif #include <mailmergechildwindow.hxx> #include <modcfg.hxx> #include <fontcfg.hxx> @@ -145,18 +123,14 @@ #include <swatrset.hxx> #include <idxmrk.hxx> #include <dlelstnr.hxx> -#ifndef _BARCFG_HXX #include <barcfg.hxx> -#endif #include <svx/rubydialog.hxx> #include <svtools/colorcfg.hxx> #include <editeng/acorrcfg.hxx> #include <unotools/moduleoptions.hxx> -#ifndef _AVMEDIA_MEDIAPPLAYER_HXX #include <avmedia/mediaplayer.hxx> -#endif #include <avmedia/mediatoolbox.hxx> #include <annotsh.hxx> diff --git a/sw/source/ui/cctrl/popbox.cxx b/sw/source/ui/cctrl/popbox.cxx index 9b99a41b3e64..bf2ea40ca264 100644 --- a/sw/source/ui/cctrl/popbox.cxx +++ b/sw/source/ui/cctrl/popbox.cxx @@ -30,9 +30,7 @@ -#ifndef _CMDID_H #include <cmdid.h> -#endif #include <swtypes.hxx> #include <popbox.hxx> #include <navipi.hxx> diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx index cc1f208950dc..fbd8032de708 100644 --- a/sw/source/ui/chrdlg/break.cxx +++ b/sw/source/ui/chrdlg/break.cxx @@ -35,33 +35,21 @@ #include <sfx2/request.hxx> #include <svl/stritem.hxx> -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif -#ifndef _CMDID_H #include <cmdid.h> -#endif #include <uitool.hxx> #include <swtypes.hxx> #include <wrtsh.hxx> -#ifndef _BASESH_HXX #include <basesh.hxx> -#endif -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <viewopt.hxx> #include <break.hxx> #include <pagedesc.hxx> #include <poolfmt.hxx> -#ifndef _BREAK_HRC #include <break.hrc> -#endif -#ifndef _CHRDLG_HRC #include <chrdlg.hrc> -#endif #include <SwStyleNameMapper.hxx> void SwBreakDlg::Apply() diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx index 38b1ba906fdd..1159c8a08fb8 100644 --- a/sw/source/ui/chrdlg/chardlg.cxx +++ b/sw/source/ui/chrdlg/chardlg.cxx @@ -35,48 +35,30 @@ #include <hintids.hxx> -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <svl/urihelper.hxx> #include <svl/stritem.hxx> #include <editeng/flstitem.hxx> #include <svx/htmlmode.hxx> #include <svl/cjkoptions.hxx> -#ifndef _CMDID_H #include <cmdid.h> -#endif -#ifndef _HELPID_H #include <helpid.h> -#endif #include <swtypes.hxx> #include <errhdl.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <wrtsh.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <uitool.hxx> #include <fmtinfmt.hxx> #include <macassgn.hxx> -#ifndef _CHRDLG_HXX #include <chrdlg.hxx> // der Dialog -#endif #include <swmodule.hxx> #include <poolfmt.hxx> -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif -#ifndef _CHRDLG_HRC #include <chrdlg.hrc> -#endif -#ifndef _CHARDLG_HRC #include <chardlg.hrc> -#endif #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <com/sun/star/ui/dialogs/XFilePicker.hpp> #include <SwStyleNameMapper.hxx> diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index 8caf959195dd..af8a9f108011 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -45,9 +45,7 @@ #include "globals.hrc" -#ifndef _METRIC_HXX //autogen #include <vcl/metric.hxx> -#endif #include <svl/stritem.hxx> #include <editeng/fontitem.hxx> #include <svx/htmlmode.hxx> diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx index f80130f475e9..355e3950be04 100644 --- a/sw/source/ui/chrdlg/numpara.cxx +++ b/sw/source/ui/chrdlg/numpara.cxx @@ -41,9 +41,7 @@ #include "helpid.h" #include <sfx2/objsh.hxx> #include <svx/htmlmode.hxx> -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <svl/eitem.hxx> #include <svl/stritem.hxx> #include <svl/intitem.hxx> diff --git a/sw/source/ui/chrdlg/tblnumfm.cxx b/sw/source/ui/chrdlg/tblnumfm.cxx index 263cb9703ef5..06310f4fdbe1 100644 --- a/sw/source/ui/chrdlg/tblnumfm.cxx +++ b/sw/source/ui/chrdlg/tblnumfm.cxx @@ -35,16 +35,12 @@ -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <svx/numinf.hxx> #include <swtypes.hxx> #include <tblnumfm.hxx> -#ifndef _CHRDLG_HRC #include <chrdlg.hrc> -#endif #include <svx/svxdlg.hxx> #include <svx/dialogs.hrc> diff --git a/sw/source/ui/config/cfgitems.cxx b/sw/source/ui/config/cfgitems.cxx index 3a462ce452b2..b62276120287 100644 --- a/sw/source/ui/config/cfgitems.cxx +++ b/sw/source/ui/config/cfgitems.cxx @@ -29,13 +29,9 @@ #include "precompiled_sw.hxx" -#ifndef __SBX_SBXVARIABLE_HXX //autogen #include <basic/sbxvar.hxx> -#endif -#ifndef _SVX_SVXIDS_HRC //autogen #include <svx/svxids.hrc> -#endif #include <editeng/svxenum.hxx> diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx index 5fa03de5e0a5..c98808408368 100644 --- a/sw/source/ui/config/mailconfigpage.cxx +++ b/sw/source/ui/config/mailconfigpage.cxx @@ -40,9 +40,7 @@ #include <svtools/headbar.hxx> #include <mmconfigitem.hxx> #include <mailmergehelper.hxx> -#ifndef _CMDID_H #include <cmdid.h> -#endif #include <vcl/svapp.hxx> #include <comphelper/processfactory.hxx> #include "com/sun/star/mail/MailServiceType.hpp" diff --git a/sw/source/ui/config/modcfg.cxx b/sw/source/ui/config/modcfg.cxx index ec0e47393eb2..50ece99d1a4b 100644 --- a/sw/source/ui/config/modcfg.cxx +++ b/sw/source/ui/config/modcfg.cxx @@ -34,18 +34,14 @@ #include <tools/stream.hxx> #include <vcl/svapp.hxx> #include <svl/mailenum.hxx> -#ifndef _SVX_SVXIDS_HRC //autogen #include <svx/svxids.hrc> -#endif #include <editeng/svxenum.hxx> #include <tools/debug.hxx> #include <tools/globname.hxx> #include <swtypes.hxx> #include <itabenum.hxx> -#ifndef _MODCFG_HXX #include <modcfg.hxx> -#endif #include <fldupde.hxx> #include <unotools/syslocaleoptions.hxx> #include <caption.hxx> diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx index 49c073103501..863fd6816526 100644 --- a/sw/source/ui/config/optcomp.cxx +++ b/sw/source/ui/config/optcomp.cxx @@ -43,9 +43,7 @@ #include "optcomp.hrc" #include "globals.hrc" #include <tools/urlobj.hxx> -#ifndef _UTL__HXX_ #include <unotools/configmgr.hxx> -#endif #include <vcl/msgbox.hxx> #include <sfx2/docfile.hxx> #include <sfx2/docfilt.hxx> diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index 383252a52568..9f5da6a92e2f 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -34,13 +34,9 @@ #include <tools/shl.hxx> #include <swtypes.hxx> -#ifndef _HELPID_H #include <helpid.h> -#endif #include <uiitems.hxx> -#ifndef _MODCFG_HXX #include <modcfg.hxx> -#endif #include "swmodule.hxx" #include "usrpref.hxx" #include "wrtsh.hxx" @@ -65,9 +61,7 @@ #include <sot/clsids.hxx> #include <unotools/configmgr.hxx> #include <docsh.hxx> -#ifndef _CONFIG_HRC #include <config.hrc> -#endif #include <SwStyleNameMapper.hxx> #include <numrule.hxx> #include <SwNodeNum.hxx> @@ -77,9 +71,7 @@ using namespace ::com::sun::star; -#ifndef _SFXENUMITEM_HXX //autogen #include <svl/eitem.hxx> -#endif /* -----------------22.10.98 15:12------------------- * diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index bd99cbd29345..d4117912a347 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -33,9 +33,7 @@ #include <hintids.hxx> -#ifndef _CMDID_H #include <cmdid.h> -#endif #include <vcl/svapp.hxx> #ifndef _SVSTDARR_HXX #define _SVSTDARR_STRINGSDTOR @@ -55,15 +53,9 @@ #include <fmtcol.hxx> #include <charatr.hxx> #include <swtypes.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif -#ifndef IDOCUMENTDEVICEACCESS_HXX_INCLUDED #include <IDocumentDeviceAccess.hxx> -#endif #include <swmodule.hxx> #include <wrtsh.hxx> #include <uitool.hxx> @@ -73,26 +65,14 @@ #include <initui.hxx> #include <optpage.hxx> #include <swprtopt.hxx> -#ifndef _MODCFG_HXX #include <modcfg.hxx> -#endif -#ifndef _SRCVIEW_HXX #include <srcview.hxx> -#endif #include <crstate.hxx> #include <viewopt.hxx> -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif -#ifndef _CONFIG_HRC #include <config.hrc> -#endif -#ifndef _REDLOPT_HRC #include <redlopt.hrc> -#endif -#ifndef _OPTDLG_HRC #include <optdlg.hrc> -#endif #include <svx/strarray.hxx> #include <svl/slstitm.hxx> #include <sfx2/request.hxx> diff --git a/sw/source/ui/config/viewopt.cxx b/sw/source/ui/config/viewopt.cxx index 13cec2b93bb5..5c0b9385ce78 100644 --- a/sw/source/ui/config/viewopt.cxx +++ b/sw/source/ui/config/viewopt.cxx @@ -32,25 +32,17 @@ #include <svx/htmlmode.hxx> #include <svtools/htmlcfg.hxx> -#ifndef _SVX_SVXIDS_HRC //autogen #include <svx/svxids.hrc> -#endif #include <editeng/svxenum.hxx> #include <editeng/svxacorr.hxx> #include <unotools/localedatawrapper.hxx> -#ifndef _REGION_HXX //autogen #include <vcl/region.hxx> -#endif -#ifndef _OUTDEV_HXX //autogen #include <vcl/outdev.hxx> -#endif #include <vcl/window.hxx> #include <swmodule.hxx> #include <swtypes.hxx> #include <viewopt.hxx> -#ifndef _WDOCSH_HXX #include <wdocsh.hxx> -#endif #include <swrect.hxx> #include <crstate.hxx> #include <svtools/colorcfg.hxx> diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx index dc007fc68e13..bfd7f4ca9b90 100644 --- a/sw/source/ui/dbui/addresslistdialog.cxx +++ b/sw/source/ui/dbui/addresslistdialog.cxx @@ -37,9 +37,7 @@ #include <mailmergewizard.hxx> #include <mmconfigitem.hxx> #include <mmaddressblockpage.hxx> -#ifndef _DBMGR_HXX #include <dbmgr.hxx> -#endif #include <dbconfig.hxx> #include <unotools/tempfile.hxx> #include <vcl/msgbox.hxx> @@ -55,9 +53,7 @@ #include <com/sun/star/sdb/CommandType.hpp> #include <com/sun/star/sdb/XDocumentDataSource.hpp> #include <com/sun/star/sdbc/XRowSet.hpp> -#ifndef _COM_SUN_STAR_SDB_XSINGLESELECTQUERYCOMPOSERFACTORY_HPP_ #include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp> -#endif #include <com/sun/star/sdbcx/XTablesSupplier.hpp> #include <com/sun/star/sdb/XQueriesSupplier.hpp> #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx index 6c13fee26b9c..c4a6a37f148c 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.cxx +++ b/sw/source/ui/dbui/createaddresslistdialog.cxx @@ -36,9 +36,7 @@ #include <mmconfigitem.hxx> #include <vcl/scrbar.hxx> #include <vcl/msgbox.hxx> -#ifndef _SVT_CONTROLDIMS_HRC_ #include <svtools/controldims.hrc> -#endif #include <unotools/pathoptions.hxx> #include <sfx2/filedlghelper.hxx> #include <sfx2/docfilt.hxx> diff --git a/sw/source/ui/dbui/dbtablepreviewdialog.cxx b/sw/source/ui/dbui/dbtablepreviewdialog.cxx index 463e64279e08..bec584234fc5 100644 --- a/sw/source/ui/dbui/dbtablepreviewdialog.cxx +++ b/sw/source/ui/dbui/dbtablepreviewdialog.cxx @@ -39,9 +39,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/frame/XFrame.hpp> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <dbui.hrc> #include <dbtablepreviewdialog.hrc> diff --git a/sw/source/ui/dbui/dbtree.cxx b/sw/source/ui/dbui/dbtree.cxx index 1e0a1faf1cbc..2e4e2cb50370 100644 --- a/sw/source/ui/dbui/dbtree.cxx +++ b/sw/source/ui/dbui/dbtree.cxx @@ -48,24 +48,16 @@ #include <cppuhelper/implbase1.hxx> #include <svx/dbaexchange.hxx> -#ifndef _DBMGR_HXX #include <dbmgr.hxx> -#endif #include <swmodule.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <wrtsh.hxx> #include <dbtree.hxx> #include <vos/mutex.hxx> #include <vcl/svapp.hxx> -#ifndef _HELPID_H #include <helpid.h> -#endif -#ifndef _UTLUI_HRC #include <utlui.hrc> -#endif #include <unomid.h> diff --git a/sw/source/ui/dbui/mailmergehelper.cxx b/sw/source/ui/dbui/mailmergehelper.cxx index 7cc5d4070891..0214054b7c4e 100644 --- a/sw/source/ui/dbui/mailmergehelper.cxx +++ b/sw/source/ui/dbui/mailmergehelper.cxx @@ -31,9 +31,7 @@ #include <mailmergehelper.hxx> #include <svtools/stdctrl.hxx> #include <mmconfigitem.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <sfx2/filedlghelper.hxx> #include <sfx2/docfile.hxx> #include <sfx2/app.hxx> @@ -47,9 +45,7 @@ #include "com/sun/star/mail/XSmtpService.hpp" #include <comphelper/processfactory.hxx> #include <vcl/msgbox.hxx> -#ifndef _PASSWD_HXX #include <sfx2/passwd.hxx> -#endif #include <dbui.hrc> diff --git a/sw/source/ui/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx index 365c56b4c0ea..5176779ba3b8 100644 --- a/sw/source/ui/dbui/mailmergewizard.cxx +++ b/sw/source/ui/dbui/mailmergewizard.cxx @@ -43,13 +43,9 @@ #include <mmlayoutpage.hxx> #include <mmconfigitem.hxx> #include <swabstdlg.hxx> -#ifndef _DBUI_HRC #include <dbui.hrc> -#endif #include <view.hxx> -#ifndef _DBMGR_HXX #include <dbmgr.hxx> -#endif #include <sfx2/viewfrm.hxx> #include <wrtsh.hxx> #include <sfx2/viewfrm.hxx> diff --git a/sw/source/ui/dbui/mmconfigitem.cxx b/sw/source/ui/dbui/mmconfigitem.cxx index be1ad7d3a43d..3c4fc31bb157 100644 --- a/sw/source/ui/dbui/mmconfigitem.cxx +++ b/sw/source/ui/dbui/mmconfigitem.cxx @@ -47,12 +47,8 @@ #include <unotools/configitem.hxx> #include <mailmergehelper.hxx> #include <swunohelper.hxx> -#ifndef _DBMGR_HXX #include <dbmgr.hxx> -#endif -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <wrtsh.hxx> #include <dbui.hrc> #include <vector> diff --git a/sw/source/ui/dbui/mmdocselectpage.cxx b/sw/source/ui/dbui/mmdocselectpage.cxx index e125b4f8ed2e..ec21bc830097 100644 --- a/sw/source/ui/dbui/mmdocselectpage.cxx +++ b/sw/source/ui/dbui/mmdocselectpage.cxx @@ -40,9 +40,7 @@ #include <sfx2/docfac.hxx> #include <vcl/msgbox.hxx> #include <view.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <mmdocselectpage.hxx> #include <mailmergewizard.hxx> #include <shellio.hxx> diff --git a/sw/source/ui/dbui/mmmergepage.cxx b/sw/source/ui/dbui/mmmergepage.cxx index bb58496effd3..6f5c73edde0e 100644 --- a/sw/source/ui/dbui/mmmergepage.cxx +++ b/sw/source/ui/dbui/mmmergepage.cxx @@ -34,9 +34,7 @@ #include <mailmergewizard.hxx> #include <mmconfigitem.hxx> #include <swtypes.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <dbui.hrc> #include <mmmergepage.hrc> #include <svl/srchitem.hxx> diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx index 0fe1a3717ca1..ee3650bfa3a6 100644 --- a/sw/source/ui/dbui/mmoutputpage.cxx +++ b/sw/source/ui/dbui/mmoutputpage.cxx @@ -37,16 +37,10 @@ #include <mailconfigpage.hxx> #include <cmdid.h> #include <swtypes.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <wrtsh.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif -#ifndef IDOCUMENTDEVICEACCESS_HXX_INCLUDED #include <IDocumentDeviceAccess.hxx> -#endif #include <hintids.hxx> #include <editeng/scripttypeitem.hxx> #include <editeng/langitem.hxx> @@ -66,9 +60,7 @@ //#endif #include <tools/urlobj.hxx> #include <svl/urihelper.hxx> -#ifndef _VCL_PRINT_HXX #include <vcl/print.hxx> -#endif #include <unotools/tempfile.hxx> #include <osl/file.hxx> #include <mmgreetingspage.hxx> @@ -81,9 +73,7 @@ //#ifndef _BASEDLGS_HXX //#include <sfx2/basedlgs.hxx> //#endif -#ifndef _DBMGR_HXX #include <dbmgr.hxx> -#endif #include <swunohelper.hxx> #include <vos/mutex.hxx> #include <shellio.hxx> diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx index 8d229b94c06c..3ce7f86ab835 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.cxx +++ b/sw/source/ui/dbui/mmoutputtypepage.cxx @@ -37,9 +37,7 @@ #include <mailmergewizard.hxx> #include <mmconfigitem.hxx> #include <vcl/msgbox.hxx> -#ifndef _DBUI_HRC #include <dbui.hrc> -#endif #include <swtypes.hxx> #include <mmoutputtypepage.hrc> #include <dbui.hrc> diff --git a/sw/source/ui/dbui/mmpreparemergepage.cxx b/sw/source/ui/dbui/mmpreparemergepage.cxx index 8539f037ecdc..5f08b7832525 100644 --- a/sw/source/ui/dbui/mmpreparemergepage.cxx +++ b/sw/source/ui/dbui/mmpreparemergepage.cxx @@ -34,16 +34,10 @@ #include <mmpreparemergepage.hxx> #include <mailmergewizard.hxx> #include <mmconfigitem.hxx> -#ifndef _DBUI_HRC #include <dbui.hrc> -#endif #include <swtypes.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif -#ifndef _DBMGR_HXX #include <dbmgr.hxx> -#endif #include <wrtsh.hxx> #include <svx/dataaccessdescriptor.hxx> #include <com/sun/star/sdbc/XConnection.hpp> diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx index 355e68bd5c58..dbfb24b29d97 100644 --- a/sw/source/ui/dialog/ascfldlg.cxx +++ b/sw/source/ui/dialog/ascfldlg.cxx @@ -51,12 +51,8 @@ #include <doc.hxx> #include <errhdl.hxx> -#ifndef _DIALOG_HRC #include <dialog.hrc> -#endif -#ifndef _ASCFLDLG_HRC #include <ascfldlg.hrc> -#endif using namespace ::com::sun::star; diff --git a/sw/source/ui/dialog/docstdlg.cxx b/sw/source/ui/dialog/docstdlg.cxx index 40f0fddf98f8..16d0f97aa192 100644 --- a/sw/source/ui/dialog/docstdlg.cxx +++ b/sw/source/ui/dialog/docstdlg.cxx @@ -36,32 +36,20 @@ #include <ctype.h> #include <swwait.hxx> #include <wrtsh.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <swmodule.hxx> -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif -#ifndef _PVIEW_HXX #include <pview.hxx> -#endif #include <doc.hxx> #include <docstdlg.hxx> -#ifndef _MODCFG_HXX #include <modcfg.hxx> -#endif // fuer Statistikfelder #include <fldmgr.hxx> #include <fldbas.hxx> -#ifndef _DOCSTDLG_HRC #include <docstdlg.hrc> -#endif /*-------------------------------------------------------------------- diff --git a/sw/source/ui/dialog/macassgn.cxx b/sw/source/ui/dialog/macassgn.cxx index 2d2b7c357720..9a72298f8620 100644 --- a/sw/source/ui/dialog/macassgn.cxx +++ b/sw/source/ui/dialog/macassgn.cxx @@ -38,9 +38,7 @@ #define _SVSTDARR_STRINGSDTOR #include <svl/svstdarr.hxx> #include <svx/htmlmode.hxx> -#ifndef _SVX_SVXIDS_HRC //autogen #include <svx/svxids.hrc> -#endif #include <sfx2/app.hxx> #include <vcl/msgbox.hxx> diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx index 8447489e5b03..c389901460a9 100644 --- a/sw/source/ui/dialog/swdlgfact.cxx +++ b/sw/source/ui/dialog/swdlgfact.cxx @@ -34,9 +34,7 @@ #include "swdlgfact.hxx" #include <svl/style.hxx> -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include "dialog.hrc" #include "misc.hrc" #include "chrdlg.hrc" diff --git a/sw/source/ui/dochdl/gloshdl.cxx b/sw/source/ui/dochdl/gloshdl.cxx index cc789d6e4498..87c6e2e976ff 100644 --- a/sw/source/ui/dochdl/gloshdl.cxx +++ b/sw/source/ui/dochdl/gloshdl.cxx @@ -35,12 +35,8 @@ #ifndef __RSC //autogen #include <tools/errinf.hxx> #endif -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <svl/macitem.hxx> #include <sfx2/fcontnr.hxx> #include <sfx2/docfile.hxx> @@ -63,21 +59,13 @@ #include <initui.hxx> // fuer ::GetGlossaries() #include <gloslst.hxx> #include <swdtflvr.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <crsskip.hxx> -#ifndef _DOCHDL_HRC #include <dochdl.hrc> -#endif -#ifndef _SWERROR_H #include <swerror.h> -#endif #include <frmmgr.hxx> -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif #include <editeng/acorrcfg.hxx> #include "swabstdlg.hxx" diff --git a/sw/source/ui/docvw/edtdd.cxx b/sw/source/ui/docvw/edtdd.cxx index 8e11e5117c27..b63fa067c356 100644 --- a/sw/source/ui/docvw/edtdd.cxx +++ b/sw/source/ui/docvw/edtdd.cxx @@ -47,15 +47,11 @@ #include <frmfmt.hxx> #include <wrtsh.hxx> #include <edtwin.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <viewopt.hxx> #include <swdtflvr.hxx> #include <swmodule.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <wdocsh.hxx> #include <swundo.hxx> diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx index 7b5741316cbb..29e93b55690e 100644 --- a/sw/source/ui/docvw/edtwin.cxx +++ b/sw/source/ui/docvw/edtwin.cxx @@ -120,9 +120,7 @@ #include <helpid.h> #include <cmdid.h> -#ifndef _DOCVW_HRC #include <docvw.hrc> -#endif #include <uitool.hxx> // OD 18.09.2003 #i18732# #include <fmtfollowtextflow.hxx> diff --git a/sw/source/ui/docvw/srcedtw.cxx b/sw/source/ui/docvw/srcedtw.cxx index 55a0cb47e296..9578718caf2d 100644 --- a/sw/source/ui/docvw/srcedtw.cxx +++ b/sw/source/ui/docvw/srcedtw.cxx @@ -30,18 +30,12 @@ #include <hintids.hxx> -#ifndef _CMDID_H #include <cmdid.h> -#endif #include <svtools/textview.hxx> -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif -#ifndef _SCRBAR_HXX //autogen #include <vcl/scrbar.hxx> -#endif #include <sfx2/dispatch.hxx> #include <sfx2/app.hxx> #include <svtools/htmltokn.h> @@ -53,15 +47,9 @@ #include <svtools/ctrltool.hxx> #include <tools/time.hxx> #include <swmodule.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif -#ifndef _SRCVIEW_HXX #include <srcview.hxx> -#endif -#ifndef _HELPID_H #include <helpid.h> -#endif struct SwTextPortion diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx index cfb5ad8f4afd..4d71f8d4a0e9 100644 --- a/sw/source/ui/envelp/envfmt.cxx +++ b/sw/source/ui/envelp/envfmt.cxx @@ -43,44 +43,28 @@ #define _SVSTDARR_LONGS #include <svl/svstdarr.hxx> #include <editeng/paperinf.hxx> -#ifndef _SVX_TSTPITEM_HXX //autogen #include <editeng/tstpitem.hxx> -#endif #include <editeng/lrspitem.hxx> #include <editeng/brshitem.hxx> -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif -#ifndef _MENU_HXX //autogen #include <vcl/menu.hxx> -#endif -#ifndef _CMDID_H #include <cmdid.h> -#endif #include <frmatr.hxx> #include <swtypes.hxx> #include <wrtsh.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif -#ifndef _BASESH_HXX #include <basesh.hxx> -#endif #include <drpcps.hxx> #include <envfmt.hxx> #include <fmtcol.hxx> -#ifndef _PARDLG_HXX #include "swuipardlg.hxx" -#endif #include <pattern.hxx> #include <poolfmt.hxx> #include <uiborder.hxx> #include <uitool.hxx> -#ifndef _ENVFMT_HRC #include <envfmt.hrc> -#endif #include "swabstdlg.hxx" #include "chrdlg.hrc" diff --git a/sw/source/ui/envelp/envimg.cxx b/sw/source/ui/envelp/envimg.cxx index df98930952f2..1f0833870a2b 100644 --- a/sw/source/ui/envelp/envimg.cxx +++ b/sw/source/ui/envelp/envimg.cxx @@ -42,12 +42,8 @@ #include <swtypes.hxx> #include <envimg.hxx> -#ifndef _CMDID_H #include <cmdid.h> -#endif -#ifndef _ENVELP_HRC #include <envelp.hrc> -#endif #include <unomid.h> diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index 162a6a5cea4f..282b1a6160f8 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -42,22 +42,12 @@ #include <labfmt.hxx> #include <labprt.hxx> #include <unotools.hxx> -#ifndef _DBMGR_HXX #include <dbmgr.hxx> -#endif #include "uitool.hxx" -#ifndef _CMDID_H #include <cmdid.h> -#endif -#ifndef _HELPID_H #include <helpid.h> -#endif -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif -#ifndef _LABEL_HRC #include <label.hrc> -#endif //impl in envimg.cxx extern SW_DLLPUBLIC String MakeSender(); diff --git a/sw/source/ui/envelp/labimg.cxx b/sw/source/ui/envelp/labimg.cxx index 0be179372ca5..76b9bb195de9 100644 --- a/sw/source/ui/envelp/labimg.cxx +++ b/sw/source/ui/envelp/labimg.cxx @@ -30,9 +30,7 @@ #include <tools/stream.hxx> -#ifndef _RESID_HXX //autogen #include <tools/resid.hxx> -#endif #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <unotools/useroptions.hxx> diff --git a/sw/source/ui/envelp/labprt.cxx b/sw/source/ui/envelp/labprt.cxx index 633e40a5d146..f4293fd22650 100644 --- a/sw/source/ui/envelp/labprt.cxx +++ b/sw/source/ui/envelp/labprt.cxx @@ -40,16 +40,10 @@ #include <label.hxx> #include <labprt.hxx> #include <labimg.hxx> -#ifndef _LABIMP_HXX #include "swuilabimp.hxx" -#endif -#ifndef _CMDID_H #include <cmdid.h> -#endif -#ifndef _LABPRT_HRC #include <labprt.hrc> -#endif // -------------------------------------------------------------------------- diff --git a/sw/source/ui/fldui/DropDownFieldDialog.cxx b/sw/source/ui/fldui/DropDownFieldDialog.cxx index 68ce692f6a32..df50e5e318da 100644 --- a/sw/source/ui/fldui/DropDownFieldDialog.cxx +++ b/sw/source/ui/fldui/DropDownFieldDialog.cxx @@ -36,17 +36,11 @@ #include <wrtsh.hxx> #include <fldbas.hxx> #include <fldmgr.hxx> -#ifndef _MSGBOX_HXX #include <vcl/msgbox.hxx> -#endif #include <DropDownFieldDialog.hxx> #include <flddropdown.hxx> -#ifndef _FLDUI_HRC #include <fldui.hrc> -#endif -#ifndef _SW_DROPDOWNFIELDDIALOG_HRC #include <DropDownFieldDialog.hrc> -#endif using namespace ::com::sun::star; diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx index 7d607b803536..4c807f381fe2 100644 --- a/sw/source/ui/fldui/changedb.cxx +++ b/sw/source/ui/fldui/changedb.cxx @@ -37,22 +37,16 @@ #define _CHANGEDB_CXX #include <svtools/stdctrl.hxx> -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/sdb/XDatabaseAccess.hpp> #include <comphelper/processfactory.hxx> #include <sfx2/viewfrm.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <wrtsh.hxx> -#ifndef _DBMGR_HXX #include <dbmgr.hxx> -#endif #include <fldmgr.hxx> #include <expfld.hxx> #include <txtatr.hxx> @@ -61,15 +55,9 @@ #include <dbfld.hxx> #include <changedb.hxx> -#ifndef _FLDUI_HRC #include <fldui.hrc> -#endif -#ifndef _UTLUI_HRC #include <utlui.hrc> -#endif -#ifndef _CHANGEDB_HRC #include <changedb.hrc> -#endif #include <unomid.h> diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx index 3c67cdb6afe7..09d382a2f18d 100644 --- a/sw/source/ui/fldui/flddb.cxx +++ b/sw/source/ui/fldui/flddb.cxx @@ -33,32 +33,18 @@ #include <swmodule.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <wrtsh.hxx> -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif #include <dbfld.hxx> -#ifndef _FLDTDLG_HXX #include <fldtdlg.hxx> -#endif #include <numrule.hxx> -#ifndef _FLDTDLG_HRC #include <fldtdlg.hrc> -#endif -#ifndef _FLDUI_HRC #include <fldui.hrc> -#endif -#ifndef _FLDDB_HXX #include <flddb.hxx> -#endif #include <dbconfig.hxx> -#ifndef _DBMGR_HXX #include <dbmgr.hxx> -#endif #define USER_DATA_VERSION_1 "1" #define USER_DATA_VERSION USER_DATA_VERSION_1 diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx index 07ab852e199e..a93248ca1995 100644 --- a/sw/source/ui/fldui/flddinf.cxx +++ b/sw/source/ui/fldui/flddinf.cxx @@ -47,16 +47,10 @@ #include <fldui.hrc> -#ifndef _FLDTDLG_HRC #include <fldtdlg.hrc> -#endif -#ifndef _FLDDINF_HXX #include <flddinf.hxx> -#endif #include <swmodule.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/util/Time.hpp> #include <com/sun/star/util/DateTime.hpp> diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx index 12d71b6f4577..ed00b5c520b7 100644 --- a/sw/source/ui/fldui/flddok.cxx +++ b/sw/source/ui/fldui/flddok.cxx @@ -35,23 +35,13 @@ #include <vcl/svapp.hxx> #include <flddat.hxx> #include <docufld.hxx> -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif #include <chpfld.hxx> -#ifndef _FLDTDLG_HRC #include <fldtdlg.hrc> -#endif -#ifndef _FLDUI_HRC #include <fldui.hrc> -#endif -#ifndef _FLDDOK_HXX #include <flddok.hxx> -#endif #include <swmodule.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <wrtsh.hxx> #include <svl/zformat.hxx> diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx index 2c354551f1f3..6c3f34f19cba 100644 --- a/sw/source/ui/fldui/fldedt.cxx +++ b/sw/source/ui/fldui/fldedt.cxx @@ -37,45 +37,23 @@ #include <sfx2/app.hxx> #include <svx/optgenrl.hxx> #include <docufld.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <dbfld.hxx> #include <wrtsh.hxx> -#ifndef _FLDDB_HXX #include <flddb.hxx> -#endif -#ifndef _FLDDINF_HXX #include <flddinf.hxx> -#endif -#ifndef _FLDVAR_HXX #include <fldvar.hxx> -#endif -#ifndef _FLDDOK_HXX #include <flddok.hxx> -#endif -#ifndef _FLDFUNC_HXX #include <fldfunc.hxx> -#endif -#ifndef _FLDREF_HXX #include <fldref.hxx> -#endif #include <fldedt.hxx> #include <crsskip.hxx> -#ifndef _CMDID_H #include <cmdid.h> -#endif -#ifndef _HELPID_H #include <helpid.h> -#endif -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif -#ifndef _FLDUI_HRC #include <fldui.hrc> -#endif #include "swabstdlg.hxx" #include "dialog.hrc" diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx index ae05a35681a7..7ceb9300c477 100644 --- a/sw/source/ui/fldui/fldfunc.cxx +++ b/sw/source/ui/fldui/fldfunc.cxx @@ -37,26 +37,16 @@ #include <basic/sbmod.hxx> #include <docsh.hxx> #include <swtypes.hxx> -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif #include <fldbas.hxx> #include <docufld.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <wrtsh.hxx> #include <swmodule.hxx> -#ifndef _FLDFUNC_HXX #include <fldfunc.hxx> -#endif #include <flddropdown.hxx> -#ifndef _FLDUI_HRC #include <fldui.hrc> -#endif -#ifndef _FLDTDLG_HRC #include <fldtdlg.hrc> -#endif #define USER_DATA_VERSION_1 "1" #define USER_DATA_VERSION USER_DATA_VERSION_1 diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index 1c7ff9e09564..c34ca7be53fe 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -39,21 +39,13 @@ #include <IMark.hxx> #include <expfld.hxx> #include <swmodule.hxx> -#ifndef _FLDREF_HXX #include <fldref.hxx> -#endif #include <reffld.hxx> #include <wrtsh.hxx> -#ifndef _FLDUI_HRC #include <fldui.hrc> -#endif -#ifndef _FLDTDLG_HRC #include <fldtdlg.hrc> -#endif -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif // --> OD 2007-11-14 #i83479# #include <SwNodeNum.hxx> #include <IDocumentMarkAccess.hxx> diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx index 308bc379d4f4..9888685c0128 100644 --- a/sw/source/ui/fldui/fldtdlg.cxx +++ b/sw/source/ui/fldui/fldtdlg.cxx @@ -34,9 +34,7 @@ -#ifndef _CMDID_H #include <cmdid.h> -#endif #include <swtypes.hxx> #include <unotools/confignode.hxx> #include <comphelper/processfactory.hxx> diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index 6aee7bba2cf3..ad67d6e3f947 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -38,27 +38,17 @@ #include <docufld.hxx> #include <expfld.hxx> #include <ddefld.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <wrtsh.hxx> #include <doc.hxx> #include <docary.hxx> #include <swmodule.hxx> -#ifndef _FLDVAR_HXX #include <fldvar.hxx> -#endif #include <calc.hxx> #include <svl/zformat.hxx> -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif -#ifndef _FLDUI_HRC #include <fldui.hrc> -#endif -#ifndef _FLDTDLG_HRC #include <fldtdlg.hrc> -#endif #define USER_DATA_VERSION_1 "1" #define USER_DATA_VERSION USER_DATA_VERSION_1 diff --git a/sw/source/ui/fldui/fldwrap.cxx b/sw/source/ui/fldui/fldwrap.cxx index 18f291d5b6e6..51379f7f301c 100644 --- a/sw/source/ui/fldui/fldwrap.cxx +++ b/sw/source/ui/fldui/fldwrap.cxx @@ -30,35 +30,23 @@ -#ifndef _CMDID_H #include <cmdid.h> -#endif #include <swtypes.hxx> #include <sfx2/basedlgs.hxx> #include <sfx2/dispatch.hxx> #include <vcl/msgbox.hxx> #include <svx/htmlmode.hxx> #include <viewopt.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <fldwrap.hxx> #include <wrtsh.hxx> #include <view.hxx> #include <swmodule.hxx> -#ifndef _HELPID_H #include <helpid.h> -#endif -#ifndef _FLDUI_HRC #include <fldui.hrc> -#endif -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif -#ifndef _FLDTDLG_HRC #include <fldtdlg.hrc> -#endif #include "swabstdlg.hxx" SFX_IMPL_CHILDWINDOW(SwFldDlgWrapper, FN_INSERT_FIELD) diff --git a/sw/source/ui/fldui/inpdlg.cxx b/sw/source/ui/fldui/inpdlg.cxx index 46c05c4ac63b..9eae92c50471 100644 --- a/sw/source/ui/fldui/inpdlg.cxx +++ b/sw/source/ui/fldui/inpdlg.cxx @@ -36,9 +36,7 @@ #define _INPDLG_CXX -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <unotools/charclass.hxx> #include <editeng/unolingu.hxx> #include <wrtsh.hxx> @@ -48,12 +46,8 @@ #include <inpdlg.hxx> #include <fldmgr.hxx> -#ifndef _FLDUI_HRC #include <fldui.hrc> -#endif -#ifndef _INPDLG_HRC #include <inpdlg.hrc> -#endif /*-------------------------------------------------------------------- diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx index 443bc075b7db..c54ec50a8051 100644 --- a/sw/source/ui/fldui/javaedit.cxx +++ b/sw/source/ui/fldui/javaedit.cxx @@ -39,14 +39,10 @@ #define _JAVAEDIT_CXX #include <hintids.hxx> -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <vcl/svapp.hxx> #include <svl/urihelper.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <sfx2/docfile.hxx> #include <sfx2/filedlghelper.hxx> #include <docsh.hxx> @@ -55,16 +51,10 @@ #include <fldmgr.hxx> #include <docufld.hxx> #include <uitool.hxx> -#ifndef _JAVAEDIT_HXX #include <javaedit.hxx> -#endif -#ifndef _FLDUI_HRC #include <fldui.hrc> -#endif -#ifndef _JAVAEDIT_HRC #include <javaedit.hrc> -#endif // static ---------------------------------------------------------------- diff --git a/sw/source/ui/fldui/xfldui.cxx b/sw/source/ui/fldui/xfldui.cxx index a86a78943711..43f2fdfcda55 100644 --- a/sw/source/ui/fldui/xfldui.cxx +++ b/sw/source/ui/fldui/xfldui.cxx @@ -40,13 +40,9 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <comphelper/processfactory.hxx> #include <fldmgr.hxx> -#ifndef _DBMGR_HXX #include <dbmgr.hxx> -#endif #include <wrtsh.hxx> // Actives Fenster -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <swmodule.hxx> diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx index c78f51f4796f..44f3202a9bde 100644 --- a/sw/source/ui/fmtui/tmpdlg.cxx +++ b/sw/source/ui/fmtui/tmpdlg.cxx @@ -52,18 +52,12 @@ #include <swmodule.hxx> #include <errhdl.hxx> // fuer Create-Methoden #include <wrtsh.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <wdocsh.hxx> #include <viewopt.hxx> #include <pgfnote.hxx> -#ifndef _PGFGRID_HXX #include <pggrid.hxx> -#endif -#ifndef _TMPDLG_HXX #include <tmpdlg.hxx> // der Dialog -#endif #include <column.hxx> // Spalten #include <drpcps.hxx> // Initialen #include <frmpage.hxx> // Rahmen @@ -78,18 +72,10 @@ #include <uitool.hxx> #include <shellres.hxx> -#ifndef _CMDID_H #include <cmdid.h> -#endif -#ifndef _HELPID_H #include <helpid.h> -#endif -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif -#ifndef _FMTUI_HRC #include <fmtui.hrc> -#endif #include <SwStyleNameMapper.hxx> #include <svx/svxids.hrc> #include <svl/stritem.hxx> diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx index cbae2ae52af1..eb187c07c40f 100644 --- a/sw/source/ui/frmdlg/cption.cxx +++ b/sw/source/ui/frmdlg/cption.cxx @@ -33,9 +33,7 @@ -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <wrtsh.hxx> #include <cption.hxx> #include <fldmgr.hxx> @@ -61,12 +59,8 @@ #include <com/sun/star/text/XTextFramesSupplier.hpp> #include <com/sun/star/text/XTextFrame.hpp> -#ifndef _FRMUI_HRC #include <frmui.hrc> -#endif -#ifndef _CPTION_HRC #include <cption.hrc> -#endif #include <SwStyleNameMapper.hxx> using namespace ::com::sun::star; diff --git a/sw/source/ui/frmdlg/frmdlg.cxx b/sw/source/ui/frmdlg/frmdlg.cxx index 740d31c5e88c..bdd3e883aff9 100644 --- a/sw/source/ui/frmdlg/frmdlg.cxx +++ b/sw/source/ui/frmdlg/frmdlg.cxx @@ -39,9 +39,7 @@ #include <svx/htmlmode.hxx> #include <fmtfsize.hxx> #include <wrtsh.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <docsh.hxx> #include <viewopt.hxx> #include <frmdlg.hxx> @@ -50,12 +48,8 @@ #include <column.hxx> #include <macassgn.hxx> -#ifndef _FRMUI_HRC #include <frmui.hrc> -#endif -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif #include <svx/svxids.hrc> #include <svx/flagsdef.hxx> #include <svx/svxdlg.hxx> diff --git a/sw/source/ui/index/cntex.cxx b/sw/source/ui/index/cntex.cxx index 40400f591753..099fb7c312f5 100644 --- a/sw/source/ui/index/cntex.cxx +++ b/sw/source/ui/index/cntex.cxx @@ -52,9 +52,7 @@ #include <com/sun/star/ui/dialogs/XFilePicker.hpp> #include <com/sun/star/ui/dialogs/XFilterManager.hpp> #include <wrtsh.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <cnttab.hxx> #include <poolfmt.hxx> #include <unoprnms.hxx> @@ -63,21 +61,11 @@ #include <docsh.hxx> #include <swmodule.hxx> -#ifndef _CMDID_H #include <cmdid.h> -#endif -#ifndef _UTLUI_HRC #include <utlui.hrc> -#endif -#ifndef _INDEX_HRC #include <index.hrc> -#endif -#ifndef _CNTTAB_HRC #include <cnttab.hrc> -#endif -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif #include <SwStyleNameMapper.hxx> #include <swuicnttab.hxx> #include <unomid.h> diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 6aa4e3c013bd..67ebed4d120f 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -57,20 +57,14 @@ #include <authfld.hxx> #include <swtypes.hxx> #include <wrtsh.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif -#ifndef _BASESH_HXX #include <basesh.hxx> -#endif #include <outline.hxx> #include <cnttab.hxx> #include <swuicnttab.hxx> #include <formedt.hxx> #include <poolfmt.hxx> -#ifndef _POOLFMT_HRC #include <poolfmt.hrc> -#endif #include <uitool.hxx> #include <fmtcol.hxx> #include <fldbas.hxx> @@ -81,34 +75,18 @@ #include <swmodule.hxx> #include <modcfg.hxx> -#ifndef _CMDID_H #include <cmdid.h> -#endif -#ifndef _HELPID_H #include <helpid.h> -#endif -#ifndef _UTLUI_HRC #include <utlui.hrc> -#endif -#ifndef _INDEX_HRC #include <index.hrc> -#endif -#ifndef _CNTTAB_HRC #include <cnttab.hrc> -#endif -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif #include <SwStyleNameMapper.hxx> #include <sfx2/filedlghelper.hxx> -#ifndef _TOXHLP_HXX #include <toxwrap.hxx> -#endif #include <chpfld.hxx> -#ifndef _UTLUI_HRC #include "utlui.hrc" -#endif #include <sfx2/app.hxx> diff --git a/sw/source/ui/index/idxmrk.cxx b/sw/source/ui/index/idxmrk.cxx index 24a3c7ddf91e..adf5ee1ae91d 100644 --- a/sw/source/ui/index/idxmrk.cxx +++ b/sw/source/ui/index/idxmrk.cxx @@ -30,9 +30,7 @@ #include <hintids.hxx> -#ifndef _HELPID_H #include <helpid.h> -#endif #define _SVSTDARR_STRINGSSORT #include <svl/svstdarr.hxx> #include <comphelper/processfactory.hxx> @@ -43,9 +41,7 @@ #include <com/sun/star/util/SearchFlags.hpp> #include <com/sun/star/i18n/TransliterationModules.hpp> #include <svl/stritem.hxx> -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <sfx2/dispatch.hxx> #include <svl/eitem.hxx> #include <svtools/txtcmp.hxx> @@ -56,20 +52,12 @@ #include <idxmrk.hxx> #include <txttxmrk.hxx> #include <wrtsh.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <multmrk.hxx> #include <swundo.hxx> // fuer Undo-Ids -#ifndef _CMDID_H #include <cmdid.h> -#endif -#ifndef _INDEX_HRC #include <index.hrc> -#endif -#ifndef _IDXMRK_HRC #include <idxmrk.hrc> -#endif #include <swmodule.hxx> #include <fldmgr.hxx> #include <fldbas.hxx> diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index 6083da00da06..2a9f4e2bf971 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -33,9 +33,7 @@ #include "swuiidxmrk.hxx" #include <hintids.hxx> -#ifndef _HELPID_H #include <helpid.h> -#endif #define _SVSTDARR_STRINGSSORT #include <svl/svstdarr.hxx> #include <comphelper/processfactory.hxx> @@ -46,9 +44,7 @@ #include <com/sun/star/util/SearchFlags.hpp> #include <com/sun/star/i18n/TransliterationModules.hpp> #include <svl/stritem.hxx> -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <sfx2/dispatch.hxx> #include <svl/eitem.hxx> #include <svtools/txtcmp.hxx> @@ -60,20 +56,12 @@ #include <idxmrk.hxx> #include <txttxmrk.hxx> #include <wrtsh.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <multmrk.hxx> #include <swundo.hxx> // fuer Undo-Ids -#ifndef _CMDID_H #include <cmdid.h> -#endif -#ifndef _INDEX_HRC #include <index.hrc> -#endif -#ifndef _IDXMRK_HRC #include <idxmrk.hrc> -#endif #include <swmodule.hxx> #include <fldmgr.hxx> #include <fldbas.hxx> diff --git a/sw/source/ui/index/toxmgr.cxx b/sw/source/ui/index/toxmgr.cxx index 8564000d26ac..14c28767b1f1 100644 --- a/sw/source/ui/index/toxmgr.cxx +++ b/sw/source/ui/index/toxmgr.cxx @@ -35,9 +35,7 @@ #include <crsskip.hxx> #include <doc.hxx> #include <swundo.hxx> -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif /*-------------------------------------------------------------------- Beschreibung: Handhabung der Verzeichnisse durch TOXMgr diff --git a/sw/source/ui/lingu/hhcwrp.cxx b/sw/source/ui/lingu/hhcwrp.cxx index da07c73f6c8e..c220877ffed0 100644 --- a/sw/source/ui/lingu/hhcwrp.cxx +++ b/sw/source/ui/lingu/hhcwrp.cxx @@ -33,20 +33,14 @@ #include <hintids.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <wrtsh.hxx> #include <swundo.hxx> // fuer Undo-Ids -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif #include <splargs.hxx> -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <editeng/unolingu.hxx> #include <editeng/langitem.hxx> #include <editeng/fontitem.hxx> @@ -69,9 +63,7 @@ #include <breakit.hxx> #include <docsh.hxx> -#ifndef _OLMENU_HRC #include <olmenu.hrc> -#endif #include <unomid.h> diff --git a/sw/source/ui/lingu/hyp.cxx b/sw/source/ui/lingu/hyp.cxx index 69c3db509fed..ef5709b034cd 100644 --- a/sw/source/ui/lingu/hyp.cxx +++ b/sw/source/ui/lingu/hyp.cxx @@ -36,9 +36,7 @@ #include "wrtsh.hxx" #include "globals.hrc" #include <vcl/msgbox.hxx> -#ifndef _WRKWIN_HXX //autogen #include <vcl/wrkwin.hxx> -#endif #include <linguistic/lngprops.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <swwait.hxx> diff --git a/sw/source/ui/lingu/sdrhhcwrap.cxx b/sw/source/ui/lingu/sdrhhcwrap.cxx index 32127f413e1a..db00d97166a1 100644 --- a/sw/source/ui/lingu/sdrhhcwrap.cxx +++ b/sw/source/ui/lingu/sdrhhcwrap.cxx @@ -44,13 +44,9 @@ #include <unotools/localedatawrapper.hxx> #include <sdrhhcwrap.hxx> #include <frmfmt.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> // " " " -#endif #include <wrtsh.hxx> // MakeVisible -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <dcontact.hxx> // Spelling von DrawObj #include <doc.hxx> // " " " #include <docary.hxx> diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx index 06a2e1ae69f4..ae7cfa6439c9 100644 --- a/sw/source/ui/misc/docfnote.cxx +++ b/sw/source/ui/misc/docfnote.cxx @@ -36,12 +36,8 @@ #include <svl/style.hxx> #include <errhdl.hxx> #include <wrtsh.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <docfnote.hxx> #include <impfnote.hxx> #include <ftninfo.hxx> @@ -53,18 +49,10 @@ #include <uitool.hxx> #include <poolfmt.hxx> #include <swstyle.h> -#ifndef _HELPID_H #include <helpid.h> -#endif -#ifndef _MISC_HRC #include <misc.hrc> -#endif -#ifndef _DOCFNOTE_HRC #include <docfnote.hrc> -#endif -#ifndef _FRMUI_HRC #include <frmui.hrc> -#endif #include <SwStyleNameMapper.hxx> SwFootNoteOptionDlg::SwFootNoteOptionDlg( Window *pParent, SwWrtShell &rS ) : diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx index 59a918fc4030..b94dc23e7e5a 100644 --- a/sw/source/ui/misc/glosbib.cxx +++ b/sw/source/ui/misc/glosbib.cxx @@ -36,9 +36,7 @@ #define _SVSTDARR_STRINGS #include <tools/urlobj.hxx> #include <tools/stream.hxx> -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <vcl/help.hxx> #include <unotools/transliterationwrapper.hxx> #include <unotools/tempfile.hxx> @@ -53,15 +51,9 @@ #include <glosdoc.hxx> #include <swunohelper.hxx> -#ifndef _GLOSBIB_HRC #include <glosbib.hrc> -#endif -#ifndef _MISC_HRC #include <misc.hrc> -#endif -#ifndef _HELPID_H #include <helpid.h> -#endif #define PATH_CASE_SENSITIVE 0x01 diff --git a/sw/source/ui/misc/glosdoc.cxx b/sw/source/ui/misc/glosdoc.cxx index 9ce1038eb898..a21ff5b2c1c3 100644 --- a/sw/source/ui/misc/glosdoc.cxx +++ b/sw/source/ui/misc/glosdoc.cxx @@ -42,9 +42,7 @@ #endif #include <tools/debug.hxx> #include <svl/urihelper.hxx> -#ifndef SVTOOLS_FSTATHELPER_HXX #include <svl/fstathelper.hxx> -#endif #include <unotools/pathoptions.hxx> #include <unotools/tempfile.hxx> #include <swtypes.hxx> @@ -56,9 +54,7 @@ #include <unoatxt.hxx> #include <swerror.h> -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index a2b6b85a7449..7b16e184839c 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -39,9 +39,7 @@ #include <vcl/menu.hxx> #include <vcl/msgbox.hxx> #include <vcl/help.hxx> -#ifndef _SVSTDARR_HXX #include <svl/svstdarr.hxx> -#endif #include <svl/stritem.hxx> #include <unotools/pathoptions.hxx> #include <unotools/lingucfg.hxx> @@ -79,15 +77,9 @@ #include <cmdid.h> #include <helpid.h> #include <swerror.h> -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif -#ifndef _MISC_HRC #include <misc.hrc> -#endif -#ifndef _GLOSSARY_HRC #include <glossary.hrc> -#endif #include <swmodule.hxx> #include <sfx2/filedlghelper.hxx> diff --git a/sw/source/ui/misc/glshell.cxx b/sw/source/ui/misc/glshell.cxx index 4d93f8d7542f..fcabe33964bd 100644 --- a/sw/source/ui/misc/glshell.cxx +++ b/sw/source/ui/misc/glshell.cxx @@ -52,15 +52,9 @@ #include <glosdoc.hxx> #include <shellio.hxx> #include <initui.hxx> // fuer ::GetGlossaries() -#ifndef _CMDID_H #include <cmdid.h> -#endif -#ifndef _SWERROR_H #include <swerror.h> -#endif -#ifndef _MISC_HRC #include <misc.hrc> -#endif #define SwWebGlosDocShell diff --git a/sw/source/ui/misc/insrule.cxx b/sw/source/ui/misc/insrule.cxx index c053030201ad..cbf4c0cfa167 100644 --- a/sw/source/ui/misc/insrule.cxx +++ b/sw/source/ui/misc/insrule.cxx @@ -36,9 +36,7 @@ #include "hintids.hxx" #include <svx/gallery.hxx> -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <editeng/brshitem.hxx> #include <svl/urihelper.hxx> #include <vcl/graph.hxx> diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index 43c92a72a3f7..fe6d4ee3ede4 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -37,9 +37,7 @@ #define _NUM_CXX #include <hintids.hxx> -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <tools/urlobj.hxx> #include <sfx2/app.hxx> #include <sfx2/imgmgr.hxx> @@ -50,16 +48,10 @@ #include <swvset.hxx> #include <swmodule.hxx> #include <wrtsh.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif -#ifndef _WVIEW_HXX #include <wview.hxx> -#endif #include <uitool.hxx> -#ifndef _WDOCSH_HXX #include <wdocsh.hxx> -#endif #include <uiitems.hxx> #include <docstyle.hxx> #include <charfmt.hxx> @@ -71,21 +63,11 @@ #include <viewopt.hxx> #include <frmmgr.hxx> -#ifndef _MISC_HRC #include <misc.hrc> -#endif -#ifndef _FRMUI_HRC #include <frmui.hrc> -#endif -#ifndef _NUM_HRC #include <num.hrc> -#endif -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif -#ifndef _HELPID_H #include <helpid.h> -#endif #include <SwStyleNameMapper.hxx> #include <svx/svxids.hrc> #include <svx/dialogs.hrc> diff --git a/sw/source/ui/misc/numberingtypelistbox.cxx b/sw/source/ui/misc/numberingtypelistbox.cxx index 964d04738755..90d51b3d7dc0 100644 --- a/sw/source/ui/misc/numberingtypelistbox.cxx +++ b/sw/source/ui/misc/numberingtypelistbox.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sw.hxx" #include <numberingtypelistbox.hxx> -#ifndef _MISC_HRC #include <misc.hrc> -#endif #include <cnttab.hxx> #include <com/sun/star/style/NumberingType.hpp> #include <com/sun/star/text/XDefaultNumberingProvider.hpp> diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index e733aa0389c2..f8e1ee2f0add 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -32,12 +32,8 @@ #endif #include <hintids.hxx> #include <tools/shl.hxx> -#ifndef _MENU_HXX //autogen #include <vcl/menu.hxx> -#endif -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <sfx2/tabdlg.hxx> #include <editeng/brshitem.hxx> #include <unotools/configmgr.hxx> @@ -47,12 +43,8 @@ #define USE_NUMTABPAGES #include <num.hxx> #endif -#ifndef _VIEW_HXX #include <view.hxx> -#endif -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <uitool.hxx> #include <errhdl.hxx> #include <wrtsh.hxx> @@ -67,18 +59,10 @@ #include <docstyle.hxx> #include <viewopt.hxx> #include <svtools/ctrlbox.hxx> -#ifndef _HELPID_H #include <helpid.h> -#endif -#ifndef _GLOBALS_HRC #include <globals.hrc> // fuer Vorlagenname 'keins' -#endif -#ifndef _MISC_HRC #include <misc.hrc> -#endif -#ifndef _OUTLINE_HRC #include <outline.hrc> -#endif #include <paratr.hxx> #include <unomid.h> diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx index 9d940b33d332..21d109fa1b81 100644 --- a/sw/source/ui/misc/pgfnote.cxx +++ b/sw/source/ui/misc/pgfnote.cxx @@ -34,14 +34,10 @@ -#ifndef _CMDID_H #include <cmdid.h> -#endif #include <hintids.hxx> #include <tools/ref.hxx> -#ifndef _SVX_DIALOGS_HRC #include <svx/dialogs.hrc> -#endif #include <vcl/field.hxx> #include <vcl/svapp.hxx> #include <unotools/localedatawrapper.hxx> @@ -55,15 +51,9 @@ #include <pgfnote.hxx> #include <uiitems.hxx> -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif -#ifndef _MISC_HRC #include <misc.hrc> -#endif -#ifndef _PGFNOTE_HRC #include <pgfnote.hrc> -#endif #define TWIP_TO_LBOX 5 /*-----------------------------------------------------#--------------- diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx index 366edfded07b..12b3c7e115dc 100644 --- a/sw/source/ui/misc/pggrid.cxx +++ b/sw/source/ui/misc/pggrid.cxx @@ -36,14 +36,10 @@ #include <sfx2/app.hxx> -#ifndef _CMDID_H #include <cmdid.h> -#endif #include <hintids.hxx> #include <swtypes.hxx> -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif #include <svx/xtable.hxx> #include <uitool.hxx> #include <editeng/sizeitem.hxx> diff --git a/sw/source/ui/misc/redlndlg.cxx b/sw/source/ui/misc/redlndlg.cxx index b87060bd19b0..fda197539688 100644 --- a/sw/source/ui/misc/redlndlg.cxx +++ b/sw/source/ui/misc/redlndlg.cxx @@ -37,9 +37,7 @@ #include <redline.hxx> #include <tools/datetime.hxx> #include <vcl/msgbox.hxx> -#ifndef _SVSTDARR_HXX #include <svl/svstdarr.hxx> -#endif #include <svl/eitem.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/dispatch.hxx> @@ -47,9 +45,7 @@ #include <svx/postattr.hxx> #include <swtypes.hxx> #include <wrtsh.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <swmodule.hxx> #ifndef _REDLNDLG_HXX #define _REDLNACCEPTDLG @@ -58,21 +54,11 @@ #include <swwait.hxx> #include <uitool.hxx> -#ifndef _HELPID_H #include <helpid.h> -#endif -#ifndef _CMDID_H #include <cmdid.h> -#endif -#ifndef _MISC_HRC #include <misc.hrc> -#endif -#ifndef _REDLNDLG_HRC #include <redlndlg.hrc> -#endif -#ifndef _SHELLS_HRC #include <shells.hrc> -#endif // -> #111827# #include <comcore.hrc> diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx index be7622319626..16d62e9d539d 100644 --- a/sw/source/ui/misc/srtdlg.cxx +++ b/sw/source/ui/misc/srtdlg.cxx @@ -33,9 +33,7 @@ #include "srtdlg.hxx" -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <svl/intitem.hxx> #include <svl/eitem.hxx> #include <sfx2/dispatch.hxx> diff --git a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx index 954d1a017a77..bab12b1e04da 100644 --- a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx +++ b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx @@ -41,9 +41,7 @@ #include <redline.hxx> #include <tools/datetime.hxx> #include <vcl/msgbox.hxx> -#ifndef _SVSTDARR_HXX #include <svl/svstdarr.hxx> -#endif #include <svl/eitem.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/dispatch.hxx> @@ -51,28 +49,16 @@ #include <svx/postattr.hxx> #include <swtypes.hxx> #include <wrtsh.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <swmodule.hxx> #include <swwait.hxx> #include <uitool.hxx> -#ifndef _HELPID_H #include <helpid.h> -#endif -#ifndef _CMDID_H #include <cmdid.h> -#endif -#ifndef _MISC_HRC #include <misc.hrc> -#endif -#ifndef _REDLNDLG_HRC #include <redlndlg.hrc> -#endif -#ifndef _SHELLS_HRC #include <shells.hrc> -#endif #include <vector> #ifndef _REDLNDLG_HXX diff --git a/sw/source/ui/ribbar/concustomshape.cxx b/sw/source/ui/ribbar/concustomshape.cxx index 66ba929fae47..8ba002641943 100644 --- a/sw/source/ui/ribbar/concustomshape.cxx +++ b/sw/source/ui/ribbar/concustomshape.cxx @@ -40,24 +40,16 @@ #include <svx/svdview.hxx> #include <svx/svdocapt.hxx> #include <editeng/outlobj.hxx> -#ifndef _CMDID_H #include <cmdid.h> -#endif -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <edtwin.hxx> #include <wrtsh.hxx> #include <viewopt.hxx> -#ifndef _DRAWBASE_HXX #include <drawbase.hxx> -#endif #include <concustomshape.hxx> #include <svx/gallery.hxx> #include <sfx2/request.hxx> -#ifndef _FM_FMMODEL_HXX #include <svx/fmmodel.hxx> -#endif #include <svl/itempool.hxx> #include <svx/svdpage.hxx> #include <svx/svdoashp.hxx> diff --git a/sw/source/ui/ribbar/tbxanchr.cxx b/sw/source/ui/ribbar/tbxanchr.cxx index 6c20f9dd818d..6fe568182df1 100644 --- a/sw/source/ui/ribbar/tbxanchr.cxx +++ b/sw/source/ui/ribbar/tbxanchr.cxx @@ -36,9 +36,7 @@ #include <svx/htmlmode.hxx> #include <svl/intitem.hxx> #include <sfx2/dispatch.hxx> -#ifndef _TOOLBOX_HXX //autogen #include <vcl/toolbox.hxx> -#endif #include <sfx2/mnumgr.hxx> diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx index c75cb3f0dfc4..2844083c9e19 100644 --- a/sw/source/ui/ribbar/workctrl.cxx +++ b/sw/source/ui/ribbar/workctrl.cxx @@ -35,31 +35,19 @@ #include <svx/htmlmode.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/bindings.hxx> -#ifndef _SFX_IMAGEMGR_HXX #include <sfx2/imagemgr.hxx> -#endif #include <swmodule.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <initui.hxx> #include <viewopt.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <gloshdl.hxx> #include <glosdoc.hxx> #include <gloslst.hxx> #include <workctrl.hxx> -#ifndef _WORKCTRL_HRC #include <workctrl.hrc> -#endif -#ifndef _CMDID_H #include <cmdid.h> -#endif -#ifndef _HELPID_H #include <helpid.h> -#endif #include <wrtsh.hxx> #include <svl/imageitm.hxx> #include <vcl/lstbox.hxx> diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx index 0500b4a88310..a39d3622d397 100644 --- a/sw/source/ui/shells/basesh.cxx +++ b/sw/source/ui/shells/basesh.cxx @@ -32,9 +32,7 @@ #include <svl/urihelper.hxx> #include <svl/languageoptions.hxx> -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <sfx2/linkmgr.hxx> #include <svx/htmlmode.hxx> #include <svx/imapdlg.hxx> @@ -97,15 +95,9 @@ #include <caption.hxx> #include <swwait.hxx> #include <cmdid.h> -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif -#ifndef _SHELLS_HRC #include <shells.hrc> -#endif -#ifndef _STATSTR_HRC #include <statstr.hrc> -#endif #include <globals.h> #include <unotxdoc.hxx> #include <crsskip.hxx> @@ -121,9 +113,7 @@ #include <svx/fmshell.hxx> // for FN_XFORMS_DESIGN_MODE #include <SwRewriter.hxx> #include <undobj.hxx> -#ifndef _COMCORE_HRC #include <comcore.hrc> -#endif #include <unomid.h> diff --git a/sw/source/ui/shells/drawdlg.cxx b/sw/source/ui/shells/drawdlg.cxx index 56b783a25711..5a7736786f30 100644 --- a/sw/source/ui/shells/drawdlg.cxx +++ b/sw/source/ui/shells/drawdlg.cxx @@ -32,12 +32,8 @@ -#ifndef _SVX_SVXIDS_HRC //autogen #include <svx/svxids.hrc> -#endif -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <sfx2/request.hxx> #include <sfx2/dispatch.hxx> #include <svx/svdview.hxx> diff --git a/sw/source/ui/shells/drwtxtsh.cxx b/sw/source/ui/shells/drwtxtsh.cxx index 3801d1b9adec..d6364e857a2b 100644 --- a/sw/source/ui/shells/drwtxtsh.cxx +++ b/sw/source/ui/shells/drwtxtsh.cxx @@ -67,19 +67,13 @@ #include <cmdid.h> #include <helpid.h> -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif -#ifndef _SHELLS_HRC #include <shells.hrc> -#endif #define SwDrawTextShell #include <sfx2/msg.hxx> #include <swslots.hxx> -#ifndef _POPUP_HRC #include <popup.hrc> -#endif #include <uitool.hxx> #include <wview.hxx> #include <swmodule.hxx> diff --git a/sw/source/ui/shells/grfsh.cxx b/sw/source/ui/shells/grfsh.cxx index 037758450081..c6448633d2da 100644 --- a/sw/source/ui/shells/grfsh.cxx +++ b/sw/source/ui/shells/grfsh.cxx @@ -31,9 +31,7 @@ -#ifndef _CMDID_H #include <cmdid.h> -#endif #include <hintids.hxx> #include <tools/urlobj.hxx> #include <vcl/msgbox.hxx> diff --git a/sw/source/ui/shells/grfshex.cxx b/sw/source/ui/shells/grfshex.cxx index fe2e7502a3df..8e035c447a8e 100644 --- a/sw/source/ui/shells/grfshex.cxx +++ b/sw/source/ui/shells/grfshex.cxx @@ -34,42 +34,28 @@ #include <wrtsh.hxx> #include <view.hxx> #include <docary.hxx> -#ifndef _TEXTSH_HXX #include <textsh.hxx> -#endif #include <viewopt.hxx> #include <swundo.hxx> -#ifndef _SHELLS_HRC #include <shells.hrc> -#endif #include <caption.hxx> #define _SVSTDARR_STRINGSSORTDTOR #include <svl/svstdarr.hxx> #include <svtools/filter.hxx> #include <svx/htmlmode.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <frmfmt.hxx> #include <frmmgr.hxx> #include <vcl/msgbox.hxx> -#ifndef _SVX_SVDOMEDIA_HXX #include <svx/svdomedia.hxx> -#endif -#ifndef _SVX_SVDVIEW_HXX #include <svx/svdview.hxx> -#endif -#ifndef _SVX_SVDPAGV_HXX #include <svx/svdpagv.hxx> -#endif #include <SwStyleNameMapper.hxx> #include <sfx2/filedlghelper.hxx> #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp> #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp> #include <com/sun/star/ui/dialogs/ListboxControlActions.hpp> -#ifndef _POOLFMT_HRC #include <poolfmt.hrc> -#endif #include <sfx2/request.hxx> #include <sfx2/viewfrm.hxx> diff --git a/sw/source/ui/shells/mediash.cxx b/sw/source/ui/shells/mediash.cxx index 36aa18f2d01c..df15ac31e31b 100644 --- a/sw/source/ui/shells/mediash.cxx +++ b/sw/source/ui/shells/mediash.cxx @@ -31,9 +31,7 @@ -#ifndef _CMDID_H #include <cmdid.h> -#endif #include <hintids.hxx> #include <tools/urlobj.hxx> #include <vcl/msgbox.hxx> @@ -71,12 +69,8 @@ #include <usrpref.hxx> #include <edtwin.hxx> #include <swwait.hxx> -#ifndef _SHELLS_HRC #include <shells.hrc> -#endif -#ifndef _POPUP_HRC #include <popup.hrc> -#endif #include <sfx2/objface.hxx> #include <svx/svdomedia.hxx> diff --git a/sw/source/ui/shells/olesh.cxx b/sw/source/ui/shells/olesh.cxx index a4eef5cdbf1d..8725e8959852 100644 --- a/sw/source/ui/shells/olesh.cxx +++ b/sw/source/ui/shells/olesh.cxx @@ -35,26 +35,14 @@ #include <sfx2/objitem.hxx> #include <wrtsh.hxx> #include <view.hxx> -#ifndef _HELPID_H #include <helpid.h> -#endif -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif #include <frmsh.hxx> -#ifndef _OLESH_HXX #include <olesh.hxx> -#endif -#ifndef _CMDID_H #include <cmdid.h> -#endif -#ifndef _POPUP_HRC #include <popup.hrc> -#endif -#ifndef _SHELLS_HRC #include <shells.hrc> -#endif #define SwOleShell diff --git a/sw/source/ui/shells/slotadd.cxx b/sw/source/ui/shells/slotadd.cxx index 9d162f57aa6f..2bd58952d126 100644 --- a/sw/source/ui/shells/slotadd.cxx +++ b/sw/source/ui/shells/slotadd.cxx @@ -52,9 +52,7 @@ #include <editeng/wrlmitem.hxx> #include <editeng/protitem.hxx> #include <editeng/opaqitem.hxx> -#ifndef _SVX_TSTPITEM_HXX //autogen #include <editeng/tstpitem.hxx> -#endif #include <editeng/akrnitem.hxx> #include <editeng/keepitem.hxx> #include <editeng/kernitem.hxx> @@ -82,9 +80,7 @@ #include <editeng/udlnitem.hxx> #include <editeng/postitem.hxx> #include <editeng/fhgtitem.hxx> -#ifndef _SVX_CNTRITEM_HXX //autogen #include <editeng/cntritem.hxx> -#endif #include <editeng/colritem.hxx> #include <editeng/boxitem.hxx> #include <editeng/sizeitem.hxx> diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx index ac194898e3e1..8a8e58cfd27f 100644 --- a/sw/source/ui/shells/tabsh.cxx +++ b/sw/source/ui/shells/tabsh.cxx @@ -96,19 +96,11 @@ */ //!!! -#ifndef _POPUP_HRC #include <popup.hrc> -#endif -#ifndef _SHELLS_HRC #include <shells.hrc> -#endif -#ifndef _TABLE_HRC #include <table.hrc> -#endif #include <cmdid.h> -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif #include <helpid.h> #include <unobaseclass.hxx> diff --git a/sw/source/ui/shells/textdrw.cxx b/sw/source/ui/shells/textdrw.cxx index e4d1bc817940..856d5de607ce 100644 --- a/sw/source/ui/shells/textdrw.cxx +++ b/sw/source/ui/shells/textdrw.cxx @@ -42,9 +42,7 @@ #include <swundo.hxx> #include <basesh.hxx> -#ifndef _POOLFMT_HRC #include <poolfmt.hrc> -#endif #include <docsh.hxx> #include <sfx2/docfile.hxx> diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx index 0de14dc3dacb..7ba86b31fa31 100644 --- a/sw/source/ui/shells/textsh.cxx +++ b/sw/source/ui/shells/textsh.cxx @@ -79,9 +79,7 @@ #include <doc.hxx> #include <uitool.hxx> #include <cmdid.h> -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif #include <frmmgr.hxx> #include <textsh.hxx> #include <frmfmt.hxx> @@ -100,12 +98,8 @@ #include <modcfg.hxx> #include <column.hxx> #include <edtwin.hxx> -#ifndef _SHELLS_HRC #include <shells.hrc> -#endif -#ifndef _POPUP_HRC #include <popup.hrc> -#endif #include <swerror.h> #include <SwAppletImpl.hxx> #include <unochart.hxx> @@ -121,9 +115,7 @@ #include <swslots.hxx> #include <SwRewriter.hxx> #include <undobj.hxx> -#ifndef _COMCORE_HRC #include <comcore.hrc> -#endif using namespace ::com::sun::star; using ::rtl::OUString; diff --git a/sw/source/ui/shells/textsh2.cxx b/sw/source/ui/shells/textsh2.cxx index 2d267e926fc8..1070f8618980 100644 --- a/sw/source/ui/shells/textsh2.cxx +++ b/sw/source/ui/shells/textsh2.cxx @@ -40,9 +40,7 @@ #include <sfx2/event.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <svl/stritem.hxx> #include <svl/itemset.hxx> #include <sfx2/request.hxx> diff --git a/sw/source/ui/shells/txtattr.cxx b/sw/source/ui/shells/txtattr.cxx index 9e89620bed28..1a3fe8a8684e 100644 --- a/sw/source/ui/shells/txtattr.cxx +++ b/sw/source/ui/shells/txtattr.cxx @@ -31,9 +31,7 @@ #include <hintids.hxx> -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <svl/whiter.hxx> #include <svl/stritem.hxx> #include <svl/itemiter.hxx> @@ -52,29 +50,19 @@ #include "paratr.hxx" #include <fmtinfmt.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <wrtsh.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <viewopt.hxx> #include <uitool.hxx> -#ifndef _TEXTSH_HXX #include <textsh.hxx> -#endif #include <num.hxx> #include <swundo.hxx> #include <fmtcol.hxx> -#ifndef _CMDID_H #include <cmdid.h> -#endif #include <globals.h> -#ifndef _SHELLS_HRC #include <shells.hrc> -#endif #include <SwStyleNameMapper.hxx> #include "swabstdlg.hxx" #include "chrdlg.hrc" diff --git a/sw/source/ui/shells/txtcrsr.cxx b/sw/source/ui/shells/txtcrsr.cxx index 69f82ebf902d..74ab1c1f658c 100644 --- a/sw/source/ui/shells/txtcrsr.cxx +++ b/sw/source/ui/shells/txtcrsr.cxx @@ -31,32 +31,22 @@ #include <sfx2/request.hxx> #include <svl/eitem.hxx> -#ifndef __SBX_SBXVARIABLE_HXX //autogen #include <basic/sbxvar.hxx> -#endif #include <sfx2/viewfrm.hxx> #include <sfx2/bindings.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <wrtsh.hxx> -#ifndef _TEXTSH_HXX #include <textsh.hxx> -#endif #include <num.hxx> #include <edtwin.hxx> #include <crsskip.hxx> #include <doc.hxx> #include <docsh.hxx> -#ifndef _CMDID_H #include <cmdid.h> -#endif #include <globals.h> -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif #include <svx/svdouno.hxx> #include <svx/fmshell.hxx> diff --git a/sw/source/ui/shells/txtnum.cxx b/sw/source/ui/shells/txtnum.cxx index 0e89b96a8d6a..b932bf062517 100644 --- a/sw/source/ui/shells/txtnum.cxx +++ b/sw/source/ui/shells/txtnum.cxx @@ -30,9 +30,7 @@ #include <hintids.hxx> -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <sfx2/request.hxx> #include <svl/eitem.hxx> #include <svl/stritem.hxx> diff --git a/sw/source/ui/smartmenu/stmenu.cxx b/sw/source/ui/smartmenu/stmenu.cxx index 4c7b473dfc50..6c4ee8f10904 100644 --- a/sw/source/ui/smartmenu/stmenu.cxx +++ b/sw/source/ui/smartmenu/stmenu.cxx @@ -36,12 +36,8 @@ #include <SwSmartTagMgr.hxx> -#ifndef _STMENU_HRC #include <stmenu.hrc> -#endif -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <breakit.hxx> #define C2U(cChar) rtl::OUString::createFromAscii(cChar) diff --git a/sw/source/ui/table/chartins.cxx b/sw/source/ui/table/chartins.cxx index a11f04d55656..a6431d22d25b 100644 --- a/sw/source/ui/table/chartins.cxx +++ b/sw/source/ui/table/chartins.cxx @@ -53,9 +53,7 @@ #include <edtwin.hxx> #include <cmdid.h> -#ifndef _CHARTINS_HRC #include <chartins.hrc> -#endif #include <anchoredobject.hxx> #include <sot/clsids.hxx> diff --git a/sw/source/ui/table/colwd.cxx b/sw/source/ui/table/colwd.cxx index dc28f6331566..eb65bdc94179 100644 --- a/sw/source/ui/table/colwd.cxx +++ b/sw/source/ui/table/colwd.cxx @@ -38,27 +38,15 @@ #include <colwd.hxx> #include <tablemgr.hxx> #include <wrtsh.hxx> -#ifndef _WDOCSH_HXX #include <wdocsh.hxx> -#endif -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <swmodule.hxx> -#ifndef _MODCFG_HXX #include <modcfg.hxx> -#endif #include <usrpref.hxx> -#ifndef _CMDID_H #include <cmdid.h> -#endif -#ifndef _COLWD_HRC #include <colwd.hrc> -#endif -#ifndef _TABLE_HRC #include <table.hrc> -#endif IMPL_LINK_INLINE_START( SwTableWidthDlg, LoseFocusHdl, Edit *, EMPTYARG ) diff --git a/sw/source/ui/table/mergetbl.cxx b/sw/source/ui/table/mergetbl.cxx index 486bb0af87b7..389acc028afa 100644 --- a/sw/source/ui/table/mergetbl.cxx +++ b/sw/source/ui/table/mergetbl.cxx @@ -35,12 +35,8 @@ #include <swtypes.hxx> #include <mergetbl.hxx> -#ifndef _MERGETBL_HRC #include <mergetbl.hrc> -#endif -#ifndef _TABLE_HRC #include <table.hrc> -#endif SwMergeTblDlg::SwMergeTblDlg( Window *pParent, BOOL& rWithPrev ) diff --git a/sw/source/ui/table/rowht.cxx b/sw/source/ui/table/rowht.cxx index 1fb108276bc1..d2f9a8f011c4 100644 --- a/sw/source/ui/table/rowht.cxx +++ b/sw/source/ui/table/rowht.cxx @@ -44,24 +44,14 @@ #include <rowht.hxx> #include <wrtsh.hxx> #include <frmatr.hxx> -#ifndef _WDOCSH_HXX #include <wdocsh.hxx> -#endif -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <swmodule.hxx> #include <usrpref.hxx> -#ifndef _CMDID_H #include <cmdid.h> -#endif -#ifndef _ROWHT_HRC #include <rowht.hrc> -#endif -#ifndef _TABLE_HRC #include <table.hrc> -#endif diff --git a/sw/source/ui/table/swtablerep.cxx b/sw/source/ui/table/swtablerep.cxx index ab7df943e201..5db1ab422123 100644 --- a/sw/source/ui/table/swtablerep.cxx +++ b/sw/source/ui/table/swtablerep.cxx @@ -49,34 +49,22 @@ #include <fmtrowsplt.hxx> #include <svx/htmlmode.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <wrtsh.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <viewopt.hxx> #include <uitool.hxx> #include <frmatr.hxx> -#ifndef _TABLEPG_HXX #include <tablepg.hxx> -#endif #include <tablemgr.hxx> #include <pagedesc.hxx> #include <poolfmt.hxx> #include <SwStyleNameMapper.hxx> -#ifndef _CMDID_H #include <cmdid.h> -#endif -#ifndef _TABLEDLG_HRC #include <tabledlg.hrc> -#endif -#ifndef _TABLE_HRC #include <table.hrc> -#endif #include "swtablerep.hxx" #ifdef DEBUG_TBLDLG diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index d8e1eed0f3fc..bf7d34caef5f 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -53,35 +53,23 @@ #include <fmtrowsplt.hxx> #include <svx/htmlmode.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <wrtsh.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <viewopt.hxx> #include <uitool.hxx> #include <frmatr.hxx> #include <tabledlg.hxx> -#ifndef _TABLEPG_HXX #include <tablepg.hxx> -#endif #include <tablemgr.hxx> #include <pagedesc.hxx> #include <uiitems.hxx> #include <poolfmt.hxx> #include <SwStyleNameMapper.hxx> -#ifndef _CMDID_H #include <cmdid.h> -#endif -#ifndef _TABLEDLG_HRC #include <tabledlg.hrc> -#endif -#ifndef _TABLE_HRC #include <table.hrc> -#endif #include <svx/svxids.hrc> #include <svx/dialogs.hrc> #include <svx/flagsdef.hxx> diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx index d097d5afeba5..bc8082b5a480 100644 --- a/sw/source/ui/table/tautofmt.cxx +++ b/sw/source/ui/table/tautofmt.cxx @@ -35,12 +35,8 @@ -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <vcl/svapp.hxx> #include <svl/zforlist.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> @@ -51,18 +47,12 @@ #include <svx/framelinkarray.hxx> #include "swmodule.hxx" #include "swtypes.hxx" -#ifndef _VIEW_HXX #include "view.hxx" -#endif #include "wrtsh.hxx" #include "tblafmt.hxx" -#ifndef _TAUTOFMT_HXX #include "tautofmt.hxx" -#endif #include "shellres.hxx" -#ifndef _TAUTOFMT_HRC #include "tautofmt.hrc" -#endif using namespace com::sun::star; diff --git a/sw/source/ui/uiview/formatclipboard.cxx b/sw/source/ui/uiview/formatclipboard.cxx index 3c77dc41d4d6..1eeb610dc283 100644 --- a/sw/source/ui/uiview/formatclipboard.cxx +++ b/sw/source/ui/uiview/formatclipboard.cxx @@ -32,12 +32,8 @@ #include <hintids.hxx> -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif -#ifndef _CMDID_H #include <cmdid.h> -#endif #include <format.hxx> #include <charfmt.hxx> #include <fmtcol.hxx> diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx index d499add5ad53..4eb65b4ced47 100644 --- a/sw/source/ui/uiview/pview.cxx +++ b/sw/source/ui/uiview/pview.cxx @@ -54,9 +54,7 @@ #include <svx/svdview.hxx> #include <svx/dlgutil.hxx> #include <svx/zoomslideritem.hxx> -#ifndef _SVX_SVXIDS_HRC //autogen #include <svx/svxids.hrc> -#endif #include <swwait.hxx> @@ -79,21 +77,11 @@ #include <viewfunc.hxx> -#ifndef _HELPID_H #include <helpid.h> -#endif -#ifndef _CMDID_H #include <cmdid.h> -#endif -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif -#ifndef _POPUP_HRC #include <popup.hrc> -#endif -#ifndef _PVIEW_HRC #include <pview.hrc> -#endif #define SwPagePreView #include <sfx2/msg.hxx> diff --git a/sw/source/ui/uiview/swcli.cxx b/sw/source/ui/uiview/swcli.cxx index 6da603c893b3..81acf6e25351 100644 --- a/sw/source/ui/uiview/swcli.cxx +++ b/sw/source/ui/uiview/swcli.cxx @@ -32,9 +32,7 @@ #include <wrtsh.hxx> #include <swtypes.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <edtwin.hxx> #include <swcli.hxx> diff --git a/sw/source/ui/uiview/view1.cxx b/sw/source/ui/uiview/view1.cxx index 208a9c27ebdc..fadfd6edb72e 100644 --- a/sw/source/ui/uiview/view1.cxx +++ b/sw/source/ui/uiview/view1.cxx @@ -33,29 +33,19 @@ #include <svx/svdview.hxx> #include <svx/ruler.hxx> #include <idxmrk.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <wrtsh.hxx> #include <swmodule.hxx> #include <viewopt.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif -#ifndef _GLOBDOC_HXX #include <globdoc.hxx> -#endif #include <navipi.hxx> #include <fldwrap.hxx> -#ifndef _REDLNDLG_HXX #include <redlndlg.hxx> -#endif #include <dpage.hxx> #include <edtwin.hxx> #include "formatclipboard.hxx" -#ifndef _CMDID_H #include <cmdid.h> -#endif // header for class SfxRequest #include <sfx2/request.hxx> diff --git a/sw/source/ui/uiview/viewmdi.cxx b/sw/source/ui/uiview/viewmdi.cxx index 3dba8745485a..6f95e271b10c 100644 --- a/sw/source/ui/uiview/viewmdi.cxx +++ b/sw/source/ui/uiview/viewmdi.cxx @@ -40,18 +40,12 @@ #include <svl/srchitem.hxx> #include <sfx2/request.hxx> #include <swmodule.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <wrtsh.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <viewopt.hxx> #include <frmatr.hxx> -#ifndef _WDOCSH_HXX #include <wdocsh.hxx> -#endif #include <uitool.hxx> #include <edtwin.hxx> #include <pagedesc.hxx> @@ -60,25 +54,13 @@ #include <workctrl.hxx> #include <usrpref.hxx> #include <scroll.hxx> -#ifndef _WVIEW_HXX #include <wview.hxx> -#endif -#ifndef _CMDID_H #include <cmdid.h> -#endif -#ifndef _VIEW_HRC #include <view.hrc> -#endif -#ifndef _RIBBAR_HRC #include <ribbar.hrc> -#endif -#ifndef _HELPID_H #include <helpid.h> -#endif -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif #include <IDocumentSettingAccess.hxx> #include <PostItMgr.hxx> diff --git a/sw/source/ui/uiview/viewport.cxx b/sw/source/ui/uiview/viewport.cxx index e0cf6526c2ee..2b7d2f1e52b8 100644 --- a/sw/source/ui/uiview/viewport.cxx +++ b/sw/source/ui/uiview/viewport.cxx @@ -35,24 +35,16 @@ #include <editeng/paperinf.hxx> #include <editeng/lrspitem.hxx> #include <sfx2/bindings.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <wrtsh.hxx> #include <swmodule.hxx> #include <viewopt.hxx> #include <frmatr.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif -#ifndef _CMDID_H #include <cmdid.h> -#endif #include <edtwin.hxx> #include <scroll.hxx> -#ifndef _WVIEW_HXX #include <wview.hxx> -#endif #include <usrpref.hxx> #include <pagedesc.hxx> #include <workctrl.hxx> diff --git a/sw/source/ui/uiview/viewprt.cxx b/sw/source/ui/uiview/viewprt.cxx index 8c90f809ffe7..1b8717fe25ca 100644 --- a/sw/source/ui/uiview/viewprt.cxx +++ b/sw/source/ui/uiview/viewprt.cxx @@ -34,9 +34,7 @@ #include <cstdarg> #endif -#ifndef _CMDID_H #include <cmdid.h> -#endif #ifndef _SVSTDARR_HXX #define _SVSTDARR_STRINGSDTOR diff --git a/sw/source/ui/uiview/viewsrch.cxx b/sw/source/ui/uiview/viewsrch.cxx index 57c7bd20623c..ccb0ad29e781 100644 --- a/sw/source/ui/uiview/viewsrch.cxx +++ b/sw/source/ui/uiview/viewsrch.cxx @@ -38,9 +38,7 @@ #include <svl/whiter.hxx> #include <sfx2/dispatch.hxx> #include <svl/stritem.hxx> -#ifndef _T2XTCMP_HXX //autogen #include <svtools/txtcmp.hxx> -#endif #include <svl/itempool.hxx> #include <svl/eitem.hxx> #include <svl/srchitem.hxx> @@ -52,27 +50,17 @@ #include <swmodule.hxx> #include <swwait.hxx> #include <workctrl.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <wrtsh.hxx> #include <swundo.hxx> // fuer Undo-Ids #include <uitool.hxx> -#ifndef _CMDID_H #include <cmdid.h> -#endif -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif -#ifndef _VIEW_HRC #include <view.hrc> -#endif #include <SwRewriter.hxx> #include <undobj.hxx> -#ifndef _COMCORE_HRC #include <comcore.hrc> -#endif #include "PostItMgr.hxx" diff --git a/sw/source/ui/uiview/viewstat.cxx b/sw/source/ui/uiview/viewstat.cxx index b0d5f71744c9..de30153f2439 100644 --- a/sw/source/ui/uiview/viewstat.cxx +++ b/sw/source/ui/uiview/viewstat.cxx @@ -49,28 +49,20 @@ #include <tox.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/app.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <wrtsh.hxx> -#ifndef _BASESH_HXX #include <basesh.hxx> -#endif #include <uitool.hxx> #include <viewopt.hxx> #include <tablemgr.hxx> #include <pagedesc.hxx> -#ifndef _WVIEW_HXX #include <wview.hxx> -#endif #include <globdoc.hxx> #include <svl/stritem.hxx> #include <unotools/moduleoptions.hxx> #include <svl/visitem.hxx> -#ifndef _CMDID_H #include <cmdid.h> -#endif #include <IDocumentRedlineAccess.hxx> diff --git a/sw/source/ui/uno/SwXPrintPreviewSettings.cxx b/sw/source/ui/uno/SwXPrintPreviewSettings.cxx index a812c39754c9..e37dc65e03c6 100644 --- a/sw/source/ui/uno/SwXPrintPreviewSettings.cxx +++ b/sw/source/ui/uno/SwXPrintPreviewSettings.cxx @@ -31,12 +31,8 @@ #include <comphelper/ChainablePropertySetInfo.hxx> #include <pvprtdat.hxx> #include <swtypes.hxx> -#ifndef _COM_SUN_STAR_BEANS_PropertyAttribute_HPP_ #include <com/sun/star/beans/PropertyAttribute.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_PropertyAttribute_HPP_ #include <com/sun/star/beans/PropertyAttribute.hpp> -#endif #include <doc.hxx> #include <vcl/svapp.hxx> using namespace ::com::sun::star; diff --git a/sw/source/ui/uno/swdetect.cxx b/sw/source/ui/uno/swdetect.cxx index cbde03479433..df8e677cc271 100644 --- a/sw/source/ui/uno/swdetect.cxx +++ b/sw/source/ui/uno/swdetect.cxx @@ -33,9 +33,7 @@ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> -#endif #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/task/XInteractionHandler.hpp> @@ -44,9 +42,7 @@ #include <com/sun/star/ucb/InteractiveAppException.hpp> #include <com/sun/star/ucb/XContent.hpp> #include <com/sun/star/packages/zip/ZipIOException.hpp> -#ifndef _TOOLKIT_UNOHLP_HXX #include <toolkit/helper/vclunohelper.hxx> -#endif #include <ucbhelper/simpleinteractionrequest.hxx> #include <rtl/ustring.h> #include <rtl/logfile.hxx> diff --git a/sw/source/ui/uno/unomailmerge.cxx b/sw/source/ui/uno/unomailmerge.cxx index 06b9e62b4a94..6046c202402a 100644 --- a/sw/source/ui/uno/unomailmerge.cxx +++ b/sw/source/ui/uno/unomailmerge.cxx @@ -54,9 +54,7 @@ #include <com/sun/star/sdbc/XRowSet.hpp> #include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/util/XCloseable.hpp> -#ifndef _COM_SUN_STAR_UTIL_CloseVetoException_HPP_ #include <com/sun/star/util/CloseVetoException.hpp> -#endif #include <com/sun/star/sdbcx/XRowLocate.hpp> #include <com/sun/star/frame/XStorable.hpp> #include "com/sun/star/mail/XSmtpService.hpp" @@ -70,9 +68,7 @@ #include <unomap.hxx> #include <swunohelper.hxx> #include <docsh.hxx> -#ifndef IDOCUMENTDEVICEACCESS_HXX_INCLUDED #include <IDocumentDeviceAccess.hxx> -#endif #include <view.hxx> #include <dbmgr.hxx> #include <unotxdoc.hxx> diff --git a/sw/source/ui/utlui/attrdesc.cxx b/sw/source/ui/utlui/attrdesc.cxx index 418ea4a4559b..c1c7e8066be6 100644 --- a/sw/source/ui/utlui/attrdesc.cxx +++ b/sw/source/ui/utlui/attrdesc.cxx @@ -60,9 +60,7 @@ #include <charfmt.hxx> #include <fmtcol.hxx> #include <tox.hxx> -#ifndef _ATTRDESC_HRC #include <attrdesc.hrc> -#endif #include <fmtftntx.hxx> #include <fmtfollowtextflow.hxx> diff --git a/sw/source/ui/utlui/bookctrl.cxx b/sw/source/ui/utlui/bookctrl.cxx index 3b2567673020..b96920a6f64c 100644 --- a/sw/source/ui/utlui/bookctrl.cxx +++ b/sw/source/ui/utlui/bookctrl.cxx @@ -37,15 +37,9 @@ #include <svl/intitem.hxx> #include <svl/stritem.hxx> #include <sfx2/dispatch.hxx> -#ifndef _EVENT_HXX //autogen #include <vcl/event.hxx> -#endif -#ifndef _STATUS_HXX //autogen #include <vcl/status.hxx> -#endif -#ifndef _MENU_HXX //autogen #include <vcl/menu.hxx> -#endif #include "cmdid.h" #include "errhdl.hxx" #include "swmodule.hxx" diff --git a/sw/source/ui/utlui/condedit.cxx b/sw/source/ui/utlui/condedit.cxx index b534b538ca54..9a82899c7840 100644 --- a/sw/source/ui/utlui/condedit.cxx +++ b/sw/source/ui/utlui/condedit.cxx @@ -33,9 +33,7 @@ #include <sot/formats.hxx> -#ifndef _CONDEDIT_HXX #include <condedit.hxx> -#endif #include <svx/dbaexchange.hxx> using namespace ::svx; using ::rtl::OUString; diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx index 04a6322eb277..d07a085c68e8 100644 --- a/sw/source/ui/utlui/content.cxx +++ b/sw/source/ui/utlui/content.cxx @@ -36,9 +36,7 @@ #include <tools/urlobj.hxx> #include <sfx2/docfile.hxx> #include <sfx2/dispatch.hxx> -#ifndef _HELP_HXX #include <vcl/help.hxx> -#endif #include <sot/formats.hxx> #include <vcl/sound.hxx> #include <uiitems.hxx> @@ -47,13 +45,9 @@ #include <fmtfld.hxx> #include <swmodule.hxx> #include <wrtsh.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <errhdl.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <content.hxx> #include <frmfmt.hxx> #include <fldbas.hxx> @@ -69,24 +63,12 @@ #include <doc.hxx> #include <unotools.hxx> #include <crsskip.hxx> -#ifndef _CMDID_H #include <cmdid.h> -#endif -#ifndef _HELPID_H #include <helpid.h> -#endif -#ifndef _NAVIPI_HRC #include <navipi.hrc> -#endif -#ifndef _UTLUI_HRC #include <utlui.hrc> -#endif -#ifndef _MISC_HRC #include <misc.hrc> -#endif -#ifndef _COMCORE_HRC #include <comcore.hrc> -#endif #include <com/sun/star/text/XTextSectionsSupplier.hpp> #include <com/sun/star/text/XTextGraphicObjectsSupplier.hpp> #include <com/sun/star/text/XTextTablesSupplier.hpp> diff --git a/sw/source/ui/utlui/glbltree.cxx b/sw/source/ui/utlui/glbltree.cxx index e221cf01376e..03a063dce3bc 100644 --- a/sw/source/ui/utlui/glbltree.cxx +++ b/sw/source/ui/utlui/glbltree.cxx @@ -66,15 +66,9 @@ #include <cmdid.h> #include <helpid.h> -#ifndef _NAVIPI_HRC #include <navipi.hrc> -#endif -#ifndef _UTLUI_HRC #include <utlui.hrc> -#endif -#ifndef _COMCORE_HRC #include <comcore.hrc> -#endif #include <globals.hrc> #include "swabstdlg.hxx" diff --git a/sw/source/ui/utlui/gloslst.cxx b/sw/source/ui/utlui/gloslst.cxx index 5c3350346201..a04d43345dc3 100644 --- a/sw/source/ui/utlui/gloslst.cxx +++ b/sw/source/ui/utlui/gloslst.cxx @@ -37,16 +37,10 @@ #include <tools/urlobj.hxx> #include <vcl/dialog.hxx> #include <vcl/msgbox.hxx> -#ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif #include <vcl/lstbox.hxx> -#ifndef SVTOOLS_FSTATHELPER_HXX #include <svl/fstathelper.hxx> -#endif #include <unotools/pathoptions.hxx> #include <unotools/transliterationwrapper.hxx> #include <swtypes.hxx> @@ -57,12 +51,8 @@ #include <gloslst.hxx> #include <swunohelper.hxx> -#ifndef _UTLUI_HRC #include <utlui.hrc> -#endif -#ifndef _GLOSLST_HRC #include <gloslst.hrc> -#endif #define STRING_DELIM (char)0x0A diff --git a/sw/source/ui/utlui/initui.cxx b/sw/source/ui/utlui/initui.cxx index d40283e39146..11758709ece0 100644 --- a/sw/source/ui/utlui/initui.cxx +++ b/sw/source/ui/utlui/initui.cxx @@ -38,19 +38,11 @@ #include <glosdoc.hxx> #include <gloslst.hxx> -#ifndef _UTLUI_HRC #include <utlui.hrc> -#endif -#ifndef _INITUI_HRC #include <initui.hrc> -#endif -#ifndef _COMCORE_HRC #include <comcore.hrc> -#endif #include <authfld.hxx> -#ifndef _DBMGR_HXX #include <dbmgr.hxx> -#endif #include <unotools/syslocale.hxx> #include <unomid.h> diff --git a/sw/source/ui/utlui/navipi.cxx b/sw/source/ui/utlui/navipi.cxx index ea43533f70d8..661beda407a8 100644 --- a/sw/source/ui/utlui/navipi.cxx +++ b/sw/source/ui/utlui/navipi.cxx @@ -48,14 +48,10 @@ #include <swtypes.hxx> // fuer Pathfinder #include <errhdl.hxx> #include <swmodule.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <navicfg.hxx> #include <wrtsh.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <actctrl.hxx> #include <IMark.hxx> #include <navipi.hxx> @@ -64,21 +60,11 @@ #include <section.hxx> #include <edtwin.hxx> #include <sfx2/app.hxx> -#ifndef _CMDID_H #include <cmdid.h> -#endif -#ifndef _HELPID_H #include <helpid.h> -#endif -#ifndef _RIBBAR_HRC #include <ribbar.hrc> -#endif -#ifndef _NAVIPI_HRC #include <navipi.hrc> -#endif -#ifndef _UTLUI_HRC #include <utlui.hrc> -#endif #include <unomid.h> diff --git a/sw/source/ui/utlui/tmplctrl.cxx b/sw/source/ui/utlui/tmplctrl.cxx index df78a355d8c8..a477f86b3fd3 100644 --- a/sw/source/ui/utlui/tmplctrl.cxx +++ b/sw/source/ui/utlui/tmplctrl.cxx @@ -32,14 +32,10 @@ #include <svl/style.hxx> -#ifndef _MENU_HXX //autogen #include <vcl/menu.hxx> -#endif #include <svl/stritem.hxx> #include <sfx2/dispatch.hxx> -#ifndef _STATUS_HXX //autogen #include <vcl/status.hxx> -#endif #include "wrtsh.hxx" #include "view.hxx" diff --git a/sw/source/ui/utlui/uiitems.cxx b/sw/source/ui/utlui/uiitems.cxx index f54641dcbf1d..15e0843331ab 100644 --- a/sw/source/ui/utlui/uiitems.cxx +++ b/sw/source/ui/utlui/uiitems.cxx @@ -38,9 +38,7 @@ #include "utlui.hrc" #include "attrdesc.hrc" -#ifndef _UNOMID_H #include <unomid.h> -#endif #include <numrule.hxx> using namespace ::com::sun::star; diff --git a/sw/source/ui/utlui/uitool.cxx b/sw/source/ui/utlui/uitool.cxx index b9982cc78227..e71e02b762b7 100644 --- a/sw/source/ui/utlui/uitool.cxx +++ b/sw/source/ui/utlui/uitool.cxx @@ -41,17 +41,13 @@ #include <sfx2/docfile.hxx> #include <sfx2/docfilt.hxx> #include <editeng/pmdlitem.hxx> -#ifndef _SVX_TSTPITEM_HXX //autogen #include <editeng/tstpitem.hxx> -#endif #include <editeng/boxitem.hxx> #include <editeng/sizeitem.hxx> #include <svx/pageitem.hxx> #include <editeng/lrspitem.hxx> #include <svl/style.hxx> -#ifndef _VCL_LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif #include <unotools/localedatawrapper.hxx> #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> @@ -66,14 +62,10 @@ #include <fmtpdsc.hxx> #include <wview.hxx> #include <uiitems.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <wrtsh.hxx> #include <swmodule.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <uitool.hxx> #include <frmatr.hxx> #include <paratr.hxx> @@ -81,18 +73,10 @@ #include <poolfmt.hxx> #include "usrpref.hxx" -#ifndef _ERROR_H #include <error.h> -#endif -#ifndef _CMDID_H #include <cmdid.h> -#endif -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif -#ifndef _UTLUI_HRC #include <utlui.hrc> -#endif #include <doc.hxx> #include <docary.hxx> #include <charfmt.hxx> diff --git a/sw/source/ui/utlui/viewlayoutctrl.cxx b/sw/source/ui/utlui/viewlayoutctrl.cxx index dbee2286731a..0930d1a6e30e 100644 --- a/sw/source/ui/utlui/viewlayoutctrl.cxx +++ b/sw/source/ui/utlui/viewlayoutctrl.cxx @@ -31,15 +31,11 @@ // include --------------------------------------------------------------- #include <viewlayoutctrl.hxx> -#ifndef _STATUS_HXX //autogen #include <vcl/status.hxx> -#endif #include <vcl/image.hxx> #include <svl/eitem.hxx> #include <svx/viewlayoutitem.hxx> -#ifndef _UTLUI_HRC #include <utlui.hrc> -#endif #include <swtypes.hxx> // fuer Pathfinder // STATIC DATA ----------------------------------------------------------- diff --git a/sw/source/ui/utlui/zoomctrl.cxx b/sw/source/ui/utlui/zoomctrl.cxx index 48cf53b6263a..e5713f9170b9 100644 --- a/sw/source/ui/utlui/zoomctrl.cxx +++ b/sw/source/ui/utlui/zoomctrl.cxx @@ -32,9 +32,7 @@ #include "hintids.hxx" -#ifndef _STATUS_HXX //autogen #include <vcl/status.hxx> -#endif #include <sfx2/app.hxx> #include <svl/stritem.hxx> #include <svx/zoomitem.hxx> diff --git a/sw/source/ui/web/wdocsh.cxx b/sw/source/ui/web/wdocsh.cxx index 4953e715fe45..a1ce0387db2d 100644 --- a/sw/source/ui/web/wdocsh.cxx +++ b/sw/source/ui/web/wdocsh.cxx @@ -33,9 +33,7 @@ #include <svl/srchitem.hxx> #include <sfx2/app.hxx> -#ifndef _SVX_SVXIDS_HRC //autogen #include <svx/svxids.hrc> -#endif #include <sot/clsids.hxx> #include <sfx2/objface.hxx> diff --git a/sw/source/ui/web/wformsh.cxx b/sw/source/ui/web/wformsh.cxx index 0ce34812216f..096b8633e60d 100644 --- a/sw/source/ui/web/wformsh.cxx +++ b/sw/source/ui/web/wformsh.cxx @@ -32,9 +32,7 @@ #include <sfx2/msg.hxx> -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <svl/srchitem.hxx> #include <sfx2/objface.hxx> #include <tools/globname.hxx> diff --git a/sw/source/ui/web/wtextsh.cxx b/sw/source/ui/web/wtextsh.cxx index 05c454d5c431..f5d8cb7fd853 100644 --- a/sw/source/ui/web/wtextsh.cxx +++ b/sw/source/ui/web/wtextsh.cxx @@ -35,9 +35,7 @@ #include <sfx2/app.hxx> #include <svl/srchitem.hxx> //*** #include <basic/sbxvar.hxx> -#ifndef _SVX_SVXIDS_HRC //autogen #include <svx/svxids.hrc> -#endif #include "swtypes.hxx" #include "cmdid.h" diff --git a/sw/source/ui/wrtsh/delete.cxx b/sw/source/ui/wrtsh/delete.cxx index 182fb5e37854..77da3688ca34 100644 --- a/sw/source/ui/wrtsh/delete.cxx +++ b/sw/source/ui/wrtsh/delete.cxx @@ -34,12 +34,8 @@ #include <swcrsr.hxx> #include <editeng/lrspitem.hxx> // #i23725# // --> OD 2006-07-10 #134369# -#ifndef _VIEW_HXX #include <view.hxx> -#endif -#ifndef _DRAWBASE_HXX #include <drawbase.hxx> -#endif // <-- inline void SwWrtShell::OpenMark() diff --git a/sw/source/ui/wrtsh/move.cxx b/sw/source/ui/wrtsh/move.cxx index dc196de9d9da..45b1eec0f76f 100644 --- a/sw/source/ui/wrtsh/move.cxx +++ b/sw/source/ui/wrtsh/move.cxx @@ -31,9 +31,7 @@ #include <sfx2/bindings.hxx> #include <wrtsh.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <viewopt.hxx> #include <crsskip.hxx> diff --git a/sw/source/ui/wrtsh/wrtsh1.cxx b/sw/source/ui/wrtsh/wrtsh1.cxx index 6c9235104a7a..9f6f0d0e7579 100644 --- a/sw/source/ui/wrtsh/wrtsh1.cxx +++ b/sw/source/ui/wrtsh/wrtsh1.cxx @@ -42,9 +42,7 @@ #include <svx/svdview.hxx> #include <sot/factory.hxx> #include <svl/itemiter.hxx> -#ifndef _SOUND_HXX //autogen #include <vcl/sound.hxx> -#endif #include <tools/bigint.hxx> #include <sot/storage.hxx> #include <svtools/insdlg.hxx> @@ -67,21 +65,13 @@ #include <svx/fontworkbar.hxx> #include <fmtftn.hxx> #include <fmtpdsc.hxx> -#ifndef _WDOCSH_HXX #include <wdocsh.hxx> -#endif -#ifndef _BASESH_HXX #include <basesh.hxx> -#endif #include <swmodule.hxx> #include <wrtsh.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <uitool.hxx> -#ifndef _CMDID_H #include <cmdid.h> -#endif #include <pagedesc.hxx> #include <frmmgr.hxx> #include <shellio.hxx> @@ -89,9 +79,7 @@ #include <swundo.hxx> // fuer Undo-Ids #include <swcli.hxx> #include <poolfmt.hxx> -#ifndef _WVIEW_HXX #include <wview.hxx> -#endif #include <edtwin.hxx> #include <fmtcol.hxx> #include <swtable.hxx> @@ -100,9 +88,7 @@ #include <swdtflvr.hxx> #include <crsskip.hxx> #include <doc.hxx> -#ifndef _WRTSH_HRC #include <wrtsh.hrc> -#endif #include <SwStyleNameMapper.hxx> #include <sfx2/request.hxx> #include <paratr.hxx> diff --git a/sw/source/ui/wrtsh/wrtsh3.cxx b/sw/source/ui/wrtsh/wrtsh3.cxx index 460d89a07a1c..4cdd8b3164a3 100644 --- a/sw/source/ui/wrtsh/wrtsh3.cxx +++ b/sw/source/ui/wrtsh/wrtsh3.cxx @@ -29,9 +29,7 @@ #include "precompiled_sw.hxx" -#ifndef _SVX_SVXIDS_HRC //autogen #include <svx/svxids.hrc> -#endif #include <sfx2/app.hxx> #include <sfx2/childwin.hxx> #include <sfx2/bindings.hxx> diff --git a/sw/source/ui/wrtsh/wrtundo.cxx b/sw/source/ui/wrtsh/wrtundo.cxx index f3c62f9f9dff..d9b270803fef 100644 --- a/sw/source/ui/wrtsh/wrtundo.cxx +++ b/sw/source/ui/wrtsh/wrtundo.cxx @@ -38,9 +38,7 @@ #include <swundo.hxx> // fuer Undo-Ids #include <swdtflvr.hxx> -#ifndef _WRTSH_HRC #include <wrtsh.hrc> -#endif #include <sfx2/sfx.hrc> |