diff options
14 files changed, 19 insertions, 19 deletions
diff --git a/drawinglayer/source/primitive2d/PolyPolygonHatchPrimitive2D.cxx b/drawinglayer/source/primitive2d/PolyPolygonHatchPrimitive2D.cxx index 17140a549436..ad85c02f22c1 100644 --- a/drawinglayer/source/primitive2d/PolyPolygonHatchPrimitive2D.cxx +++ b/drawinglayer/source/primitive2d/PolyPolygonHatchPrimitive2D.cxx @@ -21,7 +21,7 @@ #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx> #include <drawinglayer/primitive2d/maskprimitive2d.hxx> -#include <primitive2d/fillhatchprimitive2d.hxx> +#include <drawinglayer/primitive2d/fillhatchprimitive2d.hxx> using namespace com::sun::star; diff --git a/drawinglayer/source/primitive2d/epsprimitive2d.cxx b/drawinglayer/source/primitive2d/epsprimitive2d.cxx index 8ad1db87ac4d..b519547c00d7 100644 --- a/drawinglayer/source/primitive2d/epsprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/epsprimitive2d.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <primitive2d/epsprimitive2d.hxx> +#include <drawinglayer/primitive2d/epsprimitive2d.hxx> #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx> #include <drawinglayer/primitive2d/metafileprimitive2d.hxx> diff --git a/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx b/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx index 5919847ab33c..9c4ef03bfba3 100644 --- a/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <primitive2d/fillhatchprimitive2d.hxx> +#include <drawinglayer/primitive2d/fillhatchprimitive2d.hxx> #include <texture/texture.hxx> #include <drawinglayer/primitive2d/PolyPolygonColorPrimitive2D.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> diff --git a/drawinglayer/source/primitive2d/gridprimitive2d.cxx b/drawinglayer/source/primitive2d/gridprimitive2d.cxx index 66a747452103..e1d0841678e2 100644 --- a/drawinglayer/source/primitive2d/gridprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/gridprimitive2d.cxx @@ -18,7 +18,7 @@ */ #include <drawinglayer/primitive2d/gridprimitive2d.hxx> -#include <primitive2d/pointarrayprimitive2d.hxx> +#include <drawinglayer/primitive2d/pointarrayprimitive2d.hxx> #include <drawinglayer/primitive2d/markerarrayprimitive2d.hxx> #include <drawinglayer/geometry/viewinformation2d.hxx> #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx> diff --git a/drawinglayer/source/primitive2d/pointarrayprimitive2d.cxx b/drawinglayer/source/primitive2d/pointarrayprimitive2d.cxx index 66ca43bd8004..7e527487eb85 100644 --- a/drawinglayer/source/primitive2d/pointarrayprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/pointarrayprimitive2d.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <primitive2d/pointarrayprimitive2d.hxx> +#include <drawinglayer/primitive2d/pointarrayprimitive2d.hxx> #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx> diff --git a/drawinglayer/source/processor2d/hittestprocessor2d.cxx b/drawinglayer/source/processor2d/hittestprocessor2d.cxx index 225fe4d5fb97..65a03548cb1c 100644 --- a/drawinglayer/source/processor2d/hittestprocessor2d.cxx +++ b/drawinglayer/source/processor2d/hittestprocessor2d.cxx @@ -27,7 +27,7 @@ #include <drawinglayer/primitive2d/transparenceprimitive2d.hxx> #include <drawinglayer/primitive2d/maskprimitive2d.hxx> #include <drawinglayer/primitive2d/sceneprimitive2d.hxx> -#include <primitive2d/pointarrayprimitive2d.hxx> +#include <drawinglayer/primitive2d/pointarrayprimitive2d.hxx> #include <basegfx/matrix/b3dhommatrix.hxx> #include <drawinglayer/processor3d/cutfindprocessor3d.hxx> #include <drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx> diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx index b3c0d773fbff..73438efc40f9 100644 --- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx @@ -47,7 +47,7 @@ #include <tools/stream.hxx> #include <drawinglayer/primitive2d/transformprimitive2d.hxx> #include <drawinglayer/primitive2d/markerarrayprimitive2d.hxx> -#include <primitive2d/pointarrayprimitive2d.hxx> +#include <drawinglayer/primitive2d/pointarrayprimitive2d.hxx> #include <vcl/graphictools.hxx> #include <vcl/metaact.hxx> #include <drawinglayer/primitive2d/texthierarchyprimitive2d.hxx> @@ -61,7 +61,7 @@ #include <drawinglayer/primitive2d/graphicprimitive2d.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <drawinglayer/primitive2d/pagepreviewprimitive2d.hxx> -#include <primitive2d/epsprimitive2d.hxx> +#include <drawinglayer/primitive2d/epsprimitive2d.hxx> #include <basegfx/polygon/b2dlinegeometry.hxx> // for PDFExtOutDevData Graphic support diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx index cb0e3124b19d..4f7d6a22f723 100644 --- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx @@ -59,9 +59,9 @@ #include <drawinglayer/primitive2d/pagepreviewprimitive2d.hxx> #include <drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx> #include <drawinglayer/primitive2d/svggradientprimitive2d.hxx> -#include <primitive2d/pointarrayprimitive2d.hxx> -#include <primitive2d/fillhatchprimitive2d.hxx> -#include <primitive2d/epsprimitive2d.hxx> +#include <drawinglayer/primitive2d/pointarrayprimitive2d.hxx> +#include <drawinglayer/primitive2d/fillhatchprimitive2d.hxx> +#include <drawinglayer/primitive2d/epsprimitive2d.hxx> #include <com/sun/star/awt/XWindow2.hpp> #include <com/sun/star/awt/XControl.hpp> diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx index 96b0bf9a97b5..5af4dcac755f 100644 --- a/drawinglayer/source/processor2d/vclprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx @@ -61,8 +61,8 @@ // control support #include <drawinglayer/primitive2d/textlayoutdevice.hxx> -#include <primitive2d/pointarrayprimitive2d.hxx> -#include <primitive2d/epsprimitive2d.hxx> +#include <drawinglayer/primitive2d/pointarrayprimitive2d.hxx> +#include <drawinglayer/primitive2d/epsprimitive2d.hxx> using namespace com::sun::star; diff --git a/drawinglayer/source/tools/wmfemfhelper.cxx b/drawinglayer/source/tools/wmfemfhelper.cxx index eb3236a0e0b3..cfab0426ef74 100644 --- a/drawinglayer/source/tools/wmfemfhelper.cxx +++ b/drawinglayer/source/tools/wmfemfhelper.cxx @@ -18,7 +18,7 @@ */ #include <wmfemfhelper.hxx> -#include <primitive2d/pointarrayprimitive2d.hxx> +#include <drawinglayer/primitive2d/pointarrayprimitive2d.hxx> #include <vcl/lineinfo.hxx> #include <vcl/metaact.hxx> #include <drawinglayer/primitive2d/polygonprimitive2d.hxx> @@ -38,7 +38,7 @@ #include <vcl/BitmapPalette.hxx> #include <drawinglayer/primitive2d/fillgradientprimitive2d.hxx> #include <drawinglayer/primitive2d/transparenceprimitive2d.hxx> -#include <primitive2d/fillhatchprimitive2d.hxx> +#include <drawinglayer/primitive2d/fillhatchprimitive2d.hxx> #include <drawinglayer/primitive2d/maskprimitive2d.hxx> #include <basegfx/polygon/b2dpolygonclipper.hxx> #include <drawinglayer/primitive2d/invertprimitive2d.hxx> @@ -48,7 +48,7 @@ #include <drawinglayer/primitive2d/textdecoratedprimitive2d.hxx> #include <primitive2d/textlineprimitive2d.hxx> #include <primitive2d/textstrikeoutprimitive2d.hxx> -#include <primitive2d/epsprimitive2d.hxx> +#include <drawinglayer/primitive2d/epsprimitive2d.hxx> #include <sal/log.hxx> #include <tools/fract.hxx> #include <tools/stream.hxx> diff --git a/drawinglayer/inc/primitive2d/epsprimitive2d.hxx b/include/drawinglayer/primitive2d/epsprimitive2d.hxx index eb4a38678af6..eb4a38678af6 100644 --- a/drawinglayer/inc/primitive2d/epsprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/epsprimitive2d.hxx diff --git a/drawinglayer/inc/primitive2d/fillhatchprimitive2d.hxx b/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx index 4b741cef44d6..4b741cef44d6 100644 --- a/drawinglayer/inc/primitive2d/fillhatchprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx diff --git a/drawinglayer/inc/primitive2d/pointarrayprimitive2d.hxx b/include/drawinglayer/primitive2d/pointarrayprimitive2d.hxx index e83220df1726..e83220df1726 100644 --- a/drawinglayer/inc/primitive2d/pointarrayprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/pointarrayprimitive2d.hxx diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index 4beebbfc6a5d..c347c847cdc0 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -3624,10 +3624,7 @@ desktop/win32/source/unoinfo.cxx drawinglayer/inc/converters.hxx drawinglayer/inc/emfplushelper.hxx drawinglayer/inc/primitive2d/cropprimitive2d.hxx -drawinglayer/inc/primitive2d/epsprimitive2d.hxx -drawinglayer/inc/primitive2d/fillhatchprimitive2d.hxx drawinglayer/inc/primitive2d/graphicprimitivehelper2d.hxx -drawinglayer/inc/primitive2d/pointarrayprimitive2d.hxx drawinglayer/inc/primitive2d/texteffectprimitive2d.hxx drawinglayer/inc/primitive2d/textlineprimitive2d.hxx drawinglayer/inc/primitive2d/textstrikeoutprimitive2d.hxx @@ -5843,6 +5840,9 @@ include/drawinglayer/attribute/sdrobjectattribute3d.hxx include/drawinglayer/attribute/sdrsceneattribute3d.hxx include/drawinglayer/attribute/sdrshadowattribute.hxx include/drawinglayer/geometry/viewinformation3d.hxx +include/drawinglayer/primitive2d/epsprimitive2d.hxx +include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx +include/drawinglayer/primitive2d/pointarrayprimitive2d.hxx include/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx include/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx include/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx |