[Libreoffice-commits] core.git: Branch 'feature/drawinglayercore' - 138 commits - basctl/source basic/source canvas/source chart2/source comphelper/source compilerplugins/clang configure.ac connectivity/source cppcanvas/source cui/source cui/uiconfig dbaccess/source desktop/qa desktop/source download.lst drawinglayer/CppunitTest_drawinglayer_border.mk drawinglayer/inc drawinglayer/Library_drawinglayercore.mk drawinglayer/Library_drawinglayer.mk drawinglayer/Module_drawinglayer.mk drawinglayer/source editeng/source emfio/CppunitTest_emfio_emf_test.mk emfio/Library_emfio.mk extensions/source external/icu external/skia extras/CustomTarget_tplpresnt.mk extras/source filter/Library_pdffilter.mk filter/Library_svgfilter.mk filter/source forms/source fpicker/test helpcontent2 i18npool/source i18nutil/source include/basegfx include/comphelper include/drawinglayer include/LibreOfficeKit include/oox include/sfx2 include/svx include/tools include/vcl include/xmloff linguistic/source lotuswordpro/source oox/ source osx/soffice.xcodeproj package/source pyuno/source reportdesign/source Repository.mk sal/inc sal/osl sal/textenc scaddins/source sc/CppunitTest_sc_ucalc.mk schema/libreoffice sc/inc sc/Library_sc.mk scripting/source sc/source sd/CppunitTest_sd_uimpress.mk sdext/source sd/inc sd/Library_sd.mk sd/qa sd/source sfx2/inc sfx2/Library_sfx.mk sfx2/source shell/source slideshow/source solenv/CompilerTest_compilerplugins_clang.mk starmath/inc starmath/source stoc/source store/source svgio/CppunitTest_svgio.mk svgio/inc svgio/Library_svgio.mk svgio/source svl/source svtools/inc svtools/source svx/CppunitTest_svx_unit.mk svx/inc svx/Library_svxcore.mk svx/Library_svx.mk svx/qa svx/source svx/uiconfig sw/CppunitTest_sw_uwriter.mk sw/Library_sw.mk sw/Library_swui.mk sw/qa sw/source test/source testtools/source toolkit/inc toolkit/qa toolkit/source tools/source ucbhelper/source ucb/source uitest/ui_logger_dsl unodevtools/source unoidl/source unotools/inc unotools/IwyuFilter_unotools.yaml un otools/source unoxml/inc uui/source vbahelper/source vcl/CppunitTest_vcl_graphic_test.mk vcl/CppunitTest_vcl_type_serializer_test.mk vcl/inc vcl/Library_vcl.mk vcl/opengl vcl/qa vcl/qt5 vcl/skia vcl/source vcl/unx writerfilter/source xmlhelp/source xmloff/inc xmloff/qa xmloff/source xmlscript/source xmlsecurity/inc xmlsecurity/source

[Tomaž Vajngerl (via logerrit)]

Rebased ref, commits from common ancestor:
commit ef86b857f35d884b23931cf121dc3b98cb80b8e5
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Tue May 12 17:36:05 2020 +0200
Commit:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
CommitDate: Tue May 12 17:36:05 2020 +0200

    vcl: move RawBitmap out of BitmapTools.hxx
    
    Change-Id: I7bb645802718e1beac560bdcf574bf439c48765f

diff --git a/include/vcl/BitmapTools.hxx b/include/vcl/BitmapTools.hxx
index 83cf5ad85844..8c168b64262c 100644
--- a/include/vcl/BitmapTools.hxx
+++ b/include/vcl/BitmapTools.hxx
@@ -20,6 +20,7 @@
 #include <basegfx/range/b2drectangle.hxx>
 #include <o3tl/safeint.hxx>
 #include <array>
+#include <vcl/RawBitmap.hxx>
 
 class SvStream;
 namespace basegfx { class B2DHomMatrix; }
@@ -35,54 +36,6 @@ lookup_table VCL_DLLPUBLIC get_unpremultiply_table();
 sal_uInt8 unpremultiply(sal_uInt8 c, sal_uInt8 a);
 sal_uInt8 premultiply(sal_uInt8 c, sal_uInt8 a);
 
-/**
- * Intended to be used to feed into CreateFromData to create a BitmapEx. RGB data format.
- */
-class VCL_DLLPUBLIC RawBitmap
-{
-friend BitmapEx VCL_DLLPUBLIC CreateFromData( RawBitmap&& rawBitmap );
-    std::unique_ptr<sal_uInt8[]> mpData;
-    Size maSize;
-    sal_uInt8 mnBitCount;
-public:
-    RawBitmap(Size const & rSize, sal_uInt8 nBitCount)
-        : maSize(rSize),
-          mnBitCount(nBitCount)
-    {
-        assert(nBitCount == 24 || nBitCount == 32);
-        sal_Int32 nRowSize, nDataSize;
-        if (o3tl::checked_multiply<sal_Int32>(rSize.getWidth(), nBitCount/8, nRowSize) ||
-            o3tl::checked_multiply<sal_Int32>(nRowSize, rSize.getHeight(), nDataSize) ||
-            nDataSize < 0)
-        {
-            throw std::bad_alloc();
-        }
-        mpData.reset(new sal_uInt8[nDataSize]);
-    }
-    void SetPixel(long nY, long nX, Color nColor)
-    {
-        long p = (nY * maSize.getWidth() + nX) * (mnBitCount/8);
-        mpData[ p++ ] = nColor.GetRed();
-        mpData[ p++ ] = nColor.GetGreen();
-        mpData[ p++ ] = nColor.GetBlue();
-        if (mnBitCount == 32)
-            mpData[ p ] = nColor.GetTransparency();
-    }
-    Color GetPixel(long nY, long nX) const
-    {
-        long p = (nY * maSize.getWidth() + nX) * mnBitCount/8;
-        if (mnBitCount == 24)
-            return Color( mpData[p], mpData[p+1], mpData[p+2]);
-        else
-            return Color( mpData[p+3], mpData[p], mpData[p+1], mpData[p+2]);
-    }
-    // so we don't accidentally leave any code in that uses palette color indexes
-    void SetPixel(long nY, long nX, BitmapColor nColor) = delete;
-    long Height() { return maSize.Height(); }
-    long Width() { return maSize.Width(); }
-    sal_uInt8 GetBitCount() const { return mnBitCount; }
-};
-
 BitmapEx VCL_DLLPUBLIC loadFromName(const OUString& rFileName, const ImageLoadFlags eFlags = ImageLoadFlags::NONE);
 
 void loadFromSvg(SvStream& rStream, const OUString& sPath, BitmapEx& rBitmapEx, double fScaleFactor);
diff --git a/include/vcl/RawBitmap.hxx b/include/vcl/RawBitmap.hxx
new file mode 100644
index 000000000000..aeb5dec9f3e1
--- /dev/null
+++ b/include/vcl/RawBitmap.hxx
@@ -0,0 +1,65 @@
+/* -*- 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/.
+ */
+
+#pragma once
+
+namespace vcl::bitmap
+{
+/**
+ * Intended to be used to feed into CreateFromData to create a BitmapEx. RGB data format.
+ */
+class VCL_DLLPUBLIC RawBitmap
+{
+    friend BitmapEx VCL_DLLPUBLIC CreateFromData(RawBitmap&& rawBitmap);
+    std::unique_ptr<sal_uInt8[]> mpData;
+    Size maSize;
+    sal_uInt8 mnBitCount;
+
+public:
+    RawBitmap(Size const& rSize, sal_uInt8 nBitCount)
+        : maSize(rSize)
+        , mnBitCount(nBitCount)
+    {
+        assert(nBitCount == 24 || nBitCount == 32);
+        sal_Int32 nRowSize, nDataSize;
+        if (o3tl::checked_multiply<sal_Int32>(rSize.getWidth(), nBitCount / 8, nRowSize)
+            || o3tl::checked_multiply<sal_Int32>(nRowSize, rSize.getHeight(), nDataSize)
+            || nDataSize < 0)
+        {
+            throw std::bad_alloc();
+        }
+        mpData.reset(new sal_uInt8[nDataSize]);
+    }
+    void SetPixel(long nY, long nX, Color nColor)
+    {
+        long p = (nY * maSize.getWidth() + nX) * (mnBitCount / 8);
+        mpData[p++] = nColor.GetRed();
+        mpData[p++] = nColor.GetGreen();
+        mpData[p++] = nColor.GetBlue();
+        if (mnBitCount == 32)
+            mpData[p] = nColor.GetTransparency();
+    }
+    Color GetPixel(long nY, long nX) const
+    {
+        long p = (nY * maSize.getWidth() + nX) * mnBitCount / 8;
+        if (mnBitCount == 24)
+            return Color(mpData[p], mpData[p + 1], mpData[p + 2]);
+        else
+            return Color(mpData[p + 3], mpData[p], mpData[p + 1], mpData[p + 2]);
+    }
+    // so we don't accidentally leave any code in that uses palette color indexes
+    void SetPixel(long nY, long nX, BitmapColor nColor) = delete;
+    long Height() { return maSize.Height(); }
+    long Width() { return maSize.Width(); }
+    sal_uInt8 GetBitCount() const { return mnBitCount; }
+};
+
+} // end vcl::bitmap
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 241c3fdf1f1140a3b370b00a0c638a61fd9383c0
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Mon May 11 22:44:38 2020 +0200
Commit:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
CommitDate: Tue May 12 08:42:21 2020 +0200

    basegfx: simplify namespaces in ALL basegfx headers
    
    Change-Id: Iaf9426507e3822363e69dff2cae2b22f34b1b26c

diff --git a/include/basegfx/color/bcolortools.hxx b/include/basegfx/color/bcolortools.hxx
index 4a1574da4cdf..5c16802cff4a 100644
--- a/include/basegfx/color/bcolortools.hxx
+++ b/include/basegfx/color/bcolortools.hxx
@@ -21,22 +21,21 @@
 
 #include <basegfx/basegfxdllapi.h>
 
-namespace basegfx
+namespace basegfx { class BColor; }
+
+namespace basegfx::utils
 {
-    class BColor;
-
-    namespace utils
-    {
-        /// Transform from RGB to HSL
-        BASEGFX_DLLPUBLIC BColor rgb2hsl(const BColor& rRGBColor);
-        /// Transform from HSL to RGB
-        BASEGFX_DLLPUBLIC BColor hsl2rgb(const BColor& rHSLColor);
-
-        /// Transform from RGB to HSV
-        BASEGFX_DLLPUBLIC BColor rgb2hsv(const BColor& rRGBColor);
-        /// Transform from HSV to RGB
-        BASEGFX_DLLPUBLIC BColor hsv2rgb(const BColor& rHSVColor);
-    }
+
+/// Transform from RGB to HSL
+BASEGFX_DLLPUBLIC BColor rgb2hsl(const BColor& rRGBColor);
+/// Transform from HSL to RGB
+BASEGFX_DLLPUBLIC BColor hsl2rgb(const BColor& rHSLColor);
+
+/// Transform from RGB to HSV
+BASEGFX_DLLPUBLIC BColor rgb2hsv(const BColor& rRGBColor);
+/// Transform from HSV to RGB
+BASEGFX_DLLPUBLIC BColor hsv2rgb(const BColor& rHSVColor);
+
 } // end of namespace basegfx
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/matrix/b2dhommatrixtools.hxx b/include/basegfx/matrix/b2dhommatrixtools.hxx
index 471d99c14197..b7159aef6165 100644
--- a/include/basegfx/matrix/b2dhommatrixtools.hxx
+++ b/include/basegfx/matrix/b2dhommatrixtools.hxx
@@ -28,10 +28,8 @@
 
 namespace basegfx { class B2DRange; }
 
-namespace basegfx
+namespace basegfx::utils
 {
-    namespace utils
-    {
         /** If the rotation angle is an approximate multiple of pi/2,
             force fSin/fCos to -1/0/1, to maintain orthogonality (which
             might also be advantageous for the other cases, but: for
@@ -148,14 +146,7 @@ namespace basegfx
         /// get column vector from B2dHomMatrix, e.g. to extract coordinate system origin and x/yaxis
         BASEGFX_DLLPUBLIC B2DTuple getColumn(const B2DHomMatrix& rMatrix, sal_uInt16 nCol);
 
-    } // end of namespace utils
-} // end of namespace basegfx
 
-
-namespace basegfx
-{
-    namespace utils
-    {
         class BASEGFX_DLLPUBLIC B2DHomMatrixBufferedDecompose
         {
         private:
@@ -186,14 +177,7 @@ namespace basegfx
             double getRotate() const { return mfRotate; }
             double getShearX() const { return mfShearX; }
         };
-    } // end of namespace utils
-} // end of namespace basegfx
-
 
-namespace basegfx
-{
-    namespace utils
-    {
         class BASEGFX_DLLPUBLIC B2DHomMatrixBufferedOnDemandDecompose
         {
         private:
@@ -232,8 +216,6 @@ namespace basegfx
             double getRotate() const { const_cast< B2DHomMatrixBufferedOnDemandDecompose* >(this)->impCheckDecompose(); return mfRotate; }
             double getShearX() const { const_cast< B2DHomMatrixBufferedOnDemandDecompose* >(this)->impCheckDecompose(); return mfShearX; }
         };
-    } // end of namespace utils
-
-} // end of namespace basegfx
+} // end of namespace basegfx::utils
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/matrix/b3dhommatrixtools.hxx b/include/basegfx/matrix/b3dhommatrixtools.hxx
index 32a64d2ed037..6b65d24603f2 100644
--- a/include/basegfx/matrix/b3dhommatrixtools.hxx
+++ b/include/basegfx/matrix/b3dhommatrixtools.hxx
@@ -22,23 +22,12 @@
 #include <basegfx/basegfxdllapi.h>
 #include <basegfx/matrix/b3dhommatrix.hxx>
 
-namespace com
-{
-namespace sun
-{
-namespace star
-{
-namespace drawing
+namespace com::sun::star::drawing
 {
 struct HomogenMatrix;
 }
-}
-}
-}
 
-namespace basegfx
-{
-namespace utils
+namespace basegfx::utils
 {
 /* tooling methods for converting API matrices (drawing::HomogenMatrix) to
     B3DHomMatrix. drawing::HomogenMatrix4 is not used by OOo
@@ -50,7 +39,6 @@ BASEGFX_DLLPUBLIC void
 B3DHomMatrixToUnoHomogenMatrix(const B3DHomMatrix& rMatrixIn,
                                com::sun::star::drawing::HomogenMatrix& rMatrixOut);
 
-} // end of namespace tools
-} // end of namespace basegfx
+} // end of namespace basegfx::tools
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/polygon/b2dlinegeometry.hxx b/include/basegfx/polygon/b2dlinegeometry.hxx
index 7a77140c8f89..0e9f5241b866 100644
--- a/include/basegfx/polygon/b2dlinegeometry.hxx
+++ b/include/basegfx/polygon/b2dlinegeometry.hxx
@@ -26,10 +26,8 @@
 #include <basegfx/basegfxdllapi.h>
 #include <basegfx/polygon/b2dpolygontriangulator.hxx>
 
-namespace basegfx
+namespace basegfx::utils
 {
-    namespace utils
-    {
         /** Create line start/end geometry element, mostly arrows and things like that.
 
             @param rCandidate
@@ -144,7 +142,6 @@ namespace basegfx
             double fMiterMinimumAngle = basegfx::deg2rad(15.0),
             basegfx::triangulator::B2DTriangleVector* pTriangles = nullptr);
 
-    } // end of namespace utils
-} // end of namespace basegfx
+} // end of namespace basegfx::utils
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/polygon/b2dpolygonclipper.hxx b/include/basegfx/polygon/b2dpolygonclipper.hxx
index 1c10901fe929..b080fdcb5e24 100644
--- a/include/basegfx/polygon/b2dpolygonclipper.hxx
+++ b/include/basegfx/polygon/b2dpolygonclipper.hxx
@@ -23,44 +23,42 @@
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/basegfxdllapi.h>
 
-
 namespace basegfx
 {
-    // predefinitions
     class B2DRange;
+}
 
-    namespace utils
-    {
-        // This method clips the given tools::PolyPolygon against a horizontal or vertical axis (parallel to X or Y axis). The axis is
-        // defined by bParallelToXAxis (true -> it's parallel to the X-Axis of the coordinate system, else to the Y-Axis) and the
-        // fValueOnOtherAxis (gives the translation to the coordinate system axis). For example, when You want to define
-        // a clip axis parallel to X.Axis and 100 above it, use bParallelToXAxis = true and fValueOnOtherAxis = 100.
-        // The value bAboveAxis defines on which side the return value will be (true -> above X, right of Y).
-        // The switch bStroke decides if the polygon is interpreted as area (false) or strokes (true).
-        BASEGFX_DLLPUBLIC B2DPolyPolygon clipPolyPolygonOnParallelAxis(const B2DPolyPolygon& rCandidate, bool bParallelToXAxis, bool bAboveAxis, double fValueOnOtherAxis, bool bStroke);
-        BASEGFX_DLLPUBLIC B2DPolyPolygon clipPolygonOnParallelAxis(const B2DPolygon& rCandidate, bool bParallelToXAxis, bool bAboveAxis, double fValueOnOtherAxis, bool bStroke);
+namespace basegfx::utils
+{
+    // This method clips the given tools::PolyPolygon against a horizontal or vertical axis (parallel to X or Y axis). The axis is
+    // defined by bParallelToXAxis (true -> it's parallel to the X-Axis of the coordinate system, else to the Y-Axis) and the
+    // fValueOnOtherAxis (gives the translation to the coordinate system axis). For example, when You want to define
+    // a clip axis parallel to X.Axis and 100 above it, use bParallelToXAxis = true and fValueOnOtherAxis = 100.
+    // The value bAboveAxis defines on which side the return value will be (true -> above X, right of Y).
+    // The switch bStroke decides if the polygon is interpreted as area (false) or strokes (true).
+    BASEGFX_DLLPUBLIC B2DPolyPolygon clipPolyPolygonOnParallelAxis(const B2DPolyPolygon& rCandidate, bool bParallelToXAxis, bool bAboveAxis, double fValueOnOtherAxis, bool bStroke);
+    BASEGFX_DLLPUBLIC B2DPolyPolygon clipPolygonOnParallelAxis(const B2DPolygon& rCandidate, bool bParallelToXAxis, bool bAboveAxis, double fValueOnOtherAxis, bool bStroke);
 
-        // Clip the given tools::PolyPolygon against the given range. bInside defines if the result will contain the
-        // parts which are contained in the range or vice versa.
-        // The switch bStroke decides if the polygon is interpreted as area (false) or strokes (true).
-        BASEGFX_DLLPUBLIC B2DPolyPolygon clipPolyPolygonOnRange(const B2DPolyPolygon& rCandidate, const B2DRange& rRange, bool bInside, bool bStroke);
-        BASEGFX_DLLPUBLIC B2DPolyPolygon clipPolygonOnRange(const B2DPolygon& rCandidate, const B2DRange& rRange, bool bInside, bool bStroke);
+    // Clip the given tools::PolyPolygon against the given range. bInside defines if the result will contain the
+    // parts which are contained in the range or vice versa.
+    // The switch bStroke decides if the polygon is interpreted as area (false) or strokes (true).
+    BASEGFX_DLLPUBLIC B2DPolyPolygon clipPolyPolygonOnRange(const B2DPolyPolygon& rCandidate, const B2DRange& rRange, bool bInside, bool bStroke);
+    BASEGFX_DLLPUBLIC B2DPolyPolygon clipPolygonOnRange(const B2DPolygon& rCandidate, const B2DRange& rRange, bool bInside, bool bStroke);
 
-        // Clip given tools::PolyPolygon against given clipping polygon.
-        // The switch bStroke decides if the polygon is interpreted as area (false) or strokes (true).
-        // With stroke polygons, You get all line snippets inside rCip.
-        // With filled polygons, You get all tools::PolyPolygon parts which were inside rClip.
-        // The switch bInside decides if the parts inside the clip polygon or outside shall be created.
-        // The clip polygon is always assumed closed, even when it's isClosed() is false.
-        BASEGFX_DLLPUBLIC B2DPolyPolygon clipPolyPolygonOnPolyPolygon(const B2DPolyPolygon& rCandidate, const B2DPolyPolygon& rClip, bool bInside, bool bStroke);
-        BASEGFX_DLLPUBLIC B2DPolyPolygon clipPolygonOnPolyPolygon(const B2DPolygon& rCandidate, const B2DPolyPolygon& rClip, bool bInside, bool bStroke);
+    // Clip given tools::PolyPolygon against given clipping polygon.
+    // The switch bStroke decides if the polygon is interpreted as area (false) or strokes (true).
+    // With stroke polygons, You get all line snippets inside rCip.
+    // With filled polygons, You get all tools::PolyPolygon parts which were inside rClip.
+    // The switch bInside decides if the parts inside the clip polygon or outside shall be created.
+    // The clip polygon is always assumed closed, even when it's isClosed() is false.
+    BASEGFX_DLLPUBLIC B2DPolyPolygon clipPolyPolygonOnPolyPolygon(const B2DPolyPolygon& rCandidate, const B2DPolyPolygon& rClip, bool bInside, bool bStroke);
+    BASEGFX_DLLPUBLIC B2DPolyPolygon clipPolygonOnPolyPolygon(const B2DPolygon& rCandidate, const B2DPolyPolygon& rClip, bool bInside, bool bStroke);
 
-        // clip the given polygon against the given range. the resulting polygon will always contain
-        // the inside parts which will always be interpreted as areas. the incoming polygon is expected
-        // to be a simple triangle list. the result is also a simple triangle list.
-        BASEGFX_DLLPUBLIC B2DPolygon clipTriangleListOnRange( const B2DPolygon& rCandidate, const B2DRange& rRange );
+    // clip the given polygon against the given range. the resulting polygon will always contain
+    // the inside parts which will always be interpreted as areas. the incoming polygon is expected
+    // to be a simple triangle list. the result is also a simple triangle list.
+    BASEGFX_DLLPUBLIC B2DPolygon clipTriangleListOnRange( const B2DPolygon& rCandidate, const B2DRange& rRange );
 
-    } // end of namespace utils
-} // end of namespace basegfx
+} // end of namespace basegfx::utils
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/polygon/b2dpolygoncutandtouch.hxx b/include/basegfx/polygon/b2dpolygoncutandtouch.hxx
index 357bf5bc97d2..24f8e1a9f876 100644
--- a/include/basegfx/polygon/b2dpolygoncutandtouch.hxx
+++ b/include/basegfx/polygon/b2dpolygoncutandtouch.hxx
@@ -23,29 +23,26 @@
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/basegfxdllapi.h>
 
-
-namespace basegfx
+namespace basegfx::utils
 {
-    namespace utils
-    {
-        // look for self-intersections and self-touches (points on an edge) in given polygon and add
-        // extra points there. Result will have no touches or intersections on an edge, only on points
-        BASEGFX_DLLPUBLIC B2DPolygon addPointsAtCutsAndTouches(const B2DPolygon& rCandidate);
-
-        // look for polypolygon-intersections and polypolygon-touches (point of poly A on an edge of poly B) in given tools::PolyPolygon and add
-        // extra points there. Result will have no touches or intersections between contained polygons on an edge, only on points. For
-        // convenience, the correction for self-intersections for each member polygon will be used, too.
-        BASEGFX_DLLPUBLIC B2DPolyPolygon addPointsAtCutsAndTouches(const B2DPolyPolygon& rCandidate);
-
-        // look for intersections of rCandidate with the edge from rStart to rEnd and add extra points there.
-        // Points are only added in the range of the edge, not on the endless vector.
-        BASEGFX_DLLPUBLIC B2DPolygon addPointsAtCuts(const B2DPolygon& rCandidate, const B2DPoint& rStart, const B2DPoint& rEnd);
-
-        // look for intersections of rCandidate with the mask Polygon and add extra points there.
-        // The mask polygon is assumed to be closed, even when it's not explicitly.
-        BASEGFX_DLLPUBLIC B2DPolygon addPointsAtCuts(const B2DPolygon& rCandidate, const B2DPolyPolygon& rMask);
-
-    } // end of namespace utils
+
+// look for self-intersections and self-touches (points on an edge) in given polygon and add
+// extra points there. Result will have no touches or intersections on an edge, only on points
+BASEGFX_DLLPUBLIC B2DPolygon addPointsAtCutsAndTouches(const B2DPolygon& rCandidate);
+
+// look for polypolygon-intersections and polypolygon-touches (point of poly A on an edge of poly B) in given tools::PolyPolygon and add
+// extra points there. Result will have no touches or intersections between contained polygons on an edge, only on points. For
+// convenience, the correction for self-intersections for each member polygon will be used, too.
+BASEGFX_DLLPUBLIC B2DPolyPolygon addPointsAtCutsAndTouches(const B2DPolyPolygon& rCandidate);
+
+// look for intersections of rCandidate with the edge from rStart to rEnd and add extra points there.
+// Points are only added in the range of the edge, not on the endless vector.
+BASEGFX_DLLPUBLIC B2DPolygon addPointsAtCuts(const B2DPolygon& rCandidate, const B2DPoint& rStart, const B2DPoint& rEnd);
+
+// look for intersections of rCandidate with the mask Polygon and add extra points there.
+// The mask polygon is assumed to be closed, even when it's not explicitly.
+BASEGFX_DLLPUBLIC B2DPolygon addPointsAtCuts(const B2DPolygon& rCandidate, const B2DPolyPolygon& rMask);
+
 } // end of namespace basegfx
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/polygon/b2dpolygontools.hxx b/include/basegfx/polygon/b2dpolygontools.hxx
index a36c3c208927..40a4027a507d 100644
--- a/include/basegfx/polygon/b2dpolygontools.hxx
+++ b/include/basegfx/polygon/b2dpolygontools.hxx
@@ -54,12 +54,12 @@ namespace o3tl
 
 namespace basegfx
 {
-    // predefinitions
     class B2DPolygon;
     class B2DRange;
+}
 
-    namespace utils
-    {
+namespace basegfx::utils
+{
         // B2DPolygon tools
 
         // open/close with point add/remove and control point corrections
@@ -524,7 +524,6 @@ namespace basegfx
          */
         BASEGFX_DLLPUBLIC OUString exportToSvgPoints( const B2DPolygon& rPoly );
 
-    } // end of namespace utils
-} // end of namespace basegfx
+} // end of namespace basegfx::utils
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/polygon/b2dpolygontriangulator.hxx b/include/basegfx/polygon/b2dpolygontriangulator.hxx
index bbc01239b994..1fb2c9d5428a 100644
--- a/include/basegfx/polygon/b2dpolygontriangulator.hxx
+++ b/include/basegfx/polygon/b2dpolygontriangulator.hxx
@@ -27,10 +27,8 @@
 
 namespace basegfx { class B2DPolyPolygon; }
 
