diff options
29 files changed, 38 insertions, 42 deletions
diff --git a/cppcanvas/qa/extras/emfplus/emfplus.cxx b/cppcanvas/qa/extras/emfplus/emfplus.cxx index 61a496c84697..b5a32b1fca94 100644 --- a/cppcanvas/qa/extras/emfplus/emfplus.cxx +++ b/cppcanvas/qa/extras/emfplus/emfplus.cxx @@ -7,17 +7,13 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/drawing/XDrawPagesSupplier.hpp> #include <com/sun/star/frame/Desktop.hpp> -#include <com/sun/star/graphic/XGraphic.hpp> #include <comphelper/processfactory.hxx> #include <sfx2/app.hxx> #include <sfx2/objsh.hxx> #include <sfx2/sfxbasemodel.hxx> #include <test/unoapi_test.hxx> -#include <unotest/macros_test.hxx> #include <vcl/bitmapaccess.hxx> #include <vcl/pngwrite.hxx> diff --git a/drawinglayer/qa/unit/border.cxx b/drawinglayer/qa/unit/border.cxx index 505e30fc4a49..365c90d1691f 100644 --- a/drawinglayer/qa/unit/border.cxx +++ b/drawinglayer/qa/unit/border.cxx @@ -12,11 +12,8 @@ #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> -#include <com/sun/star/table/BorderLineStyle.hpp> - #include <drawinglayer/geometry/viewinformation2d.hxx> #include <drawinglayer/primitive2d/borderlineprimitive2d.hxx> -#include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx> #include <drawinglayer/primitive2d/polygonprimitive2d.hxx> #include <drawinglayer/processor2d/baseprocessor2d.hxx> #include <drawinglayer/processor2d/processorfromoutputdevice.hxx> diff --git a/oox/source/drawingml/customshapepresetdata.cxx b/oox/source/drawingml/customshapepresetdata.cxx index b91b2c5eed36..48c93614dc86 100644 --- a/oox/source/drawingml/customshapepresetdata.cxx +++ b/oox/source/drawingml/customshapepresetdata.cxx @@ -16,7 +16,7 @@ #include <oox/token/properties.hxx> #include <oox/token/tokenmap.hxx> #include <com/sun/star/awt/Rectangle.hpp> -#include <com/sun/star/beans/PropertyValues.hpp> +#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeTextFrame.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp> diff --git a/oox/source/shape/LockedCanvasContext.cxx b/oox/source/shape/LockedCanvasContext.cxx index 0b2e06ccbb3f..3d4603f47355 100644 --- a/oox/source/shape/LockedCanvasContext.cxx +++ b/oox/source/shape/LockedCanvasContext.cxx @@ -8,6 +8,7 @@ */ #include "LockedCanvasContext.hxx" +#include <oox/drawingml/shape.hxx> #include <oox/drawingml/shapecontext.hxx> #include <oox/drawingml/shapegroupcontext.hxx> #include <oox/token/namespaces.hxx> diff --git a/oox/source/shape/LockedCanvasContext.hxx b/oox/source/shape/LockedCanvasContext.hxx index 3a6d3ca6a303..793491fe648c 100644 --- a/oox/source/shape/LockedCanvasContext.hxx +++ b/oox/source/shape/LockedCanvasContext.hxx @@ -11,7 +11,7 @@ #define INCLUDED_OOX_SOURCE_SHAPE_LOCKEDCANVASCONTEXT_HXX #include <oox/core/contexthandler2.hxx> -#include <oox/drawingml/shape.hxx> +#include <oox/drawingml/drawingmltypes.hxx> namespace oox { diff --git a/oox/source/shape/WpgContext.hxx b/oox/source/shape/WpgContext.hxx index 2fa6ca02ba9f..1bdc53ecf09c 100644 --- a/oox/source/shape/WpgContext.hxx +++ b/oox/source/shape/WpgContext.hxx @@ -11,7 +11,7 @@ #define INCLUDED_OOX_SOURCE_SHAPE_WPGCONTEXT_HXX #include <oox/core/contexthandler2.hxx> -#include <oox/drawingml/shape.hxx> +#include <oox/drawingml/drawingmltypes.hxx> namespace oox { diff --git a/oox/source/shape/WpsContext.cxx b/oox/source/shape/WpsContext.cxx index 341fa8efb43a..67b3b1b60353 100644 --- a/oox/source/shape/WpsContext.cxx +++ b/oox/source/shape/WpsContext.cxx @@ -23,6 +23,7 @@ #include <oox/helper/attributelist.hxx> #include <oox/token/namespaces.hxx> #include <oox/token/tokens.hxx> +#include <oox/drawingml/shape.hxx> #include <boost/optional.hpp> diff --git a/oox/source/shape/WpsContext.hxx b/oox/source/shape/WpsContext.hxx index 73589aaed487..16443a9f084a 100644 --- a/oox/source/shape/WpsContext.hxx +++ b/oox/source/shape/WpsContext.hxx @@ -10,8 +10,9 @@ #ifndef INCLUDED_OOX_SOURCE_SHAPE_WPSCONTEXT_HXX #define INCLUDED_OOX_SOURCE_SHAPE_WPSCONTEXT_HXX +#include <com/sun/star/drawing/XShape.hpp> #include <oox/core/contexthandler2.hxx> -#include <oox/drawingml/shape.hxx> +#include <oox/drawingml/drawingmltypes.hxx> namespace oox { diff --git a/starmath/source/ooxmlexport.cxx b/starmath/source/ooxmlexport.cxx index 29cd46e9bea2..7e731fb717ca 100644 --- a/starmath/source/ooxmlexport.cxx +++ b/starmath/source/ooxmlexport.cxx @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - #include "ooxmlexport.hxx" +#include <node.hxx> #include <oox/token/tokens.hxx> #include <rtl/ustring.hxx> diff --git a/starmath/source/rtfexport.cxx b/starmath/source/rtfexport.cxx index a06bb4c5a4ad..50d32b393221 100644 --- a/starmath/source/rtfexport.cxx +++ b/starmath/source/rtfexport.cxx @@ -8,6 +8,7 @@ */ #include "rtfexport.hxx" +#include <node.hxx> #include <svtools/rtfkeywd.hxx> #include <filter/msfilter/rtfutil.hxx> diff --git a/starmath/source/wordexportbase.cxx b/starmath/source/wordexportbase.cxx index cf32d067f364..02929e438514 100644 --- a/starmath/source/wordexportbase.cxx +++ b/starmath/source/wordexportbase.cxx @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - #include "wordexportbase.hxx" +#include <node.hxx> SmWordExportBase::SmWordExportBase(const SmNode* pIn) : m_pTree(pIn) diff --git a/starmath/source/wordexportbase.hxx b/starmath/source/wordexportbase.hxx index 41a6f42408be..b5b0d6853cbf 100644 --- a/starmath/source/wordexportbase.hxx +++ b/starmath/source/wordexportbase.hxx @@ -10,7 +10,16 @@ #ifndef INCLUDED_STARMATH_SOURCE_WORDEXPORTBASE_HXX #define INCLUDED_STARMATH_SOURCE_WORDEXPORTBASE_HXX -#include <node.hxx> +class SmAttributNode; +class SmBinHorNode; +class SmBraceNode; +class SmMatrixNode; +class SmNode; +class SmOperNode; +class SmRootNode; +class SmSubSupNode; +class SmUnHorNode; +class SmVerticalBraceNode; /** Base class implementing writing of formulas to Word. diff --git a/svx/qa/unit/xoutdev.cxx b/svx/qa/unit/xoutdev.cxx index 0f0451f3cf2a..c2f48fbbc5c6 100644 --- a/svx/qa/unit/xoutdev.cxx +++ b/svx/qa/unit/xoutdev.cxx @@ -12,7 +12,6 @@ #include <cppunit/TestAssert.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> -#include <cppunit/plugin/TestPlugIn.h> #include <sal/types.h> #include <sfx2/app.hxx> diff --git a/sw/inc/textboxhelper.hxx b/sw/inc/textboxhelper.hxx index 0c3bf5ff742b..29e8ea6fd6a5 100644 --- a/sw/inc/textboxhelper.hxx +++ b/sw/inc/textboxhelper.hxx @@ -17,7 +17,6 @@ #include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/uno/Any.h> #include <com/sun/star/uno/Type.h> -#include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include "swdllapi.h" diff --git a/sw/source/core/doc/textboxhelper.cxx b/sw/source/core/doc/textboxhelper.cxx index 12389c209e8a..3d085becd87d 100644 --- a/sw/source/core/doc/textboxhelper.cxx +++ b/sw/source/core/doc/textboxhelper.cxx @@ -23,10 +23,7 @@ #include <unotextrange.hxx> #include <cmdid.h> #include <unoprnms.hxx> -#include <dflyobj.hxx> #include <mvsave.hxx> -#include <sortedobjs.hxx> -#include <cntfrm.hxx> #include <fmtsrnd.hxx> #include <frmfmt.hxx> @@ -39,6 +36,7 @@ #include <comphelper/sequenceashashmap.hxx> #include <com/sun/star/document/XActionLockable.hpp> +#include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <com/sun/star/text/SizeType.hpp> #include <com/sun/star/text/TextContentAnchorType.hpp> #include <com/sun/star/text/WrapTextMode.hpp> diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index c0a5f75b9fb1..2131779573dd 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -67,6 +67,7 @@ #include <com/sun/star/text/TextContentAnchorType.hpp> #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <com/sun/star/drawing/PointSequence.hpp> +#include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <calbck.hxx> using namespace ::com::sun::star; diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx index 313942cbf48e..6046478a1997 100644 --- a/sw/source/core/unocore/unoobj2.cxx +++ b/sw/source/core/unocore/unoobj2.cxx @@ -94,6 +94,7 @@ #include <com/sun/star/text/XTextDocument.hpp> #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> #include <com/sun/star/drawing/XDrawPageSupplier.hpp> +#include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <unoframe.hxx> #include <fmthdft.hxx> #include <vcl/svapp.hxx> diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx index d50f7fefa067..be5df4433546 100644 --- a/sw/source/filter/ww8/docxsdrexport.cxx +++ b/sw/source/filter/ww8/docxsdrexport.cxx @@ -8,10 +8,10 @@ */ #include "docxsdrexport.hxx" -#include <com/sun/star/drawing/LineStyle.hpp> #include <com/sun/star/drawing/PointSequenceSequence.hpp> #include <com/sun/star/xml/sax/XSAXSerializable.hpp> #include <com/sun/star/xml/sax/Writer.hpp> +#include <com/sun/star/xml/dom/XNodeList.hpp> #include <editeng/unoprnms.hxx> #include <editeng/charrotateitem.hxx> #include <svx/svdogrp.hxx> @@ -32,6 +32,7 @@ #include <comphelper/seqstream.hxx> #include <comphelper/sequence.hxx> #include <comphelper/sequenceashashmap.hxx> +#include <o3tl/make_unique.hxx> #include <IDocumentDrawModelAccess.hxx> diff --git a/sw/source/filter/ww8/docxsdrexport.hxx b/sw/source/filter/ww8/docxsdrexport.hxx index 85bc1239069f..25c0398cdbdb 100644 --- a/sw/source/filter/ww8/docxsdrexport.hxx +++ b/sw/source/filter/ww8/docxsdrexport.hxx @@ -11,9 +11,7 @@ #define INCLUDED_SW_SOURCE_FILTER_WW8_DOCXSDREXPORT_HXX #include <memory> -#include <o3tl/make_unique.hxx> -#include <com/sun/star/xml/dom/XDocument.hpp> #include <rtl/strbuf.hxx> #include <rtl/ref.hxx> #include <sax/fshelper.hxx> diff --git a/sw/source/uibase/docvw/SidebarScrollBar.cxx b/sw/source/uibase/docvw/SidebarScrollBar.cxx index c51d37b7bee3..9b57616ba89f 100644 --- a/sw/source/uibase/docvw/SidebarScrollBar.cxx +++ b/sw/source/uibase/docvw/SidebarScrollBar.cxx @@ -9,8 +9,6 @@ #include "SidebarScrollBar.hxx" -#include <LibreOfficeKit/LibreOfficeKitEnums.h> -#include <comphelper/lok.hxx> #include <sfx2/lokhelper.hxx> #include <view.hxx> diff --git a/vcl/inc/pdfread.hxx b/vcl/inc/pdfread.hxx index 986b257878f5..a206fa986014 100644 --- a/vcl/inc/pdfread.hxx +++ b/vcl/inc/pdfread.hxx @@ -11,7 +11,10 @@ #define INCLUDED_VCL_SOURCE_FILTER_IPDF_PDFREAD_HXX #include <tools/stream.hxx> -#include <vcl/graph.hxx> +#include <com/sun/star/uno/Sequence.hxx> + +class Bitmap; +class Graphic; namespace vcl { diff --git a/vcl/source/filter/ipdf/pdfdocument.cxx b/vcl/source/filter/ipdf/pdfdocument.cxx index 56e90cf7adf3..6921683d5054 100644 --- a/vcl/source/filter/ipdf/pdfdocument.cxx +++ b/vcl/source/filter/ipdf/pdfdocument.cxx @@ -15,22 +15,16 @@ #include <com/sun/star/uno/Sequence.hxx> -#include <comphelper/processfactory.hxx> #include <comphelper/scopeguard.hxx> #include <comphelper/string.hxx> -#include <filter/msfilter/mscodec.hxx> #include <rtl/character.hxx> #include <rtl/strbuf.hxx> #include <rtl/string.hxx> #include <sal/log.hxx> #include <sal/types.h> -#include <sax/tools/converter.hxx> #include <svl/cryptosign.hxx> #include <tools/zcodec.hxx> -#include <unotools/calendarwrapper.hxx> -#include <unotools/datetime.hxx> #include <vcl/pdfwriter.hxx> -#include <xmloff/xmluconv.hxx> #include <o3tl/make_unique.hxx> using namespace com::sun::star; diff --git a/vcl/source/filter/ipdf/pdfread.cxx b/vcl/source/filter/ipdf/pdfread.cxx index b1e85f6816de..376885703194 100644 --- a/vcl/source/filter/ipdf/pdfread.cxx +++ b/vcl/source/filter/ipdf/pdfread.cxx @@ -18,6 +18,7 @@ #endif #include <vcl/bitmapaccess.hxx> +#include <vcl/graph.hxx> using namespace com::sun::star; diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 39368c29d812..55ceef14df2e 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -63,6 +63,7 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/text/FontEmphasis.hpp> #include <com/sun/star/awt/CharSet.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <comphelper/types.hxx> #include <comphelper/storagehelper.hxx> #include <comphelper/sequence.hxx> diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 745daba638b8..b47066ffaa84 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -68,6 +68,7 @@ #include <com/sun/star/text/ControlCharacter.hpp> #include <com/sun/star/text/XTextColumns.hpp> #include <com/sun/star/awt/CharSet.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <oox/mathml/import.hxx> #include <rtl/uri.hxx> diff --git a/writerfilter/source/dmapper/LatentStyleHandler.hxx b/writerfilter/source/dmapper/LatentStyleHandler.hxx index f75b77c2caf2..fce5455792ae 100644 --- a/writerfilter/source/dmapper/LatentStyleHandler.hxx +++ b/writerfilter/source/dmapper/LatentStyleHandler.hxx @@ -10,7 +10,6 @@ #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_LATENTSTYLEHANDLER_HXX #include "LoggedResources.hxx" -#include <memory> #include <vector> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/writerfilter/source/dmapper/SdtHelper.cxx b/writerfilter/source/dmapper/SdtHelper.cxx index 2e93f1b98c83..b80903e44efa 100644 --- a/writerfilter/source/dmapper/SdtHelper.cxx +++ b/writerfilter/source/dmapper/SdtHelper.cxx @@ -8,6 +8,7 @@ */ #include "SdtHelper.hxx" +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/drawing/XControlShape.hpp> #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> #include <com/sun/star/text/VertOrientation.hpp> @@ -17,6 +18,9 @@ #include <unotools/datetime.hxx> #include <comphelper/sequence.hxx> +#include "DomainMapper_Impl.hxx" +#include "StyleSheetTable.hxx" + namespace writerfilter { namespace dmapper diff --git a/writerfilter/source/dmapper/SdtHelper.hxx b/writerfilter/source/dmapper/SdtHelper.hxx index b6691b55770b..2d9309adee49 100644 --- a/writerfilter/source/dmapper/SdtHelper.hxx +++ b/writerfilter/source/dmapper/SdtHelper.hxx @@ -12,13 +12,10 @@ #include <vector> -#include <boost/optional.hpp> +#include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <rtl/ustrbuf.hxx> -#include "DomainMapper_Impl.hxx" - namespace com { namespace sun @@ -38,6 +35,7 @@ namespace writerfilter { namespace dmapper { +class DomainMapper_Impl; /** * Helper to create form controls from w:sdt tokens. diff --git a/writerfilter/source/dmapper/TableManager.hxx b/writerfilter/source/dmapper/TableManager.hxx index 299e3584981d..e3ca33121179 100644 --- a/writerfilter/source/dmapper/TableManager.hxx +++ b/writerfilter/source/dmapper/TableManager.hxx @@ -20,15 +20,9 @@ #ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_TABLEMANAGER_HXX #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_TABLEMANAGER_HXX -#include <dmapper/resourcemodel.hxx> - -#include <ooxml/resourceids.hxx> - #include <memory> #include <stack> -#include "TagLogger.hxx" -#include <rtl/strbuf.hxx> #include "PropertyMap.hxx" #include "TableData.hxx" |