dl: move {Eps,FillHatch,PointArray}Primitive2D to global include

Change-Id: I85c10cb957f5065d964863360ca03355c87b7980
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93821
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>

13 files changed, 16 insertions, 271 deletions

diff --git a/drawinglayer/inc/primitive2d/epsprimitive2d.hxx b/drawinglayer/inc/primitive2d/epsprimitive2d.hxx
deleted file mode 100644
index eb4a38678af6..000000000000
--- a/drawinglayer/inc/primitive2d/epsprimitive2d.hxx
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#pragma once
-
-#include <drawinglayer/drawinglayerdllapi.h>
-
-#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
-#include <basegfx/matrix/b2dhommatrix.hxx>
-#include <vcl/gfxlink.hxx>
-#include <vcl/gdimtf.hxx>
-
-namespace drawinglayer
-{
-    namespace primitive2d
-    {
-        /** EpsPrimitive2D class */
-        class EpsPrimitive2D final : public BufferedDecompositionPrimitive2D
-        {
-        private:
-            /// the geometry definition
-            basegfx::B2DHomMatrix                       maEpsTransform;
-
-            /// the Eps content definition
-            GfxLink                                     maGfxLink;
-
-            /// the replacement content definition
-            GDIMetaFile                                 maMetaFile;
-
-            /// create local decomposition
-            virtual void create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& rViewInformation) const override;
-
-        public:
-            /// constructor
-            EpsPrimitive2D(
-                const basegfx::B2DHomMatrix& rEpsTransform,
-                const GfxLink& rGfxLink,
-                const GDIMetaFile& rMetaFile);
-
-            /// data read access
-            const basegfx::B2DHomMatrix& getEpsTransform() const { return maEpsTransform; }
-            const GfxLink& getGfxLink() const { return maGfxLink; }
-            const GDIMetaFile& getMetaFile() const { return maMetaFile; }
-
-            /// compare operator
-            virtual bool operator==(const BasePrimitive2D& rPrimitive) const override;
-
-            /// get B2Drange
-            virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override;
-
-            /// provide unique ID
-            virtual sal_uInt32 getPrimitive2DID() const override;
-        };
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/inc/primitive2d/fillhatchprimitive2d.hxx b/drawinglayer/inc/primitive2d/fillhatchprimitive2d.hxx
deleted file mode 100644
index 4b741cef44d6..000000000000
--- a/drawinglayer/inc/primitive2d/fillhatchprimitive2d.hxx
+++ /dev/null
@@ -1,102 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#pragma once
-
-#include <drawinglayer/drawinglayerdllapi.h>
-
-#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
-#include <drawinglayer/primitive2d/primitivetools2d.hxx>
-#include <drawinglayer/attribute/fillhatchattribute.hxx>
-#include <basegfx/color/bcolor.hxx>
-
-
-// FillHatchPrimitive2D class
-
-namespace drawinglayer
-{
-    namespace primitive2d
-    {
-        /** FillHatchPrimitive2D class
-
-            This class defines a hatch filling for a rectangular area. The
-            Range is defined by the Transformation, the hatch by the FillHatchAttribute.
-            If the background is to be filled, a flag in FillHatchAttribute is set and
-            the BColor defines the background color.
-
-            #i120230# This primitive is now evtl. metric dependent due to the value
-            MinimalDiscreteDistance in the FillHatchAttribute if the value is not zero.
-            This is used for a more appealing, VCL-like visualisation by not letting the
-            distances get too small between lines.
-
-            The decomposition will deliver the hatch lines.
-         */
-        class FillHatchPrimitive2D final : public DiscreteMetricDependentPrimitive2D
-        {
-        private:
-            /// the geometrically visible area
-            basegfx::B2DRange                       maOutputRange;
-
-            /// the area the gradient definition is based on
-            /// in the simplest case identical to OutputRange
-            basegfx::B2DRange                       maDefinitionRange;
-
-            /// the hatch definition
-            attribute::FillHatchAttribute           maFillHatch;
-
-            /// hatch background color (if used)
-            basegfx::BColor                         maBColor;
-
-            /// local decomposition.
-            virtual void create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& rViewInformation) const override;
-
-        public:
-            /// constructors. The one without definition range will use output range as definition range
-            FillHatchPrimitive2D(
-                const basegfx::B2DRange& rOutputRange,
-                const basegfx::BColor& rBColor,
-                const attribute::FillHatchAttribute& rFillHatch);
-            FillHatchPrimitive2D(
-                const basegfx::B2DRange& rOutputRange,
-                const basegfx::B2DRange& rDefinitionRange,
-                const basegfx::BColor& rBColor,
-                const attribute::FillHatchAttribute& rFillHatch);
-
-            /// data read access
-            const basegfx::B2DRange& getOutputRange() const { return maOutputRange; }
-            const basegfx::B2DRange& getDefinitionRange() const { return maDefinitionRange; }
-            const attribute::FillHatchAttribute& getFillHatch() const { return maFillHatch; }
-            const basegfx::BColor& getBColor() const { return maBColor; }
-
-            /// compare operator
-            virtual bool operator==(const BasePrimitive2D& rPrimitive) const override;
-
-            /// get range
-            virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override;
-
-            /// Override standard getDecomposition to be view-dependent here
-            virtual void get2DDecomposition(Primitive2DDecompositionVisitor& rVisitor, const geometry::ViewInformation2D& rViewInformation) const override;
-
-            /// provide unique ID
-            virtual sal_uInt32 getPrimitive2DID() const override;
-        };
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/inc/primitive2d/pointarrayprimitive2d.hxx b/drawinglayer/inc/primitive2d/pointarrayprimitive2d.hxx
deleted file mode 100644
index e83220df1726..000000000000
--- a/drawinglayer/inc/primitive2d/pointarrayprimitive2d.hxx
+++ /dev/null
@@ -1,79 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#pragma once
-
-#include <drawinglayer/drawinglayerdllapi.h>
-
-#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
-#include <basegfx/color/bcolor.hxx>
-
-
-// PointArrayPrimitive2D class
-
-namespace drawinglayer
-{
-    namespace primitive2d
-    {
-        /** PointArrayPrimitive2D class
-
-            This primitive defines single,discrete 'pixels' for the given
-            positions in the given color. This makes it view-dependent since
-            the logic size of a 'pixel' depends on the view transformation.
-
-            This is one of the non-decomposable primitives, so a renderer
-            should process it (Currently it is only used for grid visualisation,
-            but this may change).
-         */
-        class PointArrayPrimitive2D final : public BasePrimitive2D
-        {
-        private:
-            /// the array of positions
-            std::vector< basegfx::B2DPoint >                maPositions;
-
-            /// the color to use
-            basegfx::BColor                                 maRGBColor;
-
-            /// #i96669# add simple range buffering for this primitive
-            basegfx::B2DRange                               maB2DRange;
-
-        public:
-            /// constructor
-            PointArrayPrimitive2D(
-                const std::vector< basegfx::B2DPoint >& rPositions,
-                const basegfx::BColor& rRGBColor);
-
-            /// data read access
-            const std::vector< basegfx::B2DPoint >& getPositions() const { return maPositions; }
-            const basegfx::BColor& getRGBColor() const { return maRGBColor; }
-
-            /// compare operator
-            virtual bool operator==(const BasePrimitive2D& rPrimitive) const override;
-
-            /// get range
-            virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override;
-
-            /// provide unique ID
-            virtual sal_uInt32 getPrimitive2DID() const override;
-        };
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
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>