-namespace basegfx
+namespace basegfx::triangulator
 {
-    namespace triangulator
-    {
         // Simple B2D-based triangle. Main reason is to
         // keep the data types separated (before a B2DPolygon
         // was used with the convention that three points in
@@ -68,7 +66,6 @@ namespace basegfx
         // triangulate given PolyPolygon
         BASEGFX_DLLPUBLIC B2DTriangleVector triangulate(const ::basegfx::B2DPolyPolygon& rCandidate);
 
-    } // end of namespace triangulator
-} // end of namespace basegfx
+} // end of namespace basegfx::triangulator
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/polygon/b2dpolypolygoncutter.hxx b/include/basegfx/polygon/b2dpolypolygoncutter.hxx
index f09d3ca6e815..a5f4ba6626af 100644
--- a/include/basegfx/polygon/b2dpolypolygoncutter.hxx
+++ b/include/basegfx/polygon/b2dpolypolygoncutter.hxx
@@ -23,10 +23,8 @@
 #include <basegfx/basegfxdllapi.h>
 
 
-namespace basegfx
+namespace basegfx::utils
 {
-    namespace utils
-    {
         /** Solve all crossovers (aka self-intersections) in a polyPolygon.
 
             This re-layouts all contained polygons so that the result
@@ -140,7 +138,6 @@ namespace basegfx
         */
         BASEGFX_DLLPUBLIC B2DPolyPolygon mergeToSinglePolyPolygon(const B2DPolyPolygonVector& rInput);
 
-    } // end of namespace utils
-} // end of namespace basegfx
+} // end of namespace basegfx::utils
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/polygon/b2dpolypolygontools.hxx b/include/basegfx/polygon/b2dpolypolygontools.hxx
index 4947d4be9233..9a83ab4549d7 100644
--- a/include/basegfx/polygon/b2dpolypolygontools.hxx
+++ b/include/basegfx/polygon/b2dpolypolygontools.hxx
@@ -31,12 +31,12 @@ namespace com::sun::star::drawing { struct PolyPolygonBezierCoords; }
 
 namespace basegfx
 {
-    // predefinitions
     class B2DPolyPolygon;
     class B2DRange;
+}
 
-    namespace utils
-    {
+namespace basegfx::utils
+{
         // B2DPolyPolygon tools
 
         // Check and evtl. correct orientations of all contained Polygons so that
@@ -293,7 +293,6 @@ namespace basegfx
             const B2DPolyPolygon& rPolyPolygon,
             css::drawing::PolyPolygonBezierCoords& rPolyPolygonBezierCoordsRetval);
 
-    } // end of namespace utils
-} // end of namespace basegfx
+} // end of namespace basegfx::utils
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/polygon/b2dtrapezoid.hxx b/include/basegfx/polygon/b2dtrapezoid.hxx
index 5bcc614d149c..abe0c5c4e14d 100644
--- a/include/basegfx/polygon/b2dtrapezoid.hxx
+++ b/include/basegfx/polygon/b2dtrapezoid.hxx
@@ -75,38 +75,34 @@ namespace basegfx
 } // end of namespace basegfx
 
 
-namespace basegfx
+namespace basegfx::utils
 {
-    namespace utils
-    {
-        // convert SourcePolyPolygon to trapezoids. The trapezoids will be appended to
-        // ro_Result. ro_Result will not be cleared. If SourcePolyPolygon contains curves,
-        // it's default AdaptiveSubdivision will be used.
-        // CAUTION: Trapezoids are orientation-dependent in the sense that the upper and lower
-        // lines have to be parallel to the X-Axis, thus this subdivision is NOT simply usable
-        // for primitive decompositions. To use it, the shear and rotate parts of the
-        // involved transformations HAVE to be taken into account.
-        BASEGFX_DLLPUBLIC void trapezoidSubdivide(
-            B2DTrapezoidVector& ro_Result,
-            const B2DPolyPolygon& rSourcePolyPolygon);
-
-        // directly create trapezoids from given edge. Depending on the given geometry,
-        // none up to three trapezoids will be created
-        BASEGFX_DLLPUBLIC void createLineTrapezoidFromEdge(
-            B2DTrapezoidVector& ro_Result,
-            const B2DPoint& rPointA,
-            const B2DPoint& rPointB,
-            double fLineWidth);
-
-        // create trapezoids for all edges of the given polygon. The closed state of
-        // the polygon is taken into account. If curves are contained, the default
-        // AdaptiveSubdivision will be used.
-        BASEGFX_DLLPUBLIC void createLineTrapezoidFromB2DPolygon(
-            B2DTrapezoidVector& ro_Result,
-            const B2DPolygon& rPolygon,
-            double fLineWidth);
-
-    } // end of namespace utils
-} // end of namespace basegfx
+    // convert SourcePolyPolygon to trapezoids. The trapezoids will be appended to
+    // ro_Result. ro_Result will not be cleared. If SourcePolyPolygon contains curves,
+    // it's default AdaptiveSubdivision will be used.
+    // CAUTION: Trapezoids are orientation-dependent in the sense that the upper and lower
+    // lines have to be parallel to the X-Axis, thus this subdivision is NOT simply usable
+    // for primitive decompositions. To use it, the shear and rotate parts of the
+    // involved transformations HAVE to be taken into account.
+    BASEGFX_DLLPUBLIC void trapezoidSubdivide(
+        B2DTrapezoidVector& ro_Result,
+        const B2DPolyPolygon& rSourcePolyPolygon);
+
+    // directly create trapezoids from given edge. Depending on the given geometry,
+    // none up to three trapezoids will be created
+    BASEGFX_DLLPUBLIC void createLineTrapezoidFromEdge(
+        B2DTrapezoidVector& ro_Result,
+        const B2DPoint& rPointA,
+        const B2DPoint& rPointB,
+        double fLineWidth);
+
+    // create trapezoids for all edges of the given polygon. The closed state of
+    // the polygon is taken into account. If curves are contained, the default
+    // AdaptiveSubdivision will be used.
+    BASEGFX_DLLPUBLIC void createLineTrapezoidFromB2DPolygon(
+        B2DTrapezoidVector& ro_Result,
+        const B2DPolygon& rPolygon,
+        double fLineWidth);
+} // end of namespace basegfx::utils
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/polygon/b3dpolygontools.hxx b/include/basegfx/polygon/b3dpolygontools.hxx
index 7582b188711b..67ff859b6186 100644
--- a/include/basegfx/polygon/b3dpolygontools.hxx
+++ b/include/basegfx/polygon/b3dpolygontools.hxx
@@ -26,17 +26,15 @@
 #include <basegfx/vector/b3dvector.hxx>
 #include <basegfx/basegfxdllapi.h>
 
-
-namespace basegfx { class B3DPolyPolygon; }
-
 namespace basegfx
 {
-    // predefinitions
+    class B3DPolyPolygon;
     class B3DPolygon;
     class B3DRange;
+}
 
-    namespace utils
-    {
+namespace basegfx::utils
+{
         // B3DPolygon tools
 
         /** Check if given polygon is closed. This is kind of a
@@ -126,7 +124,6 @@ namespace basegfx
         */
         BASEGFX_DLLPUBLIC B3DPolygon snapPointsOfHorizontalOrVerticalEdges(const B3DPolygon& rCandidate);
 
-    } // end of namespace utils
-} // end of namespace basegfx
+} // end of namespace basegfx::utils
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/polygon/b3dpolypolygontools.hxx b/include/basegfx/polygon/b3dpolypolygontools.hxx
index 77bcf0fb955c..cd51ac9e6524 100644
--- a/include/basegfx/polygon/b3dpolypolygontools.hxx
+++ b/include/basegfx/polygon/b3dpolypolygontools.hxx
@@ -23,17 +23,16 @@
 #include <basegfx/point/b3dpoint.hxx>
 #include <basegfx/basegfxdllapi.h>
 
-
 namespace com::sun::star::drawing { struct PolyPolygonShape3D; }
 
 namespace basegfx
 {
-    // predefinitions
     class B3DPolyPolygon;
     class B3DRange;
+}
 
-    namespace utils
-    {
+namespace basegfx::utils
+{
         // B3DPolyPolygon tools
 
         // get size of PolyPolygon. Control vectors are included in that ranges.
@@ -129,7 +128,6 @@ namespace basegfx
             const B3DPolyPolygon& rPolyPolygonSource,
             css::drawing::PolyPolygonShape3D& rPolyPolygonShape3DRetval);
 
-    } // end of namespace utils
-} // end of namespace basegfx
+} // end of namespace basegfx::utils
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/raster/rasterconvert3d.hxx b/include/basegfx/raster/rasterconvert3d.hxx
index 9179f175d696..59a309c865f7 100644
--- a/include/basegfx/raster/rasterconvert3d.hxx
+++ b/include/basegfx/raster/rasterconvert3d.hxx
@@ -62,10 +62,7 @@ namespace basegfx
 
         void increment(double fStep) { mfVal += fStep * mfInc; }
     };
-} // end of namespace basegfx
 
-namespace basegfx
-{
     class ip_double
     {
     private:
@@ -88,10 +85,7 @@ namespace basegfx
 
         void increment(double fStep) { maX.increment(fStep); maY.increment(fStep); }
     };
-} // end of namespace basegfx
 
-namespace basegfx
-{
     class ip_triple
     {
     private:
@@ -118,14 +112,10 @@ namespace basegfx
 
         void increment(double fStep) { maX.increment(fStep); maY.increment(fStep); maZ.increment(fStep); }
     };
-} // end of namespace basegfx
 
+    // InterpolatorProvider3D to have a common source for allocating interpolators
+    // which may then be addressed using the index to the vectors
 
-// InterpolatorProvider3D to have a common source for allocating interpolators
-// which may then be addressed using the index to the vectors
-
-namespace basegfx
-{
     #define SCANLINE_EMPTY_INDEX (0xffffffff)
 
     class InterpolatorProvider3D
@@ -303,13 +293,9 @@ namespace basegfx
         ::std::vector< ip_double >& getTextureInterpolators() { return maTextureInterpolators; }
         ::std::vector< ip_triple >& getInverseTextureInterpolators() { return maInverseTextureInterpolators; }
     };
-} // end of namespace basegfx
-
 
-// RasterConversionLineEntry3D for Rasterconversion of 3D PolyPolygons
+    // RasterConversionLineEntry3D for Rasterconversion of 3D PolyPolygons
 
-namespace basegfx
-{
     class RasterConversionLineEntry3D
     {
     private:
@@ -400,14 +386,10 @@ namespace basegfx
         sal_uInt32 getTextureIndex() const { return mnTextureIndex; }
         sal_uInt32 getInverseTextureIndex() const { return mnInverseTextureIndex; }
     };
-} // end of namespace basegfx
-
 
-// the basic RasterConverter itself. Only one method needs to be overridden. The
-// class itself is pure virtual
+    // the basic RasterConverter itself. Only one method needs to be overridden. The
+    // class itself is pure virtual
 
