diff options
| author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2019-12-07 23:02:07 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-12-17 10:32:33 +0100 |
| commit | 5e80d0fe6326a0a32da72f0ad2d7e0fe4df8d75b (patch) | |
| tree | cf108abe43ae830d7a74f15b2d18bf3f499a00be /filter | |
| parent | 99783d0edc2405f351322dfa2479c7fb36527878 (diff) | |
tdf#42949 Fix IWYU warnings in filter/
Also drop inc/gfxtypes.hxx and source/svg/spirit_supplements.hxx
which are unused since commit
3ca7be09834a26fbd1c371deabd7a58111092676
"Replace SVGFilter using SVGIO"
Drop now unneeded pass-through header
source/graphicfilter/icgm/main.hxx too.
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: I8abaf294370c98256815a226168085dd01123f3e
Reviewed-on: https://gerrit.libreoffice.org/84734
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'filter')
133 files changed, 168 insertions, 882 deletions
diff --git a/filter/IwyuFilter_filter.yaml b/filter/IwyuFilter_filter.yaml new file mode 100644 index 000000000000..71c09a3069cf --- /dev/null +++ b/filter/IwyuFilter_filter.yaml @@ -0,0 +1,50 @@ +--- +assumeFilename: filter/source/msfilter/msdffimp.cxx +blacklist: + filter/source/graphicfilter/icgm/cgm.cxx: + # OSL_BIGENDIAN is being checked + - osl/endian.h + filter/source/graphicfilter/ieps/ieps.cxx: + # Needed on WIN32 + - o3tl/char16_t2wchar_t.hxx + filter/source/msfilter/mscodec.cxx: + # Actually used + - com/sun/star/beans/NamedValue.hpp + filter/source/msfilter/svdfppt.cxx: + # OSL_BIGENDIAN is being checked + - osl/endian.h + filter/source/pdf/impdialog.cxx: + # Actually used + - com/sun/star/beans/XMaterialHolder.hpp + filter/source/pdf/pdfexport.cxx: + # Needed for direct member access + - com/sun/star/security/XCertificate.hpp + filter/source/pdf/pdfinteract.cxx: + # Actually used + - com/sun/star/task/XInteractionRequest.hpp + filter/source/svg/svgfilter.cxx: + # Actually used + - com/sun/star/io/IOException.hpp + filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx: + # Actually used + - comphelper/scopeguard.hxx + filter/source/xmlfilterdetect/filterdetect.cxx: + # Actually used + - com/sun/star/uno/XComponentContext.hpp + filter/source/xsltdialog/typedetectionimport.cxx: + # Actually used + - com/sun/star/xml/sax/XAttributeList.hpp + filter/source/xsltdialog/xmlfilterjar.cxx: + # Actually used + - com/sun/star/uno/XComponentContext.hpp + filter/source/xsltdialog/xmlfiltertabdialog.cxx: + # Actually used + - com/sun/star/uno/XComponentContext.hpp + filter/source/xsltdialog/xmlfiltersettingsdialog.cxx: + # Actually used + - com/sun/star/uno/XComponentContext.hpp + filter/source/xsltfilter/LibXSLTTransformer.cxx: + # Actually used + - com/sun/star/io/XInputStream.hpp + - com/sun/star/io/XOutputStream.hpp + - com/sun/star/io/XStreamListener.hpp diff --git a/filter/inc/gfxtypes.hxx b/filter/inc/gfxtypes.hxx deleted file mode 100644 index af180e2e1d3a..000000000000 --- a/filter/inc/gfxtypes.hxx +++ /dev/null @@ -1,323 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ -#ifndef INCLUDED_FILTER_INC_GFXTYPES_HXX -#define INCLUDED_FILTER_INC_GFXTYPES_HXX - -#include <basegfx/range/b2drange.hxx> -#include <basegfx/matrix/b2dhommatrix.hxx> -#include <basegfx/polygon/b2dlinegeometry.hxx> -#include <rtl/ustring.hxx> -#include <functional> -#include <unordered_set> -#include <unordered_map> -#include <boost/functional/hash.hpp> - -namespace svgi -{ - -struct ARGBColor -{ - static double toDoubleColor( sal_uInt8 val ) { return val/255.0; } - - ARGBColor() : a(1.0), r(0.0), g(0.0), b(0.0) - {} - explicit ARGBColor(double fGrey) : a(1.0), r(fGrey), g(fGrey), b(fGrey) - {} - ARGBColor( int r_, int g_, int b_ ) : - a(1.0), - r(toDoubleColor(sal::static_int_cast<sal_uInt8>(r_))), - g(toDoubleColor(sal::static_int_cast<sal_uInt8>(g_))), - b(toDoubleColor(sal::static_int_cast<sal_uInt8>(b_))) - {} - double a; - double r; - double g; - double b; -}; -inline bool operator==( const ARGBColor& rLHS, const ARGBColor& rRHS ) -{ return rLHS.a==rRHS.a && rLHS.r==rRHS.r && rLHS.g==rRHS.g && rLHS.b==rRHS.b; } -inline bool operator!=( const ARGBColor& rLHS, const ARGBColor& rRHS ) -{ return !(rLHS==rRHS); } - -struct GradientStop -{ - GradientStop() : maStopColor(), mnStopPosition(0.0) - {} - ARGBColor maStopColor; - double mnStopPosition; -}; - -struct Gradient -{ - enum GradientType { LINEAR, RADIAL}; - std::vector<std::size_t> maStops; - basegfx::B2DHomMatrix maTransform; - GradientType meType; - union - { - struct - { - double mfX1; - double mfX2; - double mfY1; - double mfY2; - } linear; - struct - { - double mfCX; - double mfCY; - double mfFX; - double mfFY; - double mfR; - } radial; - } maCoords; - sal_Int32 mnId; - bool mbBoundingBoxUnits; - -// explicit Gradient(GradientType eType) : maStops(), maTransform(), meType(eType), maCoords.mfCX(0.0), maCoords.mfCY(0.0), maCoords.mfFX(0.0), maCoords.mfFY(0.0), maCoords.mfR(0.0), mnId(0), mbBoundingBoxUnits(false) - explicit Gradient(GradientType eType) : maStops(), maTransform(), meType(eType), mnId(0), mbBoundingBoxUnits(false) - { - maCoords.radial.mfCX = 0.0; - maCoords.radial.mfCY = 0.0; - maCoords.radial.mfFX = 0.0; - maCoords.radial.mfFY = 0.0; - maCoords.radial.mfR = 0.0; - } -}; - -inline bool operator==( const Gradient& rLHS, const Gradient& rRHS ) -{ - if( rLHS.meType != rRHS.meType ) - return false; - if( rLHS.meType == Gradient::LINEAR ) - return rLHS.mbBoundingBoxUnits==rRHS.mbBoundingBoxUnits && rLHS.maStops==rRHS.maStops && - rLHS.maCoords.linear.mfX1 == rRHS.maCoords.linear.mfX1 && rLHS.maCoords.linear.mfX2 == rRHS.maCoords.linear.mfX2 && - rLHS.maCoords.linear.mfY1 == rRHS.maCoords.linear.mfY1 && rLHS.maCoords.linear.mfY2 == rRHS.maCoords.linear.mfY2; - else - return rLHS.mbBoundingBoxUnits==rRHS.mbBoundingBoxUnits && rLHS.maStops==rRHS.maStops && - rLHS.maCoords.radial.mfCX == rRHS.maCoords.radial.mfCX && rLHS.maCoords.radial.mfCY == rRHS.maCoords.radial.mfCY && - rLHS.maCoords.radial.mfFX == rRHS.maCoords.radial.mfFX && rLHS.maCoords.radial.mfFY == rRHS.maCoords.radial.mfFY && - rLHS.maCoords.radial.mfR == rRHS.maCoords.radial.mfR; -} - -enum PaintType -{ - NONE, - SOLID, - GRADIENT, - DASH -}; - -enum FillRule -{ - NON_ZERO, - EVEN_ODD -}; - -enum TextAlign -{ - BEFORE, - CENTER, - AFTER -}; - -enum CapStyle -{ - BUTT, - RECT, - ROUND -}; - -struct State -{ - State() : - maCTM(), - maTransform(), - maViewport(), - maViewBox(), - mbIsText(false), - maFontFamily(), // app-default - mnFontSize(12), - mnParentFontSize(12), - maFontStyle("normal"), - maFontVariant("normal"), - mnFontWeight(400.0), - meTextAnchor(BEFORE), - maCurrentColor(0.0), - mbVisibility(true), - meFillType(SOLID), - mnFillOpacity(1.0), - mnOpacity(1.0), - meStrokeType(NONE), - mnStrokeOpacity(1.0), - mnViewportFillOpacity(1.0), - maFillColor(0.0), - maFillGradient(Gradient::LINEAR), - meFillRule(NON_ZERO), - maStrokeColor(0.0), - maStrokeGradient(Gradient::LINEAR), - maDashArray(), - mnDashOffset(0.0), - meLineCap(BUTT), - meLineJoin(basegfx::B2DLineJoin::Miter), - mnMiterLimit(4.0), - mnStrokeWidth(1.0), - maViewportFillColor(1.0), - maViewportFillGradient(Gradient::LINEAR), - mnStyleId(0) - {} - - basegfx::B2DHomMatrix maCTM; - basegfx::B2DHomMatrix maTransform; - basegfx::B2DRange maViewport; - basegfx::B2DRange maViewBox; - - bool mbIsText; - OUString maFontFamily; - - double mnFontSize; - double mnParentFontSize; - OUString maFontStyle; - OUString maFontVariant; - double mnFontWeight; - - TextAlign meTextAnchor; // text-anchor - - ARGBColor maCurrentColor; - bool mbVisibility; - - PaintType meFillType; - double mnFillOpacity; - double mnOpacity; - PaintType meStrokeType; - double mnStrokeOpacity; - double mnViewportFillOpacity; - - ARGBColor maFillColor; - Gradient maFillGradient; - FillRule meFillRule; - - ARGBColor maStrokeColor; - Gradient maStrokeGradient; - std::vector<double> maDashArray; - double mnDashOffset; - CapStyle meLineCap; - basegfx::B2DLineJoin meLineJoin; - double mnMiterLimit; - double mnStrokeWidth; - - ARGBColor maViewportFillColor; - Gradient maViewportFillGradient; - - sal_Int32 mnStyleId; -}; - -inline bool operator==(const State& rLHS, const State& rRHS ) -{ - return rLHS.maCTM==rRHS.maCTM && - rLHS.maTransform==rRHS.maTransform && - rLHS.maViewport==rRHS.maViewport && - rLHS.maViewBox==rRHS.maViewBox && - rLHS.mbIsText==rRHS.mbIsText && - rLHS.maFontFamily==rRHS.maFontFamily && - rLHS.mnFontSize==rRHS.mnFontSize && - rLHS.mnParentFontSize==rRHS.mnParentFontSize && - rLHS.maFontStyle==rRHS.maFontStyle && - rLHS.maFontVariant==rRHS.maFontVariant && - rLHS.mnFontWeight==rRHS.mnFontWeight && - rLHS.meTextAnchor==rRHS.meTextAnchor && - rLHS.maCurrentColor==rRHS.maCurrentColor && - rLHS.mbVisibility==rRHS.mbVisibility && - rLHS.meFillType==rRHS.meFillType && - rLHS.mnFillOpacity==rRHS.mnFillOpacity && - rLHS.mnOpacity==rRHS.mnOpacity && - rLHS.meStrokeType==rRHS.meStrokeType && - rLHS.mnStrokeOpacity==rRHS.mnStrokeOpacity && - rLHS.mnViewportFillOpacity==rRHS.mnViewportFillOpacity && - rLHS.maFillColor==rRHS.maFillColor && - rLHS.maFillGradient==rRHS.maFillGradient && - rLHS.meFillRule==rRHS.meFillRule && - rLHS.maStrokeColor==rRHS.maStrokeColor && - rLHS.maStrokeGradient==rRHS.maStrokeGradient && - rLHS.maDashArray==rRHS.maDashArray && - rLHS.mnDashOffset==rRHS.mnDashOffset && - rLHS.meLineCap==rRHS.meLineCap && - rLHS.meLineJoin==rRHS.meLineJoin && - rLHS.mnMiterLimit==rRHS.mnMiterLimit && - rLHS.mnStrokeWidth==rRHS.mnStrokeWidth && - rLHS.maViewportFillColor==rRHS.maViewportFillColor && - rLHS.maViewportFillGradient==rRHS.maViewportFillGradient; -} - -} // namespace svgi - -namespace std -{ - template<> struct hash<svgi::State> - { - using result_type = std::size_t; - using argument_type = svgi::State; - std::size_t operator()(const svgi::State& rState ) const - { - std::size_t seed = 0; - boost::hash_combine(seed, rState.maCTM.get( 0, 0 )); - boost::hash_combine(seed, rState.maCTM.get( 1, 0 )); - boost::hash_combine(seed, rState.maCTM.get( 0, 1 )); - boost::hash_combine(seed, rState.maCTM.get( 1, 1 )); - boost::hash_combine(seed, rState.maCTM.get( 0, 2 )); - boost::hash_combine(seed, rState.maCTM.get( 1, 2 )); - boost::hash_combine(seed, rState.maViewport.getWidth()); - boost::hash_combine(seed, rState.maViewport.getHeight()); - boost::hash_combine(seed, rState.maViewBox.getWidth()); - boost::hash_combine(seed, rState.maViewBox.getHeight()); - boost::hash_combine(seed, rState.mbIsText); - boost::hash_combine(seed, rState.maFontFamily); - boost::hash_combine(seed, rState.mnFontSize); - boost::hash_combine(seed, rState.mnParentFontSize); - boost::hash_combine(seed, rState.maFontStyle); - boost::hash_combine(seed, rState.maFontVariant); - boost::hash_combine(seed, rState.mnFontWeight); - boost::hash_combine(seed, rState.meTextAnchor); - boost::hash_combine(seed, rState.mbVisibility); - boost::hash_combine(seed, rState.meFillType) - boost::hash_combine(seed, rState.mnFillOpacity); - boost::hash_combine(seed, rState.mnOpacity); - boost::hash_combine(seed, rState.meStrokeType); - boost::hash_combine(seed, rState.mnStrokeOpacity); - boost::hash_combine(seed, rState.mnViewportFillOpacity); - boost::hash_combine(seed, rState.maFillColor.a); - boost::hash_combine(seed, rState.maFillColor.r); - boost::hash_combine(seed, rState.maFillColor.g); - boost::hash_combine(seed, rState.maFillColor.b); - boost::hash_combine(seed, rState.maFillGradient.maStops.size()); - boost::hash_combine(seed, rState.meFillRule); - boost::hash_combine(seed, rState.maStrokeColor.a); - boost::hash_combine(seed, rState.maStrokeColor.r); - boost::hash_combine(seed, rState.maStrokeColor.g); - boost::hash_combine(seed, rState.maStrokeColor.b); - boost::hash_combine(seed, rState.maStrokeGradient.maStops.size()); - boost::hash_combine(seed, rState.maDashArray.size()); - boost::hash_combine(seed, rState.mnDashOffset); - boost::hash_combine(seed, rState.meLineCap); - boost::hash_combine(seed, rState.meLineJoin); - boost::hash_combine(seed, rState.mnMiterLimit); - boost::hash_combine(seed, rState.mnStrokeWidth); - boost::hash_combine(seed, rState.maViewportFillColor.a); - boost::hash_combine(seed, rState.maViewportFillColor.r); - boost::hash_combine(seed, rState.maViewportFillColor.g); - boost::hash_combine(seed, rState.maViewportFillColor.b); - boost::hash_combine(seed, rState.maViewportFillGradient.maStops.size()); - return seed; - } - }; -} - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/qa/cppunit/filters-dxf-test.cxx b/filter/qa/cppunit/filters-dxf-test.cxx index d90d4173baa2..dcadeae17d19 100644 --- a/filter/qa/cppunit/filters-dxf-test.cxx +++ b/filter/qa/cppunit/filters-dxf-test.cxx @@ -13,9 +13,6 @@ #include <tools/stream.hxx> #include <vcl/graph.hxx> -#include <osl/file.hxx> -#include <osl/process.h> - extern "C" { SAL_DLLPUBLIC_EXPORT bool SAL_CALL diff --git a/filter/qa/cppunit/filters-eps-test.cxx b/filter/qa/cppunit/filters-eps-test.cxx index da204859f8ac..a79bcab7f596 100644 --- a/filter/qa/cppunit/filters-eps-test.cxx +++ b/filter/qa/cppunit/filters-eps-test.cxx @@ -13,9 +13,6 @@ #include <tools/stream.hxx> #include <vcl/graph.hxx> -#include <osl/file.hxx> -#include <osl/process.h> - extern "C" { SAL_DLLPUBLIC_EXPORT bool SAL_CALL diff --git a/filter/qa/cppunit/filters-met-test.cxx b/filter/qa/cppunit/filters-met-test.cxx index af78d17bbe21..596be1237be9 100644 --- a/filter/qa/cppunit/filters-met-test.cxx +++ b/filter/qa/cppunit/filters-met-test.cxx @@ -13,9 +13,6 @@ #include <tools/stream.hxx> #include <vcl/graph.hxx> -#include <osl/file.hxx> -#include <osl/process.h> - extern "C" { SAL_DLLPUBLIC_EXPORT bool SAL_CALL diff --git a/filter/qa/cppunit/filters-pcd-test.cxx b/filter/qa/cppunit/filters-pcd-test.cxx index 6f967665474c..2104b539653a 100644 --- a/filter/qa/cppunit/filters-pcd-test.cxx +++ b/filter/qa/cppunit/filters-pcd-test.cxx @@ -13,9 +13,6 @@ #include <tools/stream.hxx> #include <vcl/graph.hxx> -#include <osl/file.hxx> -#include <osl/process.h> - extern "C" { SAL_DLLPUBLIC_EXPORT bool SAL_CALL diff --git a/filter/qa/cppunit/filters-pcx-test.cxx b/filter/qa/cppunit/filters-pcx-test.cxx index 4c5c778fac0e..1c8faa01a3e8 100644 --- a/filter/qa/cppunit/filters-pcx-test.cxx +++ b/filter/qa/cppunit/filters-pcx-test.cxx @@ -13,9 +13,6 @@ #include <tools/stream.hxx> #include <vcl/graph.hxx> -#include <osl/file.hxx> -#include <osl/process.h> - extern "C" { SAL_DLLPUBLIC_EXPORT bool SAL_CALL diff --git a/filter/qa/cppunit/filters-pict-test.cxx b/filter/qa/cppunit/filters-pict-test.cxx index a7824e4e929c..1fd6ae8e37a0 100644 --- a/filter/qa/cppunit/filters-pict-test.cxx +++ b/filter/qa/cppunit/filters-pict-test.cxx @@ -16,9 +16,6 @@ #include <vcl/graph.hxx> #include <vcl/metaactiontypes.hxx> -#include <osl/file.hxx> -#include <osl/process.h> - #include "../../source/graphicfilter/ipict/ipict.hxx" extern "C" diff --git a/filter/qa/cppunit/filters-ppm-test.cxx b/filter/qa/cppunit/filters-ppm-test.cxx index 0eefd1979203..1a11eedd5d38 100644 --- a/filter/qa/cppunit/filters-ppm-test.cxx +++ b/filter/qa/cppunit/filters-ppm-test.cxx @@ -13,9 +13,6 @@ #include <tools/stream.hxx> #include <vcl/graph.hxx> -#include <osl/file.hxx> -#include <osl/process.h> - extern "C" { SAL_DLLPUBLIC_EXPORT bool SAL_CALL diff --git a/filter/qa/cppunit/filters-psd-test.cxx b/filter/qa/cppunit/filters-psd-test.cxx index 0f1f007e7772..3b983df1d1f5 100644 --- a/filter/qa/cppunit/filters-psd-test.cxx +++ b/filter/qa/cppunit/filters-psd-test.cxx @@ -13,9 +13,6 @@ #include <tools/stream.hxx> #include <vcl/graph.hxx> -#include <osl/file.hxx> -#include <osl/process.h> - extern "C" { SAL_DLLPUBLIC_EXPORT bool SAL_CALL diff --git a/filter/qa/cppunit/filters-ras-test.cxx b/filter/qa/cppunit/filters-ras-test.cxx index 4293b8da5db3..0c5b0df1a12b 100644 --- a/filter/qa/cppunit/filters-ras-test.cxx +++ b/filter/qa/cppunit/filters-ras-test.cxx @@ -13,9 +13,6 @@ #include <tools/stream.hxx> #include <vcl/graph.hxx> -#include <osl/file.hxx> -#include <osl/process.h> - extern "C" { SAL_DLLPUBLIC_EXPORT bool SAL_CALL diff --git a/filter/qa/cppunit/filters-tga-test.cxx b/filter/qa/cppunit/filters-tga-test.cxx index 6df9e5818d64..53f424dac78e 100644 --- a/filter/qa/cppunit/filters-tga-test.cxx +++ b/filter/qa/cppunit/filters-tga-test.cxx @@ -13,9 +13,6 @@ #include <tools/stream.hxx> #include <vcl/graph.hxx> -#include <osl/file.hxx> -#include <osl/process.h> - extern "C" { SAL_DLLPUBLIC_EXPORT bool SAL_CALL diff --git a/filter/qa/cppunit/filters-tiff-test.cxx b/filter/qa/cppunit/filters-tiff-test.cxx index 80b8fa3a1b6a..8d8fba03caf1 100644 --- a/filter/qa/cppunit/filters-tiff-test.cxx +++ b/filter/qa/cppunit/filters-tiff-test.cxx @@ -13,9 +13,6 @@ #include <tools/stream.hxx> #include <vcl/graph.hxx> -#include <osl/file.hxx> -#include <osl/process.h> - extern "C" { SAL_DLLPUBLIC_EXPORT bool SAL_CALL diff --git a/filter/qa/cppunit/msfilter-test.cxx b/filter/qa/cppunit/msfilter-test.cxx index 3fd553c05e25..ce7b4b7c4cbd 100644 --- a/filter/qa/cppunit/msfilter-test.cxx +++ b/filter/qa/cppunit/msfilter-test.cxx @@ -8,12 +8,10 @@ */ #include <cppunit/TestAssert.h> -#include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> #include <sal/types.h> -#include <rtl/ustrbuf.hxx> #include <tools/color.hxx> #include <filter/msfilter/util.hxx> diff --git a/filter/qa/cppunit/priority-test.cxx b/filter/qa/cppunit/priority-test.cxx index 223d0c58c937..018d882a7215 100644 --- a/filter/qa/cppunit/priority-test.cxx +++ b/filter/qa/cppunit/priority-test.cxx @@ -9,15 +9,11 @@ // Unit test to check that we get the right filters for the right extensions. -#include <limits> - #include <cppunit/TestAssert.h> -#include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> #include <sal/types.h> -#include <rtl/ustrbuf.hxx> #include <com/sun/star/document/XTypeDetection.hpp> #include <comphelper/processfactory.hxx> diff --git a/filter/qa/cppunit/xslt-test.cxx b/filter/qa/cppunit/xslt-test.cxx index 061f25c43133..24740097b4a5 100644 --- a/filter/qa/cppunit/xslt-test.cxx +++ b/filter/qa/cppunit/xslt-test.cxx @@ -10,11 +10,9 @@ #include <sal/config.h> #include <condition_variable> -#include <limits> #include <mutex> #include <cppunit/TestAssert.h> -#include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> @@ -27,7 +25,6 @@ #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/io/XStreamListener.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/ucb/SimpleFileAccess.hpp> #include <com/sun/star/xml/xslt/XSLTTransformer.hpp> diff --git a/filter/qa/unit/filter-dialogs-test.cxx b/filter/qa/unit/filter-dialogs-test.cxx index 0f9d2b688b70..5bddb6ccefe0 100644 --- a/filter/qa/unit/filter-dialogs-test.cxx +++ b/filter/qa/unit/filter-dialogs-test.cxx @@ -9,9 +9,6 @@ #include <sal/config.h> #include <test/screenshot_test.hxx> -#include <rtl/strbuf.hxx> -#include <osl/file.hxx> -#include <sfx2/app.hxx> #include <vcl/abstdlg.hxx> using namespace ::com::sun::star; diff --git a/filter/source/config/cache/basecontainer.cxx b/filter/source/config/cache/basecontainer.cxx index a354727ca9f7..31fb9e89c149 100644 --- a/filter/source/config/cache/basecontainer.cxx +++ b/filter/source/config/cache/basecontainer.cxx @@ -19,7 +19,6 @@ #include "basecontainer.hxx" -#include "constant.hxx" #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> #include <com/sun/star/document/FilterConfigRefresh.hpp> diff --git a/filter/source/config/cache/basecontainer.hxx b/filter/source/config/cache/basecontainer.hxx index fa75e3ec5fc7..c53c8f39fe72 100644 --- a/filter/source/config/cache/basecontainer.hxx +++ b/filter/source/config/cache/basecontainer.hxx @@ -22,7 +22,6 @@ #include <memory> #include "filtercache.hxx" -#include <com/sun/star/uno/Exception.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/util/XRefreshable.hpp> #include <com/sun/star/uno/XComponentContext.hpp> diff --git a/filter/source/config/cache/cacheitem.cxx b/filter/source/config/cache/cacheitem.cxx index d864459508e1..b77b3af760b1 100644 --- a/filter/source/config/cache/cacheitem.cxx +++ b/filter/source/config/cache/cacheitem.cxx @@ -23,6 +23,7 @@ #include <com/sun/star/uno/Sequence.h> +#include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <osl/diagnose.h> diff --git a/filter/source/config/cache/cacheitem.hxx b/filter/source/config/cache/cacheitem.hxx index aedd899b64d0..ed359bdab893 100644 --- a/filter/source/config/cache/cacheitem.hxx +++ b/filter/source/config/cache/cacheitem.hxx @@ -23,7 +23,6 @@ #include <unordered_map> #include <com/sun/star/uno/Sequence.h> #include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/beans/NamedValue.hpp> #include <vector> #include <comphelper/sequenceashashmap.hxx> #include <osl/mutex.hxx> diff --git a/filter/source/config/cache/cacheupdatelistener.cxx b/filter/source/config/cache/cacheupdatelistener.cxx index 6625d4ee9286..22d7b1bae25c 100644 --- a/filter/source/config/cache/cacheupdatelistener.cxx +++ b/filter/source/config/cache/cacheupdatelistener.cxx @@ -19,12 +19,10 @@ #include "cacheupdatelistener.hxx" -#include "constant.hxx" #include <com/sun/star/util/XChangesNotifier.hpp> #include <com/sun/star/util/XRefreshable.hpp> #include <com/sun/star/document/FilterConfigRefresh.hpp> -#include <salhelper/singletonref.hxx> #include <unotools/configpaths.hxx> #include <rtl/ustring.hxx> #include <comphelper/processfactory.hxx> diff --git a/filter/source/config/cache/cacheupdatelistener.hxx b/filter/source/config/cache/cacheupdatelistener.hxx index 163b27f14af7..62e01c91c64a 100644 --- a/filter/source/config/cache/cacheupdatelistener.hxx +++ b/filter/source/config/cache/cacheupdatelistener.hxx @@ -20,9 +20,7 @@ #define INCLUDED_FILTER_SOURCE_CONFIG_CACHE_CACHEUPDATELISTENER_HXX #include "filtercache.hxx" -#include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/util/XChangesListener.hpp> -#include <salhelper/singletonref.hxx> #include <cppuhelper/implbase.hxx> diff --git a/filter/source/config/cache/configflush.cxx b/filter/source/config/cache/configflush.cxx index 1d098085dfab..03cb95442abd 100644 --- a/filter/source/config/cache/configflush.cxx +++ b/filter/source/config/cache/configflush.cxx @@ -18,7 +18,6 @@ */ #include "configflush.hxx" -#include "constant.hxx" #include <cppuhelper/supportsservice.hxx> diff --git a/filter/source/config/cache/contenthandlerfactory.cxx b/filter/source/config/cache/contenthandlerfactory.cxx index d24cd8e752d2..8a4a1e7e5993 100644 --- a/filter/source/config/cache/contenthandlerfactory.cxx +++ b/filter/source/config/cache/contenthandlerfactory.cxx @@ -19,8 +19,6 @@ #include "contenthandlerfactory.hxx" -#include "querytokenizer.hxx" -#include "constant.hxx" #include <com/sun/star/lang/XInitialization.hpp> #include <comphelper/processfactory.hxx> diff --git a/filter/source/config/cache/contenthandlerfactory.hxx b/filter/source/config/cache/contenthandlerfactory.hxx index 53608131f7e3..bcb2dcfca9f1 100644 --- a/filter/source/config/cache/contenthandlerfactory.hxx +++ b/filter/source/config/cache/contenthandlerfactory.hxx @@ -22,7 +22,6 @@ #include "basecontainer.hxx" #include <com/sun/star/frame/XLoaderFactory.hpp> -#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <cppuhelper/implbase.hxx> diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx index ad278e28caf6..28d0826fb51d 100644 --- a/filter/source/config/cache/filtercache.cxx +++ b/filter/source/config/cache/filtercache.cxx @@ -29,11 +29,9 @@ #include <com/sun/star/configuration/theDefaultProvider.hpp> #include <com/sun/star/util/XChangesBatch.hpp> -#include <com/sun/star/container/XHierarchicalNameAccess.hpp> +#include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/beans/NamedValue.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/beans/XPropertyAccess.hpp> #include <com/sun/star/beans/XMultiPropertySet.hpp> #include <com/sun/star/beans/XProperty.hpp> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/filter/source/config/cache/filtercache.hxx b/filter/source/config/cache/filtercache.hxx index 14b6ac48640b..6b99a0781f0c 100644 --- a/filter/source/config/cache/filtercache.hxx +++ b/filter/source/config/cache/filtercache.hxx @@ -23,13 +23,10 @@ #include <memory> #include "cacheitem.hxx" -#include <com/sun/star/uno/Exception.hpp> #include <com/sun/star/util/URL.hpp> #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/container/XNameAccess.hpp> -#include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/container/XNameReplace.hpp> -#include <com/sun/star/util/ChangesEvent.hpp> #include <com/sun/star/uno/Reference.h> #include <com/sun/star/uno/Any.h> #include <comphelper/documentconstants.hxx> diff --git a/filter/source/config/cache/filterfactory.cxx b/filter/source/config/cache/filterfactory.cxx index a012b5542a8a..2b5268f698eb 100644 --- a/filter/source/config/cache/filterfactory.cxx +++ b/filter/source/config/cache/filterfactory.cxx @@ -25,7 +25,6 @@ #include <comphelper/processfactory.hxx> #include <comphelper/enumhelper.hxx> #include <comphelper/sequence.hxx> -#include <rtl/ustrbuf.hxx> #include <officecfg/Setup.hxx> #include <officecfg/TypeDetection/UISort.hxx> diff --git a/filter/source/config/cache/filterfactory.hxx b/filter/source/config/cache/filterfactory.hxx index d46963afa652..5cc06919e576 100644 --- a/filter/source/config/cache/filterfactory.hxx +++ b/filter/source/config/cache/filterfactory.hxx @@ -23,7 +23,6 @@ #include "basecontainer.hxx" #include "querytokenizer.hxx" #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <cppuhelper/implbase.hxx> diff --git a/filter/source/config/cache/frameloaderfactory.cxx b/filter/source/config/cache/frameloaderfactory.cxx index 45ebe511b49b..8f34feed7cd4 100644 --- a/filter/source/config/cache/frameloaderfactory.cxx +++ b/filter/source/config/cache/frameloaderfactory.cxx @@ -19,7 +19,6 @@ #include "frameloaderfactory.hxx" -#include "constant.hxx" #include <com/sun/star/lang/XInitialization.hpp> #include <comphelper/processfactory.hxx> diff --git a/filter/source/config/cache/frameloaderfactory.hxx b/filter/source/config/cache/frameloaderfactory.hxx index 30b6525b6619..7a0b744d2152 100644 --- a/filter/source/config/cache/frameloaderfactory.hxx +++ b/filter/source/config/cache/frameloaderfactory.hxx @@ -22,7 +22,6 @@ #include "basecontainer.hxx" #include <com/sun/star/frame/XLoaderFactory.hpp> -#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <cppuhelper/implbase.hxx> diff --git a/filter/source/config/cache/registration.cxx b/filter/source/config/cache/registration.cxx index 38cd72c3efd1..bf334aaf6d21 100644 --- a/filter/source/config/cache/registration.cxx +++ b/filter/source/config/cache/registration.cxx @@ -19,7 +19,8 @@ #include <cppuhelper/factory.hxx> -#include <rtl/instance.hxx> + +#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include "typedetection.hxx" #include "filterfactory.hxx" diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx index d3bf230b115f..0ae899b47990 100644 --- a/filter/source/config/cache/typedetection.cxx +++ b/filter/source/config/cache/typedetection.cxx @@ -29,7 +29,6 @@ #include <com/sun/star/io/XSeekable.hpp> #include <com/sun/star/task/XInteractionHandler.hpp> #include <tools/wldcrd.hxx> -#include <rtl/ustrbuf.hxx> #include <sal/log.hxx> #include <framework/interaction.hxx> #include <tools/diagnose_ex.h> diff --git a/filter/source/config/cache/typedetection.hxx b/filter/source/config/cache/typedetection.hxx index eaac83146432..34995191e978 100644 --- a/filter/source/config/cache/typedetection.hxx +++ b/filter/source/config/cache/typedetection.hxx @@ -22,7 +22,6 @@ #include "basecontainer.hxx" #include <com/sun/star/document/XTypeDetection.hpp> #include <com/sun/star/frame/XTerminateListener.hpp> -#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <unotools/mediadescriptor.hxx> #include <cppuhelper/compbase.hxx> diff --git a/filter/source/flash/swfdialog.cxx b/filter/source/flash/swfdialog.cxx index c2ea828332ad..423b85691522 100644 --- a/filter/source/flash/swfdialog.cxx +++ b/filter/source/flash/swfdialog.cxx @@ -21,12 +21,9 @@ #include "swfdialog.hxx" #include "swfuno.hxx" #include "impswfdialog.hxx" -#include <svl/solar.hrc> #include <comphelper/processfactory.hxx> #include <cppuhelper/queryinterface.hxx> #include <com/sun/star/view/XRenderable.hpp> -#include <com/sun/star/frame/XController.hpp> -#include <com/sun/star/view/XSelectionSupplier.hpp> #include <vcl/svapp.hxx> using namespace ::com::sun::star; diff --git a/filter/source/flash/swfexporter.cxx b/filter/source/flash/swfexporter.cxx index 8f6615128bbd..b27635cb922a 100644 --- a/filter/source/flash/swfexporter.cxx +++ b/filter/source/flash/swfexporter.cxx @@ -19,6 +19,7 @@ #include <com/sun/star/awt/Rectangle.hpp> #include <com/sun/star/beans/PropertyValue.hpp> +#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/drawing/GraphicExportFilter.hpp> #include <com/sun/star/drawing/XMasterPageTarget.hpp> #include <com/sun/star/drawing/XDrawPagesSupplier.hpp> @@ -28,9 +29,7 @@ #include <vcl/gdimtf.hxx> #include <unotools/tempfile.hxx> #include <osl/diagnose.h> -#include <osl/file.hxx> #include <vcl/metaact.hxx> -#include <vcl/wmf.hxx> #include <vcl/graphicfilter.hxx> #include <vcl/gdimetafiletools.hxx> #include <memory> diff --git a/filter/source/flash/swfexporter.hxx b/filter/source/flash/swfexporter.hxx index f39f4c6a0a0b..2482a18df1c2 100644 --- a/filter/source/flash/swfexporter.hxx +++ b/filter/source/flash/swfexporter.hxx @@ -19,14 +19,14 @@ #ifndef INCLUDED_FILTER_SOURCE_FLASH_SWFEXPORTER_HXX #define INCLUDED_FILTER_SOURCE_FLASH_SWFEXPORTER_HXX -#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/lang/XComponent.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> +#include <com/sun/star/task/XStatusIndicator.hpp> #include <com/sun/star/drawing/XDrawPage.hpp> #include <com/sun/star/drawing/XGraphicExportFilter.hpp> #include <com/sun/star/io/XOutputStream.hpp> #include <vcl/checksum.hxx> -#include <vector> #include <map> #include <memory> diff --git a/filter/source/flash/swfuno.cxx b/filter/source/flash/swfuno.cxx index d9b18294e575..32604cb075f9 100644 --- a/filter/source/flash/swfuno.cxx +++ b/filter/source/flash/swfuno.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <osl/thread.h> #include <cppuhelper/factory.hxx> #include <com/sun/star/lang/XSingleServiceFactory.hpp> diff --git a/filter/source/flash/swfuno.hxx b/filter/source/flash/swfuno.hxx index caa304868509..77ca66a02e2d 100644 --- a/filter/source/flash/swfuno.hxx +++ b/filter/source/flash/swfuno.hxx @@ -22,13 +22,10 @@ #include <sal/config.h> -#include <com/sun/star/uno/Exception.hpp> #include <com/sun/star/uno/Reference.hxx> -#include <com/sun/star/uno/RuntimeException.hpp> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <rtl/ustring.hxx> -#include <sal/types.h> namespace com { namespace sun { namespace star { namespace lang { class XMultiSerivceFactory; } diff --git a/filter/source/flash/swfwriter.hxx b/filter/source/flash/swfwriter.hxx index ecb04e9dd0ce..61916d1304c1 100644 --- a/filter/source/flash/swfwriter.hxx +++ b/filter/source/flash/swfwriter.hxx @@ -31,7 +31,7 @@ #include <tools/gen.hxx> #include <tools/stream.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <osl/file.hxx> +#include <osl/diagnose.h> #include <vector> #include <stack> diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx index 4bc117c0dccf..d48fc83e31e4 100644 --- a/filter/source/flash/swfwriter1.cxx +++ b/filter/source/flash/swfwriter1.cxx @@ -19,12 +19,10 @@ #include <com/sun/star/i18n/BreakIterator.hpp> #include <com/sun/star/i18n/ScriptType.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <comphelper/processfactory.hxx> #include "swfwriter.hxx" #include <vcl/metaact.hxx> #include <vcl/gdimtf.hxx> -#include <vcl/bitmapaccess.hxx> #include <vcl/virdev.hxx> #include <vcl/metric.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> diff --git a/filter/source/graphicfilter/egif/egif.cxx b/filter/source/graphicfilter/egif/egif.cxx index b7e4ac40fe06..e8e3a6f6894b 100644 --- a/filter/source/graphicfilter/egif/egif.cxx +++ b/filter/source/graphicfilter/egif/egif.cxx @@ -20,11 +20,9 @@ #include <tools/stream.hxx> #include <tools/debug.hxx> +#include <vcl/bitmapaccess.hxx> #include <vcl/graph.hxx> -#include <vcl/svapp.hxx> -#include <vcl/window.hxx> -#include <svl/solar.hrc> -#include <vcl/fltcall.hxx> +#include <vcl/outdev.hxx> #include <vcl/FilterConfigItem.hxx> #include <com/sun/star/task/XStatusIndicator.hpp> #include "giflzwc.hxx" diff --git a/filter/source/graphicfilter/egif/giflzwc.hxx b/filter/source/graphicfilter/egif/giflzwc.hxx index 018a45812646..057710c85230 100644 --- a/filter/source/graphicfilter/egif/giflzwc.hxx +++ b/filter/source/graphicfilter/egif/giflzwc.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_FILTER_SOURCE_GRAPHICFILTER_EGIF_GIFLZWC_HXX #define INCLUDED_FILTER_SOURCE_GRAPHICFILTER_EGIF_GIFLZWC_HXX -#include <vcl/bitmapaccess.hxx> +#include <vcl/mapmod.hxx> class GIFImageDataOutputStream; diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx index e933763c9140..dedcbddb0ede 100644 --- a/filter/source/graphicfilter/eps/eps.cxx +++ b/filter/source/graphicfilter/eps/eps.cxx @@ -28,15 +28,11 @@ #include <vcl/graph.hxx> #include <vcl/bitmapaccess.hxx> #include <vcl/region.hxx> -#include <vcl/metric.hxx> #include <vcl/font.hxx> #include <vcl/virdev.hxx> #include <vcl/cvtgrf.hxx> #include <vcl/gradient.hxx> -#include <vcl/settings.hxx> #include <unotools/configmgr.hxx> -#include <svl/solar.hrc> -#include <vcl/fltcall.hxx> #include <vcl/FilterConfigItem.hxx> #include <vcl/graphictools.hxx> #include <vcl/weld.hxx> @@ -44,7 +40,6 @@ #include <osl/diagnose.h> #include <com/sun/star/task/XStatusIndicator.hpp> -#include <math.h> #include <memory> using namespace ::com::sun::star::uno; diff --git a/filter/source/graphicfilter/etiff/etiff.cxx b/filter/source/graphicfilter/etiff/etiff.cxx index 456088d0c234..aaccd16bf73a 100644 --- a/filter/source/graphicfilter/etiff/etiff.cxx +++ b/filter/source/graphicfilter/etiff/etiff.cxx @@ -21,10 +21,7 @@ #include <tools/stream.hxx> #include <vcl/graph.hxx> #include <vcl/outdev.hxx> -#include <vcl/svapp.hxx> #include <vcl/bitmapaccess.hxx> -#include <svl/solar.hrc> -#include <vcl/fltcall.hxx> #include <vcl/FilterConfigItem.hxx> #include <com/sun/star/task/XStatusIndicator.hpp> diff --git a/filter/source/graphicfilter/icgm/actimpr.cxx b/filter/source/graphicfilter/icgm/actimpr.cxx index dd72bd297dbd..c892f5db9b68 100644 --- a/filter/source/graphicfilter/icgm/actimpr.cxx +++ b/filter/source/graphicfilter/icgm/actimpr.cxx @@ -47,9 +47,9 @@ #include <toolkit/helper/vclunohelper.hxx> #include <tools/helpers.hxx> #include <unotools/configmgr.hxx> -#include <vcl/gradient.hxx> -#include "main.hxx" +#include "bitmap.hxx" +#include "elements.hxx" #include "outact.hxx" using namespace ::com::sun::star; diff --git a/filter/source/graphicfilter/icgm/bitmap.cxx b/filter/source/graphicfilter/icgm/bitmap.cxx index 825c90243e0a..e6e4d60da426 100644 --- a/filter/source/graphicfilter/icgm/bitmap.cxx +++ b/filter/source/graphicfilter/icgm/bitmap.cxx @@ -18,12 +18,14 @@ */ -#include "main.hxx" #include <sal/log.hxx> #include <unotools/configmgr.hxx> #include <vcl/BitmapTools.hxx> #include <memory> +#include "bitmap.hxx" +#include "elements.hxx" + namespace { Color BMCOL(sal_uInt32 _col) { diff --git a/filter/source/graphicfilter/icgm/bundles.cxx b/filter/source/graphicfilter/icgm/bundles.cxx index 2bb36999de98..357901ad1048 100644 --- a/filter/source/graphicfilter/icgm/bundles.cxx +++ b/filter/source/graphicfilter/icgm/bundles.cxx @@ -20,8 +20,8 @@ #include "bundles.hxx" -#include <tools/stream.hxx> #include <memory> +#include <string.h> void Bundle::SetColor( sal_uInt32 nColor ) { diff --git a/filter/source/graphicfilter/icgm/cgm.cxx b/filter/source/graphicfilter/icgm/cgm.cxx index 32f9fca0257b..09abcac8d136 100644 --- a/filter/source/graphicfilter/icgm/cgm.cxx +++ b/filter/source/graphicfilter/icgm/cgm.cxx @@ -20,11 +20,9 @@ #include <com/sun/star/task/XStatusIndicator.hpp> #include <osl/endian.h> -#include <vcl/virdev.hxx> -#include <vcl/graph.hxx> #include <tools/stream.hxx> +#include "bitmap.hxx" #include "chart.hxx" -#include "main.hxx" #include "elements.hxx" #include "outact.hxx" #include <memory> diff --git a/filter/source/graphicfilter/icgm/cgm.hxx b/filter/source/graphicfilter/icgm/cgm.hxx index 19773b9117c1..3f9c88dde649 100644 --- a/filter/source/graphicfilter/icgm/cgm.hxx +++ b/filter/source/graphicfilter/icgm/cgm.hxx @@ -22,10 +22,8 @@ #include <com/sun/star/frame/XModel.hpp> -#include <rtl/ustring.hxx> #include <vector> #include <memory> -#include <vcl/vclptr.hxx> #include "cgmtypes.hxx" class Graphic; diff --git a/filter/source/graphicfilter/icgm/chart.cxx b/filter/source/graphicfilter/icgm/chart.cxx index a2a3ea34b050..91818149a51a 100644 --- a/filter/source/graphicfilter/icgm/chart.cxx +++ b/filter/source/graphicfilter/icgm/chart.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "main.hxx" #include "chart.hxx" diff --git a/filter/source/graphicfilter/icgm/chart.hxx b/filter/source/graphicfilter/icgm/chart.hxx index 839be2e4a196..96b715b9a879 100644 --- a/filter/source/graphicfilter/icgm/chart.hxx +++ b/filter/source/graphicfilter/icgm/chart.hxx @@ -20,6 +20,11 @@ #ifndef INCLUDED_FILTER_SOURCE_GRAPHICFILTER_ICGM_CHART_HXX #define INCLUDED_FILTER_SOURCE_GRAPHICFILTER_ICGM_CHART_HXX +#include <sal/types.h> + +#include <memory> +#include <vector> + /* FILE TYPE CONSTANTS: */ #define BULCHART 32 /* Bullet chart file. */ /* the following were added although SPC doesn't have a #define */ diff --git a/filter/source/graphicfilter/icgm/class0.cxx b/filter/source/graphicfilter/icgm/class0.cxx index baeef1249dd7..aa6152d241d0 100644 --- a/filter/source/graphicfilter/icgm/class0.cxx +++ b/filter/source/graphicfilter/icgm/class0.cxx @@ -17,7 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "main.hxx" +#include "bitmap.hxx" +#include "cgm.hxx" +#include "elements.hxx" #include "outact.hxx" diff --git a/filter/source/graphicfilter/icgm/class1.cxx b/filter/source/graphicfilter/icgm/class1.cxx index 0adee25234f9..cf9e7ed9885f 100644 --- a/filter/source/graphicfilter/icgm/class1.cxx +++ b/filter/source/graphicfilter/icgm/class1.cxx @@ -17,8 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -#include "main.hxx" +#include "bundles.hxx" +#include "cgm.hxx" +#include "elements.hxx" void CGM::ImplDoClass1() diff --git a/filter/source/graphicfilter/icgm/class2.cxx b/filter/source/graphicfilter/icgm/class2.cxx index 05528fe280d8..8d410e475816 100644 --- a/filter/source/graphicfilter/icgm/class2.cxx +++ b/filter/source/graphicfilter/icgm/class2.cxx @@ -17,8 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -#include "main.hxx" +#include "cgm.hxx" +#include "bundles.hxx" +#include "elements.hxx" void CGM::ImplDoClass2() diff --git a/filter/source/graphicfilter/icgm/class3.cxx b/filter/source/graphicfilter/icgm/class3.cxx index 1ccc038d3c56..c3d56367947b 100644 --- a/filter/source/graphicfilter/icgm/class3.cxx +++ b/filter/source/graphicfilter/icgm/class3.cxx @@ -18,7 +18,8 @@ */ -#include "main.hxx" +#include "cgm.hxx" +#include "elements.hxx" #include "outact.hxx" diff --git a/filter/source/graphicfilter/icgm/class4.cxx b/filter/source/graphicfilter/icgm/class4.cxx index a7779ab23d49..0213e89542e3 100644 --- a/filter/source/graphicfilter/icgm/class4.cxx +++ b/filter/source/graphicfilter/icgm/class4.cxx @@ -18,8 +18,10 @@ */ -#include "main.hxx" +#include "bitmap.hxx" +#include "cgm.hxx" #include "chart.hxx" +#include "elements.hxx" #include "outact.hxx" #include <math.h> #include <memory> diff --git a/filter/source/graphicfilter/icgm/class5.cxx b/filter/source/graphicfilter/icgm/class5.cxx index 2525e88b07b1..33273adb7cf8 100644 --- a/filter/source/graphicfilter/icgm/class5.cxx +++ b/filter/source/graphicfilter/icgm/class5.cxx @@ -19,7 +19,8 @@ //#define VCL_NEED_BASETSD -#include "main.hxx" +#include "cgm.hxx" +#include "elements.hxx" #include "outact.hxx" diff --git a/filter/source/graphicfilter/icgm/class7.cxx b/filter/source/graphicfilter/icgm/class7.cxx index 8c2478a308ae..830b4d79c9cd 100644 --- a/filter/source/graphicfilter/icgm/class7.cxx +++ b/filter/source/graphicfilter/icgm/class7.cxx @@ -18,7 +18,7 @@ */ -#include "main.hxx" +#include "cgm.hxx" #include "chart.hxx" #include "outact.hxx" diff --git a/filter/source/graphicfilter/icgm/classx.cxx b/filter/source/graphicfilter/icgm/classx.cxx index ce2e7de485fd..ea1fc79196a9 100644 --- a/filter/source/graphicfilter/icgm/classx.cxx +++ b/filter/source/graphicfilter/icgm/classx.cxx @@ -18,7 +18,8 @@ */ -#include "main.hxx" +#include "cgm.hxx" +#include "elements.hxx" #include "outact.hxx" diff --git a/filter/source/graphicfilter/icgm/elements.cxx b/filter/source/graphicfilter/icgm/elements.cxx index 8061d399537a..2be08c32f04b 100644 --- a/filter/source/graphicfilter/icgm/elements.cxx +++ b/filter/source/graphicfilter/icgm/elements.cxx @@ -20,6 +20,7 @@ #include "elements.hxx" +#include <algorithm> CGMElements::CGMElements() { diff --git a/filter/source/graphicfilter/icgm/elements.hxx b/filter/source/graphicfilter/icgm/elements.hxx index e7f0e9ca64d0..4dbd0e9aa08e 100644 --- a/filter/source/graphicfilter/icgm/elements.hxx +++ b/filter/source/graphicfilter/icgm/elements.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_FILTER_SOURCE_GRAPHICFILTER_ICGM_ELEMENTS_HXX #define INCLUDED_FILTER_SOURCE_GRAPHICFILTER_ICGM_ELEMENTS_HXX -#include "main.hxx" +#include "bundles.hxx" #include "cgmtypes.hxx" #include <vector> #include <map> diff --git a/filter/source/graphicfilter/icgm/main.hxx b/filter/source/graphicfilter/icgm/main.hxx deleted file mode 100644 index 3d02d5b1f68d..000000000000 --- a/filter/source/graphicfilter/icgm/main.hxx +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_FILTER_SOURCE_GRAPHICFILTER_ICGM_MAIN_HXX -#define INCLUDED_FILTER_SOURCE_GRAPHICFILTER_ICGM_MAIN_HXX - -#include "cgm.hxx" - -#include <tools/stream.hxx> -#include "bundles.hxx" -#include "bitmap.hxx" -#include "elements.hxx" - - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/graphicfilter/icgm/outact.hxx b/filter/source/graphicfilter/icgm/outact.hxx index a31d42c4560a..43af85d10844 100644 --- a/filter/source/graphicfilter/icgm/outact.hxx +++ b/filter/source/graphicfilter/icgm/outact.hxx @@ -32,7 +32,6 @@ #define CGM_OUTACT_MAX_GROUP_LEVEL 64 #include "cgm.hxx" -#include "chart.hxx" #include <tools/poly.hxx> #include <array> #include <memory> diff --git a/filter/source/graphicfilter/idxf/dxf2mtf.cxx b/filter/source/graphicfilter/idxf/dxf2mtf.cxx index c57ad6b97924..3c8ce673547a 100644 --- a/filter/source/graphicfilter/idxf/dxf2mtf.cxx +++ b/filter/source/graphicfilter/idxf/dxf2mtf.cxx @@ -18,7 +18,6 @@ */ -#include <string.h> #include <unotools/configmgr.hxx> #include <vcl/gdimtf.hxx> #include <vcl/metaact.hxx> diff --git a/filter/source/graphicfilter/idxf/dxf2mtf.hxx b/filter/source/graphicfilter/idxf/dxf2mtf.hxx index e510c3e16789..27ec1fbda76a 100644 --- a/filter/source/graphicfilter/idxf/dxf2mtf.hxx +++ b/filter/source/graphicfilter/idxf/dxf2mtf.hxx @@ -23,6 +23,8 @@ #include "dxfreprd.hxx" #include <vcl/font.hxx> #include <vcl/lineinfo.hxx> +#include <vcl/vclptr.hxx> +#include <vcl/virdev.hxx> enum PenStyle { PEN_NULL, PEN_SOLID, PEN_DOT, PEN_DASH, PEN_DASHDOT }; diff --git a/filter/source/graphicfilter/idxf/dxfblkrd.cxx b/filter/source/graphicfilter/idxf/dxfblkrd.cxx index ce47e205515c..9597fdca95a4 100644 --- a/filter/source/graphicfilter/idxf/dxfblkrd.cxx +++ b/filter/source/graphicfilter/idxf/dxfblkrd.cxx @@ -18,7 +18,6 @@ */ -#include <string.h> #include "dxfblkrd.hxx" diff --git a/filter/source/graphicfilter/idxf/dxfentrd.cxx b/filter/source/graphicfilter/idxf/dxfentrd.cxx index a35cea0fb240..dfc14ba0edcb 100644 --- a/filter/source/graphicfilter/idxf/dxfentrd.cxx +++ b/filter/source/graphicfilter/idxf/dxfentrd.cxx @@ -18,7 +18,6 @@ */ -#include <string.h> #include "dxfentrd.hxx" //--------------------------DXFBasicEntity-------------------------------------- diff --git a/filter/source/graphicfilter/idxf/dxfgrprd.cxx b/filter/source/graphicfilter/idxf/dxfgrprd.cxx index 1261f29823b0..5d28a1b04c5e 100644 --- a/filter/source/graphicfilter/idxf/dxfgrprd.cxx +++ b/filter/source/graphicfilter/idxf/dxfgrprd.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <string.h> #include <stdlib.h> #include <rtl/strbuf.hxx> #include <tools/stream.hxx> diff --git a/filter/source/graphicfilter/idxf/dxfreprd.cxx b/filter/source/graphicfilter/idxf/dxfreprd.cxx index 424aa2ac728e..26ec1077ae79 100644 --- a/filter/source/graphicfilter/idxf/dxfreprd.cxx +++ b/filter/source/graphicfilter/idxf/dxfreprd.cxx @@ -18,7 +18,6 @@ */ -#include <string.h> #include "dxfreprd.hxx" #include <osl/nlsupport.h> #include <officecfg/Setup.hxx> diff --git a/filter/source/graphicfilter/idxf/dxftblrd.cxx b/filter/source/graphicfilter/idxf/dxftblrd.cxx index 3975651ac0ea..e328c797a0f1 100644 --- a/filter/source/graphicfilter/idxf/dxftblrd.cxx +++ b/filter/source/graphicfilter/idxf/dxftblrd.cxx @@ -18,7 +18,6 @@ */ -#include <string.h> #include "dxftblrd.hxx" //----------------------------------DXFLType----------------------------------- diff --git a/filter/source/graphicfilter/idxf/idxf.cxx b/filter/source/graphicfilter/idxf/idxf.cxx index 80abdd8a8470..ad75d6b5e1c3 100644 --- a/filter/source/graphicfilter/idxf/idxf.cxx +++ b/filter/source/graphicfilter/idxf/idxf.cxx @@ -18,12 +18,9 @@ */ -#include <string.h> #include <vcl/gdimtf.hxx> #include <vcl/graph.hxx> -#include <vcl/virdev.hxx> #include "dxf2mtf.hxx" -#include <math.h> class FilterConfigItem; diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx index b8942d13e48c..4ad7349149e3 100644 --- a/filter/source/graphicfilter/ieps/ieps.cxx +++ b/filter/source/graphicfilter/ieps/ieps.cxx @@ -20,10 +20,7 @@ #include <tools/solar.h> #include <vcl/svapp.hxx> -#include <vcl/bitmapex.hxx> -#include <vcl/animate/Animation.hxx> #include <vcl/gdimtf.hxx> -#include <vcl/window.hxx> #include <vcl/graph.hxx> #include <vcl/metaact.hxx> #include <vcl/virdev.hxx> diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx index 00ef5a9355b6..85e8b269423d 100644 --- a/filter/source/graphicfilter/ios2met/ios2met.cxx +++ b/filter/source/graphicfilter/ios2met/ios2met.cxx @@ -30,7 +30,6 @@ #include <vcl/gdimtf.hxx> #include <math.h> -#include <algorithm> #include <memory> class FilterConfigItem; diff --git a/filter/source/graphicfilter/ipcd/ipcd.cxx b/filter/source/graphicfilter/ipcd/ipcd.cxx index 9c9fc0983f30..6da5f9c50f02 100644 --- a/filter/source/graphicfilter/ipcd/ipcd.cxx +++ b/filter/source/graphicfilter/ipcd/ipcd.cxx @@ -18,12 +18,8 @@ */ -#include <rtl/alloc.h> #include <vcl/graph.hxx> #include <vcl/BitmapTools.hxx> -#include <vcl/svapp.hxx> -#include <vcl/fltcall.hxx> -#include <svl/solar.hrc> #include <vcl/FilterConfigItem.hxx> #include <tools/stream.hxx> diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx index d81cc2d7b073..bfd06303f3a1 100644 --- a/filter/source/graphicfilter/itiff/itiff.cxx +++ b/filter/source/graphicfilter/itiff/itiff.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <memory> #include <sal/config.h> #include <sal/log.hxx> diff --git a/filter/source/graphicfilter/itiff/lzwdecom.cxx b/filter/source/graphicfilter/itiff/lzwdecom.cxx index 88beb13d9b6f..f231ecd8ec6a 100644 --- a/filter/source/graphicfilter/itiff/lzwdecom.cxx +++ b/filter/source/graphicfilter/itiff/lzwdecom.cxx @@ -21,8 +21,6 @@ #include "lzwdecom.hxx" #include <sal/log.hxx> #include <tools/stream.hxx> -#include <algorithm> -#include <set> LZWDecompressor::LZWDecompressor() : pIStream(nullptr) diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index 3f3c580f9ff1..89b26b1d32f6 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -28,10 +28,8 @@ #include <svx/svdobj.hxx> #include <svx/svdoashp.hxx> #include <svx/svdoole2.hxx> -#include <svx/svdmodel.hxx> #include <svx/sdtfsitm.hxx> #include <editeng/outlobj.hxx> -#include <vcl/gradient.hxx> #include <vcl/graph.hxx> #include <vcl/cvtgrf.hxx> #include <vcl/svapp.hxx> @@ -50,17 +48,14 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/awt/GradientStyle.hpp> -#include <com/sun/star/awt/RasterOperation.hpp> #include <com/sun/star/awt/Gradient.hpp> #include <com/sun/star/drawing/LineStyle.hpp> #include <com/sun/star/drawing/LineJoint.hpp> #include <com/sun/star/drawing/LineCap.hpp> #include <com/sun/star/drawing/FillStyle.hpp> #include <com/sun/star/drawing/LineDash.hpp> -#include <com/sun/star/drawing/BezierPoint.hpp> #include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp> #include <com/sun/star/drawing/ConnectorType.hpp> -#include <com/sun/star/drawing/ConnectionType.hpp> #include <com/sun/star/drawing/CircleKind.hpp> #include <com/sun/star/drawing/PointSequence.hpp> #include <com/sun/star/drawing/FlagSequence.hpp> @@ -80,7 +75,6 @@ #include <com/sun/star/drawing/ShadeMode.hpp> #include <com/sun/star/drawing/TextFitToSizeType.hpp> #include <vcl/hatch.hxx> -#include <com/sun/star/awt/XGraphics.hpp> #include <com/sun/star/awt/FontSlant.hpp> #include <com/sun/star/awt/FontWeight.hpp> #include <com/sun/star/drawing/ColorMode.hpp> @@ -90,7 +84,6 @@ #include <com/sun/star/graphic/XGraphic.hpp> #include <com/sun/star/text/GraphicCrop.hpp> #include <unotools/ucbstreamhelper.hxx> -#include <unotools/localfilehelper.hxx> #include <comphelper/string.hxx> #include <vcl/virdev.hxx> #include <rtl/crc.h> diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx index b145cbef20c8..e92933cf2775 100644 --- a/filter/source/msfilter/eschesdo.cxx +++ b/filter/source/msfilter/eschesdo.cxx @@ -20,38 +20,22 @@ #include <memory> #include "eschesdo.hxx" #include <o3tl/any.hxx> -#include <sal/log.hxx> #include <svx/svdobj.hxx> #include <svx/unoapi.hxx> -#include <svx/svdoashp.hxx> #include <svx/unoshape.hxx> #include <vcl/outdev.hxx> #include <tools/poly.hxx> -#include <vcl/bitmapex.hxx> -#include <vcl/graph.hxx> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> +#include <tools/fract.hxx> #include <svx/fmdpage.hxx> -#include <com/sun/star/style/VerticalAlignment.hpp> -#include <com/sun/star/awt/Gradient.hpp> -#include <com/sun/star/drawing/PointSequence.hpp> -#include <com/sun/star/drawing/PointSequenceSequence.hpp> -#include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp> -#include <com/sun/star/drawing/FlagSequence.hpp> -#include <com/sun/star/drawing/TextAdjust.hpp> -#include <com/sun/star/drawing/LineDash.hpp> +#include <com/sun/star/awt/Rectangle.hpp> #include <com/sun/star/text/XText.hpp> #include <com/sun/star/text/TextContentAnchorType.hpp> #include <com/sun/star/drawing/CircleKind.hpp> -#include <com/sun/star/drawing/FillStyle.hpp> -#include <com/sun/star/task/XStatusIndicator.hpp> #include <comphelper/extract.hxx> -#include <vcl/fltcall.hxx> -#include <vcl/cvtgrf.hxx> #include <com/sun/star/drawing/HomogenMatrix3.hpp> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <basegfx/polygon/b2dpolygontools.hxx> -#include <basegfx/polygon/b2dpolygon.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::beans; diff --git a/filter/source/msfilter/eschesdo.hxx b/filter/source/msfilter/eschesdo.hxx index 4602a320b557..52bd852146d8 100644 --- a/filter/source/msfilter/eschesdo.hxx +++ b/filter/source/msfilter/eschesdo.hxx @@ -20,7 +20,6 @@ #define INCLUDED_FILTER_SOURCE_MSFILTER_ESCHESDO_HXX #include <filter/msfilter/escherex.hxx> #include <o3tl/any.hxx> -#include <svx/unopage.hxx> #include <vcl/mapmod.hxx> diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index bbd95fb50b61..9786e880197c 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -25,10 +25,8 @@ #include <vector> #include <o3tl/any.hxx> -#include <osl/endian.h> #include <osl/file.hxx> #include <tools/solar.h> -#include <rtl/math.hxx> #include <sal/log.hxx> #include <comphelper/classids.hxx> @@ -52,21 +50,14 @@ // SvxItem-Mapping. Is needed to successfully include the SvxItem-Header #include <editeng/eeitem.hxx> #include <editeng/editdata.hxx> -#include <svl/urihelper.hxx> #include <tools/stream.hxx> #include <tools/debug.hxx> #include <tools/zcodec.hxx> -#include <unotools/ucbstreamhelper.hxx> #include <filter/msfilter/escherex.hxx> -#include <basegfx/range/b2drange.hxx> #include <basegfx/numeric/ftools.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> -#include <com/sun/star/container/XIdentifierContainer.hpp> -#include <com/sun/star/drawing/XGluePointsSupplier.hpp> #include <com/sun/star/drawing/Position3D.hpp> #include <com/sun/star/drawing/Direction3D.hpp> -#include <com/sun/star/drawing/GluePoint2.hpp> -#include <com/sun/star/drawing/XShapes.hpp> #include <editeng/charscaleitem.hxx> #include <editeng/kernitem.hxx> #include <vcl/graphicfilter.hxx> @@ -74,19 +65,14 @@ #include <vcl/virdev.hxx> #include <vcl/bitmapaccess.hxx> #include <sot/storage.hxx> -#include <sfx2/docfac.hxx> #include <sfx2/docfilt.hxx> -#include <sfx2/docfile.hxx> #include <sfx2/fcontnr.hxx> -#include <sfx2/module.hxx> #include <svx/xbtmpit.hxx> #include <svx/xsflclit.hxx> #include <svx/xflgrit.hxx> #include <svx/xflftrit.hxx> #include <svx/sdgcpitm.hxx> #include <svx/sdgmoitm.hxx> -#include <editeng/tstpitem.hxx> -#include <svx/fmmodel.hxx> #include <svx/svdmodel.hxx> #include <svx/svdobj.hxx> #include <svx/svdpage.hxx> @@ -94,9 +80,7 @@ #include <svx/svdograf.hxx> #include <svx/svdotext.hxx> #include <svx/svdorect.hxx> -#include <svx/svdocapt.hxx> #include <svx/svdoedge.hxx> -#include <svx/svdocirc.hxx> #include <svx/svdoutl.hxx> #include <svx/svdoole2.hxx> #include <svx/svdopath.hxx> @@ -119,11 +103,7 @@ #include <editeng/crossedoutitem.hxx> #include <editeng/shdditem.hxx> #include <editeng/fontitem.hxx> -#include <editeng/colritem.hxx> #include <svx/sxekitm.hxx> -#include <editeng/bulletitem.hxx> -#include <svx/extrud3d.hxx> -#include <svx/svditer.hxx> #include <svx/xpoly.hxx> #include <svx/xlineit0.hxx> #include <svx/xlncapit.hxx> @@ -152,11 +132,7 @@ #include <filter/msfilter/msdffimp.hxx> #include <editeng/outliner.hxx> #include <editeng/outlobj.hxx> -#include <editeng/editobj.hxx> -#include <editeng/editeng.hxx> -#include <svx/gallery.hxx> #include <com/sun/star/drawing/ShadeMode.hpp> -#include <svl/itempool.hxx> #include <vcl/dibtools.hxx> #include <vcl/svapp.hxx> #include <svx/svx3ditems.hxx> @@ -176,8 +152,6 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/drawing/ProjectionMode.hpp> #include <svx/EnhancedCustomShape2d.hxx> -#include <svx/xbitmap.hxx> -#include <rtl/strbuf.hxx> #include <rtl/ustring.hxx> #include <svtools/embedhlp.hxx> #include <memory> diff --git a/filter/source/msfilter/msoleexp.cxx b/filter/source/msfilter/msoleexp.cxx index 42907629bfaa..a6e31ad8fb91 100644 --- a/filter/source/msfilter/msoleexp.cxx +++ b/filter/source/msfilter/msoleexp.cxx @@ -32,10 +32,7 @@ #include <com/sun/star/embed/Aspects.hpp> #include <osl/diagnose.h> #include <comphelper/classids.hxx> -#include <sfx2/objsh.hxx> -#include <sfx2/docfac.hxx> #include <sfx2/docfilt.hxx> -#include <sfx2/docfile.hxx> #include <sfx2/fcontnr.hxx> #include <sot/formats.hxx> #include <sot/storage.hxx> diff --git a/filter/source/msfilter/mstoolbar.cxx b/filter/source/msfilter/mstoolbar.cxx index 42ed5ee2df77..ee872866ddb3 100644 --- a/filter/source/msfilter/mstoolbar.cxx +++ b/filter/source/msfilter/mstoolbar.cxx @@ -7,9 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include <filter/msfilter/mstoolbar.hxx> -#include <rtl/ustrbuf.hxx> #include <sal/log.hxx> -#include <stdarg.h> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/ui/XUIConfigurationManager.hpp> @@ -19,16 +17,11 @@ #include <com/sun/star/ui/ImageType.hpp> #include <com/sun/star/ui/ItemType.hpp> #include <com/sun/star/ui/ItemStyle.hpp> -#include <fstream> #include <vcl/dibtools.hxx> #include <vcl/graph.hxx> #include <vcl/bitmapex.hxx> -#include <vcl/image.hxx> -#include <map> #include <sfx2/objsh.hxx> -#include <basic/basmgr.hxx> #include <filter/msfilter/msvbahelper.hxx> -#include <svtools/miscopt.hxx> #include <vcl/svapp.hxx> #include <vcl/window.hxx> diff --git a/filter/source/msfilter/msvbahelper.cxx b/filter/source/msfilter/msvbahelper.cxx index 736f65887764..a60e097bd067 100644 --- a/filter/source/msfilter/msvbahelper.cxx +++ b/filter/source/msfilter/msvbahelper.cxx @@ -20,7 +20,6 @@ #include <config_features.h> #include <filter/msfilter/msvbahelper.hxx> -#include <basic/sbx.hxx> #include <basic/sbstar.hxx> #include <basic/basmgr.hxx> #include <basic/sbmod.hxx> @@ -40,7 +39,6 @@ #include <rtl/character.hxx> #include <sfx2/objsh.hxx> -#include <com/sun/star/awt/KeyModifier.hpp> #include <svtools/acceleratorexecute.hxx> #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> #include <com/sun/star/ui/XUIConfigurationManager.hpp> diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 0c399260d6bf..c82f6411941c 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -37,11 +37,9 @@ #include <com/sun/star/geometry/RealPoint2D.hpp> #include <com/sun/star/util/DateTime.hpp> #include <com/sun/star/drawing/BitmapMode.hpp> -#include <unotools/streamwrap.hxx> #include <filter/msfilter/svdfppt.hxx> #include <svx/xflgrit.hxx> #include <svx/xbtmpit.hxx> -#include <svx/xpoly.hxx> #include <svx/svdtrans.hxx> #include <svx/svdmodel.hxx> #include <svx/svdpage.hxx> @@ -51,8 +49,6 @@ #include <svx/svdopage.hxx> #include <svx/svdograf.hxx> #include <svx/svdopath.hxx> -#include <svx/svdocirc.hxx> -#include <svx/svdocapt.hxx> #include <svx/svdotable.hxx> #include <svx/xfillit0.hxx> #include <svx/xflbstit.hxx> @@ -70,14 +66,10 @@ #include <svx/xlineit0.hxx> #include <svx/xlnclit.hxx> #include <svx/xlnwtit.hxx> -#include <svx/svdetc.hxx> -#include <editeng/bulletitem.hxx> #include <editeng/hngpnctitem.hxx> #include <editeng/forbiddenruleitem.hxx> -#include <svx/extrud3d.hxx> #include <svx/svdoashp.hxx> #include <editeng/tstpitem.hxx> -#include <editeng/unoprnms.hxx> #include <editeng/editids.hrc> #include <editeng/adjustitem.hxx> @@ -92,17 +84,13 @@ #include <editeng/charreliefitem.hxx> #include <editeng/fontitem.hxx> #include <svx/svdoutl.hxx> -#include <editeng/editeng.hxx> #include <editeng/lspcitem.hxx> #include <editeng/ulspitem.hxx> #include <editeng/lrspitem.hxx> #include <editeng/numitem.hxx> #include <vcl/gdimtf.hxx> -#include <vcl/metric.hxx> #include <vcl/bitmapaccess.hxx> #include <svx/svditer.hxx> -#include <svx/svdoedge.hxx> -#include <svx/sxekitm.hxx> #include <editeng/flditem.hxx> #include <tools/zcodec.hxx> #include <filter/msfilter/svxmsbas.hxx> @@ -113,33 +101,24 @@ #include <svx/unoapi.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <com/sun/star/container/XIndexContainer.hpp> -#include <com/sun/star/drawing/XShapes.hpp> #include <com/sun/star/drawing/XControlShape.hpp> #include <com/sun/star/form/XFormComponent.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/drawing/XDrawPagesSupplier.hpp> #include <com/sun/star/drawing/XMasterPagesSupplier.hpp> -#include <com/sun/star/drawing/XDrawPageSupplier.hpp> #include <com/sun/star/awt/Size.hpp> -#include <com/sun/star/awt/Point.hpp> #include <com/sun/star/drawing/FillStyle.hpp> #include <com/sun/star/drawing/TextVerticalAdjust.hpp> -#include <editeng/writingmodeitem.hxx> -#include <vcl/print.hxx> -#include <editeng/svxfont.hxx> #include <editeng/frmdiritem.hxx> #include <svx/sdtfchim.hxx> -#include <editeng/scripttypeitem.hxx> #include <com/sun/star/awt/Gradient.hpp> #include <com/sun/star/table/XMergeableCellRange.hpp> #include <com/sun/star/table/BorderLine2.hpp> #include <com/sun/star/table/BorderLineStyle.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <vcl/virdev.hxx> #include <svtools/embedhlp.hxx> #include <o3tl/enumrange.hxx> #include <o3tl/safeint.hxx> -#include <o3tl/optional.hxx> #include <sal/log.hxx> #include <algorithm> diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx index 8654458b98cf..bc323ea45d23 100644 --- a/filter/source/msfilter/util.cxx +++ b/filter/source/msfilter/util.cxx @@ -10,10 +10,8 @@ #include <com/sun/star/awt/Size.hpp> #include <com/sun/star/lang/Locale.hpp> #include <rtl/ustring.hxx> -#include <rtl/strbuf.hxx> #include <unotools/fontcvt.hxx> #include <unotools/fontdefs.hxx> -#include <vcl/svapp.hxx> #include <vcl/BitmapPalette.hxx> #include <filter/msfilter/escherex.hxx> #include <filter/msfilter/util.hxx> diff --git a/filter/source/odfflatxml/OdfFlatXml.cxx b/filter/source/odfflatxml/OdfFlatXml.cxx index cf7f37b9f993..5099af082b87 100644 --- a/filter/source/odfflatxml/OdfFlatXml.cxx +++ b/filter/source/odfflatxml/OdfFlatXml.cxx @@ -17,7 +17,6 @@ #include <sax/tools/documenthandleradapter.hxx> -#include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> @@ -28,8 +27,6 @@ #include <com/sun/star/xml/sax/Parser.hpp> #include <com/sun/star/xml/sax/InputSource.hpp> #include <com/sun/star/xml/sax/XDocumentHandler.hpp> -#include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp> -#include <com/sun/star/xml/sax/SAXException.hpp> #include <com/sun/star/xml/sax/Writer.hpp> #include <com/sun/star/xml/sax/XFastParser.hpp> diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index 8d852d0e847e..477098a85114 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -17,19 +17,14 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <string.h> - #include "impdialog.hxx" #include <strings.hrc> #include <officecfg/Office/Common.hxx> #include <vcl/errinf.hxx> -#include <vcl/settings.hxx> #include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <sfx2/passwd.hxx> -#include <svtools/miscopt.hxx> #include <unotools/resmgr.hxx> -#include <sal/log.hxx> #include <tools/diagnose_ex.h> #include <comphelper/propertyvalue.hxx> @@ -42,8 +37,8 @@ #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> #include <com/sun/star/security/DocumentDigitalSignatures.hpp> -#include <com/sun/star/security/XCertificate.hpp> #include <com/sun/star/beans/XMaterialHolder.hpp> +#include <com/sun/star/lang/XServiceInfo.hpp> static OUString PDFFilterResId(const char* pId) { diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx index 4827e125fbc0..f3599f6587ec 100644 --- a/filter/source/pdf/impdialog.hxx +++ b/filter/source/pdf/impdialog.hxx @@ -26,15 +26,18 @@ #include <vcl/FilterConfigItem.hxx> #include <vcl/weld.hxx> -#include "pdffilter.hxx" - #include <com/sun/star/beans/NamedValue.hpp> +#include <com/sun/star/lang/XComponent.hpp> class ImpPDFTabGeneralPage; class ImpPDFTabViewerPage; class ImpPDFTabOpnFtrPage; class ImpPDFTabLinksPage; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::beans; +using namespace ::com::sun::star::lang; + class ImplErrorDialog : public weld::MessageDialogController { private: diff --git a/filter/source/pdf/pdfdialog.cxx b/filter/source/pdf/pdfdialog.cxx index 79dec365d437..7380a3ec0894 100644 --- a/filter/source/pdf/pdfdialog.cxx +++ b/filter/source/pdf/pdfdialog.cxx @@ -21,8 +21,6 @@ #include "pdfdialog.hxx" #include "impdialog.hxx" #include <vcl/svapp.hxx> -#include <svl/solar.hrc> -#include <com/sun/star/view/XRenderable.hpp> #include <comphelper/processfactory.hxx> using namespace ::com::sun::star; diff --git a/filter/source/pdf/pdfdialog.hxx b/filter/source/pdf/pdfdialog.hxx index 2fa7ba76e257..0179467b1320 100644 --- a/filter/source/pdf/pdfdialog.hxx +++ b/filter/source/pdf/pdfdialog.hxx @@ -20,15 +20,23 @@ #ifndef INCLUDED_FILTER_SOURCE_PDF_PDFDIALOG_HXX #define INCLUDED_FILTER_SOURCE_PDF_PDFDIALOG_HXX -#include "pdffilter.hxx" #include <svtools/genericunodialog.hxx> #include <comphelper/proparrhlp.hxx> #include <cppuhelper/implbase.hxx> +#include <com/sun/star/beans/XPropertyAccess.hpp> +#include <com/sun/star/document/XExporter.hpp> +#include <com/sun/star/lang/XComponent.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> namespace vcl { class Window; } +using namespace ::com::sun::star::beans; +using namespace ::com::sun::star::document; +using namespace ::com::sun::star::lang; +using namespace ::com::sun::star::uno; + typedef ::cppu::ImplInheritanceHelper < ::svt::OGenericUnoDialog, XPropertyAccess, XExporter > PDFDialog_Base; class PDFDialog final: diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx index 039ac09de19c..d00e371338b4 100644 --- a/filter/source/pdf/pdfexport.cxx +++ b/filter/source/pdf/pdfexport.cxx @@ -21,22 +21,11 @@ #include <osl/file.hxx> #include <tools/debug.hxx> #include <tools/urlobj.hxx> -#include <tools/fract.hxx> #include <tools/poly.hxx> #include <unotools/resmgr.hxx> #include <vcl/canvastools.hxx> #include <vcl/mapmod.hxx> -#include <vcl/virdev.hxx> -#include <vcl/metaact.hxx> #include <vcl/gdimtf.hxx> -#include <vcl/jobset.hxx> -#include <vcl/bitmapaccess.hxx> -#include <vcl/svapp.hxx> -#include <vcl/FilterConfigItem.hxx> -#include <vcl/graphicfilter.hxx> -#include <vcl/settings.hxx> -#include <vcl/graphictools.hxx> -#include <svl/solar.hrc> #include <comphelper/sequence.hxx> #include <comphelper/string.hxx> #include <comphelper/storagehelper.hxx> @@ -44,22 +33,16 @@ #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <toolkit/awt/vclxdevice.hxx> -#include <unotools/streamwrap.hxx> -#include <unotools/saveopt.hxx> #include <unotools/configmgr.hxx> -#include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> #include "pdfexport.hxx" -#include "impdialog.hxx" #include <strings.hrc> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/configuration/theDefaultProvider.hpp> -#include <com/sun/star/awt/Rectangle.hpp> #include <com/sun/star/awt/XDevice.hpp> -#include <com/sun/star/util/MeasureUnit.hpp> #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/frame/ModuleManager.hpp> #include <com/sun/star/frame/XStorable.hpp> @@ -70,16 +53,16 @@ #include <com/sun/star/task/XInteractionRequest.hpp> #include <com/sun/star/task/PDFExportException.hpp> #include <com/sun/star/io/IOException.hpp> -#include <com/sun/star/io/XSeekable.hpp> +#include <com/sun/star/io/XOutputStream.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/drawing/XShapes.hpp> -#include <com/sun/star/graphic/XGraphicProvider.hpp> #include <com/sun/star/security/XCertificate.hpp> #include <com/sun/star/beans/XMaterialHolder.hpp> #include <memory> using namespace ::com::sun::star; +using namespace ::com::sun::star::io; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; diff --git a/filter/source/pdf/pdfexport.hxx b/filter/source/pdf/pdfexport.hxx index f133e12c5ffa..426416628e24 100644 --- a/filter/source/pdf/pdfexport.hxx +++ b/filter/source/pdf/pdfexport.hxx @@ -20,10 +20,15 @@ #ifndef INCLUDED_FILTER_SOURCE_PDF_PDFEXPORT_HXX #define INCLUDED_FILTER_SOURCE_PDF_PDFEXPORT_HXX -#include "pdffilter.hxx" #include <tools/multisel.hxx> #include <vcl/pdfwriter.hxx> #include <vcl/pdfextoutdevdata.hxx> +#include <com/sun/star/beans/PropertyValue.hpp> +#include <com/sun/star/lang/XComponent.hpp> +#include <com/sun/star/task/XInteractionHandler.hpp> +#include <com/sun/star/task/XStatusIndicator.hpp> +#include <com/sun/star/uno/Reference.hxx> +#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/view/XRenderable.hpp> class GDIMetaFile; @@ -31,6 +36,10 @@ class Size; namespace vcl { class PDFWriter; } +using namespace ::com::sun::star; +using namespace ::com::sun::star::beans; +using namespace ::com::sun::star::lang; +using namespace ::com::sun::star::uno; class PDFExport { diff --git a/filter/source/pdf/pdffilter.cxx b/filter/source/pdf/pdffilter.cxx index b79cc7884346..5dfb9396a590 100644 --- a/filter/source/pdf/pdffilter.cxx +++ b/filter/source/pdf/pdffilter.cxx @@ -25,9 +25,13 @@ #include <vcl/window.hxx> #include <svl/outstrm.hxx> #include <unotools/ucbstreamhelper.hxx> +#include <unotools/tempfile.hxx> #include <vcl/FilterConfigItem.hxx> #include <memory> +#include <com/sun/star/io/XOutputStream.hpp> + +using namespace ::com::sun::star::io; PDFFilter::PDFFilter( const Reference< XComponentContext > &rxContext ) : mxContext( rxContext ) diff --git a/filter/source/pdf/pdffilter.hxx b/filter/source/pdf/pdffilter.hxx index b686071574c1..f6c48af0b2f4 100644 --- a/filter/source/pdf/pdffilter.hxx +++ b/filter/source/pdf/pdffilter.hxx @@ -24,27 +24,16 @@ #include <com/sun/star/document/XExporter.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <cppuhelper/implbase.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/beans/XPropertyAccess.hpp> -#include <com/sun/star/task/XStatusIndicator.hpp> -#include <com/sun/star/task/XInteractionHandler.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <osl/diagnose.h> -#include <rtl/process.h> -#include <unotools/tempfile.hxx> -#include <unotools/localfilehelper.hxx> -#include <unotools/streamwrap.hxx> - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::document; -using namespace ::com::sun::star::io; class PDFFilter : public cppu::WeakImplHelper < XFilter, XExporter, XInitialization, XServiceInfo > diff --git a/filter/source/pdf/pdfinteract.cxx b/filter/source/pdf/pdfinteract.cxx index 024ac40ea7fe..cc1c205eaac3 100644 --- a/filter/source/pdf/pdfinteract.cxx +++ b/filter/source/pdf/pdfinteract.cxx @@ -25,7 +25,6 @@ #include <com/sun/star/task/PDFExportException.hpp> #include <comphelper/namedvaluecollection.hxx> #include <cppuhelper/supportsservice.hxx> -#include <toolkit/helper/vclunohelper.hxx> #include <vcl/svapp.hxx> PDFInteractionHandler::PDFInteractionHandler() diff --git a/filter/source/pdf/pdfuno.cxx b/filter/source/pdf/pdfuno.cxx index 8dad87097afa..cd1adfbafb43 100644 --- a/filter/source/pdf/pdfuno.cxx +++ b/filter/source/pdf/pdfuno.cxx @@ -18,7 +18,6 @@ */ -#include <osl/thread.h> #include <cppuhelper/factory.hxx> #include <com/sun/star/lang/XSingleServiceFactory.hpp> diff --git a/filter/source/storagefilterdetect/filterdetect.cxx b/filter/source/storagefilterdetect/filterdetect.cxx index 02ed875c6699..4937349dbd6b 100644 --- a/filter/source/storagefilterdetect/filterdetect.cxx +++ b/filter/source/storagefilterdetect/filterdetect.cxx @@ -21,7 +21,6 @@ #include <comphelper/documentconstants.hxx> #include <comphelper/storagehelper.hxx> -#include <comphelper/types.hxx> #include <cppuhelper/supportsservice.hxx> #include <unotools/mediadescriptor.hxx> #include <tools/urlobj.hxx> diff --git a/filter/source/svg/spirit_supplements.hxx b/filter/source/svg/spirit_supplements.hxx deleted file mode 100644 index 1ed60ec232e2..000000000000 --- a/filter/source/svg/spirit_supplements.hxx +++ /dev/null @@ -1,110 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ -#ifndef INCLUDED_FILTER_SOURCE_SVG_SPIRIT_SUPPLEMENTS_HXX -#define INCLUDED_FILTER_SOURCE_SVG_SPIRIT_SUPPLEMENTS_HXX - -# ifndef USE_MODERN_SPIRIT -# include <boost/spirit.hpp> - -namespace boost { namespace spirit -{ - template <> - class assign_actor< std::pair<const char*,const char*> > - { - public: - explicit assign_actor(std::pair<const char*,const char*>& ref_) - : ref(ref_) {} - - template <typename T2> - void operator()(T2 const& val) const - { ref = val; } - - template <typename IteratorT> - void operator()(IteratorT const& f, IteratorT const& l) const - { - ref.first = f, ref.second = l; - } - - private: - std::pair<const char*,const char*>& ref; - }; - - template<typename Target, typename Value> struct assigner - { - assigner( Target& rTarget, Value aValue ) : - mrTarget(rTarget), maValue(aValue) - {} - - void assign() const { mrTarget=maValue; } - - void operator()() const { assign(); } - template<typename T1> void operator()(T1) const { assign(); } - template<typename T1,typename T2> void operator()(T1,T2) const { assign(); } - template<typename T1,typename T2,typename T3> void operator()(T1,T2,T3) const { assign(); } - - Target& mrTarget; - const Value maValue; - }; - - template<typename Target, typename Value> inline assigner<Target,Value> - assign_a( Target& rTarget, Value aValue ) - { - return assigner<Target,Value>(rTarget,aValue); - } - - template <typename Target> inline assign_actor<Target> - assign_a(Target& rTarget) - { - return assign_actor<Target>(rTarget); - } - - template<typename Target, typename Value> struct back_pusher - { - back_pusher( Target& rTarget, const Value& rValue ) : - mrTarget(rTarget), mrValue(rValue) - {} - - void push_back() const { mrTarget.push_back(mrValue); } - - void operator()() const { push_back(); } - template<typename T1> void operator()(T1) const { push_back(); } - template<typename T1,typename T2> void operator()(T1,T2) const { push_back(); } - template<typename T1,typename T2,typename T3> void operator()(T1,T2,T3) const { push_back(); } - - Target& mrTarget; - const Value& mrValue; - }; - - template<typename Target, typename Value> inline back_pusher<Target,Value> - push_back_a( Target& rTarget, const Value& rValue ) - { - return back_pusher<Target,Value>(rTarget,rValue); - } - - template<typename Target> struct value_back_pusher - { - explicit value_back_pusher( Target& rTarget ) : - mrTarget(rTarget) - {} - template<typename T1> void operator()(T1 val) const { mrTarget.push_back(val); } - - Target& mrTarget; - }; - - template<typename Target> inline value_back_pusher<Target> - push_back_a( Target& rTarget ) - { - return value_back_pusher<Target>(rTarget); - } -} } - -# endif -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index 7fbf85283d7f..df77168765b6 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -24,8 +24,9 @@ #include <com/sun/star/awt/Rectangle.hpp> #include <com/sun/star/animations/XAnimationNodeSupplier.hpp> +#include <com/sun/star/container/XEnumerationAccess.hpp> +#include <com/sun/star/drawing/FillStyle.hpp> #include <com/sun/star/drawing/XMasterPageTarget.hpp> -#include <com/sun/star/graphic/PrimitiveFactory2D.hpp> #include <com/sun/star/drawing/GraphicExportFilter.hpp> #include <com/sun/star/presentation/XPresentationSupplier.hpp> #include <com/sun/star/style/ParagraphAdjust.hpp> @@ -36,21 +37,19 @@ #include <com/sun/star/drawing/ShapeCollection.hpp> #include <rtl/bootstrap.hxx> -#include <svtools/miscopt.hxx> #include <svx/unopage.hxx> -#include <svx/unoshape.hxx> #include <svx/svdpage.hxx> #include <svx/svdoutl.hxx> -#include <svx/xfillit0.hxx> #include <editeng/outliner.hxx> #include <editeng/flditem.hxx> -#include <editeng/numitem.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/sequenceashashmap.hxx> #include <i18nlangtag/lang.h> #include <svl/zforlist.hxx> #include <tools/debug.hxx> #include <tools/urlobj.hxx> +#include <unotools/streamwrap.hxx> +#include <unotools/tempfile.hxx> #include <unotools/ucbstreamhelper.hxx> #include <xmloff/unointerfacetouniqueidentifiermapper.hxx> #include <xmloff/nmspmap.hxx> @@ -58,6 +57,8 @@ #include <xmloff/xmltoken.hxx> #include <xmloff/animationexport.hxx> #include <svx/svdograf.hxx> +#include <svx/svdmodel.hxx> +#include <svx/svdxcgv.hxx> #include <memory> diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx index ba3e56cf045c..e0df140ea6d9 100644 --- a/filter/source/svg/svgfilter.cxx +++ b/filter/source/svg/svgfilter.cxx @@ -20,11 +20,8 @@ #include <cstdio> -#include <sal/log.hxx> #include <comphelper/lok.hxx> #include <comphelper/servicedecl.hxx> -#include <uno/environment.h> -#include <com/sun/star/text/XTextDocument.hpp> #include <com/sun/star/drawing/XDrawPage.hpp> #include <com/sun/star/drawing/XDrawPagesSupplier.hpp> #include <com/sun/star/drawing/XDrawView.hpp> @@ -34,21 +31,15 @@ #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/io/IOException.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> -#include <com/sun/star/drawing/XDrawSubController.hpp> -#include <com/sun/star/container/XNamed.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/drawing/framework/XControllerManager.hpp> #include <com/sun/star/drawing/framework/XConfigurationController.hpp> #include <com/sun/star/drawing/framework/XConfiguration.hpp> #include <com/sun/star/drawing/framework/AnchorBindingMode.hpp> #include <com/sun/star/drawing/framework/XResourceId.hpp> #include <com/sun/star/drawing/framework/XResource.hpp> -#include <com/sun/star/drawing/framework/XView.hpp> -#include <com/sun/star/drawing/framework/ResourceId.hpp> #include <unotools/mediadescriptor.hxx> #include <unotools/ucbstreamhelper.hxx> -#include <unotools/streamwrap.hxx> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <tools/zcodec.hxx> @@ -61,6 +52,8 @@ #include <svx/unopage.hxx> #include <vcl/graphicfilter.hxx> +#include <vcl/window.hxx> +#include <svx/svdmodel.hxx> #include <svx/svdpage.hxx> #include <svx/svdograf.hxx> #include <svl/itempool.hxx> diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx index c4b31eef77a7..79c5c58696d3 100644 --- a/filter/source/svg/svgfilter.hxx +++ b/filter/source/svg/svgfilter.hxx @@ -32,22 +32,10 @@ #include <com/sun/star/xml/sax/XWriter.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> -#include <osl/diagnose.h> -#include <sal/log.hxx> -#include <rtl/process.h> -#include <basegfx/polygon/b2dpolypolygon.hxx> -#include <basegfx/polygon/b2dpolygonclipper.hxx> -#include <basegfx/polygon/b2dpolypolygontools.hxx> #include <editeng/flditem.hxx> -#include <unotools/tempfile.hxx> -#include <unotools/streamwrap.hxx> -#include <vcl/cvtgrf.hxx> +#include <vcl/gdimtf.hxx> #include <vcl/svapp.hxx> -#include <vcl/outdev.hxx> -#include <vcl/GraphicObject.hxx> #include <svx/unoapi.hxx> -#include <svx/svdxcgv.hxx> -#include <svx/svdobj.hxx> #include <xmloff/xmlexp.hxx> #include <cstdio> #include <unordered_set> diff --git a/filter/source/svg/svgfontexport.cxx b/filter/source/svg/svgfontexport.cxx index 203655f4281b..40e4207a1a0d 100644 --- a/filter/source/svg/svgfontexport.cxx +++ b/filter/source/svg/svgfontexport.cxx @@ -24,9 +24,14 @@ #include <vcl/unohelp.hxx> #include <vcl/font.hxx> +#include <vcl/metric.hxx> #include <vcl/outdev.hxx> #include <vcl/settings.hxx> #include <i18nlangtag/languagetag.hxx> +#include <xmloff/nmspmap.hxx> + +#include <com/sun/star/i18n/CharacterIteratorMode.hpp> +#include <com/sun/star/i18n/XBreakIterator.hpp> static const sal_Int32 nFontEM = 2048; diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx index 4393e4e0c1a6..6ddf2e444227 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -22,16 +22,26 @@ #include "svgwriter.hxx" #include <comphelper/base64.hxx> -#include <rtl/crc.h> #include <sal/log.hxx> #include <vcl/unohelp.hxx> +#include <vcl/cvtgrf.hxx> +#include <vcl/metric.hxx> #include <vcl/outdev.hxx> #include <vcl/settings.hxx> +#include <tools/fract.hxx> #include <tools/helpers.hxx> +#include <tools/stream.hxx> +#include <xmloff/nmspmap.hxx> #include <xmloff/unointerfacetouniqueidentifiermapper.hxx> -#include <sax/tools/converter.hxx> #include <i18nlangtag/languagetag.hxx> +#include <com/sun/star/container/XEnumerationAccess.hpp> +#include <com/sun/star/container/XIndexReplace.hpp> +#include <com/sun/star/i18n/CharacterIteratorMode.hpp> +#include <com/sun/star/i18n/XBreakIterator.hpp> +#include <com/sun/star/style/NumberingType.hpp> +#include <com/sun/star/text/XTextField.hpp> + #include <memory> diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx index f0271ed4090b..4a94cee30ae0 100644 --- a/filter/source/svg/svgwriter.hxx +++ b/filter/source/svg/svgwriter.hxx @@ -25,37 +25,17 @@ #include <osl/diagnose.h> #include <vcl/gdimtf.hxx> #include <vcl/metaact.hxx> -#include <vcl/metric.hxx> #include <vcl/virdev.hxx> -#include <vcl/cvtgrf.hxx> #include <vcl/graphictools.hxx> #include <xmloff/xmlexp.hxx> -#include <xmloff/nmspmap.hxx> #include <com/sun/star/uno/Reference.h> -#include <com/sun/star/container/XEnumerationAccess.hpp> -#include <com/sun/star/container/XContentEnumerationAccess.hpp> #include <com/sun/star/container/XEnumeration.hpp> -#include <com/sun/star/container/XIndexReplace.hpp> -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/beans/XPropertySetInfo.hpp> -#include <com/sun/star/uno/RuntimeException.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/lang/XComponent.hpp> -#include <com/sun/star/registry/XRegistryKey.hpp> -#include <com/sun/star/io/XInputStream.hpp> -#include <com/sun/star/io/XOutputStream.hpp> #include <com/sun/star/xml/sax/XDocumentHandler.hpp> -#include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp> -#include <com/sun/star/i18n/CharacterIteratorMode.hpp> -#include <com/sun/star/i18n/XBreakIterator.hpp> #include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/text/XText.hpp> #include <com/sun/star/text/XTextContent.hpp> #include <com/sun/star/text/XTextRange.hpp> -#include <com/sun/star/text/XTextField.hpp> -#include <com/sun/star/style/NumberingType.hpp> #include <com/sun/star/svg/XSVGWriter.hpp> #include <memory> diff --git a/filter/source/t602/filterenv.cxx b/filter/source/t602/filterenv.cxx index 11af8a6690a5..238cdde2f6ea 100644 --- a/filter/source/t602/filterenv.cxx +++ b/filter/source/t602/filterenv.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <osl/thread.h> #include <cppuhelper/factory.hxx> #include <com/sun/star/lang/XSingleServiceFactory.hpp> diff --git a/filter/source/t602/t602filter.cxx b/filter/source/t602/t602filter.cxx index 3464cbdf61f2..de3f341872b3 100644 --- a/filter/source/t602/t602filter.cxx +++ b/filter/source/t602/t602filter.cxx @@ -26,14 +26,10 @@ #include <cppuhelper/bootstrap.hxx> #include <cppuhelper/supportsservice.hxx> #include <com/sun/star/awt/Toolkit.hpp> -#include <com/sun/star/bridge/XUnoUrlResolver.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/ucb/XSimpleFileAccess.hpp> -#include <com/sun/star/text/XTextDocument.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/awt/UnoControlDialog.hpp> #include <com/sun/star/awt/XControl.hpp> -#include <com/sun/star/awt/XDialog.hpp> #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> #include <osl/diagnose.h> #include <rtl/ref.hxx> diff --git a/filter/source/t602/t602filter.hxx b/filter/source/t602/t602filter.hxx index b0293b107c66..d8ebcd258cd2 100644 --- a/filter/source/t602/t602filter.hxx +++ b/filter/source/t602/t602filter.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_FILTER_SOURCE_T602_T602FILTER_HXX #define INCLUDED_FILTER_SOURCE_T602_T602FILTER_HXX -#include <memory> #include <com/sun/star/document/XFilter.hpp> #include <com/sun/star/document/XImporter.hpp> #include <com/sun/star/document/XExtendedFilterDetection.hpp> diff --git a/filter/source/textfilterdetect/filterdetect.cxx b/filter/source/textfilterdetect/filterdetect.cxx index b4959639c574..ec751ea13661 100644 --- a/filter/source/textfilterdetect/filterdetect.cxx +++ b/filter/source/textfilterdetect/filterdetect.cxx @@ -17,7 +17,6 @@ #include <unotools/streamwrap.hxx> #include <unotools/ucbstreamhelper.hxx> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <cppuhelper/supportsservice.hxx> #include <memory> diff --git a/filter/source/textfilterdetect/filterdetect.hxx b/filter/source/textfilterdetect/filterdetect.hxx index 173a0bf81cc9..64a65aa440f1 100644 --- a/filter/source/textfilterdetect/filterdetect.hxx +++ b/filter/source/textfilterdetect/filterdetect.hxx @@ -23,7 +23,6 @@ #include <com/sun/star/document/XExtendedFilterDetection.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/implbase.hxx> diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx index ba039bb99916..5e5a897e9e8e 100644 --- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx +++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx @@ -18,28 +18,19 @@ */ #include <iostream> -#include <stdlib.h> #include <rtl/ustring.hxx> #include <sal/log.hxx> #include <tools/diagnose_ex.h> #include <tools/urlobj.hxx> #include "XmlFilterAdaptor.hxx" -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/uno/RuntimeException.hpp> #include <com/sun/star/io/XActiveDataSource.hpp> -#include <com/sun/star/io/XOutputStream.hpp> -#include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/xml/sax/XDocumentHandler.hpp> -#include <com/sun/star/xml/sax/InputSource.hpp> -#include <com/sun/star/xml/sax/Parser.hpp> #include <com/sun/star/xml/XImportFilter.hpp> #include <com/sun/star/xml/XExportFilter.hpp> #include <com/sun/star/task/XStatusIndicator.hpp> -#include <com/sun/star/task/XStatusIndicatorFactory.hpp> #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> #include <com/sun/star/style/XStyleLoader.hpp> #include <com/sun/star/frame/XModel.hpp> -#include <com/sun/star/container/XNameAccess.hpp> #include <comphelper/fileurl.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/sequenceashashmap.hxx> diff --git a/filter/source/xmlfilteradaptor/genericfilter.cxx b/filter/source/xmlfilteradaptor/genericfilter.cxx index 91bda6f47728..a6d9b6291410 100644 --- a/filter/source/xmlfilteradaptor/genericfilter.cxx +++ b/filter/source/xmlfilteradaptor/genericfilter.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <osl/thread.h> #include <cppuhelper/factory.hxx> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include "XmlFilterAdaptor.hxx" diff --git a/filter/source/xmlfilterdetect/filterdetect.cxx b/filter/source/xmlfilterdetect/filterdetect.cxx index 43a3fc288f3e..03f323caf06e 100644 --- a/filter/source/xmlfilterdetect/filterdetect.cxx +++ b/filter/source/xmlfilterdetect/filterdetect.cxx @@ -21,7 +21,6 @@ #include <osl/diagnose.h> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/document/XExtendedFilterDetection.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/beans/PropertyState.hpp> #include <cppuhelper/supportsservice.hxx> diff --git a/filter/source/xsltdialog/typedetectionexport.cxx b/filter/source/xsltdialog/typedetectionexport.cxx index 7d53a7db8726..692f1347230e 100644 --- a/filter/source/xsltdialog/typedetectionexport.cxx +++ b/filter/source/xsltdialog/typedetectionexport.cxx @@ -20,17 +20,15 @@ #include <com/sun/star/xml/sax/XAttributeList.hpp> #include <com/sun/star/xml/sax/Writer.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/io/XActiveDataSource.hpp> #include <tools/urlobj.hxx> #include <osl/diagnose.h> #include "typedetectionexport.hxx" -#include "xmlfiltersettingsdialog.hxx" +#include "xmlfiltercommon.hxx" #include <comphelper/attributelist.hxx> -using namespace com::sun::star::beans; using namespace com::sun::star::uno; using namespace com::sun::star::io; using namespace com::sun::star::lang; diff --git a/filter/source/xsltdialog/typedetectionimport.cxx b/filter/source/xsltdialog/typedetectionimport.cxx index 5a0ebdb8c05a..8c479fa4c203 100644 --- a/filter/source/xsltdialog/typedetectionimport.cxx +++ b/filter/source/xsltdialog/typedetectionimport.cxx @@ -20,11 +20,10 @@ #include <com/sun/star/xml/sax/InputSource.hpp> #include <com/sun/star/xml/sax/Parser.hpp> #include <com/sun/star/xml/sax/XAttributeList.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> #include <osl/diagnose.h> #include "typedetectionimport.hxx" -#include "xmlfiltersettingsdialog.hxx" +#include "xmlfiltercommon.hxx" using namespace com::sun::star::lang; using namespace com::sun::star::uno; diff --git a/filter/source/xsltdialog/typedetectionimport.hxx b/filter/source/xsltdialog/typedetectionimport.hxx index 507419ff0ae1..672ea40e38af 100644 --- a/filter/source/xsltdialog/typedetectionimport.hxx +++ b/filter/source/xsltdialog/typedetectionimport.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_FILTER_SOURCE_XSLTDIALOG_TYPEDETECTIONIMPORT_HXX #define INCLUDED_FILTER_SOURCE_XSLTDIALOG_TYPEDETECTIONIMPORT_HXX -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <cppuhelper/implbase.hxx> #include <com/sun/star/xml/sax/XDocumentHandler.hpp> diff --git a/filter/source/xsltdialog/xmlfiltercommon.hxx b/filter/source/xsltdialog/xmlfiltercommon.hxx index 83ab9f470a5e..49e437f86161 100644 --- a/filter/source/xsltdialog/xmlfiltercommon.hxx +++ b/filter/source/xsltdialog/xmlfiltercommon.hxx @@ -19,10 +19,6 @@ #ifndef INCLUDED_FILTER_SOURCE_XSLTDIALOG_XMLFILTERCOMMON_HXX #define INCLUDED_FILTER_SOURCE_XSLTDIALOG_XMLFILTERCOMMON_HXX -#include <com/sun/star/lang/XComponent.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/container/XHierarchicalName.hpp> -#include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/io/XOutputStream.hpp> diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx index efaf7a32ff83..1646b433caa3 100644 --- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx +++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx @@ -18,17 +18,13 @@ */ #include <osl/mutex.hxx> -#include <toolkit/helper/vclunohelper.hxx> -#include <osl/thread.h> #include <cppuhelper/factory.hxx> #include <cppuhelper/typeprovider.hxx> #include <cppuhelper/component.hxx> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/frame/Desktop.hpp> -#include <com/sun/star/frame/TerminationVetoException.hpp> #include <com/sun/star/frame/XTerminateListener.hpp> -#include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XInitialization.hpp> @@ -36,12 +32,9 @@ #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <vcl/svapp.hxx> -#include <vcl/settings.hxx> #include <rtl/instance.hxx> #include <comphelper/processfactory.hxx> -#include <svl/solar.hrc> - #include "xmlfiltersettingsdialog.hxx" using namespace ::cppu; diff --git a/filter/source/xsltdialog/xmlfilterjar.cxx b/filter/source/xsltdialog/xmlfilterjar.cxx index d388410ad083..5cee8bd9176b 100644 --- a/filter/source/xsltdialog/xmlfilterjar.cxx +++ b/filter/source/xsltdialog/xmlfilterjar.cxx @@ -18,13 +18,13 @@ */ #include <com/sun/star/io/XActiveDataControl.hpp> -#include <com/sun/star/io/XActiveDataSource.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/io/XActiveDataSink.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/NamedValue.hpp> +#include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/container/XNamed.hpp> #include <com/sun/star/container/XChild.hpp> +#include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/util/XChangesBatch.hpp> #include <com/sun/star/uno/XComponentContext.hpp> @@ -42,9 +42,8 @@ #include <rtl/uri.hxx> +#include "xmlfiltercommon.hxx" #include "xmlfilterjar.hxx" -#include <strings.hrc> -#include "xmlfiltersettingsdialog.hxx" #include "typedetectionexport.hxx" #include "typedetectionimport.hxx" diff --git a/filter/source/xsltdialog/xmlfilterjar.hxx b/filter/source/xsltdialog/xmlfilterjar.hxx index d9e20cd05847..da081387a181 100644 --- a/filter/source/xsltdialog/xmlfilterjar.hxx +++ b/filter/source/xsltdialog/xmlfilterjar.hxx @@ -21,7 +21,7 @@ #include <com/sun/star/container/XHierarchicalNameAccess.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <vector> diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx index d5c568b7a49e..c935f1b91db9 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx @@ -18,9 +18,6 @@ */ #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/container/XNameAccess.hpp> -#include <com/sun/star/frame/Desktop.hpp> -#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/util/XFlushable.hpp> #include <com/sun/star/uno/XComponentContext.hpp> diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx index f6a876b258ab..bfef03b29e28 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx @@ -19,14 +19,10 @@ #ifndef INCLUDED_FILTER_SOURCE_XSLTDIALOG_XMLFILTERSETTINGSDIALOG_HXX #define INCLUDED_FILTER_SOURCE_XSLTDIALOG_XMLFILTERSETTINGSDIALOG_HXX -#include <com/sun/star/lang/XComponent.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/container/XHierarchicalName.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <vcl/weld.hxx> #include <vcl/waitobj.hxx> -#include <svl/poolitem.hxx> #include <unotools/moduleoptions.hxx> #include "xmlfiltercommon.hxx" diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.cxx b/filter/source/xsltdialog/xmlfiltertabdialog.cxx index d02b8cbcd2f9..4f1a9cf1c21d 100644 --- a/filter/source/xsltdialog/xmlfiltertabdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltertabdialog.cxx @@ -21,7 +21,6 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <comphelper/fileurl.hxx> -#include <unotools/resmgr.hxx> #include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <osl/file.hxx> @@ -30,7 +29,7 @@ #include "xmlfiltertabdialog.hxx" #include "xmlfiltertabpagebasic.hxx" #include "xmlfiltertabpagexslt.hxx" -#include "xmlfiltersettingsdialog.hxx" +#include "xmlfiltercommon.hxx" using namespace com::sun::star::uno; using namespace com::sun::star::container; diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.hxx b/filter/source/xsltdialog/xmlfiltertabdialog.hxx index f6b6784eea8d..05d576103924 100644 --- a/filter/source/xsltdialog/xmlfiltertabdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltertabdialog.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_FILTER_SOURCE_XSLTDIALOG_XMLFILTERTABDIALOG_HXX #define INCLUDED_FILTER_SOURCE_XSLTDIALOG_XMLFILTERTABDIALOG_HXX -#include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <vcl/weld.hxx> class filter_info_impl; diff --git a/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx b/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx index abfa596c4d09..c7516a1e484b 100644 --- a/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx +++ b/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx @@ -19,9 +19,8 @@ #include <rtl/ustrbuf.hxx> #include <vcl/svapp.hxx> -#include <strings.hrc> +#include "xmlfiltercommon.hxx" #include "xmlfiltertabpagebasic.hxx" -#include "xmlfiltersettingsdialog.hxx" XMLFilterTabPageBasic::XMLFilterTabPageBasic(weld::Widget* pPage) : m_xBuilder(Application::CreateBuilder(pPage, "filter/ui/xmlfiltertabpagegeneral.ui")) diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx index ca879c93a4fa..8f3e288a1f69 100644 --- a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx +++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx @@ -19,14 +19,13 @@ #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <sfx2/filedlghelper.hxx> -#include <unotools/localfilehelper.hxx> #include <unotools/pathoptions.hxx> #include <osl/file.hxx> #include <svl/urihelper.hxx> #include <vcl/svapp.hxx> +#include "xmlfiltercommon.hxx" #include "xmlfiltertabpagexslt.hxx" -#include "xmlfiltersettingsdialog.hxx" using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx index 076e91ce364d..3d048f070178 100644 --- a/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx +++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_FILTER_SOURCE_XSLTDIALOG_XMLFILTERTABPAGEXSLT_HXX #define INCLUDED_FILTER_SOURCE_XSLTDIALOG_XMLFILTERTABPAGEXSLT_HXX -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <vcl/weld.hxx> #include <svtools/inettbc.hxx> diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx index 94780eef3324..f2f237c31c30 100644 --- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx @@ -27,7 +27,7 @@ #include <com/sun/star/frame/theGlobalEventBroadcaster.hpp> #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/frame/XStorable.hpp> -#include <com/sun/star/io/XActiveDataSource.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/system/SystemShellExecute.hpp> #include <com/sun/star/system/SystemShellExecuteFlags.hpp> @@ -46,8 +46,7 @@ #include <tools/urlobj.hxx> #include <comphelper/processfactory.hxx> -#include <strings.hrc> -#include "xmlfiltersettingsdialog.hxx" +#include "xmlfiltercommon.hxx" #include "xmlfiltertestdialog.hxx" diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.hxx b/filter/source/xsltdialog/xmlfiltertestdialog.hxx index 5c726c6499f4..4bf66989346b 100644 --- a/filter/source/xsltdialog/xmlfiltertestdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltertestdialog.hxx @@ -19,13 +19,12 @@ #ifndef INCLUDED_FILTER_SOURCE_XSLTDIALOG_XMLFILTERTESTDIALOG_HXX #define INCLUDED_FILTER_SOURCE_XSLTDIALOG_XMLFILTERTESTDIALOG_HXX -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/document/XDocumentEventBroadcaster.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/weakref.hxx> #include <vcl/weld.hxx> -#include <svl/poolitem.hxx> class filter_info_impl; diff --git a/filter/source/xsltfilter/LibXSLTTransformer.cxx b/filter/source/xsltfilter/LibXSLTTransformer.cxx index a98b6537855f..2d1c148a8c0f 100644 --- a/filter/source/xsltfilter/LibXSLTTransformer.cxx +++ b/filter/source/xsltfilter/LibXSLTTransformer.cxx @@ -9,14 +9,11 @@ */ #include <algorithm> -#include <cstdio> #include <cstring> #include <map> #include <utility> #include <vector> -#include <iostream> #include <libxml/parser.h> -#include <libxml/tree.h> #include <libxml/xmlIO.h> #include <libxml/xpath.h> #include <libxml/xpathInternals.h> @@ -29,18 +26,11 @@ #include <cppuhelper/factory.hxx> -#include <osl/module.h> #include <osl/file.hxx> -#include <osl/process.h> -#include <com/sun/star/lang/XComponent.hpp> -#include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/io/XOutputStream.hpp> -#include <com/sun/star/io/XActiveDataSource.hpp> -#include <com/sun/star/io/XActiveDataSink.hpp> -#include <com/sun/star/io/XActiveDataControl.hpp> #include <com/sun/star/io/XStreamListener.hpp> #include "LibXSLTTransformer.hxx" diff --git a/filter/source/xsltfilter/OleHandler.cxx b/filter/source/xsltfilter/OleHandler.cxx index 265321ec9f8e..f298c01b7040 100644 --- a/filter/source/xsltfilter/OleHandler.cxx +++ b/filter/source/xsltfilter/OleHandler.cxx @@ -9,30 +9,14 @@ */ -#include <cstdio> -#include <cstring> -#include <list> -#include <map> -#include <vector> -#include <iostream> -#include <libxml/parser.h> -#include <libxml/tree.h> -#include <libxml/xmlIO.h> -#include <libxslt/transform.h> -#include <libxslt/xsltutils.h> -#include <libxslt/variables.h> - #include <rtl/ustrbuf.hxx> -#include <sax/tools/converter.hxx> - #include <package/Inflater.hxx> #include <package/Deflater.hxx> #include <cppuhelper/factory.hxx> #include <comphelper/base64.hxx> #include <com/sun/star/uno/Any.hxx> -#include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/io/TempFile.hpp> #include <com/sun/star/io/XInputStream.hpp> diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx index cdc5b5497dec..4ff351d69ce6 100644 --- a/filter/source/xsltfilter/XSLTFilter.cxx +++ b/filter/source/xsltfilter/XSLTFilter.cxx @@ -26,7 +26,6 @@ #include <osl/diagnose.h> #include <osl/time.h> #include <osl/conditn.hxx> -#include <rtl/strbuf.hxx> #include <tools/urlobj.hxx> #include <tools/diagnose_ex.h> #include <sal/log.hxx> @@ -34,7 +33,6 @@ #include <comphelper/interaction.hxx> #include <comphelper/processfactory.hxx> -#include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/EventObject.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> @@ -47,7 +45,6 @@ #include <com/sun/star/xml/sax/XDocumentHandler.hpp> #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp> #include <com/sun/star/xml/sax/XFastParser.hpp> -#include <com/sun/star/xml/sax/SAXException.hpp> #include <com/sun/star/xml/sax/Writer.hpp> #include <com/sun/star/xml/XImportFilter.hpp> #include <com/sun/star/xml/XExportFilter.hpp> @@ -58,8 +55,6 @@ #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/io/XOutputStream.hpp> #include <com/sun/star/io/XActiveDataSource.hpp> -#include <com/sun/star/io/XActiveDataSink.hpp> -#include <com/sun/star/io/XActiveDataControl.hpp> #include <com/sun/star/io/XSeekable.hpp> #include <com/sun/star/io/XStreamListener.hpp> #include <com/sun/star/util/PathSubstitution.hpp> @@ -71,8 +66,6 @@ #include <com/sun/star/xml/xslt/XSLT2Transformer.hpp> #include <com/sun/star/xml/xslt/XSLTTransformer.hpp> -#include <xmloff/attrlist.hxx> - #include "LibXSLTTransformer.hxx" #define TRANSFORMATION_TIMEOUT_SEC 60 |