From 617052236400e86888e1a2894f9ae4125fd73351 Mon Sep 17 00:00:00 2001 From: Gabor Kelemen Date: Tue, 14 Dec 2021 12:29:21 +0100 Subject: Remove transitional header drawinglayer/primitive2d/polygonprimitive2d.hxx follow up to commit 1103727fb24b368419ea0cfd2382560ef6b82f43 Change-Id: I227042f4703f3f4c18a8dc0355f044d2ad7dfb2b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126838 Tested-by: Jenkins Reviewed-by: Miklos Vajna --- drawinglayer/source/primitive2d/PolyPolygonHairlinePrimitive2D.cxx | 2 +- drawinglayer/source/primitive2d/PolyPolygonMarkerPrimitive2D.cxx | 2 +- drawinglayer/source/primitive2d/PolyPolygonStrokePrimitive2D.cxx | 2 +- drawinglayer/source/primitive2d/borderlineprimitive2d.cxx | 2 +- drawinglayer/source/primitive2d/controlprimitive2d.cxx | 2 +- drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx | 2 +- drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx | 2 +- drawinglayer/source/primitive2d/helplineprimitive2d.cxx | 2 +- drawinglayer/source/primitive2d/polygonprimitive2d.cxx | 5 ++++- drawinglayer/source/primitive2d/sceneprimitive2d.cxx | 2 +- drawinglayer/source/primitive2d/textlineprimitive2d.cxx | 2 +- drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx | 2 +- drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d.cxx | 2 +- drawinglayer/source/primitive2d/wrongspellprimitive2d.cxx | 2 +- drawinglayer/source/processor2d/contourextractor2d.cxx | 2 +- drawinglayer/source/processor2d/hittestprocessor2d.cxx | 4 +++- drawinglayer/source/processor2d/linegeometryextractor2d.cxx | 2 +- drawinglayer/source/processor2d/textaspolygonextractor2d.cxx | 2 +- drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx | 3 ++- drawinglayer/source/processor2d/vclpixelprocessor2d.cxx | 3 ++- drawinglayer/source/processor2d/vclprocessor2d.cxx | 3 ++- drawinglayer/source/processor3d/geometry2dextractor.cxx | 2 +- drawinglayer/source/processor3d/shadow3dextractor.cxx | 2 +- drawinglayer/source/tools/primitive2dxmldump.cxx | 3 ++- drawinglayer/source/tools/wmfemfhelper.cxx | 3 ++- 25 files changed, 35 insertions(+), 25 deletions(-) (limited to 'drawinglayer/source') diff --git a/drawinglayer/source/primitive2d/PolyPolygonHairlinePrimitive2D.cxx b/drawinglayer/source/primitive2d/PolyPolygonHairlinePrimitive2D.cxx index 5bc291676dbc..2bfed5fb1d9e 100644 --- a/drawinglayer/source/primitive2d/PolyPolygonHairlinePrimitive2D.cxx +++ b/drawinglayer/source/primitive2d/PolyPolygonHairlinePrimitive2D.cxx @@ -18,10 +18,10 @@ */ #include +#include #include #include -#include using namespace com::sun::star; diff --git a/drawinglayer/source/primitive2d/PolyPolygonMarkerPrimitive2D.cxx b/drawinglayer/source/primitive2d/PolyPolygonMarkerPrimitive2D.cxx index 2381ed8f866c..4f9f83298bb3 100644 --- a/drawinglayer/source/primitive2d/PolyPolygonMarkerPrimitive2D.cxx +++ b/drawinglayer/source/primitive2d/PolyPolygonMarkerPrimitive2D.cxx @@ -18,10 +18,10 @@ */ #include +#include #include #include -#include using namespace com::sun::star; diff --git a/drawinglayer/source/primitive2d/PolyPolygonStrokePrimitive2D.cxx b/drawinglayer/source/primitive2d/PolyPolygonStrokePrimitive2D.cxx index 91093f37278d..67555de00857 100644 --- a/drawinglayer/source/primitive2d/PolyPolygonStrokePrimitive2D.cxx +++ b/drawinglayer/source/primitive2d/PolyPolygonStrokePrimitive2D.cxx @@ -21,7 +21,7 @@ #include #include -#include +#include using namespace com::sun::star; diff --git a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx index f26f690fb337..cc48f6467364 100644 --- a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include diff --git a/drawinglayer/source/primitive2d/controlprimitive2d.cxx b/drawinglayer/source/primitive2d/controlprimitive2d.cxx index 6eebc11a0fa5..24094bb58210 100644 --- a/drawinglayer/source/primitive2d/controlprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/controlprimitive2d.cxx @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx b/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx index 0b217adf6b49..fe83b3850d8f 100644 --- a/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx b/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx index 60d47c3ed559..07c48612d21d 100644 --- a/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx @@ -19,10 +19,10 @@ #include #include +#include #include #include #include -#include #include #include diff --git a/drawinglayer/source/primitive2d/helplineprimitive2d.cxx b/drawinglayer/source/primitive2d/helplineprimitive2d.cxx index ba1a680560bb..612181bb7854 100644 --- a/drawinglayer/source/primitive2d/helplineprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/helplineprimitive2d.cxx @@ -19,10 +19,10 @@ #include #include -#include #include #include #include +#include using namespace com::sun::star; diff --git a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx index 25e78edffff4..0ed46fa68c81 100644 --- a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx @@ -17,10 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include #include #include #include +#include +#include +#include +#include #include #include #include diff --git a/drawinglayer/source/primitive2d/sceneprimitive2d.cxx b/drawinglayer/source/primitive2d/sceneprimitive2d.cxx index 870d187b222c..da8618614fd3 100644 --- a/drawinglayer/source/primitive2d/sceneprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/sceneprimitive2d.cxx @@ -23,13 +23,13 @@ #include #include #include +#include #include #include #include #include #include #include -#include #include #include #include diff --git a/drawinglayer/source/primitive2d/textlineprimitive2d.cxx b/drawinglayer/source/primitive2d/textlineprimitive2d.cxx index ea23ad25b684..461a83d756b5 100644 --- a/drawinglayer/source/primitive2d/textlineprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/textlineprimitive2d.cxx @@ -22,8 +22,8 @@ #include #include #include -#include #include +#include namespace drawinglayer::primitive2d diff --git a/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx b/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx index c86f42ff3c52..2408a27e41e8 100644 --- a/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d.cxx b/drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d.cxx index 56b284619362..a2ba512be73f 100644 --- a/drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d.cxx @@ -21,10 +21,10 @@ #include #include #include +#include #include #include #include -#include using namespace com::sun::star; diff --git a/drawinglayer/source/primitive2d/wrongspellprimitive2d.cxx b/drawinglayer/source/primitive2d/wrongspellprimitive2d.cxx index 11a5b1929870..5249cdfb3ca2 100644 --- a/drawinglayer/source/primitive2d/wrongspellprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/wrongspellprimitive2d.cxx @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include diff --git a/drawinglayer/source/processor2d/contourextractor2d.cxx b/drawinglayer/source/processor2d/contourextractor2d.cxx index 5fc51695ddc5..a1d1200183cc 100644 --- a/drawinglayer/source/processor2d/contourextractor2d.cxx +++ b/drawinglayer/source/processor2d/contourextractor2d.cxx @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include diff --git a/drawinglayer/source/processor2d/hittestprocessor2d.cxx b/drawinglayer/source/processor2d/hittestprocessor2d.cxx index ddccfb988654..dc7d6fa7cb3f 100644 --- a/drawinglayer/source/processor2d/hittestprocessor2d.cxx +++ b/drawinglayer/source/processor2d/hittestprocessor2d.cxx @@ -20,7 +20,9 @@ #include #include #include -#include +#include +#include +#include #include #include #include diff --git a/drawinglayer/source/processor2d/linegeometryextractor2d.cxx b/drawinglayer/source/processor2d/linegeometryextractor2d.cxx index 1123833cfc99..08ec1232d137 100644 --- a/drawinglayer/source/processor2d/linegeometryextractor2d.cxx +++ b/drawinglayer/source/processor2d/linegeometryextractor2d.cxx @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include diff --git a/drawinglayer/source/processor2d/textaspolygonextractor2d.cxx b/drawinglayer/source/processor2d/textaspolygonextractor2d.cxx index a2943fd8ac16..fcf15b189ed2 100644 --- a/drawinglayer/source/processor2d/textaspolygonextractor2d.cxx +++ b/drawinglayer/source/processor2d/textaspolygonextractor2d.cxx @@ -19,9 +19,9 @@ #include #include +#include #include #include -#include #include #include diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx index b679768c9c3b..de95df83dc8d 100644 --- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx @@ -40,11 +40,12 @@ #include // for PDFExtOutDevData Graphic support #include #include +#include +#include #include #include #include #include -#include #include #include #include diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx index 139bb0ba080a..c4ca011d30d1 100644 --- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx @@ -34,10 +34,11 @@ #include #include #include +#include +#include #include #include #include -#include #include #include #include diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx index 5d3f68d29a4a..c6a2d013fcc1 100644 --- a/drawinglayer/source/processor2d/vclprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx @@ -38,9 +38,10 @@ #include #include #include -#include #include #include +#include +#include #include #include #include diff --git a/drawinglayer/source/processor3d/geometry2dextractor.cxx b/drawinglayer/source/processor3d/geometry2dextractor.cxx index 3fb3d0d19f12..568496bb989d 100644 --- a/drawinglayer/source/processor3d/geometry2dextractor.cxx +++ b/drawinglayer/source/processor3d/geometry2dextractor.cxx @@ -23,9 +23,9 @@ #include #include #include -#include #include #include +#include #include #include diff --git a/drawinglayer/source/processor3d/shadow3dextractor.cxx b/drawinglayer/source/processor3d/shadow3dextractor.cxx index bed08b9688fb..91fc57aaec89 100644 --- a/drawinglayer/source/processor3d/shadow3dextractor.cxx +++ b/drawinglayer/source/processor3d/shadow3dextractor.cxx @@ -24,9 +24,9 @@ #include #include #include -#include #include #include +#include #include #include #include diff --git a/drawinglayer/source/tools/primitive2dxmldump.cxx b/drawinglayer/source/tools/primitive2dxmldump.cxx index 2e2bb887a3d4..5f753039183c 100644 --- a/drawinglayer/source/tools/primitive2dxmldump.cxx +++ b/drawinglayer/source/tools/primitive2dxmldump.cxx @@ -21,10 +21,11 @@ #include #include #include +#include +#include #include #include #include -#include #include #include #include diff --git a/drawinglayer/source/tools/wmfemfhelper.cxx b/drawinglayer/source/tools/wmfemfhelper.cxx index 22b1d4217413..f8c562ce1a7a 100644 --- a/drawinglayer/source/tools/wmfemfhelper.cxx +++ b/drawinglayer/source/tools/wmfemfhelper.cxx @@ -21,10 +21,11 @@ #include #include #include -#include #include #include #include +#include +#include #include #include #include -- cgit