-namespace basegfx
-{
     class UNLESS_MERGELIBS(BASEGFX_DLLPUBLIC) RasterConverter3D : public InterpolatorProvider3D
     {
     private:
diff --git a/include/basegfx/utils/b2dclipstate.hxx b/include/basegfx/utils/b2dclipstate.hxx
index b145dac33fc7..f4d9d9e7d67f 100644
--- a/include/basegfx/utils/b2dclipstate.hxx
+++ b/include/basegfx/utils/b2dclipstate.hxx
@@ -28,9 +28,10 @@ namespace basegfx
     class B2DRange;
     class B2DPolyPolygon;
     class B2DHomMatrix;
+}
 
-    namespace utils
-    {
+namespace basegfx::utils
+{
         class ImplB2DClipState;
 
         /** This class provides an optimized, symbolic clip state for graphical output
@@ -86,7 +87,6 @@ namespace basegfx
 
             B2DPolyPolygon const & getClipPoly() const;
         };
-    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/utils/canvastools.hxx b/include/basegfx/utils/canvastools.hxx
index ecf5a594f588..d4cfa0a5cfba 100644
--- a/include/basegfx/utils/canvastools.hxx
+++ b/include/basegfx/utils/canvastools.hxx
@@ -60,9 +60,10 @@ namespace basegfx
     class B2IRange;
     class B2DPolygon;
     class B2DPolyPolygon;
+}
 
-    namespace unotools
-    {
+namespace basegfx::unotools
+{
         // Polygon conversions
 
 
@@ -159,8 +160,6 @@ namespace basegfx
             which completely contains rRange.
          */
         BASEGFX_DLLPUBLIC ::basegfx::B2DRange   b2DSurroundingIntegerRangeFromB2DRange( const ::basegfx::B2DRange& rRange );
-
-    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/utils/keystoplerp.hxx b/include/basegfx/utils/keystoplerp.hxx
index a68336f71ba1..302020ac337e 100644
--- a/include/basegfx/utils/keystoplerp.hxx
+++ b/include/basegfx/utils/keystoplerp.hxx
@@ -26,10 +26,8 @@ namespace com::sun::star::uno {
     template<typename T> class Sequence;
 }
 
-namespace basegfx
+namespace basegfx::utils
 {
-    namespace utils
-    {
         /** Lerp in a vector of key stops
 
             This class holds a key stop vector and provides the
@@ -82,7 +80,6 @@ namespace basegfx
             std::vector<double>    maKeyStops;
             mutable std::ptrdiff_t mnLastIndex;
         };
-    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/utils/lerp.hxx b/include/basegfx/utils/lerp.hxx
index 409b26c92d4a..e02b3b0fa51b 100644
--- a/include/basegfx/utils/lerp.hxx
+++ b/include/basegfx/utils/lerp.hxx
@@ -19,27 +19,24 @@
 
 #pragma once
 
-namespace basegfx
+namespace basegfx::utils
 {
-    namespace utils
-    {
-        /** Generic linear interpolator
+    /** Generic linear interpolator
 
-            @tpl ValueType
-            Must have operator+ and operator* defined, and should
-            have value semantics.
+        @tpl ValueType
+        Must have operator+ and operator* defined, and should
+        have value semantics.
 
-            @param t
-            As usual, t must be in the [0,1] range
-        */
-        template< typename ValueType > ValueType lerp( const ValueType&     rFrom,
-                                                       const ValueType&     rTo,
-                                                       double               t )
-        {
-            // This is only to suppress a double->int warning. All other
-            // types should be okay here.
-            return static_cast<ValueType>( (1.0-t)*rFrom + t*rTo );
-        }
+        @param t
+        As usual, t must be in the [0,1] range
+    */
+    template< typename ValueType > ValueType lerp( const ValueType&     rFrom,
+                                                   const ValueType&     rTo,
+                                                   double               t )
+    {
+        // This is only to suppress a double->int warning. All other
+        // types should be okay here.
+        return static_cast<ValueType>( (1.0-t)*rFrom + t*rTo );
     }
 }
 
diff --git a/include/basegfx/utils/rectcliptools.hxx b/include/basegfx/utils/rectcliptools.hxx
index a187645f541d..b1354a6cac87 100644
--- a/include/basegfx/utils/rectcliptools.hxx
+++ b/include/basegfx/utils/rectcliptools.hxx
@@ -23,53 +23,49 @@
 #include <basegfx/range/b2ibox.hxx>
 
 
-namespace basegfx
+namespace basegfx::utils
 {
-    namespace utils
+    namespace RectClipFlags
     {
-        namespace RectClipFlags
-        {
-            static const sal_uInt32 LEFT   = sal_Int32(0x01);
-            static const sal_uInt32 RIGHT  = sal_Int32(0x02);
-            static const sal_uInt32 TOP    = sal_Int32(0x04);
-            static const sal_uInt32 BOTTOM = sal_Int32(0x08);
-        }
-
-        /** Calc clip mask for Cohen-Sutherland rectangle clip
+        static const sal_uInt32 LEFT   = sal_Int32(0x01);
+        static const sal_uInt32 RIGHT  = sal_Int32(0x02);
+        static const sal_uInt32 TOP    = sal_Int32(0x04);
+        static const sal_uInt32 BOTTOM = sal_Int32(0x08);
+    }
 
-            This function returns a clip mask used for the
-            Cohen-Sutherland rectangle clip method, where one or more
-            of the lower four bits are set, if the given point is
-            outside one or more of the four half planes defining the
-            rectangle (see RectClipFlags for possible values)
-         */
-        template< class Point, class Rect > inline
-           sal_uInt32 getCohenSutherlandClipFlags( const Point& rP,
-                                                   const Rect&  rR )
-        {
-            // maxY | minY | maxX | minX
-            sal_uInt32 clip;
-            clip = (rP.getX() < rR.getMinX()) << 0;
-            clip |= (rP.getX() > rR.getMaxX()) << 1;
-            clip |= (rP.getY() < rR.getMinY()) << 2;
-            clip |= (rP.getY() > rR.getMaxY()) << 3;
-            return clip;
-        }
+    /** Calc clip mask for Cohen-Sutherland rectangle clip
 
-        /// Cohen-Sutherland mask calculation - overload for boxes.
-        template< class Point > inline
-           sal_uInt32 getCohenSutherlandClipFlags( const Point&  rP,
-                                                   const B2IBox& rB )
-        {
-            // maxY | minY | maxX | minX
-            sal_uInt32 clip;
-            clip = (rP.getX() <  rB.getMinX()) << 0;
-            clip |= (rP.getX() >= rB.getMaxX()) << 1;
-            clip |= (rP.getY() <  rB.getMinY()) << 2;
-            clip |= (rP.getY() >= rB.getMaxY()) << 3;
-            return clip;
-        }
+        This function returns a clip mask used for the
+        Cohen-Sutherland rectangle clip method, where one or more
+        of the lower four bits are set, if the given point is
+        outside one or more of the four half planes defining the
+        rectangle (see RectClipFlags for possible values)
+     */
+    template< class Point, class Rect > inline
+       sal_uInt32 getCohenSutherlandClipFlags( const Point& rP,
+                                               const Rect&  rR )
+    {
+        // maxY | minY | maxX | minX
+        sal_uInt32 clip;
+        clip = (rP.getX() < rR.getMinX()) << 0;
+        clip |= (rP.getX() > rR.getMaxX()) << 1;
+        clip |= (rP.getY() < rR.getMinY()) << 2;
+        clip |= (rP.getY() > rR.getMaxY()) << 3;
+        return clip;
+    }
 
+    /// Cohen-Sutherland mask calculation - overload for boxes.
+    template< class Point > inline
+       sal_uInt32 getCohenSutherlandClipFlags( const Point&  rP,
+                                               const B2IBox& rB )
+    {
+        // maxY | minY | maxX | minX
+        sal_uInt32 clip;
+        clip = (rP.getX() <  rB.getMinX()) << 0;
+        clip |= (rP.getX() >= rB.getMaxX()) << 1;
+        clip |= (rP.getY() <  rB.getMinY()) << 2;
+        clip |= (rP.getY() >= rB.getMaxY()) << 3;
+        return clip;
     }
 }
 
diff --git a/include/basegfx/utils/systemdependentdata.hxx b/include/basegfx/utils/systemdependentdata.hxx
index 62562b488e1b..120e39a0e595 100644
--- a/include/basegfx/utils/systemdependentdata.hxx
+++ b/include/basegfx/utils/systemdependentdata.hxx
@@ -20,10 +20,7 @@ namespace basegfx
     class SystemDependentData;
     typedef std::shared_ptr<SystemDependentData> SystemDependentData_SharedPtr;
     typedef std::weak_ptr<SystemDependentData> SystemDependentData_WeakPtr;
-} // end of namespace basegfx
 
-namespace basegfx
-{
     class BASEGFX_DLLPUBLIC SystemDependentDataManager
     {
     private:
@@ -44,10 +41,7 @@ namespace basegfx
         // flush all buffered data (e.g. cleanup/shutdown)
         virtual void flushAll() = 0;
     };
-} // end of namespace basegfx
 
-namespace basegfx
-{
     class BASEGFX_DLLPUBLIC MinimalSystemDependentDataManager final : public SystemDependentDataManager
     {
     private:
@@ -73,10 +67,7 @@ namespace basegfx
         virtual void touchUsage(basegfx::SystemDependentData_SharedPtr& rData) override;
         virtual void flushAll() override;
     };
-} // end of namespace basegfx
 
-namespace basegfx
-{
     class BASEGFX_DLLPUBLIC SystemDependentData
     {
     private:
@@ -120,10 +111,7 @@ namespace basegfx
         // offer useful data if you want to have better caching.
         virtual sal_Int64 estimateUsageInBytes() const;
     };
-} // end of namespace basegfx
 
-namespace basegfx
-{
     class BASEGFX_DLLPUBLIC SystemDependentDataHolder
     {
     private:
diff --git a/include/basegfx/utils/tools.hxx b/include/basegfx/utils/tools.hxx
index 7992777f4686..f8fc61999505 100644
--- a/include/basegfx/utils/tools.hxx
+++ b/include/basegfx/utils/tools.hxx
@@ -27,9 +27,10 @@ namespace basegfx
     class B2DPoint;
     class B2DRange;
     class B2DPolyPolygon;
+}
 
-    namespace utils
-    {
+namespace basegfx::utils
+{
         /** Expand given parallelogram, such that it extends beyond
             bound rect in a given direction.
 
@@ -118,7 +119,6 @@ namespace basegfx
                                                             sal_Int32 nTotalDigits,
                                                             sal_Int32 nDecPlaces,
                                                             bool      bLitSegments=true);
-    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/utils/unopolypolygon.hxx b/include/basegfx/utils/unopolypolygon.hxx
index f6b17328405a..da95ebff2a6d 100644
--- a/include/basegfx/utils/unopolypolygon.hxx
+++ b/include/basegfx/utils/unopolypolygon.hxx
@@ -29,9 +29,7 @@
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/basegfxdllapi.h>
 
-namespace basegfx
-{
-namespace unotools
+namespace basegfx::unotools
 {
     typedef cppu::WeakComponentImplHelper<
             css::rendering::XLinePolyPolygon2D,
@@ -103,6 +101,5 @@ namespace unotools
         css::rendering::FillRule              meFillRule;
     };
 }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/utils/zoomtools.hxx b/include/basegfx/utils/zoomtools.hxx
index 5543c8660b22..4d85e5dec533 100644
--- a/include/basegfx/utils/zoomtools.hxx
+++ b/include/basegfx/utils/zoomtools.hxx
@@ -11,16 +11,14 @@
 
 #include <basegfx/basegfxdllapi.h>
 
-
-namespace basegfx
+namespace basegfx::zoomtools
 {
-    /** This namespace provides functions for optimized geometric zooming
-    */
-    namespace zoomtools
-    {
-        BASEGFX_DLLPUBLIC long zoomOut(long nCurrent);
-        BASEGFX_DLLPUBLIC long zoomIn(long nCurrent);
-    }
+
+/** This namespace provides functions for optimized geometric zooming
+*/
+BASEGFX_DLLPUBLIC long zoomOut(long nCurrent);
+BASEGFX_DLLPUBLIC long zoomIn(long nCurrent);
+
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit ea5fa1f95d01ea338394cae1c16aaf7479bb34fb
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Mon May 11 22:23:48 2020 +0200
Commit:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
CommitDate: Tue May 12 08:42:21 2020 +0200

    use pragma once in include/basegfx headers
    
    Change-Id: Ief442ff36927b9b14d76d72b25a6cec3d481fb2d

diff --git a/include/basegfx/color/bcolor.hxx b/include/basegfx/color/bcolor.hxx
index ef4857bba598..414a815b3d87 100644
--- a/include/basegfx/color/bcolor.hxx
+++ b/include/basegfx/color/bcolor.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEGFX_COLOR_BCOLOR_HXX
-#define INCLUDED_BASEGFX_COLOR_BCOLOR_HXX
+#pragma once
 
 #include <sal/config.h>
 
@@ -184,6 +183,4 @@ namespace basegfx
     }
 } // end of namespace basegfx
 
-#endif // INCLUDED_BASEGFX_COLOR_BCOLOR_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/color/bcolormodifier.hxx b/include/basegfx/color/bcolormodifier.hxx
index ea18f8ba4fc0..2c6cf25ba8de 100644
--- a/include/basegfx/color/bcolormodifier.hxx
+++ b/include/basegfx/color/bcolormodifier.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEGFX_COLOR_BCOLORMODIFIER_HXX
-#define INCLUDED_BASEGFX_COLOR_BCOLORMODIFIER_HXX
+#pragma once
 
 #include <config_options.h>
 #include <basegfx/basegfxdllapi.h>
@@ -340,7 +339,4 @@ namespace basegfx
     };
 } // end of namespace basegfx
 
-
-#endif // INCLUDED_BASEGFX_COLOR_BCOLORMODIFIER_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/color/bcolortools.hxx b/include/basegfx/color/bcolortools.hxx
index fd0fa803c10a..4a1574da4cdf 100644
--- a/include/basegfx/color/bcolortools.hxx
+++ b/include/basegfx/color/bcolortools.hxx
@@ -17,12 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEGFX_COLOR_BCOLORTOOLS_HXX
-#define INCLUDED_BASEGFX_COLOR_BCOLORTOOLS_HXX
+#pragma once
 
 #include <basegfx/basegfxdllapi.h>
 
-
 namespace basegfx
 {
     class BColor;
@@ -41,6 +39,4 @@ namespace basegfx
     }
 } // end of namespace basegfx
 
-#endif // INCLUDED_BASEGFX_COLOR_BCOLORTOOLS_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/curve/b2dbeziertools.hxx b/include/basegfx/curve/b2dbeziertools.hxx
index e0630484221f..b9c91fac0a7f 100644
--- a/include/basegfx/curve/b2dbeziertools.hxx
+++ b/include/basegfx/curve/b2dbeziertools.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEGFX_CURVE_B2DBEZIERTOOLS_HXX
-#define INCLUDED_BASEGFX_CURVE_B2DBEZIERTOOLS_HXX
+#pragma once
 
 #include <sal/types.h>
 #include <vector>
@@ -50,6 +49,4 @@ namespace basegfx
 } // end of namespace basegfx
 
 
-#endif // INCLUDED_BASEGFX_CURVE_B2DBEZIERTOOLS_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/curve/b2dcubicbezier.hxx b/include/basegfx/curve/b2dcubicbezier.hxx
index b8254b4b9a2e..0199731475d2 100644
--- a/include/basegfx/curve/b2dcubicbezier.hxx
+++ b/include/basegfx/curve/b2dcubicbezier.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEGFX_CURVE_B2DCUBICBEZIER_HXX
-#define INCLUDED_BASEGFX_CURVE_B2DCUBICBEZIER_HXX
+#pragma once
 
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/range/b2drange.hxx>
@@ -197,6 +196,4 @@ namespace basegfx
     };
 } // end of namespace basegfx
 
-#endif // INCLUDED_BASEGFX_CURVE_B2DCUBICBEZIER_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/matrix/b2dhommatrix.hxx b/include/basegfx/matrix/b2dhommatrix.hxx
index 0015b2a78fce..60b32fb09f00 100644
--- a/include/basegfx/matrix/b2dhommatrix.hxx
+++ b/include/basegfx/matrix/b2dhommatrix.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEGFX_MATRIX_B2DHOMMATRIX_HXX
-#define INCLUDED_BASEGFX_MATRIX_B2DHOMMATRIX_HXX
+#pragma once
 
 #include <sal/config.h>
 
@@ -151,6 +150,4 @@ namespace basegfx
     }
 } // end of namespace basegfx
 
-#endif // INCLUDED_BASEGFX_MATRIX_B2DHOMMATRIX_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/matrix/b2dhommatrixtools.hxx b/include/basegfx/matrix/b2dhommatrixtools.hxx
index db7c6af24139..471d99c14197 100644
--- a/include/basegfx/matrix/b2dhommatrixtools.hxx
+++ b/include/basegfx/matrix/b2dhommatrixtools.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEGFX_MATRIX_B2DHOMMATRIXTOOLS_HXX
-#define INCLUDED_BASEGFX_MATRIX_B2DHOMMATRIXTOOLS_HXX
+#pragma once
 
 #include <sal/types.h>
 #include <basegfx/matrix/b2dhommatrix.hxx>
@@ -237,7 +236,4 @@ namespace basegfx
 
 } // end of namespace basegfx
 
-
-#endif // INCLUDED_BASEGFX_MATRIX_B2DHOMMATRIXTOOLS_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/matrix/b3dhommatrix.hxx b/include/basegfx/matrix/b3dhommatrix.hxx
index 6d5d5c486b9b..29603f88ebdb 100644
--- a/include/basegfx/matrix/b3dhommatrix.hxx
+++ b/include/basegfx/matrix/b3dhommatrix.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEGFX_MATRIX_B3DHOMMATRIX_HXX
-#define INCLUDED_BASEGFX_MATRIX_B3DHOMMATRIX_HXX
+#pragma once
 
 #include <sal/types.h>
 #include <basegfx/point/b3dpoint.hxx>
@@ -125,6 +124,4 @@ namespace basegfx
     }
 } // end of namespace basegfx
 
-#endif // INCLUDED_BASEGFX_MATRIX_B3DHOMMATRIX_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/matrix/b3dhommatrixtools.hxx b/include/basegfx/matrix/b3dhommatrixtools.hxx
index 1ea0d80c14e5..32a64d2ed037 100644
--- a/include/basegfx/matrix/b3dhommatrixtools.hxx
+++ b/include/basegfx/matrix/b3dhommatrixtools.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEGFX_MATRIX_B3DHOMMATRIXTOOLS_HXX
-#define INCLUDED_BASEGFX_MATRIX_B3DHOMMATRIXTOOLS_HXX
+#pragma once
 
 #include <basegfx/basegfxdllapi.h>
 #include <basegfx/matrix/b3dhommatrix.hxx>
@@ -54,6 +53,4 @@ B3DHomMatrixToUnoHomogenMatrix(const B3DHomMatrix& rMatrixIn,
 } // end of namespace tools
 } // end of namespace basegfx
 
-#endif // INCLUDED_BASEGFX_MATRIX_B3DHOMMATRIXTOOLS_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/pixel/bpixel.hxx b/include/basegfx/pixel/bpixel.hxx
index 95400b966021..ee42f29c6318 100644
--- a/include/basegfx/pixel/bpixel.hxx
+++ b/include/basegfx/pixel/bpixel.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEGFX_PIXEL_BPIXEL_HXX
-#define INCLUDED_BASEGFX_PIXEL_BPIXEL_HXX
+#pragma once
 
 #include <sal/types.h>
 #include <basegfx/color/bcolor.hxx>
@@ -96,6 +95,4 @@ namespace basegfx
 
 } // end of namespace basegfx
 
-#endif // INCLUDED_BASEGFX_PIXEL_BPIXEL_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/point/b2dpoint.hxx b/include/basegfx/point/b2dpoint.hxx
index 0f1613252091..413aa00e40b5 100644
--- a/include/basegfx/point/b2dpoint.hxx
+++ b/include/basegfx/point/b2dpoint.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEGFX_POINT_B2DPOINT_HXX
-#define INCLUDED_BASEGFX_POINT_B2DPOINT_HXX
+#pragma once
 
 #include <ostream>
 
@@ -133,6 +132,4 @@ namespace basegfx
 
 } // end of namespace basegfx
 
-#endif // INCLUDED_BASEGFX_POINT_B2DPOINT_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/point/b2ipoint.hxx b/include/basegfx/point/b2ipoint.hxx
index a41c8d1b4321..171fcbc9c8be 100644
--- a/include/basegfx/point/b2ipoint.hxx
+++ b/include/basegfx/point/b2ipoint.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEGFX_POINT_B2IPOINT_HXX
-#define INCLUDED_BASEGFX_POINT_B2IPOINT_HXX
+#pragma once
 
 #include <basegfx/tuple/b2ituple.hxx>
 #include <basegfx/basegfxdllapi.h>
@@ -99,6 +98,4 @@ namespace basegfx
     };
 } // end of namespace basegfx
 
-#endif // INCLUDED_BASEGFX_POINT_B2IPOINT_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/point/b3dpoint.hxx b/include/basegfx/point/b3dpoint.hxx
index c044e6bb6ec7..2cb8acf9be50 100644
--- a/include/basegfx/point/b3dpoint.hxx
+++ b/include/basegfx/point/b3dpoint.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEGFX_POINT_B3DPOINT_HXX
-#define INCLUDED_BASEGFX_POINT_B3DPOINT_HXX
+#pragma once
 
 #include <basegfx/tuple/b3dtuple.hxx>
 #include <basegfx/basegfxdllapi.h>
@@ -122,6 +121,4 @@ namespace basegfx
 
 } // end of namespace basegfx
 
-#endif // INCLUDED_BASEGFX_POINT_B3DPOINT_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/polygon/WaveLine.hxx b/include/basegfx/polygon/WaveLine.hxx
index 9d703165b212..b839c7519808 100644
--- a/include/basegfx/polygon/WaveLine.hxx
+++ b/include/basegfx/polygon/WaveLine.hxx
@@ -8,8 +8,7 @@
  *
  */
 
-#ifndef INCLUDED_BASEGFX_POLYGON_WAVELINE_HXX
-#define INCLUDED_BASEGFX_POLYGON_WAVELINE_HXX
+#pragma once
 
 #include <basegfx/basegfxdllapi.h>
 #include <basegfx/polygon/b2dpolygon.hxx>
@@ -36,6 +35,4 @@ BASEGFX_DLLPUBLIC B2DPolygon createWaveLinePolygon(basegfx::B2DRectangle const&
 
 } // end of namespace basegfx
 
-#endif // INCLUDED_BASEGFX_POLYGON_WAVELINE_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/polygon/b2dlinegeometry.hxx b/include/basegfx/polygon/b2dlinegeometry.hxx
index 6a98d6189394..7a77140c8f89 100644
--- a/include/basegfx/polygon/b2dlinegeometry.hxx
+++ b/include/basegfx/polygon/b2dlinegeometry.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEGFX_POLYGON_B2DLINEGEOMETRY_HXX
-#define INCLUDED_BASEGFX_POLYGON_B2DLINEGEOMETRY_HXX
+#pragma once
 
 #include <basegfx/numeric/ftools.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
@@ -148,6 +147,4 @@ namespace basegfx
     } // end of namespace utils
 } // end of namespace basegfx
 
-#endif // INCLUDED_BASEGFX_POLYGON_B2DLINEGEOMETRY_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/polygon/b2dpolygon.hxx b/include/basegfx/polygon/b2dpolygon.hxx
index 72be3525fc0f..997a669bcba3 100644
--- a/include/basegfx/polygon/b2dpolygon.hxx
+++ b/include/basegfx/polygon/b2dpolygon.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEGFX_POLYGON_B2DPOLYGON_HXX
-#define INCLUDED_BASEGFX_POLYGON_B2DPOLYGON_HXX
+#pragma once
 
 #include <ostream>
 #include <vector>
@@ -276,6 +275,4 @@ namespace basegfx
 
 } // end of namespace basegfx
 
-#endif // INCLUDED_BASEGFX_POLYGON_B2DPOLYGON_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/polygon/b2dpolygonclipper.hxx b/include/basegfx/polygon/b2dpolygonclipper.hxx
index 472cbf387b98..1c10901fe929 100644
--- a/include/basegfx/polygon/b2dpolygonclipper.hxx
+++ b/include/basegfx/polygon/b2dpolygonclipper.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEGFX_POLYGON_B2DPOLYGONCLIPPER_HXX
-#define INCLUDED_BASEGFX_POLYGON_B2DPOLYGONCLIPPER_HXX
+#pragma once
 
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
@@ -64,6 +63,4 @@ namespace basegfx
     } // end of namespace utils
 } // end of namespace basegfx
 
-#endif // INCLUDED_BASEGFX_POLYGON_B2DPOLYGONCLIPPER_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/polygon/b2dpolygoncutandtouch.hxx b/include/basegfx/polygon/b2dpolygoncutandtouch.hxx
index 536f11a693b0..357bf5bc97d2 100644
--- a/include/basegfx/polygon/b2dpolygoncutandtouch.hxx
+++ b/include/basegfx/polygon/b2dpolygoncutandtouch.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEGFX_POLYGON_B2DPOLYGONCUTANDTOUCH_HXX
-#define INCLUDED_BASEGFX_POLYGON_B2DPOLYGONCUTANDTOUCH_HXX
+#pragma once
 
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
@@ -49,7 +48,4 @@ namespace basegfx
     } // end of namespace utils
 } // end of namespace basegfx
 
-
-#endif // INCLUDED_BASEGFX_POLYGON_B2DPOLYGONCUTANDTOUCH_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/polygon/b2dpolygontools.hxx b/include/basegfx/polygon/b2dpolygontools.hxx
index e1eb4c044dbb..a36c3c208927 100644
--- a/include/basegfx/polygon/b2dpolygontools.hxx
+++ b/include/basegfx/polygon/b2dpolygontools.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEGFX_POLYGON_B2DPOLYGONTOOLS_HXX
-#define INCLUDED_BASEGFX_POLYGON_B2DPOLYGONTOOLS_HXX
+#pragma once
 
 #include <vector>
 #include <functional>
@@ -528,6 +527,4 @@ namespace basegfx
     } // end of namespace utils
 } // end of namespace basegfx
 
-#endif // INCLUDED_BASEGFX_POLYGON_B2DPOLYGONTOOLS_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/polygon/b2dpolygontriangulator.hxx b/include/basegfx/polygon/b2dpolygontriangulator.hxx
index 40bd8117e423..bbc01239b994 100644
--- a/include/basegfx/polygon/b2dpolygontriangulator.hxx
+++ b/include/basegfx/polygon/b2dpolygontriangulator.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEGFX_POLYGON_B2DPOLYGONTRIANGULATOR_HXX
-#define INCLUDED_BASEGFX_POLYGON_B2DPOLYGONTRIANGULATOR_HXX
+#pragma once
 
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/point/b2dpoint.hxx>
@@ -72,6 +71,4 @@ namespace basegfx
     } // end of namespace triangulator
 } // end of namespace basegfx
 
-#endif // INCLUDED_BASEGFX_POLYGON_B2DPOLYGONTRIANGULATOR_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/polygon/b2dpolypolygon.hxx b/include/basegfx/polygon/b2dpolypolygon.hxx
index d1af340048fd..010815c8784e 100644
--- a/include/basegfx/polygon/b2dpolypolygon.hxx
+++ b/include/basegfx/polygon/b2dpolypolygon.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEGFX_POLYGON_B2DPOLYPOLYGON_HXX
-#define INCLUDED_BASEGFX_POLYGON_B2DPOLYPOLYGON_HXX
+#pragma once
 
 #include <ostream>
 #include <vector>
@@ -175,6 +174,4 @@ namespace basegfx
 
 } // end of namespace basegfx
 
-#endif // INCLUDED_BASEGFX_POLYGON_B2DPOLYPOLYGON_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/polygon/b2dpolypolygoncutter.hxx b/include/basegfx/polygon/b2dpolypolygoncutter.hxx
index 1b3a5be26104..f09d3ca6e815 100644
--- a/include/basegfx/polygon/b2dpolypolygoncutter.hxx
+++ b/include/basegfx/polygon/b2dpolypolygoncutter.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEGFX_POLYGON_B2DPOLYPOLYGONCUTTER_HXX
-#define INCLUDED_BASEGFX_POLYGON_B2DPOLYPOLYGONCUTTER_HXX
+#pragma once
 
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/basegfxdllapi.h>
@@ -144,7 +143,4 @@ namespace basegfx
     } // end of namespace utils
 } // end of namespace basegfx
 
-
-#endif // INCLUDED_BASEGFX_POLYGON_B2DPOLYPOLYGONCUTTER_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/polygon/b2dpolypolygontools.hxx b/include/basegfx/polygon/b2dpolypolygontools.hxx
index 3bf21ada8c59..4947d4be9233 100644
--- a/include/basegfx/polygon/b2dpolypolygontools.hxx
+++ b/include/basegfx/polygon/b2dpolypolygontools.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEGFX_POLYGON_B2DPOLYPOLYGONTOOLS_HXX
-#define INCLUDED_BASEGFX_POLYGON_B2DPOLYPOLYGONTOOLS_HXX
+#pragma once
 
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/polygon/b3dpolypolygon.hxx>
@@ -297,6 +296,4 @@ namespace basegfx
     } // end of namespace utils
 } // end of namespace basegfx
 
-#endif // INCLUDED_BASEGFX_POLYGON_B2DPOLYPOLYGONTOOLS_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/polygon/b2dtrapezoid.hxx b/include/basegfx/polygon/b2dtrapezoid.hxx
index 82bee12e37bf..5bcc614d149c 100644
--- a/include/basegfx/polygon/b2dtrapezoid.hxx
+++ b/include/basegfx/polygon/b2dtrapezoid.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEGFX_POLYGON_B2DTRAPEZOID_HXX
-#define INCLUDED_BASEGFX_POLYGON_B2DTRAPEZOID_HXX
+#pragma once
 
 #include <config_options.h>
 #include <basegfx/polygon/b2dpolygon.hxx>
@@ -110,7 +109,4 @@ namespace basegfx
     } // end of namespace utils
 } // end of namespace basegfx
 
