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/source/pdf | |
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/source/pdf')
-rw-r--r-- | filter/source/pdf/impdialog.cxx | 7 | ||||
-rw-r--r-- | filter/source/pdf/impdialog.hxx | 7 | ||||
-rw-r--r-- | filter/source/pdf/pdfdialog.cxx | 2 | ||||
-rw-r--r-- | filter/source/pdf/pdfdialog.hxx | 10 | ||||
-rw-r--r-- | filter/source/pdf/pdfexport.cxx | 21 | ||||
-rw-r--r-- | filter/source/pdf/pdfexport.hxx | 11 | ||||
-rw-r--r-- | filter/source/pdf/pdffilter.cxx | 4 | ||||
-rw-r--r-- | filter/source/pdf/pdffilter.hxx | 11 | ||||
-rw-r--r-- | filter/source/pdf/pdfinteract.cxx | 1 | ||||
-rw-r--r-- | filter/source/pdf/pdfuno.cxx | 1 |
10 files changed, 31 insertions, 44 deletions
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> |