From 957e6c7968b205caf939c53942fe1c5fd64d57ef Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 23 Oct 2017 22:42:36 +0200 Subject: loplugin:includeform: drawinglayer Change-Id: I52693e59a37e36fa0bb21732efe90af84fe6d6c6 --- drawinglayer/inc/emfplushelper.hxx | 2 +- drawinglayer/source/drawinglayeruno/drawinglayeruno.cxx | 2 +- .../source/drawinglayeruno/xprimitive2drenderer.cxx | 4 ++-- drawinglayer/source/dumper/EnhancedShapeDumper.cxx | 2 +- .../source/primitive2d/patternfillprimitive2d.cxx | 2 +- drawinglayer/source/processor2d/getdigitlanguage.cxx | 6 +++--- drawinglayer/source/processor2d/getdigitlanguage.hxx | 4 ++-- .../source/processor2d/helperwrongspellrenderer.cxx | 2 +- .../source/processor2d/vclhelperbufferdevice.cxx | 2 +- drawinglayer/source/processor2d/vclpixelprocessor2d.cxx | 2 +- drawinglayer/source/processor2d/vclprocessor2d.cxx | 2 +- drawinglayer/source/texture/texture.cxx | 2 +- drawinglayer/source/tools/converters.cxx | 2 +- drawinglayer/source/tools/emfpbrush.cxx | 4 ++-- drawinglayer/source/tools/emfpbrush.hxx | 2 +- drawinglayer/source/tools/emfpcustomlinecap.cxx | 6 +++--- drawinglayer/source/tools/emfpcustomlinecap.hxx | 2 +- drawinglayer/source/tools/emfpfont.cxx | 2 +- drawinglayer/source/tools/emfpfont.hxx | 2 +- drawinglayer/source/tools/emfphelperdata.cxx | 16 ++++++++-------- drawinglayer/source/tools/emfpimage.cxx | 2 +- drawinglayer/source/tools/emfpimage.hxx | 2 +- drawinglayer/source/tools/emfplushelper.cxx | 2 +- drawinglayer/source/tools/emfppath.cxx | 2 +- drawinglayer/source/tools/emfppath.hxx | 2 +- drawinglayer/source/tools/emfppen.cxx | 4 ++-- drawinglayer/source/tools/emfppen.hxx | 2 +- drawinglayer/source/tools/emfpregion.cxx | 2 +- drawinglayer/source/tools/emfpregion.hxx | 2 +- drawinglayer/source/tools/emfpstringformat.cxx | 2 +- drawinglayer/source/tools/emfpstringformat.hxx | 2 +- 31 files changed, 46 insertions(+), 46 deletions(-) (limited to 'drawinglayer') diff --git a/drawinglayer/inc/emfplushelper.hxx b/drawinglayer/inc/emfplushelper.hxx index 060bd04dc054..c689610c5ea2 100644 --- a/drawinglayer/inc/emfplushelper.hxx +++ b/drawinglayer/inc/emfplushelper.hxx @@ -23,7 +23,7 @@ #include #include #include -#include +#include "wmfemfhelper.hxx" namespace emfplushelper { struct EmfPlusHelperData; } namespace wmfemfhelper { class TargetHolders; } diff --git a/drawinglayer/source/drawinglayeruno/drawinglayeruno.cxx b/drawinglayer/source/drawinglayeruno/drawinglayeruno.cxx index 2e7ec2dfd629..d78eac190e1a 100644 --- a/drawinglayer/source/drawinglayeruno/drawinglayeruno.cxx +++ b/drawinglayer/source/drawinglayeruno/drawinglayeruno.cxx @@ -26,7 +26,7 @@ #include #include -#include +#include "xprimitive2drenderer.hxx" using namespace ::com::sun::star; diff --git a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx index c8139bb19dfd..6549bb070f2e 100644 --- a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx +++ b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx @@ -36,9 +36,9 @@ #include #include -#include "converters.hxx" +#include -#include +#include "xprimitive2drenderer.hxx" using namespace ::com::sun::star; diff --git a/drawinglayer/source/dumper/EnhancedShapeDumper.cxx b/drawinglayer/source/dumper/EnhancedShapeDumper.cxx index d033e982d164..ab29517d9370 100644 --- a/drawinglayer/source/dumper/EnhancedShapeDumper.cxx +++ b/drawinglayer/source/dumper/EnhancedShapeDumper.cxx @@ -7,7 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include +#include "EnhancedShapeDumper.hxx" #include #include diff --git a/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx b/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx index 1cad17802106..102097c791dc 100644 --- a/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx @@ -28,7 +28,7 @@ #include #include -#include "converters.hxx" +#include using namespace com::sun::star; diff --git a/drawinglayer/source/processor2d/getdigitlanguage.cxx b/drawinglayer/source/processor2d/getdigitlanguage.cxx index 46a39db5ea98..7f5537466ccd 100644 --- a/drawinglayer/source/processor2d/getdigitlanguage.cxx +++ b/drawinglayer/source/processor2d/getdigitlanguage.cxx @@ -7,10 +7,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "sal/config.h" +#include -#include "i18nlangtag/lang.h" -#include "svl/ctloptions.hxx" +#include +#include #include #include diff --git a/drawinglayer/source/processor2d/getdigitlanguage.hxx b/drawinglayer/source/processor2d/getdigitlanguage.hxx index 6b8f17822c52..9ee4b5aaa5d4 100644 --- a/drawinglayer/source/processor2d/getdigitlanguage.hxx +++ b/drawinglayer/source/processor2d/getdigitlanguage.hxx @@ -10,9 +10,9 @@ #ifndef INCLUDED_DRAWINGLAYER_SOURCE_PROCESSOR2D_GETDIGITLANGUAGE_HXX #define INCLUDED_DRAWINGLAYER_SOURCE_PROCESSOR2D_GETDIGITLANGUAGE_HXX -#include "sal/config.h" +#include -#include "i18nlangtag/lang.h" +#include namespace drawinglayer { namespace detail { diff --git a/drawinglayer/source/processor2d/helperwrongspellrenderer.cxx b/drawinglayer/source/processor2d/helperwrongspellrenderer.cxx index e154ad438773..d690a77b6728 100644 --- a/drawinglayer/source/processor2d/helperwrongspellrenderer.cxx +++ b/drawinglayer/source/processor2d/helperwrongspellrenderer.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include +#include "helperwrongspellrenderer.hxx" #include #include #include diff --git a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx index 64e2086520ae..1b3382243a3d 100644 --- a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx +++ b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx @@ -23,7 +23,7 @@ #include #include -#include +#include "vclhelperbufferdevice.hxx" #include #include #include diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx index d638fabfccc4..9c21c83ee8f8 100644 --- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx @@ -38,7 +38,7 @@ #include #include #include -#include +#include "helperwrongspellrenderer.hxx" #include #include #include diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx index da7e8e1056dd..e1cf42b0f42c 100644 --- a/drawinglayer/source/processor2d/vclprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx @@ -33,7 +33,7 @@ #include #include #include -#include +#include "vclhelperbufferdevice.hxx" #include #include #include diff --git a/drawinglayer/source/texture/texture.cxx b/drawinglayer/source/texture/texture.cxx index aef02b5424aa..6a482a73c4cc 100644 --- a/drawinglayer/source/texture/texture.cxx +++ b/drawinglayer/source/texture/texture.cxx @@ -22,7 +22,7 @@ #include #include -#include "converters.hxx" +#include namespace drawinglayer { diff --git a/drawinglayer/source/tools/converters.cxx b/drawinglayer/source/tools/converters.cxx index 0ffd10a44ffc..ee65e2526a74 100644 --- a/drawinglayer/source/tools/converters.cxx +++ b/drawinglayer/source/tools/converters.cxx @@ -24,7 +24,7 @@ #include #include -#include "converters.hxx" +#include #ifdef DBG_UTIL #include diff --git a/drawinglayer/source/tools/emfpbrush.cxx b/drawinglayer/source/tools/emfpbrush.cxx index 28300f767bd3..7b2b4d46d96b 100644 --- a/drawinglayer/source/tools/emfpbrush.cxx +++ b/drawinglayer/source/tools/emfpbrush.cxx @@ -35,8 +35,8 @@ #include #include #include -#include -#include +#include "emfpbrush.hxx" +#include "emfppath.hxx" namespace emfplushelper { diff --git a/drawinglayer/source/tools/emfpbrush.hxx b/drawinglayer/source/tools/emfpbrush.hxx index 792b5f018790..631fea642d9f 100644 --- a/drawinglayer/source/tools/emfpbrush.hxx +++ b/drawinglayer/source/tools/emfpbrush.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_DRAWINGLAYER_SOURCE_TOOLS_EMFPBRUSH_HXX #define INCLUDED_DRAWINGLAYER_SOURCE_TOOLS_EMFPBRUSH_HXX -#include +#include "emfphelperdata.hxx" #include #include diff --git a/drawinglayer/source/tools/emfpcustomlinecap.cxx b/drawinglayer/source/tools/emfpcustomlinecap.cxx index ee366bcb4aa6..4bd8e4ab3319 100644 --- a/drawinglayer/source/tools/emfpcustomlinecap.cxx +++ b/drawinglayer/source/tools/emfpcustomlinecap.cxx @@ -35,9 +35,9 @@ #include #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/drawinglayer/source/tools/emfpcustomlinecap.hxx b/drawinglayer/source/tools/emfpcustomlinecap.hxx index 67b21c85d81b..f50d0f63bc98 100644 --- a/drawinglayer/source/tools/emfpcustomlinecap.hxx +++ b/drawinglayer/source/tools/emfpcustomlinecap.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_DRAWINGLAYER_SOURCE_TOOLS_EMFPCUSTOMLINECAP_HXX #define INCLUDED_DRAWINGLAYER_SOURCE_TOOLS_EMFPCUSTOMLINECAP_HXX -#include +#include "emfphelperdata.hxx" namespace emfplushelper { diff --git a/drawinglayer/source/tools/emfpfont.cxx b/drawinglayer/source/tools/emfpfont.cxx index 62119d7f7cbe..cdaa5a8585b1 100644 --- a/drawinglayer/source/tools/emfpfont.cxx +++ b/drawinglayer/source/tools/emfpfont.cxx @@ -35,7 +35,7 @@ #include #include #include -#include +#include "emfpfont.hxx" namespace emfplushelper { diff --git a/drawinglayer/source/tools/emfpfont.hxx b/drawinglayer/source/tools/emfpfont.hxx index 3719b096e3c9..9abeff344728 100644 --- a/drawinglayer/source/tools/emfpfont.hxx +++ b/drawinglayer/source/tools/emfpfont.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_DRAWINGLAYER_SOURCE_TOOLS_EMFPFONT_HXX #define INCLUDED_DRAWINGLAYER_SOURCE_TOOLS_EMFPFONT_HXX -#include +#include "emfphelperdata.hxx" namespace emfplushelper { diff --git a/drawinglayer/source/tools/emfphelperdata.cxx b/drawinglayer/source/tools/emfphelperdata.cxx index 19d24eb77481..519b4d99510c 100644 --- a/drawinglayer/source/tools/emfphelperdata.cxx +++ b/drawinglayer/source/tools/emfphelperdata.cxx @@ -17,14 +17,14 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include -#include -#include -#include -#include -#include -#include -#include +#include "emfphelperdata.hxx" +#include "emfpbrush.hxx" +#include "emfppen.hxx" +#include "emfppath.hxx" +#include "emfpregion.hxx" +#include "emfpimage.hxx" +#include "emfpfont.hxx" +#include "emfpstringformat.hxx" #include #include #include diff --git a/drawinglayer/source/tools/emfpimage.cxx b/drawinglayer/source/tools/emfpimage.cxx index 3c8409658cf7..533e54a71678 100644 --- a/drawinglayer/source/tools/emfpimage.cxx +++ b/drawinglayer/source/tools/emfpimage.cxx @@ -36,7 +36,7 @@ #include #include #include -#include +#include "emfpimage.hxx" namespace emfplushelper { diff --git a/drawinglayer/source/tools/emfpimage.hxx b/drawinglayer/source/tools/emfpimage.hxx index 455a88ea7757..5208708f9d7a 100644 --- a/drawinglayer/source/tools/emfpimage.hxx +++ b/drawinglayer/source/tools/emfpimage.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_DRAWINGLAYER_SOURCE_TOOLS_EMFPIMAGE_HXX #define INCLUDED_DRAWINGLAYER_SOURCE_TOOLS_EMFPIMAGE_HXX -#include +#include "emfphelperdata.hxx" #include namespace emfplushelper diff --git a/drawinglayer/source/tools/emfplushelper.cxx b/drawinglayer/source/tools/emfplushelper.cxx index a587bf09e27d..87276d99880f 100644 --- a/drawinglayer/source/tools/emfplushelper.cxx +++ b/drawinglayer/source/tools/emfplushelper.cxx @@ -18,7 +18,7 @@ */ #include -#include +#include "emfphelperdata.hxx" namespace emfplushelper { diff --git a/drawinglayer/source/tools/emfppath.cxx b/drawinglayer/source/tools/emfppath.cxx index 72ccd9409873..8f2698330e8b 100644 --- a/drawinglayer/source/tools/emfppath.cxx +++ b/drawinglayer/source/tools/emfppath.cxx @@ -35,7 +35,7 @@ #include #include #include -#include +#include "emfppath.hxx" using namespace ::com::sun::star; using namespace ::basegfx; diff --git a/drawinglayer/source/tools/emfppath.hxx b/drawinglayer/source/tools/emfppath.hxx index 6f2ccd10fe5c..1b10816bb7c8 100644 --- a/drawinglayer/source/tools/emfppath.hxx +++ b/drawinglayer/source/tools/emfppath.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_DRAWINGLAYER_SOURCE_TOOLS_EMFPPATH_HXX #define INCLUDED_DRAWINGLAYER_SOURCE_TOOLS_EMFPPATH_HXX -#include +#include "emfphelperdata.hxx" #include namespace emfplushelper diff --git a/drawinglayer/source/tools/emfppen.cxx b/drawinglayer/source/tools/emfppen.cxx index 04ab09811156..9356eaa3398a 100644 --- a/drawinglayer/source/tools/emfppen.cxx +++ b/drawinglayer/source/tools/emfppen.cxx @@ -35,8 +35,8 @@ #include #include #include -#include -#include +#include "emfppen.hxx" +#include "emfpcustomlinecap.hxx" using namespace ::com::sun::star; using namespace ::basegfx; diff --git a/drawinglayer/source/tools/emfppen.hxx b/drawinglayer/source/tools/emfppen.hxx index 2a7f4d9320e1..12115ad5b089 100644 --- a/drawinglayer/source/tools/emfppen.hxx +++ b/drawinglayer/source/tools/emfppen.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_DRAWINGLAYER_SOURCE_TOOLS_EMFPPEN_HXX #define INCLUDED_DRAWINGLAYER_SOURCE_TOOLS_EMFPPEN_HXX -#include +#include "emfpbrush.hxx" #include #include diff --git a/drawinglayer/source/tools/emfpregion.cxx b/drawinglayer/source/tools/emfpregion.cxx index c610e65d2e6f..758c702ddaa9 100644 --- a/drawinglayer/source/tools/emfpregion.cxx +++ b/drawinglayer/source/tools/emfpregion.cxx @@ -35,7 +35,7 @@ #include #include #include -#include +#include "emfpregion.hxx" using namespace ::com::sun::star; using namespace ::basegfx; diff --git a/drawinglayer/source/tools/emfpregion.hxx b/drawinglayer/source/tools/emfpregion.hxx index b537c28b5214..67689634d9e9 100644 --- a/drawinglayer/source/tools/emfpregion.hxx +++ b/drawinglayer/source/tools/emfpregion.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_DRAWINGLAYER_SOURCE_TOOLS_EMFPREGION_HXX #define INCLUDED_DRAWINGLAYER_SOURCE_TOOLS_EMFPREGION_HXX -#include +#include "emfphelperdata.hxx" namespace emfplushelper { diff --git a/drawinglayer/source/tools/emfpstringformat.cxx b/drawinglayer/source/tools/emfpstringformat.cxx index 0f0958da5e1d..ff3a51b4d32c 100644 --- a/drawinglayer/source/tools/emfpstringformat.cxx +++ b/drawinglayer/source/tools/emfpstringformat.cxx @@ -19,7 +19,7 @@ #include #include -#include +#include "emfpstringformat.hxx" namespace emfplushelper { diff --git a/drawinglayer/source/tools/emfpstringformat.hxx b/drawinglayer/source/tools/emfpstringformat.hxx index 39bc004dd01f..0797c25ff7af 100644 --- a/drawinglayer/source/tools/emfpstringformat.hxx +++ b/drawinglayer/source/tools/emfpstringformat.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_DRAWINGLAYER_SOURCE_TOOLS_EMFPSTRINGFORMAT_HXX #define INCLUDED_DRAWINGLAYER_SOURCE_TOOLS_EMFPSTRINGFORMAT_HXX -#include +#include "emfphelperdata.hxx" namespace emfplushelper { -- cgit