-
-#endif // INCLUDED_BASEGFX_POLYGON_B2DTRAPEZOID_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/polygon/b3dpolygon.hxx b/include/basegfx/polygon/b3dpolygon.hxx
index 2851e8f47d4a..ea9ea2fdedcf 100644
--- a/include/basegfx/polygon/b3dpolygon.hxx
+++ b/include/basegfx/polygon/b3dpolygon.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEGFX_POLYGON_B3DPOLYGON_HXX
-#define INCLUDED_BASEGFX_POLYGON_B3DPOLYGON_HXX
+#pragma once
 
 #include <sal/types.h>
 #include <o3tl/cow_wrapper.hxx>
@@ -119,7 +118,4 @@ namespace basegfx
     };
 } // end of namespace basegfx
 
-
-#endif // INCLUDED_BASEGFX_POLYGON_B3DPOLYGON_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/polygon/b3dpolygontools.hxx b/include/basegfx/polygon/b3dpolygontools.hxx
index 80383c29625e..7582b188711b 100644
--- a/include/basegfx/polygon/b3dpolygontools.hxx
+++ b/include/basegfx/polygon/b3dpolygontools.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEGFX_POLYGON_B3DPOLYGONTOOLS_HXX
-#define INCLUDED_BASEGFX_POLYGON_B3DPOLYGONTOOLS_HXX
+#pragma once
 
 #include <vector>
 #include <functional>
@@ -130,6 +129,4 @@ namespace basegfx
     } // end of namespace utils
 } // end of namespace basegfx
 
-#endif // INCLUDED_BASEGFX_POLYGON_B3DPOLYGONTOOLS_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/polygon/b3dpolypolygon.hxx b/include/basegfx/polygon/b3dpolypolygon.hxx
index ce659148c72a..14a062c08cd6 100644
--- a/include/basegfx/polygon/b3dpolypolygon.hxx
+++ b/include/basegfx/polygon/b3dpolypolygon.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEGFX_POLYGON_B3DPOLYPOLYGON_HXX
-#define INCLUDED_BASEGFX_POLYGON_B3DPOLYPOLYGON_HXX
+#pragma once
 
 #include <sal/types.h>
 #include <o3tl/cow_wrapper.hxx>
@@ -111,6 +110,4 @@ namespace basegfx
     };
 } // end of namespace basegfx
 
-#endif // INCLUDED_BASEGFX_POLYGON_B3DPOLYPOLYGON_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/polygon/b3dpolypolygontools.hxx b/include/basegfx/polygon/b3dpolypolygontools.hxx
index 3111c9df50a0..77bcf0fb955c 100644
--- a/include/basegfx/polygon/b3dpolypolygontools.hxx
+++ b/include/basegfx/polygon/b3dpolypolygontools.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEGFX_POLYGON_B3DPOLYPOLYGONTOOLS_HXX
-#define INCLUDED_BASEGFX_POLYGON_B3DPOLYPOLYGONTOOLS_HXX
+#pragma once
 
 #include <basegfx/numeric/ftools.hxx>
 #include <basegfx/point/b3dpoint.hxx>
@@ -133,6 +132,4 @@ namespace basegfx
     } // end of namespace utils
 } // end of namespace basegfx
 
-#endif // INCLUDED_BASEGFX_POLYGON_B3DPOLYPOLYGONTOOLS_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/range/b2dconnectedranges.hxx b/include/basegfx/range/b2dconnectedranges.hxx
index 01008bc55ab8..0d7a81481fdd 100644
--- a/include/basegfx/range/b2dconnectedranges.hxx
+++ b/include/basegfx/range/b2dconnectedranges.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEGFX_RANGE_B2DCONNECTEDRANGES_HXX
-#define INCLUDED_BASEGFX_RANGE_B2DCONNECTEDRANGES_HXX
+#pragma once
 
 #include <osl/diagnose.h>
 #include <basegfx/range/b2drange.hxx>
@@ -238,6 +237,4 @@ namespace basegfx
     };
 }
 
-#endif // INCLUDED_BASEGFX_RANGE_B2DCONNECTEDRANGES_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/range/b2drangeclipper.hxx b/include/basegfx/range/b2drangeclipper.hxx
index 3e37df1170f1..63e8f05c2fc9 100644
--- a/include/basegfx/range/b2drangeclipper.hxx
+++ b/include/basegfx/range/b2drangeclipper.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEGFX_RANGE_B2DRANGECLIPPER_HXX
-#define INCLUDED_BASEGFX_RANGE_B2DRANGECLIPPER_HXX
+#pragma once
 
 #include <basegfx/range/b2dpolyrange.hxx>
 #include <vector>
@@ -40,6 +39,4 @@ namespace basegfx
     }
 }
 
-#endif // INCLUDED_BASEGFX_RANGE_B2DRANGECLIPPER_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/range/b2drectangle.hxx b/include/basegfx/range/b2drectangle.hxx
index 603660206cf4..9c1ad86c0f9e 100644
--- a/include/basegfx/range/b2drectangle.hxx
+++ b/include/basegfx/range/b2drectangle.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEGFX_RANGE_B2DRECTANGLE_HXX
-#define INCLUDED_BASEGFX_RANGE_B2DRECTANGLE_HXX
+#pragma once
 
 #include <basegfx/range/b2drange.hxx>
 
@@ -31,6 +30,4 @@ namespace basegfx
     typedef B2DRange B2DRectangle;
 }
 
-#endif // INCLUDED_BASEGFX_RANGE_B2DRECTANGLE_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/range/b2irectangle.hxx b/include/basegfx/range/b2irectangle.hxx
index 022a1c0fe730..2c6a932a2ede 100644
--- a/include/basegfx/range/b2irectangle.hxx
+++ b/include/basegfx/range/b2irectangle.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEGFX_RANGE_B2IRECTANGLE_HXX
-#define INCLUDED_BASEGFX_RANGE_B2IRECTANGLE_HXX
+#pragma once
 
 #include <basegfx/range/b2irange.hxx>
 
@@ -31,6 +30,4 @@ namespace basegfx
     typedef B2IRange B2IRectangle;
 }
 
-#endif // INCLUDED_BASEGFX_RANGE_B2IRECTANGLE_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/range/b3drange.hxx b/include/basegfx/range/b3drange.hxx
index e1c44393813a..338c4f54a029 100644
--- a/include/basegfx/range/b3drange.hxx
+++ b/include/basegfx/range/b3drange.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEGFX_RANGE_B3DRANGE_HXX
-#define INCLUDED_BASEGFX_RANGE_B3DRANGE_HXX
+#pragma once
 
 #include <basegfx/vector/b3dvector.hxx>
 #include <basegfx/point/b3dpoint.hxx>
@@ -225,7 +224,4 @@ namespace basegfx
 
 } // end of namespace basegfx
 
-
-#endif // INCLUDED_BASEGFX_RANGE_B3DRANGE_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/range/basicbox.hxx b/include/basegfx/range/basicbox.hxx
index 2453f7e08462..123d2b1b3e0b 100644
--- a/include/basegfx/range/basicbox.hxx
+++ b/include/basegfx/range/basicbox.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEGFX_RANGE_BASICBOX_HXX
-#define INCLUDED_BASEGFX_RANGE_BASICBOX_HXX
+#pragma once
 
 #include <basegfx/range/basicrange.hxx>
 
@@ -66,6 +65,4 @@ namespace basegfx
 
 } // end of namespace basegfx
 
-#endif // INCLUDED_BASEGFX_RANGE_BASICBOX_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/range/basicrange.hxx b/include/basegfx/range/basicrange.hxx
index 046dfafdd03f..429f31957bcc 100644
--- a/include/basegfx/range/basicrange.hxx
+++ b/include/basegfx/range/basicrange.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEGFX_RANGE_BASICRANGE_HXX
-#define INCLUDED_BASEGFX_RANGE_BASICRANGE_HXX
+#pragma once
 
 #include <sal/types.h>
 #include <float.h>
@@ -304,6 +303,4 @@ namespace basegfx
 
 } // end of namespace basegfx
 
-#endif // INCLUDED_BASEGFX_RANGE_BASICRANGE_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/raster/bzpixelraster.hxx b/include/basegfx/raster/bzpixelraster.hxx
index fc6511c2160a..d1b166fb0361 100644
--- a/include/basegfx/raster/bzpixelraster.hxx
+++ b/include/basegfx/raster/bzpixelraster.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEGFX_RASTER_BZPIXELRASTER_HXX
-#define INCLUDED_BASEGFX_RASTER_BZPIXELRASTER_HXX
+#pragma once
 
 #include <basegfx/pixel/bpixel.hxx>
 #include <sal/types.h>
@@ -88,6 +87,4 @@ namespace basegfx
     };
 } // end of namespace basegfx
 
-#endif // INCLUDED_BASEGFX_RASTER_BZPIXELRASTER_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/raster/rasterconvert3d.hxx b/include/basegfx/raster/rasterconvert3d.hxx
index acffe04471cb..9179f175d696 100644
--- a/include/basegfx/raster/rasterconvert3d.hxx
+++ b/include/basegfx/raster/rasterconvert3d.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEGFX_RASTER_RASTERCONVERT3D_HXX
-#define INCLUDED_BASEGFX_RASTER_RASTERCONVERT3D_HXX
+#pragma once
 
 #include <config_options.h>
 #include <sal/types.h>
@@ -442,6 +441,4 @@ namespace basegfx
     };
 } // end of namespace basegfx
 
-#endif // INCLUDED_BASEGFX_RASTER_RASTERCONVERT3D_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/tuple/b2dtuple.hxx b/include/basegfx/tuple/b2dtuple.hxx
index efe44f5863f3..0c7b7f463261 100644
--- a/include/basegfx/tuple/b2dtuple.hxx
+++ b/include/basegfx/tuple/b2dtuple.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEGFX_TUPLE_B2DTUPLE_HXX
-#define INCLUDED_BASEGFX_TUPLE_B2DTUPLE_HXX
+#pragma once
 
 #include <sal/types.h>
 #include <basegfx/numeric/ftools.hxx>
@@ -289,6 +288,4 @@ namespace basegfx
     BASEGFX_DLLPUBLIC B2ITuple fround(const B2DTuple& rTup);
 } // end of namespace basegfx
 
-#endif // INCLUDED_BASEGFX_TUPLE_B2DTUPLE_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/tuple/b2i64tuple.hxx b/include/basegfx/tuple/b2i64tuple.hxx
index ee86ef34ba1f..5f2350b66ac1 100644
--- a/include/basegfx/tuple/b2i64tuple.hxx
+++ b/include/basegfx/tuple/b2i64tuple.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEGFX_TUPLE_B2I64TUPLE_HXX
-#define INCLUDED_BASEGFX_TUPLE_B2I64TUPLE_HXX
+#pragma once
 
 #include <sal/types.h>
 #include <basegfx/basegfxdllapi.h>
@@ -174,6 +173,4 @@ namespace basegfx
 
 } // end of namespace basegfx
 
-#endif // INCLUDED_BASEGFX_TUPLE_B2I64TUPLE_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/tuple/b2ituple.hxx b/include/basegfx/tuple/b2ituple.hxx
index a47a8be8f275..b8f6c3e96386 100644
--- a/include/basegfx/tuple/b2ituple.hxx
+++ b/include/basegfx/tuple/b2ituple.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEGFX_TUPLE_B2ITUPLE_HXX
-#define INCLUDED_BASEGFX_TUPLE_B2ITUPLE_HXX
+#pragma once
 
 #include <sal/types.h>
 #include <basegfx/basegfxdllapi.h>
@@ -198,6 +197,4 @@ namespace basegfx
 
 } // end of namespace basegfx
 
-#endif // INCLUDED_BASEGFX_TUPLE_B2ITUPLE_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/tuple/b3dtuple.hxx b/include/basegfx/tuple/b3dtuple.hxx
index 08f46c0cdbfb..791cc5f3e667 100644
--- a/include/basegfx/tuple/b3dtuple.hxx
+++ b/include/basegfx/tuple/b3dtuple.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEGFX_TUPLE_B3DTUPLE_HXX
-#define INCLUDED_BASEGFX_TUPLE_B3DTUPLE_HXX
+#pragma once
 
 #include <config_options.h>
 #include <sal/types.h>
@@ -333,6 +332,4 @@ namespace basegfx
     BASEGFX_DLLPUBLIC B3ITuple fround(const B3DTuple& rTup);
 } // end of namespace basegfx
 
-#endif // INCLUDED_BASEGFX_TUPLE_B3DTUPLE_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/tuple/b3ituple.hxx b/include/basegfx/tuple/b3ituple.hxx
index 877e33f9a34e..7fe49ea92e93 100644
--- a/include/basegfx/tuple/b3ituple.hxx
+++ b/include/basegfx/tuple/b3ituple.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEGFX_TUPLE_B3ITUPLE_HXX
-#define INCLUDED_BASEGFX_TUPLE_B3ITUPLE_HXX
+#pragma once
 
 #include <sal/types.h>
 #include <basegfx/basegfxdllapi.h>
@@ -170,6 +169,4 @@ namespace basegfx
 
 } // end of namespace basegfx
 
-#endif // INCLUDED_BASEGFX_TUPLE_B3ITUPLE_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/utils/b2dclipstate.hxx b/include/basegfx/utils/b2dclipstate.hxx
index 66fe72d9506c..b145dac33fc7 100644
--- a/include/basegfx/utils/b2dclipstate.hxx
+++ b/include/basegfx/utils/b2dclipstate.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEGFX_UTILS_B2DCLIPSTATE_HXX
-#define INCLUDED_BASEGFX_UTILS_B2DCLIPSTATE_HXX
+#pragma once
 
 #include <o3tl/cow_wrapper.hxx>
 #include <basegfx/basegfxdllapi.h>
@@ -90,6 +89,4 @@ namespace basegfx
     }
 }
 
