From 74067098bbf225138fad5d2c208b6e1fc71fa9a9 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 23 Oct 2017 22:43:32 +0200 Subject: loplugin:includeform: cppucanvas Change-Id: I83da2a535f89dfaa675629ca3dc2a6cefc334443 --- cppcanvas/source/inc/implrenderer.hxx | 6 +++--- cppcanvas/source/mtfrenderer/bitmapaction.cxx | 2 +- .../source/mtfrenderer/cachedprimitivebase.hxx | 2 +- cppcanvas/source/mtfrenderer/emfpbrush.cxx | 4 ++-- cppcanvas/source/mtfrenderer/emfpcustomlinecap.cxx | 6 +++--- cppcanvas/source/mtfrenderer/emfpfont.cxx | 2 +- cppcanvas/source/mtfrenderer/emfpimage.cxx | 2 +- cppcanvas/source/mtfrenderer/emfplus.cxx | 24 +++++++++++----------- cppcanvas/source/mtfrenderer/emfppath.cxx | 2 +- cppcanvas/source/mtfrenderer/emfppen.cxx | 4 ++-- cppcanvas/source/mtfrenderer/emfppen.hxx | 2 +- cppcanvas/source/mtfrenderer/emfpregion.cxx | 2 +- cppcanvas/source/mtfrenderer/emfpstringformat.cxx | 2 +- cppcanvas/source/mtfrenderer/implrenderer.cxx | 12 +++++------ cppcanvas/source/mtfrenderer/lineaction.cxx | 4 ++-- cppcanvas/source/mtfrenderer/mtftools.cxx | 2 +- cppcanvas/source/mtfrenderer/pointaction.cxx | 4 ++-- cppcanvas/source/mtfrenderer/polypolyaction.cxx | 2 +- cppcanvas/source/mtfrenderer/textaction.cxx | 2 +- .../source/mtfrenderer/transparencygroupaction.cxx | 4 ++-- cppcanvas/source/tools/canvasgraphichelper.cxx | 2 +- cppcanvas/source/wrapper/implbitmapcanvas.hxx | 2 +- cppcanvas/source/wrapper/implcustomsprite.hxx | 4 ++-- cppcanvas/source/wrapper/implfont.cxx | 2 +- cppcanvas/source/wrapper/implpolypolygon.cxx | 2 +- cppcanvas/source/wrapper/implsprite.hxx | 2 +- cppcanvas/source/wrapper/implspritecanvas.cxx | 4 ++-- cppcanvas/source/wrapper/implspritecanvas.hxx | 2 +- cppcanvas/source/wrapper/vclfactory.cxx | 10 ++++----- 29 files changed, 60 insertions(+), 60 deletions(-) (limited to 'cppcanvas') diff --git a/cppcanvas/source/inc/implrenderer.hxx b/cppcanvas/source/inc/implrenderer.hxx index df26d09a4654..15b610306304 100644 --- a/cppcanvas/source/inc/implrenderer.hxx +++ b/cppcanvas/source/inc/implrenderer.hxx @@ -24,9 +24,9 @@ #include #include -#include -#include -#include +#include "canvasgraphichelper.hxx" +#include "action.hxx" +#include "outdevstate.hxx" #include #include diff --git a/cppcanvas/source/mtfrenderer/bitmapaction.cxx b/cppcanvas/source/mtfrenderer/bitmapaction.cxx index fd27bb62dd15..32b97275e3c7 100644 --- a/cppcanvas/source/mtfrenderer/bitmapaction.cxx +++ b/cppcanvas/source/mtfrenderer/bitmapaction.cxx @@ -32,7 +32,7 @@ #include #include "cachedprimitivebase.hxx" #include "bitmapaction.hxx" -#include "outdevstate.hxx" +#include #include "mtftools.hxx" #include diff --git a/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx b/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx index 68e5649abbfb..af587ae79ab0 100644 --- a/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx +++ b/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx @@ -25,7 +25,7 @@ #include -#include "action.hxx" +#include namespace basegfx { class B2DHomMatrix; } diff --git a/cppcanvas/source/mtfrenderer/emfpbrush.cxx b/cppcanvas/source/mtfrenderer/emfpbrush.cxx index 927c89c1c2fa..b9f2ed4246e2 100644 --- a/cppcanvas/source/mtfrenderer/emfpbrush.cxx +++ b/cppcanvas/source/mtfrenderer/emfpbrush.cxx @@ -36,8 +36,8 @@ #include #include #include -#include -#include +#include "emfpbrush.hxx" +#include "emfppath.hxx" namespace cppcanvas { diff --git a/cppcanvas/source/mtfrenderer/emfpcustomlinecap.cxx b/cppcanvas/source/mtfrenderer/emfpcustomlinecap.cxx index d5baafc862f9..d53d14fb155e 100644 --- a/cppcanvas/source/mtfrenderer/emfpcustomlinecap.cxx +++ b/cppcanvas/source/mtfrenderer/emfpcustomlinecap.cxx @@ -37,9 +37,9 @@ #include #include -#include -#include -#include +#include "emfpcustomlinecap.hxx" +#include "emfppath.hxx" +#include "emfppen.hxx" using namespace ::com::sun::star; using namespace ::basegfx; diff --git a/cppcanvas/source/mtfrenderer/emfpfont.cxx b/cppcanvas/source/mtfrenderer/emfpfont.cxx index ade72e8ac380..b5bcceebf9e5 100644 --- a/cppcanvas/source/mtfrenderer/emfpfont.cxx +++ b/cppcanvas/source/mtfrenderer/emfpfont.cxx @@ -36,7 +36,7 @@ #include #include #include -#include +#include "emfpfont.hxx" namespace cppcanvas diff --git a/cppcanvas/source/mtfrenderer/emfpimage.cxx b/cppcanvas/source/mtfrenderer/emfpimage.cxx index 0cb54cb58a23..e3f1fc3d31a3 100644 --- a/cppcanvas/source/mtfrenderer/emfpimage.cxx +++ b/cppcanvas/source/mtfrenderer/emfpimage.cxx @@ -37,7 +37,7 @@ #include #include #include -#include +#include "emfpimage.hxx" namespace cppcanvas diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx index 47e1b1d48d3f..60f9f51b3e15 100644 --- a/cppcanvas/source/mtfrenderer/emfplus.cxx +++ b/cppcanvas/source/mtfrenderer/emfplus.cxx @@ -44,20 +44,20 @@ #include #include -#include +#include "bitmapaction.hxx" #include #include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include +#include "polypolyaction.hxx" +#include "textaction.hxx" + +#include "emfpbrush.hxx" +#include "emfpcustomlinecap.hxx" +#include "emfpfont.hxx" +#include "emfpimage.hxx" +#include "emfppath.hxx" +#include "emfppen.hxx" +#include "emfpregion.hxx" +#include "emfpstringformat.hxx" namespace { diff --git a/cppcanvas/source/mtfrenderer/emfppath.cxx b/cppcanvas/source/mtfrenderer/emfppath.cxx index 45d68f1313a6..506a01f424b1 100644 --- a/cppcanvas/source/mtfrenderer/emfppath.cxx +++ b/cppcanvas/source/mtfrenderer/emfppath.cxx @@ -36,7 +36,7 @@ #include #include #include -#include +#include "emfppath.hxx" using namespace ::com::sun::star; using namespace ::basegfx; diff --git a/cppcanvas/source/mtfrenderer/emfppen.cxx b/cppcanvas/source/mtfrenderer/emfppen.cxx index 14f91b73a7a5..9ca64d53c169 100644 --- a/cppcanvas/source/mtfrenderer/emfppen.cxx +++ b/cppcanvas/source/mtfrenderer/emfppen.cxx @@ -36,8 +36,8 @@ #include #include #include -#include -#include +#include "emfppen.hxx" +#include "emfpcustomlinecap.hxx" using namespace ::com::sun::star; using namespace ::basegfx; diff --git a/cppcanvas/source/mtfrenderer/emfppen.hxx b/cppcanvas/source/mtfrenderer/emfppen.hxx index 7e2bd9e8e7db..d905f9da6f2c 100644 --- a/cppcanvas/source/mtfrenderer/emfppen.hxx +++ b/cppcanvas/source/mtfrenderer/emfppen.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_EMFPPEN_HXX #define INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_EMFPPEN_HXX -#include +#include "emfpbrush.hxx" #include namespace cppcanvas diff --git a/cppcanvas/source/mtfrenderer/emfpregion.cxx b/cppcanvas/source/mtfrenderer/emfpregion.cxx index 58844b2478ad..efb7effe9800 100644 --- a/cppcanvas/source/mtfrenderer/emfpregion.cxx +++ b/cppcanvas/source/mtfrenderer/emfpregion.cxx @@ -36,7 +36,7 @@ #include #include #include -#include +#include "emfpregion.hxx" using namespace ::com::sun::star; using namespace ::basegfx; diff --git a/cppcanvas/source/mtfrenderer/emfpstringformat.cxx b/cppcanvas/source/mtfrenderer/emfpstringformat.cxx index a677be4c11c5..76ba0d29266c 100644 --- a/cppcanvas/source/mtfrenderer/emfpstringformat.cxx +++ b/cppcanvas/source/mtfrenderer/emfpstringformat.cxx @@ -20,7 +20,7 @@ #include #include #include -#include +#include "emfpstringformat.hxx" namespace cppcanvas { diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index 144246de2e2f..d7a8850b2883 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -64,12 +64,12 @@ #include #include #include -#include -#include -#include -#include -#include -#include +#include "bitmapaction.hxx" +#include "lineaction.hxx" +#include "pointaction.hxx" +#include "polypolyaction.hxx" +#include "textaction.hxx" +#include "transparencygroupaction.hxx" #include #include #include diff --git a/cppcanvas/source/mtfrenderer/lineaction.cxx b/cppcanvas/source/mtfrenderer/lineaction.cxx index 44fe93ca6d13..6a5062ab3bca 100644 --- a/cppcanvas/source/mtfrenderer/lineaction.cxx +++ b/cppcanvas/source/mtfrenderer/lineaction.cxx @@ -18,7 +18,7 @@ */ -#include +#include "lineaction.hxx" #include #include @@ -33,7 +33,7 @@ #include -#include +#include "mtftools.hxx" using namespace ::com::sun::star; diff --git a/cppcanvas/source/mtfrenderer/mtftools.cxx b/cppcanvas/source/mtfrenderer/mtftools.cxx index adeb30c1af24..59ad2fbd9b6d 100644 --- a/cppcanvas/source/mtfrenderer/mtftools.cxx +++ b/cppcanvas/source/mtfrenderer/mtftools.cxx @@ -34,7 +34,7 @@ #include #include #include "mtftools.hxx" -#include "outdevstate.hxx" +#include #include "polypolyaction.hxx" #include diff --git a/cppcanvas/source/mtfrenderer/pointaction.cxx b/cppcanvas/source/mtfrenderer/pointaction.cxx index de099d9245df..8869a5744701 100644 --- a/cppcanvas/source/mtfrenderer/pointaction.cxx +++ b/cppcanvas/source/mtfrenderer/pointaction.cxx @@ -29,8 +29,8 @@ #include #include "pointaction.hxx" -#include "outdevstate.hxx" -#include "cppcanvas/canvas.hxx" +#include +#include #include "mtftools.hxx" diff --git a/cppcanvas/source/mtfrenderer/polypolyaction.cxx b/cppcanvas/source/mtfrenderer/polypolyaction.cxx index 7ad9399587a8..b0a3e55d1d68 100644 --- a/cppcanvas/source/mtfrenderer/polypolyaction.cxx +++ b/cppcanvas/source/mtfrenderer/polypolyaction.cxx @@ -33,7 +33,7 @@ #include "cachedprimitivebase.hxx" #include "polypolyaction.hxx" -#include "outdevstate.hxx" +#include #include "mtftools.hxx" diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx b/cppcanvas/source/mtfrenderer/textaction.cxx index e53a2c0fe6e1..550b98e699a6 100644 --- a/cppcanvas/source/mtfrenderer/textaction.cxx +++ b/cppcanvas/source/mtfrenderer/textaction.cxx @@ -42,7 +42,7 @@ #include #include "textaction.hxx" -#include "outdevstate.hxx" +#include #include "mtftools.hxx" diff --git a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx index 16fa545c3c68..f8026e4d7f78 100644 --- a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx +++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx @@ -49,9 +49,9 @@ #include #include "transparencygroupaction.hxx" -#include "outdevstate.hxx" +#include #include "mtftools.hxx" -#include "cppcanvas/vclfactory.hxx" +#include using namespace ::com::sun::star; diff --git a/cppcanvas/source/tools/canvasgraphichelper.cxx b/cppcanvas/source/tools/canvasgraphichelper.cxx index 81e77cc39c1e..ded58f9f6b2e 100644 --- a/cppcanvas/source/tools/canvasgraphichelper.cxx +++ b/cppcanvas/source/tools/canvasgraphichelper.cxx @@ -29,7 +29,7 @@ #include #include -#include "tools.hxx" +#include using namespace ::com::sun::star; diff --git a/cppcanvas/source/wrapper/implbitmapcanvas.hxx b/cppcanvas/source/wrapper/implbitmapcanvas.hxx index 3b6a72d1d8e4..6f09794caf99 100644 --- a/cppcanvas/source/wrapper/implbitmapcanvas.hxx +++ b/cppcanvas/source/wrapper/implbitmapcanvas.hxx @@ -25,7 +25,7 @@ #include #include -#include +#include "implcanvas.hxx" namespace cppcanvas diff --git a/cppcanvas/source/wrapper/implcustomsprite.hxx b/cppcanvas/source/wrapper/implcustomsprite.hxx index 0c4a64e1922e..f8964a3f4763 100644 --- a/cppcanvas/source/wrapper/implcustomsprite.hxx +++ b/cppcanvas/source/wrapper/implcustomsprite.hxx @@ -23,8 +23,8 @@ #include #include #include -#include -#include +#include "implsprite.hxx" +#include "implspritecanvas.hxx" namespace cppcanvas { diff --git a/cppcanvas/source/wrapper/implfont.cxx b/cppcanvas/source/wrapper/implfont.cxx index 3fe7aaee4623..9cb52095129a 100644 --- a/cppcanvas/source/wrapper/implfont.cxx +++ b/cppcanvas/source/wrapper/implfont.cxx @@ -18,7 +18,7 @@ */ -#include +#include "implfont.hxx" #include diff --git a/cppcanvas/source/wrapper/implpolypolygon.cxx b/cppcanvas/source/wrapper/implpolypolygon.cxx index d59d5eb3448e..755d87022529 100644 --- a/cppcanvas/source/wrapper/implpolypolygon.cxx +++ b/cppcanvas/source/wrapper/implpolypolygon.cxx @@ -29,7 +29,7 @@ #include #include "implpolypolygon.hxx" -#include "tools.hxx" +#include using namespace ::com::sun::star; diff --git a/cppcanvas/source/wrapper/implsprite.hxx b/cppcanvas/source/wrapper/implsprite.hxx index d9aa0699c4d1..aad786d4ccc8 100644 --- a/cppcanvas/source/wrapper/implsprite.hxx +++ b/cppcanvas/source/wrapper/implsprite.hxx @@ -24,7 +24,7 @@ #include #include #include -#include +#include "implspritecanvas.hxx" namespace cppcanvas { diff --git a/cppcanvas/source/wrapper/implspritecanvas.cxx b/cppcanvas/source/wrapper/implspritecanvas.cxx index 8aa875b2a491..fe13c2286f20 100644 --- a/cppcanvas/source/wrapper/implspritecanvas.cxx +++ b/cppcanvas/source/wrapper/implspritecanvas.cxx @@ -22,8 +22,8 @@ #include #include -#include -#include +#include "implspritecanvas.hxx" +#include "implcustomsprite.hxx" using namespace ::com::sun::star; diff --git a/cppcanvas/source/wrapper/implspritecanvas.hxx b/cppcanvas/source/wrapper/implspritecanvas.hxx index 49fcc9891265..036022f48135 100644 --- a/cppcanvas/source/wrapper/implspritecanvas.hxx +++ b/cppcanvas/source/wrapper/implspritecanvas.hxx @@ -24,7 +24,7 @@ #include #include #include -#include +#include "implcanvas.hxx" namespace cppcanvas { diff --git a/cppcanvas/source/wrapper/vclfactory.cxx b/cppcanvas/source/wrapper/vclfactory.cxx index de3b1f6176c9..f013aef5b92c 100644 --- a/cppcanvas/source/wrapper/vclfactory.cxx +++ b/cppcanvas/source/wrapper/vclfactory.cxx @@ -28,12 +28,12 @@ #include -#include -#include -#include -#include +#include "implbitmapcanvas.hxx" +#include "implspritecanvas.hxx" +#include "implpolypolygon.hxx" +#include "implbitmap.hxx" #include -#include +#include "implsprite.hxx" using namespace ::com::sun::star; -- cgit