-#endif // INCLUDED_BASEGFX_UTILS_B2DCLIPSTATE_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/utils/canvastools.hxx b/include/basegfx/utils/canvastools.hxx
index 794074da0fdb..ecf5a594f588 100644
--- a/include/basegfx/utils/canvastools.hxx
+++ b/include/basegfx/utils/canvastools.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEGFX_UTILS_CANVASTOOLS_HXX
-#define INCLUDED_BASEGFX_UTILS_CANVASTOOLS_HXX
+#pragma once
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
@@ -164,6 +163,4 @@ namespace basegfx
     }
 }
 
-#endif // INCLUDED_BASEGFX_UTILS_CANVASTOOLS_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/utils/gradienttools.hxx b/include/basegfx/utils/gradienttools.hxx
index 97101adf2201..331e2998b32f 100644
--- a/include/basegfx/utils/gradienttools.hxx
+++ b/include/basegfx/utils/gradienttools.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEGFX_UTILS_GRADIENTTOOLS_HXX
-#define INCLUDED_BASEGFX_UTILS_GRADIENTTOOLS_HXX
+#pragma once
 
 #include <config_options.h>
 #include <basegfx/point/b2dpoint.hxx>
@@ -399,6 +398,4 @@ namespace basegfx
     }
 }
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/utils/keystoplerp.hxx b/include/basegfx/utils/keystoplerp.hxx
index b35c46e638f1..a68336f71ba1 100644
--- a/include/basegfx/utils/keystoplerp.hxx
+++ b/include/basegfx/utils/keystoplerp.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEGFX_UTILS_KEYSTOPLERP_HXX
-#define INCLUDED_BASEGFX_UTILS_KEYSTOPLERP_HXX
+#pragma once
 
 #include <vector>
 #include <basegfx/basegfxdllapi.h>
@@ -86,6 +85,4 @@ namespace basegfx
     }
 }
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/utils/lerp.hxx b/include/basegfx/utils/lerp.hxx
index 3e1c272128f1..409b26c92d4a 100644
--- a/include/basegfx/utils/lerp.hxx
+++ b/include/basegfx/utils/lerp.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEGFX_UTILS_LERP_HXX
-#define INCLUDED_BASEGFX_UTILS_LERP_HXX
+#pragma once
 
 namespace basegfx
 {
@@ -44,6 +43,4 @@ namespace basegfx
     }
 }
 
-#endif // INCLUDED_BASEGFX_UTILS_LERP_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/utils/rectcliptools.hxx b/include/basegfx/utils/rectcliptools.hxx
index f3e4b6b19a62..a187645f541d 100644
--- a/include/basegfx/utils/rectcliptools.hxx
+++ b/include/basegfx/utils/rectcliptools.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEGFX_UTILS_RECTCLIPTOOLS_HXX
-#define INCLUDED_BASEGFX_UTILS_RECTCLIPTOOLS_HXX
+#pragma once
 
 #include <sal/types.h>
 #include <basegfx/range/b2ibox.hxx>
@@ -74,6 +73,4 @@ namespace basegfx
     }
 }
 
-#endif // INCLUDED_BASEGFX_UTILS_RECTCLIPTOOLS_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/utils/systemdependentdata.hxx b/include/basegfx/utils/systemdependentdata.hxx
index 7baff4c7b01b..62562b488e1b 100644
--- a/include/basegfx/utils/systemdependentdata.hxx
+++ b/include/basegfx/utils/systemdependentdata.hxx
@@ -7,8 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_BASEGFX_SYSTEMDEPENDENTDATA_HXX
-#define INCLUDED_BASEGFX_SYSTEMDEPENDENTDATA_HXX
+#pragma once
 
 #include <sal/types.h>
 #include <basegfx/basegfxdllapi.h>
@@ -144,6 +143,4 @@ namespace basegfx
     };
 } // end of namespace basegfx
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/utils/tools.hxx b/include/basegfx/utils/tools.hxx
index b243d0167c81..7992777f4686 100644
--- a/include/basegfx/utils/tools.hxx
+++ b/include/basegfx/utils/tools.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEGFX_UTILS_TOOLS_HXX
-#define INCLUDED_BASEGFX_UTILS_TOOLS_HXX
+#pragma once
 
 #include <sal/types.h>
 #include <basegfx/basegfxdllapi.h>
@@ -122,6 +121,4 @@ namespace basegfx
     }
 }
 
-#endif // INCLUDED_BASEGFX_UTILS_TOOLS_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/utils/unopolypolygon.hxx b/include/basegfx/utils/unopolypolygon.hxx
index afe0fe9efeb8..f6b17328405a 100644
--- a/include/basegfx/utils/unopolypolygon.hxx
+++ b/include/basegfx/utils/unopolypolygon.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEGFX_UTILS_UNOPOLYPOLYGON_HXX
-#define INCLUDED_BASEGFX_UTILS_UNOPOLYPOLYGON_HXX
+#pragma once
 
 #include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/compbase.hxx>
@@ -106,6 +105,4 @@ namespace unotools
 }
 }
 
-#endif // INCLUDED_BASEGFX_UTILS_UNOPOLYPOLYGON_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/utils/zoomtools.hxx b/include/basegfx/utils/zoomtools.hxx
index b8a72551589a..5543c8660b22 100644
--- a/include/basegfx/utils/zoomtools.hxx
+++ b/include/basegfx/utils/zoomtools.hxx
@@ -7,8 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_BASEGFX_UTILS_ZOOMTOOLS_HXX
-#define INCLUDED_BASEGFX_UTILS_ZOOMTOOLS_HXX
+#pragma once
 
 #include <basegfx/basegfxdllapi.h>
 
@@ -24,6 +23,4 @@ namespace basegfx
     }
 }
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/vector/b2dsize.hxx b/include/basegfx/vector/b2dsize.hxx
index 95baf41fe2fb..6ae6de5e8045 100644
--- a/include/basegfx/vector/b2dsize.hxx
+++ b/include/basegfx/vector/b2dsize.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEGFX_VECTOR_B2DSIZE_HXX
-#define INCLUDED_BASEGFX_VECTOR_B2DSIZE_HXX
+#pragma once
 
 #include <basegfx/vector/b2dvector.hxx>
 
@@ -31,6 +30,4 @@ namespace basegfx
     typedef B2DVector B2DSize;
 }
 
-#endif // INCLUDED_BASEGFX_VECTOR_B2DSIZE_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/vector/b2dvector.hxx b/include/basegfx/vector/b2dvector.hxx
index d091ec2cda27..cfb1e58d1c80 100644
--- a/include/basegfx/vector/b2dvector.hxx
+++ b/include/basegfx/vector/b2dvector.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEGFX_VECTOR_B2DVECTOR_HXX
-#define INCLUDED_BASEGFX_VECTOR_B2DVECTOR_HXX
+#pragma once
 
 #include <basegfx/tuple/b2dtuple.hxx>
 #include <basegfx/vector/b2ivector.hxx>
@@ -236,6 +235,4 @@ namespace basegfx
 
 } // end of namespace basegfx
 
-#endif // INCLUDED_BASEGFX_VECTOR_B2DVECTOR_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/vector/b2enums.hxx b/include/basegfx/vector/b2enums.hxx
index 3793e6844b84..803902370195 100644
--- a/include/basegfx/vector/b2enums.hxx
+++ b/include/basegfx/vector/b2enums.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEGFX_VECTOR_B2ENUMS_HXX
-#define INCLUDED_BASEGFX_VECTOR_B2ENUMS_HXX
+#pragma once
 
 namespace basegfx
 {
@@ -63,6 +62,4 @@ namespace basegfx
 
 } // end of namespace basegfx
 
-#endif // INCLUDED_BASEGFX_VECTOR_B2ENUMS_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/vector/b2isize.hxx b/include/basegfx/vector/b2isize.hxx
index 530bc28a6f88..5d299f4fd8e5 100644
--- a/include/basegfx/vector/b2isize.hxx
+++ b/include/basegfx/vector/b2isize.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEGFX_VECTOR_B2ISIZE_HXX
-#define INCLUDED_BASEGFX_VECTOR_B2ISIZE_HXX
+#pragma once
 
 #include <basegfx/vector/b2ivector.hxx>
 
@@ -31,6 +30,4 @@ namespace basegfx
     typedef B2IVector B2ISize;
 }
 
-#endif // INCLUDED_BASEGFX_VECTOR_B2ISIZE_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/vector/b2ivector.hxx b/include/basegfx/vector/b2ivector.hxx
index df7c651ef57a..fbb1c642292e 100644
--- a/include/basegfx/vector/b2ivector.hxx
+++ b/include/basegfx/vector/b2ivector.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEGFX_VECTOR_B2IVECTOR_HXX
-#define INCLUDED_BASEGFX_VECTOR_B2IVECTOR_HXX
+#pragma once
 
 #include <ostream>
 
@@ -128,6 +127,4 @@ namespace basegfx
 
 } // end of namespace basegfx
 
-#endif // INCLUDED_BASEGFX_VECTOR_B2IVECTOR_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/vector/b3dvector.hxx b/include/basegfx/vector/b3dvector.hxx
index e368f8849091..1f38d5dd7f7e 100644
--- a/include/basegfx/vector/b3dvector.hxx
+++ b/include/basegfx/vector/b3dvector.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEGFX_VECTOR_B3DVECTOR_HXX
-#define INCLUDED_BASEGFX_VECTOR_B3DVECTOR_HXX
+#pragma once
 
 #include <basegfx/tuple/b3dtuple.hxx>
 #include <basegfx/basegfxdllapi.h>
@@ -257,6 +256,4 @@ namespace basegfx
     }
 } // end of namespace basegfx
 
-#endif // INCLUDED_BASEGFX_VECTOR_B3DVECTOR_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 8a4e67b490f6fcf23c6898499c367d65f1f8de4f
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Fri May 8 22:28:35 2020 +0200
Commit:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
CommitDate: Tue May 12 08:42:20 2020 +0200

    Move some basic primitives to drawinglayer CORE
    
    Mostly which are easy to move and used in VclProcessor2D
    
    Change-Id: Ie1559e13a2a7cdb5225421def2f9145026ff9121

diff --git a/drawinglayer/Library_drawinglayer.mk b/drawinglayer/Library_drawinglayer.mk
index 46f21f56b6b6..bb12485b8a06 100644
--- a/drawinglayer/Library_drawinglayer.mk
+++ b/drawinglayer/Library_drawinglayer.mk
@@ -50,11 +50,6 @@ $(eval $(call gb_Library_use_libraries,drawinglayer,\
 $(eval $(call gb_Library_add_exception_objects,drawinglayer,\
     drawinglayer/source/animation/animationtiming \
     drawinglayer/source/attribute/fillgraphicattribute \
-    drawinglayer/source/attribute/fillgradientattribute \
-    drawinglayer/source/attribute/fillhatchattribute \
-    drawinglayer/source/attribute/fontattribute \
-    drawinglayer/source/attribute/lineattribute \
-    drawinglayer/source/attribute/linestartendattribute \
     drawinglayer/source/attribute/materialattribute3d \
     drawinglayer/source/attribute/sdrallattribute3d \
     drawinglayer/source/attribute/sdrfillattribute \
@@ -67,11 +62,9 @@ $(eval $(call gb_Library_add_exception_objects,drawinglayer,\
     drawinglayer/source/attribute/sdrobjectattribute3d \
     drawinglayer/source/attribute/sdrsceneattribute3d \
     drawinglayer/source/attribute/sdrshadowattribute \
-    drawinglayer/source/attribute/strokeattribute \
     drawinglayer/source/geometry/viewinformation3d \
     drawinglayer/source/primitive2d/animatedprimitive2d \
     drawinglayer/source/primitive2d/backgroundcolorprimitive2d \
-    drawinglayer/source/primitive2d/bitmapprimitive2d \
     drawinglayer/source/primitive2d/borderlineprimitive2d \
     drawinglayer/source/primitive2d/controlprimitive2d \
     drawinglayer/source/primitive2d/cropprimitive2d \
@@ -80,53 +73,31 @@ $(eval $(call gb_Library_add_exception_objects,drawinglayer,\
     drawinglayer/source/primitive2d/embedded3dprimitive2d \
     drawinglayer/source/primitive2d/epsprimitive2d \
     drawinglayer/source/primitive2d/fillgraphicprimitive2d \
-    drawinglayer/source/primitive2d/fillgradientprimitive2d \
-    drawinglayer/source/primitive2d/fillhatchprimitive2d \
     drawinglayer/source/primitive2d/glowprimitive2d \
     drawinglayer/source/primitive2d/graphicprimitivehelper2d \
     drawinglayer/source/primitive2d/graphicprimitive2d \
     drawinglayer/source/primitive2d/gridprimitive2d \
-    drawinglayer/source/primitive2d/groupprimitive2d \
     drawinglayer/source/primitive2d/helplineprimitive2d \
     drawinglayer/source/primitive2d/hiddengeometryprimitive2d \
     drawinglayer/source/primitive2d/invertprimitive2d \
     drawinglayer/source/primitive2d/markerarrayprimitive2d \
-    drawinglayer/source/primitive2d/maskprimitive2d \
     drawinglayer/source/primitive2d/mediaprimitive2d \
     drawinglayer/source/primitive2d/metafileprimitive2d \
-    drawinglayer/source/primitive2d/modifiedcolorprimitive2d \
-    drawinglayer/source/primitive2d/objectinfoprimitive2d \
     drawinglayer/source/primitive2d/pagehierarchyprimitive2d \
-    drawinglayer/source/primitive2d/pagepreviewprimitive2d \
     drawinglayer/source/primitive2d/patternfillprimitive2d \
-    drawinglayer/source/primitive2d/pointarrayprimitive2d \
-    drawinglayer/source/primitive2d/polygonprimitive2d \
-    drawinglayer/source/primitive2d/PolyPolygonHairlinePrimitive2D \
-    drawinglayer/source/primitive2d/PolyPolygonMarkerPrimitive2D \
-    drawinglayer/source/primitive2d/PolyPolygonStrokePrimitive2D \
-    drawinglayer/source/primitive2d/PolyPolygonColorPrimitive2D \
-    drawinglayer/source/primitive2d/PolyPolygonGradientPrimitive2D \
-    drawinglayer/source/primitive2d/PolyPolygonHatchPrimitive2D \
     drawinglayer/source/primitive2d/PolyPolygonGraphicPrimitive2D \
-    drawinglayer/source/primitive2d/PolyPolygonSelectionPrimitive2D \
-    drawinglayer/source/primitive2d/primitivetools2d \
     drawinglayer/source/primitive2d/sceneprimitive2d \
     drawinglayer/source/primitive2d/sdrdecompositiontools2d \
     drawinglayer/source/primitive2d/shadowprimitive2d \
     drawinglayer/source/primitive2d/structuretagprimitive2d \
-    drawinglayer/source/primitive2d/svggradientprimitive2d \
     drawinglayer/source/primitive2d/textbreakuphelper \
     drawinglayer/source/primitive2d/textdecoratedprimitive2d \
     drawinglayer/source/primitive2d/texteffectprimitive2d \
-    drawinglayer/source/primitive2d/textenumsprimitive2d \
     drawinglayer/source/primitive2d/texthierarchyprimitive2d \
     drawinglayer/source/primitive2d/textlayoutdevice \
     drawinglayer/source/primitive2d/textlineprimitive2d \
     drawinglayer/source/primitive2d/textprimitive2d \
     drawinglayer/source/primitive2d/textstrikeoutprimitive2d \
-    drawinglayer/source/primitive2d/transformprimitive2d \
-    drawinglayer/source/primitive2d/transparenceprimitive2d \
-    drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d \
     drawinglayer/source/primitive2d/wallpaperprimitive2d \
     drawinglayer/source/primitive2d/wrongspellprimitive2d \
     drawinglayer/source/primitive3d/baseprimitive3d \
@@ -185,7 +156,6 @@ $(eval $(call gb_Library_add_exception_objects,drawinglayer,\
     drawinglayer/source/tools/primitive2dxmldump \
     drawinglayer/source/drawinglayeruno/drawinglayeruno \
     drawinglayer/source/drawinglayeruno/xprimitive2drenderer \
-    drawinglayer/source/texture/texture \
     drawinglayer/source/dumper/XShapeDumper \
     drawinglayer/source/dumper/EnhancedShapeDumper \
 ))
diff --git a/drawinglayer/Library_drawinglayercore.mk b/drawinglayer/Library_drawinglayercore.mk
index f1643d27014d..972ac32f5388 100644
--- a/drawinglayer/Library_drawinglayercore.mk
+++ b/drawinglayer/Library_drawinglayercore.mk
@@ -40,10 +40,47 @@ $(eval $(call gb_Library_use_libraries,drawinglayercore,\
 ))
 
 $(eval $(call gb_Library_add_exception_objects,drawinglayercore,\
+    drawinglayer/source/attribute/lineattribute \
+    drawinglayer/source/attribute/strokeattribute \
+    drawinglayer/source/attribute/linestartendattribute \
+    drawinglayer/source/attribute/fillgradientattribute \
+    drawinglayer/source/attribute/fillhatchattribute \
+    drawinglayer/source/attribute/fontattribute \
+    drawinglayer/source/geometry/viewinformation2d \
+    drawinglayer/source/texture/texture \
     drawinglayer/source/primitive2d/baseprimitive2d \
     drawinglayer/source/primitive2d/Primitive2DContainer \
     drawinglayer/source/primitive2d/Tools \
-    drawinglayer/source/geometry/viewinformation2d \
+    drawinglayer/source/primitive2d/polygonprimitive2d \
+    drawinglayer/source/primitive2d/PolyPolygonColorPrimitive2D \
+    drawinglayer/source/primitive2d/PolyPolygonHairlinePrimitive2D \
+    drawinglayer/source/primitive2d/PolyPolygonMarkerPrimitive2D \
+    drawinglayer/source/primitive2d/PolyPolygonStrokePrimitive2D \
+    drawinglayer/source/primitive2d/PolyPolygonGradientPrimitive2D \
+    drawinglayer/source/primitive2d/PolyPolygonHatchPrimitive2D \
+    drawinglayer/source/primitive2d/PolyPolygonSelectionPrimitive2D \
+    drawinglayer/source/primitive2d/fillgradientprimitive2d \
+    drawinglayer/source/primitive2d/maskprimitive2d \
+    drawinglayer/source/primitive2d/groupprimitive2d \
+    drawinglayer/source/primitive2d/fillhatchprimitive2d \
+    drawinglayer/source/primitive2d/primitivetools2d \
+    drawinglayer/source/primitive2d/pointarrayprimitive2d \
+    drawinglayer/source/primitive2d/modifiedcolorprimitive2d \
+    drawinglayer/source/primitive2d/bitmapprimitive2d \
+    drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d \
+    drawinglayer/source/primitive2d/transparenceprimitive2d \
+    drawinglayer/source/primitive2d/pagepreviewprimitive2d \
+    drawinglayer/source/primitive2d/transformprimitive2d \
+    drawinglayer/source/primitive2d/svggradientprimitive2d \
+    drawinglayer/source/primitive2d/objectinfoprimitive2d \
+    drawinglayer/source/primitive2d/textenumsprimitive2d \
 ))
 
+#    drawinglayer/source/primitive2d/epsprimitive2d \
+#    drawinglayer/source/primitive2d/markerarrayprimitive2d \
+#    drawinglayer/source/primitive2d/fillgraphicprimitive2d \
+#    drawinglayer/source/primitive2d/textdecoratedprimitive2d \
+#    drawinglayer/source/primitive2d/textprimitive2d \
+
+
 # vim: set noet sw=4 ts=4:
diff --git a/filter/Library_pdffilter.mk b/filter/Library_pdffilter.mk
index 9694490655de..9320e3648724 100644
--- a/filter/Library_pdffilter.mk
+++ b/filter/Library_pdffilter.mk
@@ -49,6 +49,7 @@ $(eval $(call gb_Library_use_libraries,pdffilter,\
 	cppuhelper \
 	cppu \
 	sal \
+	drawinglayercore \
 	drawinglayer \
 ))
 
commit 41e0f7fa018c362e6eb6117566061a42c2f41ba9
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Fri May 8 20:50:29 2020 +0200
Commit:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
CommitDate: Tue May 12 08:42:20 2020 +0200

    drawinglayer: externalize PointArrayPrimitive2D class
    
    Change-Id: I8ee993947bf2f4437cf3a429c43a81132fac0947

diff --git a/include/drawinglayer/primitive2d/pointarrayprimitive2d.hxx b/include/drawinglayer/primitive2d/pointarrayprimitive2d.hxx
index 613b8969828d..682132218411 100644
--- a/include/drawinglayer/primitive2d/pointarrayprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/pointarrayprimitive2d.hxx
@@ -39,7 +39,7 @@ namespace drawinglayer::primitive2d
             should process it (Currently it is only used for grid visualisation,
             but this may change).
          */
-        class PointArrayPrimitive2D final : public BasePrimitive2D
+        class DRAWINGLAYER_DLLPUBLIC PointArrayPrimitive2D final : public BasePrimitive2D
         {
         private:
             /// the array of positions
commit 93f153abaaf241e0e1ac12bebd28e1222aaeee17
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Fri May 8 20:43:38 2020 +0200
Commit:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
CommitDate: Tue May 12 08:42:20 2020 +0200

    drawinglayer: externalize classes in texture.hxx
    
    Change-Id: I1e49a6c896733ebebf16db23f3c2f8b06161d659

diff --git a/drawinglayer/inc/texture/texture.hxx b/drawinglayer/inc/texture/texture.hxx
index 24e23a4b241c..b34bde38d1bc 100644
--- a/drawinglayer/inc/texture/texture.hxx
+++ b/drawinglayer/inc/texture/texture.hxx
@@ -30,7 +30,7 @@
 
 namespace drawinglayer::texture
 {
-        class GeoTexSvx
+        class DRAWINGLAYER_DLLPUBLIC GeoTexSvx
         {
         public:
             GeoTexSvx();
@@ -53,7 +53,7 @@ namespace drawinglayer::texture
             basegfx::BColor         maBColor;
         };
 
-        class GeoTexSvxGradient : public GeoTexSvx
+        class DRAWINGLAYER_DLLPUBLIC GeoTexSvxGradient : public GeoTexSvx
         {
         protected:
             basegfx::ODFGradientInfo            maGradientInfo;
@@ -79,7 +79,7 @@ namespace drawinglayer::texture
                 basegfx::BColor& rOuterColor) = 0;
         };
 
-        class GeoTexSvxGradientLinear final : public GeoTexSvxGradient
+        class DRAWINGLAYER_DLLPUBLIC GeoTexSvxGradientLinear final : public GeoTexSvxGradient
         {
             double                  mfUnitMinX;
             double                  mfUnitWidth;
@@ -102,7 +102,7 @@ namespace drawinglayer::texture
             virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const override;
         };
 
-        class GeoTexSvxGradientAxial final : public GeoTexSvxGradient
+        class DRAWINGLAYER_DLLPUBLIC GeoTexSvxGradientAxial final : public GeoTexSvxGradient
         {
             double                  mfUnitMinX;
             double                  mfUnitWidth;
@@ -124,7 +124,7 @@ namespace drawinglayer::texture
             virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const override;
         };
 
-        class GeoTexSvxGradientRadial final : public GeoTexSvxGradient
+        class DRAWINGLAYER_DLLPUBLIC GeoTexSvxGradientRadial final : public GeoTexSvxGradient
         {
         public:
             GeoTexSvxGradientRadial(
@@ -143,7 +143,7 @@ namespace drawinglayer::texture
             virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const override;
         };
 
-        class GeoTexSvxGradientElliptical final : public GeoTexSvxGradient
+        class DRAWINGLAYER_DLLPUBLIC GeoTexSvxGradientElliptical final : public GeoTexSvxGradient
         {
         public:
             GeoTexSvxGradientElliptical(
@@ -163,7 +163,7 @@ namespace drawinglayer::texture
             virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const override;
         };
 
-        class GeoTexSvxGradientSquare final : public GeoTexSvxGradient
+        class DRAWINGLAYER_DLLPUBLIC GeoTexSvxGradientSquare final : public GeoTexSvxGradient
         {
         public:
             GeoTexSvxGradientSquare(
@@ -183,7 +183,7 @@ namespace drawinglayer::texture
             virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const override;
         };
 
-        class GeoTexSvxGradientRect final : public GeoTexSvxGradient
+        class DRAWINGLAYER_DLLPUBLIC GeoTexSvxGradientRect final : public GeoTexSvxGradient
         {
         public:
             GeoTexSvxGradientRect(
@@ -203,7 +203,7 @@ namespace drawinglayer::texture
             virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const override;
         };
 
-        class GeoTexSvxHatch final : public GeoTexSvx
+        class DRAWINGLAYER_DLLPUBLIC GeoTexSvxHatch final : public GeoTexSvx
         {
             basegfx::B2DRange                   maOutputRange;
             basegfx::B2DHomMatrix               maTextureTransform;
@@ -239,7 +239,7 @@ namespace drawinglayer::texture
         // given percentage value (offsetX has to be 0.0 <= offsetX <= 1.0).
         // Accordingly to offsetY. If both are given, offsetX is preferred
         // and offsetY is ignored.
-        class GeoTexSvxTiled final : public GeoTexSvx
+        class DRAWINGLAYER_DLLPUBLIC GeoTexSvxTiled final : public GeoTexSvx
         {
             basegfx::B2DRange               maRange;
             double                          mfOffsetX;
commit 251631a43f31e6adb89f298399c0eb2ca05d7567
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Fri May 8 20:40:59 2020 +0200
Commit:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
CommitDate: Tue May 12 08:42:19 2020 +0200

    drawinglayer: externalize FillHatchPrimitive2D class
    
    Change-Id: I9ad1f179a43bb6c501cb699c0f26523f47307829

diff --git a/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx b/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx
index bab7e47b03e8..c7b3a559bc42 100644
--- a/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx
@@ -26,9 +26,6 @@
 #include <drawinglayer/attribute/fillhatchattribute.hxx>
 #include <basegfx/color/bcolor.hxx>
 
-
-// FillHatchPrimitive2D class
-
 namespace drawinglayer::primitive2d
 {
         /** FillHatchPrimitive2D class
@@ -45,7 +42,7 @@ namespace drawinglayer::primitive2d
 
             The decomposition will deliver the hatch lines.
          */
-        class FillHatchPrimitive2D final : public DiscreteMetricDependentPrimitive2D
+        class DRAWINGLAYER_DLLPUBLIC FillHatchPrimitive2D final : public DiscreteMetricDependentPrimitive2D
         {
         private:
             /// the geometrically visible area
commit ffeee2d79016893c3c9c5035189189d83e780169
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Thu May 7 22:01:22 2020 +0200
Commit:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
CommitDate: Tue May 12 08:42:19 2020 +0200

    vcl: VectorGraphicSearch - for searching text inside PDF
    
    Change-Id: Iee940a3927330c8739774ff3c1af15998f89193b

diff --git a/include/vcl/VectorGraphicSearch.hxx b/include/vcl/VectorGraphicSearch.hxx
new file mode 100644
index 000000000000..3411d0a931e6
--- /dev/null
+++ b/include/vcl/VectorGraphicSearch.hxx
@@ -0,0 +1,39 @@
+/* -*- 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/.

... etc. - the rest is truncated