drawinglayer: extract classes from baseprimitive2d.hxx to own files

This extracts Primitive2DContainer class to its own file, common
typedefs for PrimitiveReference, Primitive2DSequence to own file
CommonTypes.hxx, some commonly used and independent functions to
Tools.hxx.

But for not BufferedDecompositionPrimitive2D class is left as
it is.

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

6 files changed, 372 insertions, 306 deletions

diff --git a/drawinglayer/Library_drawinglayer.mk b/drawinglayer/Library_drawinglayer.mk
index 189959e51017..aba0ce9b6e08 100644
--- a/drawinglayer/Library_drawinglayer.mk
+++ b/drawinglayer/Library_drawinglayer.mk
@@ -102,6 +102,7 @@ $(eval $(call gb_Library_add_exception_objects,drawinglayer,\
     drawinglayer/source/primitive2d/polygonprimitive2d \
     drawinglayer/source/primitive2d/polypolygonprimitive2d \
     drawinglayer/source/primitive2d/primitivetools2d \
+    drawinglayer/source/primitive2d/Primitive2DContainer \
     drawinglayer/source/primitive2d/sceneprimitive2d \
     drawinglayer/source/primitive2d/sdrdecompositiontools2d \
     drawinglayer/source/primitive2d/shadowprimitive2d \
@@ -116,6 +117,7 @@ $(eval $(call gb_Library_add_exception_objects,drawinglayer,\
     drawinglayer/source/primitive2d/textlineprimitive2d \
     drawinglayer/source/primitive2d/textprimitive2d \
     drawinglayer/source/primitive2d/textstrikeoutprimitive2d \
+    drawinglayer/source/primitive2d/Tools \
     drawinglayer/source/primitive2d/transformprimitive2d \
     drawinglayer/source/primitive2d/transparenceprimitive2d \
     drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d \
diff --git a/drawinglayer/source/primitive2d/Primitive2DContainer.cxx b/drawinglayer/source/primitive2d/Primitive2DContainer.cxx
new file mode 100644
index 000000000000..8f1e7d31e743
--- /dev/null
+++ b/drawinglayer/source/primitive2d/Primitive2DContainer.cxx
@@ -0,0 +1,129 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include <sal/config.h>
+
+#include <drawinglayer/primitive2d/Primitive2DContainer.hxx>
+#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
+#include <drawinglayer/primitive2d/Tools.hxx>
+#include <drawinglayer/geometry/viewinformation2d.hxx>
+#include <basegfx/utils/canvastools.hxx>
+
+using namespace css;
+
+namespace drawinglayer::primitive2d
+{
+Primitive2DContainer Primitive2DContainer::maybeInvert(bool bInvert) const
+{
+    const sal_uInt32 nSize(size());
+    Primitive2DContainer aRetval;
+
+    aRetval.resize(nSize);
+
+    for (sal_uInt32 a(0); a < nSize; a++)
+    {
+        aRetval[bInvert ? nSize - 1 - a : a] = (*this)[a];
+    }
+
+    // all entries taken over to Uno References as owners. To avoid
+    // errors with users of this mechanism to delete pointers to BasePrimitive2D
+    // itself, clear given vector
+    const_cast<Primitive2DContainer&>(*this).clear();
+
+    return aRetval;
+}
+
+// get B2DRange from a given Primitive2DSequence
+basegfx::B2DRange
+Primitive2DContainer::getB2DRange(const geometry::ViewInformation2D& aViewInformation) const
+{
+    basegfx::B2DRange aRetval;
+
+    if (!empty())
+    {
+        const sal_Int32 nCount(size());
+
+        for (sal_Int32 a(0); a < nCount; a++)
+        {
+            aRetval.expand(getB2DRangeFromPrimitive2DReference((*this)[a], aViewInformation));
+        }
+    }
+
+    return aRetval;
+}
+
+bool Primitive2DContainer::operator==(const Primitive2DContainer& rB) const
+{
+    const bool bAHasElements(!empty());
+
+    if (bAHasElements != !rB.empty())
+    {
+        return false;
+    }
+
+    if (!bAHasElements)
+    {
+        return true;
+    }
+
+    const size_t nCount(size());
+
+    if (nCount != rB.size())
+    {
+        return false;
+    }
+
+    for (size_t a(0); a < nCount; a++)
+    {
+        if (!arePrimitive2DReferencesEqual((*this)[a], rB[a]))
+        {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+Primitive2DContainer::~Primitive2DContainer() {}
+
+void Primitive2DContainer::append(const Primitive2DReference& rSource) { push_back(rSource); }
+
+void Primitive2DContainer::append(const Primitive2DContainer& rSource)
+{
+    insert(end(), rSource.begin(), rSource.end());
+}
+
+void Primitive2DContainer::append(Primitive2DContainer&& rSource)
+{
+    size_t n = size();
+    resize(n + rSource.size());
+    for (size_t i = 0; i < rSource.size(); ++i)
+    {
+        (*this)[n + i] = std::move(rSource[i]);
+    }
+}
+
+void Primitive2DContainer::append(const Primitive2DSequence& rSource)
+{
+    std::copy(rSource.begin(), rSource.end(), std::back_inserter(*this));
+}
+
+} // end of namespace drawinglayer::primitive2d
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/Tools.cxx b/drawinglayer/source/primitive2d/Tools.cxx
new file mode 100644
index 000000000000..e9ff7a55394d
--- /dev/null
+++ b/drawinglayer/source/primitive2d/Tools.cxx
@@ -0,0 +1,238 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include <drawinglayer/primitive2d/Tools.hxx>
+#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
+#include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
+#include <drawinglayer/geometry/viewinformation2d.hxx>
+#include <basegfx/utils/canvastools.hxx>
+
+using namespace css;
+
+namespace drawinglayer::primitive2d
+{
+// get B2DRange from a given Primitive2DReference
+basegfx::B2DRange
+getB2DRangeFromPrimitive2DReference(const Primitive2DReference& rCandidate,
+                                    const geometry::ViewInformation2D& aViewInformation)
+{
+    basegfx::B2DRange aRetval;
+
+    if (rCandidate.is())
+    {
+        // try to get C++ implementation base
+        const BasePrimitive2D* pCandidate(dynamic_cast<BasePrimitive2D*>(rCandidate.get()));
+
+        if (pCandidate)
+        {
+            // use it if possible
+            aRetval.expand(pCandidate->getB2DRange(aViewInformation));
+        }
+        else
+        {
+            // use UNO API call instead
+            const uno::Sequence<beans::PropertyValue>& rViewParameters(
+                aViewInformation.getViewInformationSequence());
+            aRetval.expand(basegfx::unotools::b2DRectangleFromRealRectangle2D(
+                rCandidate->getRange(rViewParameters)));
+        }
+    }
+
+    return aRetval;
+}
+
+bool arePrimitive2DReferencesEqual(const Primitive2DReference& rxA, const Primitive2DReference& rxB)
+{
+    const bool bAIs(rxA.is());
+
+    if (bAIs != rxB.is())
+    {
+        return false;
+    }
+
+    if (!bAIs)
+    {
+        return true;
+    }
+
+    const BasePrimitive2D* pA(dynamic_cast<const BasePrimitive2D*>(rxA.get()));
+    const BasePrimitive2D* pB(dynamic_cast<const BasePrimitive2D*>(rxB.get()));
+
+    if (!pA || !pB)
+    {
+        return false;
+    }
+
+    return pA->operator==(*pB);
+}
+
+OUString idToString(sal_uInt32 nId)
+{
+    switch (nId)
+    {
+        case PRIMITIVE2D_ID_TRANSPARENCEPRIMITIVE2D:
+            return "TRANSPARENCE";
+        case PRIMITIVE2D_ID_ANIMATEDSWITCHPRIMITIVE2D:
+            return "ANIMATEDSWITCH";
+        case PRIMITIVE2D_ID_ANIMATEDBLINKPRIMITIVE2D:
+            return "ANIMATEDBLINK";
+        case PRIMITIVE2D_ID_ANIMATEDINTERPOLATEPRIMITIVE2D:
+            return "ANIMATEDINTERPOLATE";
+        case PRIMITIVE2D_ID_BACKGROUNDCOLORPRIMITIVE2D:
+            return "BACKGROUNDCOLOR";
+        case PRIMITIVE2D_ID_BITMAPPRIMITIVE2D:
+            return "BITMAP";
+        case PRIMITIVE2D_ID_CONTROLPRIMITIVE2D:
+            return "CONTROL";
+        case PRIMITIVE2D_ID_EMBEDDED3DPRIMITIVE2D:
+            return "EMBEDDED3D";
+        case PRIMITIVE2D_ID_FILLGRAPHICPRIMITIVE2D:
+            return "FILLGRAPHIC";
+        case PRIMITIVE2D_ID_FILLGRADIENTPRIMITIVE2D:
+            return "FILLGRADIENT";
+        case PRIMITIVE2D_ID_FILLHATCHPRIMITIVE2D:
+            return "FILLHATCH";
+        case PRIMITIVE2D_ID_GRAPHICPRIMITIVE2D:
+            return "GRAPHIC";
+        case PRIMITIVE2D_ID_GRIDPRIMITIVE2D:
+            return "GRID";
+        case PRIMITIVE2D_ID_GROUPPRIMITIVE2D:
+            return "GROUP";
+        case PRIMITIVE2D_ID_HELPLINEPRIMITIVE2D:
+            return "HELPLINE";
+        case PRIMITIVE2D_ID_MARKERARRAYPRIMITIVE2D:
+            return "MARKERARRAY";
+        case PRIMITIVE2D_ID_MASKPRIMITIVE2D:
+            return "MASK";
+        case PRIMITIVE2D_ID_MEDIAPRIMITIVE2D:
+            return "MEDIA";
+        case PRIMITIVE2D_ID_METAFILEPRIMITIVE2D:
+            return "METAFILE";
+        case PRIMITIVE2D_ID_MODIFIEDCOLORPRIMITIVE2D:
+            return "MODIFIEDCOLOR";
+        case PRIMITIVE2D_ID_POLYGONHAIRLINEPRIMITIVE2D:
+            return "POLYGONHAIRLINE";
+        case PRIMITIVE2D_ID_POLYGONMARKERPRIMITIVE2D:
+            return "POLYGONMARKER";
+        case PRIMITIVE2D_ID_POLYGONSTROKEPRIMITIVE2D:
+            return "POLYGONSTROKE";
+        case PRIMITIVE2D_ID_POLYGONSTROKEARROWPRIMITIVE2D:
+            return "POLYGONSTROKEARROW";
+        case PRIMITIVE2D_ID_POLYPOLYGONSTROKEPRIMITIVE2D:
+            return "POLYPOLYGONSTROKE";
+        case PRIMITIVE2D_ID_POLYPOLYGONSTROKEARROWPRIMITIVE2D:
+            return "POLYPOLYGONSTROKEARROW";
+        case PRIMITIVE2D_ID_POLYPOLYGONCOLORPRIMITIVE2D:
+            return "POLYPOLYGONCOLOR";
+        case PRIMITIVE2D_ID_POLYPOLYGONGRADIENTPRIMITIVE2D:
+            return "POLYPOLYGONGRADIENT";
+        case PRIMITIVE2D_ID_POLYPOLYGONHATCHPRIMITIVE2D:
+            return "POLYPOLYGONHATCH";
+        case PRIMITIVE2D_ID_POLYPOLYGONGRAPHICPRIMITIVE2D:
+            return "POLYPOLYGONGRAPHIC";
+        case PRIMITIVE2D_ID_SCENEPRIMITIVE2D:
+            return "SCENE";
+        case PRIMITIVE2D_ID_SHADOWPRIMITIVE2D:
+            return "SHADOW";
+        case PRIMITIVE2D_ID_TEXTSIMPLEPORTIONPRIMITIVE2D:
+            return "TEXTSIMPLEPORTION";
+        case PRIMITIVE2D_ID_TEXTDECORATEDPORTIONPRIMITIVE2D:
+            return "TEXTDECORATEDPORTION";
+        case PRIMITIVE2D_ID_TRANSFORMPRIMITIVE2D:
+            return "TRANSFORM";
+        case PRIMITIVE2D_ID_UNIFIEDTRANSPARENCEPRIMITIVE2D:
+            return "UNIFIEDTRANSPARENCE";
+        case PRIMITIVE2D_ID_POINTARRAYPRIMITIVE2D:
+            return "POINTARRAY";
+        case PRIMITIVE2D_ID_TEXTHIERARCHYFIELDPRIMITIVE2D:
+            return "TEXTHIERARCHYFIELD";
+        case PRIMITIVE2D_ID_TEXTHIERARCHYLINEPRIMITIVE2D:
+            return "TEXTHIERARCHYLINE";
+        case PRIMITIVE2D_ID_TEXTHIERARCHYPARAGRAPHPRIMITIVE2D:
+            return "TEXTHIERARCHYPARAGRAPH";
+        case PRIMITIVE2D_ID_TEXTHIERARCHYBLOCKPRIMITIVE2D:
+            return "TEXTHIERARCHYBLOCK";
+        case PRIMITIVE2D_ID_TEXTHIERARCHYEDITPRIMITIVE2D:
+            return "TEXTHIERARCHYEDIT";
+        case PRIMITIVE2D_ID_POLYGONWAVEPRIMITIVE2D:
+            return "POLYGONWAVE";
+        case PRIMITIVE2D_ID_WRONGSPELLPRIMITIVE2D:
+            return "WRONGSPELL";
+        case PRIMITIVE2D_ID_TEXTEFFECTPRIMITIVE2D:
+            return "TEXTEFFECT";
+        case PRIMITIVE2D_ID_TEXTHIERARCHYBULLETPRIMITIVE2D:
+            return "TEXTHIERARCHYBULLET";
+        case PRIMITIVE2D_ID_POLYPOLYGONHAIRLINEPRIMITIVE2D:
+            return "POLYPOLYGONHAIRLINE";
+        case PRIMITIVE2D_ID_EXECUTEPRIMITIVE2D:
+            return "EXECUTE";
+        case PRIMITIVE2D_ID_PAGEPREVIEWPRIMITIVE2D:
+            return "PAGEPREVIEW";
+        case PRIMITIVE2D_ID_STRUCTURETAGPRIMITIVE2D:
+            return "STRUCTURETAG";
+        case PRIMITIVE2D_ID_BORDERLINEPRIMITIVE2D:
+            return "BORDERLINE";
+        case PRIMITIVE2D_ID_POLYPOLYGONMARKERPRIMITIVE2D:
+            return "POLYPOLYGONMARKER";
+        case PRIMITIVE2D_ID_HITTESTPRIMITIVE2D:
+            return "HITTEST";
+        case PRIMITIVE2D_ID_INVERTPRIMITIVE2D:
+            return "INVERT";
+        case PRIMITIVE2D_ID_DISCRETEBITMAPPRIMITIVE2D:
+            return "DISCRETEBITMAP";
+        case PRIMITIVE2D_ID_WALLPAPERBITMAPPRIMITIVE2D:
+            return "WALLPAPERBITMAP";
+        case PRIMITIVE2D_ID_TEXTLINEPRIMITIVE2D:
+            return "TEXTLINE";
+        case PRIMITIVE2D_ID_TEXTCHARACTERSTRIKEOUTPRIMITIVE2D:
+            return "TEXTCHARACTERSTRIKEOUT";
+        case PRIMITIVE2D_ID_TEXTGEOMETRYSTRIKEOUTPRIMITIVE2D:
+            return "TEXTGEOMETRYSTRIKEOUT";
+        case PRIMITIVE2D_ID_EPSPRIMITIVE2D:
+            return "EPS";
+        case PRIMITIVE2D_ID_DISCRETESHADOWPRIMITIVE2D:
+            return "DISCRETESHADOW";
+        case PRIMITIVE2D_ID_HIDDENGEOMETRYPRIMITIVE2D:
+            return "HIDDENGEOMETRY";
+        case PRIMITIVE2D_ID_SVGLINEARGRADIENTPRIMITIVE2D:
+            return "SVGLINEARGRADIENT";
+        case PRIMITIVE2D_ID_SVGRADIALGRADIENTPRIMITIVE2D:
+            return "SVGRADIALGRADIENT";
+        case PRIMITIVE2D_ID_SVGLINEARATOMPRIMITIVE2D:
+            return "SVGLINEARATOM";
+        case PRIMITIVE2D_ID_SVGRADIALATOMPRIMITIVE2D:
+            return "SVGRADIALATOM";
+        case PRIMITIVE2D_ID_CROPPRIMITIVE2D:
+            return "CROP";
+        case PRIMITIVE2D_ID_PATTERNFILLPRIMITIVE2D:
+            return "PATTERNFILL";
+        case PRIMITIVE2D_ID_OBJECTINFOPRIMITIVE2D:
+            return "OBJECTINFO";
+        case PRIMITIVE2D_ID_POLYPOLYGONSELECTIONPRIMITIVE2D:
+            return "POLYPOLYGONSELECTION";
+        case PRIMITIVE2D_ID_PAGEHIERARCHYPRIMITIVE2D:
+            return "PAGEHIERARCHY";
+        default:
+            return OUString::number((nId >> 16) & 0xFF) + "|" + OUString::number(nId & 0xFF);
+    }
+}
+
+} // end of namespace drawinglayer::primitive2d
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/baseprimitive2d.cxx b/drawinglayer/source/primitive2d/baseprimitive2d.cxx
index 1ee89de9e5bc..ef7055ebdaa4 100644
--- a/drawinglayer/source/primitive2d/baseprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/baseprimitive2d.cxx
@@ -23,7 +23,7 @@
 #include <utility>
 
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
-#include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
+#include <drawinglayer/primitive2d/Tools.hxx>
 #include <drawinglayer/geometry/viewinformation2d.hxx>
 #include <basegfx/utils/canvastools.hxx>
 #include <comphelper/sequence.hxx>
@@ -32,8 +32,6 @@ using namespace css;
 
 namespace drawinglayer::primitive2d
 {
-Primitive2DDecompositionVisitor::~Primitive2DDecompositionVisitor() {}
-
 BasePrimitive2D::BasePrimitive2D()
     : BasePrimitive2DImplBase(m_aMutex)
 {
@@ -138,309 +136,6 @@ void BufferedDecompositionPrimitive2D::get2DDecomposition(
     rVisitor.append(getBuffered2DDecomposition());
 }
 
-// tooling
-
-Primitive2DContainer Primitive2DContainer::maybeInvert(bool bInvert) const
-{
-    const sal_uInt32 nSize(size());
-    Primitive2DContainer aRetval;
-
-    aRetval.resize(nSize);
-
-    for (sal_uInt32 a(0); a < nSize; a++)
-    {
-        aRetval[bInvert ? nSize - 1 - a : a] = (*this)[a];
-    }
-
-    // all entries taken over to Uno References as owners. To avoid
-    // errors with users of this mechanism to delete pointers to BasePrimitive2D
-    // itself, clear given vector
-    const_cast<Primitive2DContainer&>(*this).clear();
-
-    return aRetval;
-}
-
-// get B2DRange from a given Primitive2DReference
-basegfx::B2DRange
-getB2DRangeFromPrimitive2DReference(const Primitive2DReference& rCandidate,
-                                    const geometry::ViewInformation2D& aViewInformation)
-{
-    basegfx::B2DRange aRetval;
-
-    if (rCandidate.is())
-    {
-        // try to get C++ implementation base
-        const BasePrimitive2D* pCandidate(dynamic_cast<BasePrimitive2D*>(rCandidate.get()));
-
-        if (pCandidate)
-        {
-            // use it if possible
-            aRetval.expand(pCandidate->getB2DRange(aViewInformation));
-        }
-        else
-        {
-            // use UNO API call instead
-            const uno::Sequence<beans::PropertyValue>& rViewParameters(
-                aViewInformation.getViewInformationSequence());
-            aRetval.expand(basegfx::unotools::b2DRectangleFromRealRectangle2D(
-                rCandidate->getRange(rViewParameters)));
-        }
-    }
-
-    return aRetval;
-}
-
-// get B2DRange from a given Primitive2DSequence
-basegfx::B2DRange
-Primitive2DContainer::getB2DRange(const geometry::ViewInformation2D& aViewInformation) const
-{
-    basegfx::B2DRange aRetval;
-
-    if (!empty())
-    {
-        const sal_Int32 nCount(size());
-
-        for (sal_Int32 a(0); a < nCount; a++)
-        {
-            aRetval.expand(getB2DRangeFromPrimitive2DReference((*this)[a], aViewInformation));
-        }
-    }
-
-    return aRetval;
-}
-
-bool arePrimitive2DReferencesEqual(const Primitive2DReference& rxA, const Primitive2DReference& rxB)
-{
-    const bool bAIs(rxA.is());
-
-    if (bAIs != rxB.is())
-    {
-        return false;
-    }
-
-    if (!bAIs)
-    {
-        return true;
-    }
-
-    const BasePrimitive2D* pA(dynamic_cast<const BasePrimitive2D*>(rxA.get()));
-    const BasePrimitive2D* pB(dynamic_cast<const BasePrimitive2D*>(rxB.get()));
-
-    if (!pA || !pB)
-    {
-        return false;
-    }
-
-    return pA->operator==(*pB);
-}
-
-bool Primitive2DContainer::operator==(const Primitive2DContainer& rB) const
-{
-    const bool bAHasElements(!empty());
-
-    if (bAHasElements != !rB.empty())
-    {
-        return false;
-    }
-
-    if (!bAHasElements)
-    {
-        return true;
-    }
-
-    const size_t nCount(size());
-
-    if (nCount != rB.size())
-    {
-        return false;
-    }
-
-    for (size_t a(0); a < nCount; a++)
-    {
-        if (!arePrimitive2DReferencesEqual((*this)[a], rB[a]))
-        {
-            return false;
-        }
-    }
-
-    return true;
-}
-
-Primitive2DContainer::~Primitive2DContainer() {}
-
-void Primitive2DContainer::append(const Primitive2DReference& rSource) { push_back(rSource); }
-
-void Primitive2DContainer::append(const Primitive2DContainer& rSource)
-{
-    insert(end(), rSource.begin(), rSource.end());
-}
-
-void Primitive2DContainer::append(Primitive2DContainer&& rSource)
-{
-    size_t n = size();
-    resize(n + rSource.size());
-    for (size_t i = 0; i < rSource.size(); ++i)
-    {
-        (*this)[n + i] = std::move(rSource[i]);
-    }
-}
-
-void Primitive2DContainer::append(const Primitive2DSequence& rSource)
-{
-    std::copy(rSource.begin(), rSource.end(), std::back_inserter(*this));
-}
-
-OUString idToString(sal_uInt32 nId)
-{
-    switch (nId)
-    {
-        case PRIMITIVE2D_ID_TRANSPARENCEPRIMITIVE2D:
-            return "TRANSPARENCE";
-        case PRIMITIVE2D_ID_ANIMATEDSWITCHPRIMITIVE2D:
-            return "ANIMATEDSWITCH";
-        case PRIMITIVE2D_ID_ANIMATEDBLINKPRIMITIVE2D:
-            return "ANIMATEDBLINK";
-        case PRIMITIVE2D_ID_ANIMATEDINTERPOLATEPRIMITIVE2D:
-            return "ANIMATEDINTERPOLATE";
-        case PRIMITIVE2D_ID_BACKGROUNDCOLORPRIMITIVE2D:
-            return "BACKGROUNDCOLOR";
-        case PRIMITIVE2D_ID_BITMAPPRIMITIVE2D:
-            return "BITMAP";
-        case PRIMITIVE2D_ID_CONTROLPRIMITIVE2D:
-            return "CONTROL";
-        case PRIMITIVE2D_ID_EMBEDDED3DPRIMITIVE2D:
-            return "EMBEDDED3D";
-        case PRIMITIVE2D_ID_FILLGRAPHICPRIMITIVE2D:
-            return "FILLGRAPHIC";
-        case PRIMITIVE2D_ID_FILLGRADIENTPRIMITIVE2D:
-            return "FILLGRADIENT";
-        case PRIMITIVE2D_ID_FILLHATCHPRIMITIVE2D:
-            return "FILLHATCH";
-        case PRIMITIVE2D_ID_GRAPHICPRIMITIVE2D:
-            return "GRAPHIC";
-        case PRIMITIVE2D_ID_GRIDPRIMITIVE2D:
-            return "GRID";
-        case PRIMITIVE2D_ID_GROUPPRIMITIVE2D:
-            return "GROUP";
-        case PRIMITIVE2D_ID_HELPLINEPRIMITIVE2D:
-            return "HELPLINE";
-        case PRIMITIVE2D_ID_MARKERARRAYPRIMITIVE2D:
-            return "MARKERARRAY";
-        case PRIMITIVE2D_ID_MASKPRIMITIVE2D:
-            return "MASK";
-        case PRIMITIVE2D_ID_MEDIAPRIMITIVE2D:
-            return "MEDIA";
-        case PRIMITIVE2D_ID_METAFILEPRIMITIVE2D:
-            return "METAFILE";
-        case PRIMITIVE2D_ID_MODIFIEDCOLORPRIMITIVE2D:
-            return "MODIFIEDCOLOR";
-        case PRIMITIVE2D_ID_POLYGONHAIRLINEPRIMITIVE2D:
-            return "POLYGONHAIRLINE";
-        case PRIMITIVE2D_ID_POLYGONMARKERPRIMITIVE2D:
-            return "POLYGONMARKER";
-        case PRIMITIVE2D_ID_POLYGONSTROKEPRIMITIVE2D:
-            return "POLYGONSTROKE";
-        case PRIMITIVE2D_ID_POLYGONSTROKEARROWPRIMITIVE2D:
-            return "POLYGONSTROKEARROW";
-        case PRIMITIVE2D_ID_POLYPOLYGONSTROKEPRIMITIVE2D:
-            return "POLYPOLYGONSTROKE";
-        case PRIMITIVE2D_ID_POLYPOLYGONSTROKEARROWPRIMITIVE2D:
-            return "POLYPOLYGONSTROKEARROW";
-        case PRIMITIVE2D_ID_POLYPOLYGONCOLORPRIMITIVE2D:
-            return "POLYPOLYGONCOLOR";
-        case PRIMITIVE2D_ID_POLYPOLYGONGRADIENTPRIMITIVE2D:
-            return "POLYPOLYGONGRADIENT";
-        case PRIMITIVE2D_ID_POLYPOLYGONHATCHPRIMITIVE2D:
-            return "POLYPOLYGONHATCH";
-        case PRIMITIVE2D_ID_POLYPOLYGONGRAPHICPRIMITIVE2D:
-            return "POLYPOLYGONGRAPHIC";
-        case PRIMITIVE2D_ID_SCENEPRIMITIVE2D:
-            return "SCENE";
-        case PRIMITIVE2D_ID_SHADOWPRIMITIVE2D:
-            return "SHADOW";
-        case PRIMITIVE2D_ID_TEXTSIMPLEPORTIONPRIMITIVE2D:
-            return "TEXTSIMPLEPORTION";
-        case PRIMITIVE2D_ID_TEXTDECORATEDPORTIONPRIMITIVE2D:
-            return "TEXTDECORATEDPORTION";
-        case PRIMITIVE2D_ID_TRANSFORMPRIMITIVE2D:
-            return "TRANSFORM";
-        case PRIMITIVE2D_ID_UNIFIEDTRANSPARENCEPRIMITIVE2D:
-            return "UNIFIEDTRANSPARENCE";
-        case PRIMITIVE2D_ID_POINTARRAYPRIMITIVE2D:
-            return "POINTARRAY";
-        case PRIMITIVE2D_ID_TEXTHIERARCHYFIELDPRIMITIVE2D:
-            return "TEXTHIERARCHYFIELD";
-        case PRIMITIVE2D_ID_TEXTHIERARCHYLINEPRIMITIVE2D:
-            return "TEXTHIERARCHYLINE";
-        case PRIMITIVE2D_ID_TEXTHIERARCHYPARAGRAPHPRIMITIVE2D:
-            return "TEXTHIERARCHYPARAGRAPH";
-        case PRIMITIVE2D_ID_TEXTHIERARCHYBLOCKPRIMITIVE2D:
-            return "TEXTHIERARCHYBLOCK";
-        case PRIMITIVE2D_ID_TEXTHIERARCHYEDITPRIMITIVE2D:
-            return "TEXTHIERARCHYEDIT";
-        case PRIMITIVE2D_ID_POLYGONWAVEPRIMITIVE2D:
-            return "POLYGONWAVE";
-        case PRIMITIVE2D_ID_WRONGSPELLPRIMITIVE2D:
-            return "WRONGSPELL";
-        case PRIMITIVE2D_ID_TEXTEFFECTPRIMITIVE2D:
-            return "TEXTEFFECT";
-        case PRIMITIVE2D_ID_TEXTHIERARCHYBULLETPRIMITIVE2D:
-            return "TEXTHIERARCHYBULLET";
-        case PRIMITIVE2D_ID_POLYPOLYGONHAIRLINEPRIMITIVE2D:
-            return "POLYPOLYGONHAIRLINE";
-        case PRIMITIVE2D_ID_EXECUTEPRIMITIVE2D:
-            return "EXECUTE";
-        case PRIMITIVE2D_ID_PAGEPREVIEWPRIMITIVE2D:
-            return "PAGEPREVIEW";
-        case PRIMITIVE2D_ID_STRUCTURETAGPRIMITIVE2D:
-            return "STRUCTURETAG";
-        case PRIMITIVE2D_ID_BORDERLINEPRIMITIVE2D:
-            return "BORDERLINE";
-        case PRIMITIVE2D_ID_POLYPOLYGONMARKERPRIMITIVE2D:
-            return "POLYPOLYGONMARKER";
-        case PRIMITIVE2D_ID_HITTESTPRIMITIVE2D:
-            return "HITTEST";
-        case PRIMITIVE2D_ID_INVERTPRIMITIVE2D:
-            return "INVERT";
-        case PRIMITIVE2D_ID_DISCRETEBITMAPPRIMITIVE2D:
-            return "DISCRETEBITMAP";
-        case PRIMITIVE2D_ID_WALLPAPERBITMAPPRIMITIVE2D:
-            return "WALLPAPERBITMAP";
-        case PRIMITIVE2D_ID_TEXTLINEPRIMITIVE2D:
-            return "TEXTLINE";
-        case PRIMITIVE2D_ID_TEXTCHARACTERSTRIKEOUTPRIMITIVE2D:
-            return "TEXTCHARACTERSTRIKEOUT";
-        case PRIMITIVE2D_ID_TEXTGEOMETRYSTRIKEOUTPRIMITIVE2D:
-            return "TEXTGEOMETRYSTRIKEOUT";
-        case PRIMITIVE2D_ID_EPSPRIMITIVE2D:
-            return "EPS";
-        case PRIMITIVE2D_ID_DISCRETESHADOWPRIMITIVE2D:
-            return "DISCRETESHADOW";
-        case PRIMITIVE2D_ID_HIDDENGEOMETRYPRIMITIVE2D:
-            return "HIDDENGEOMETRY";
-        case PRIMITIVE2D_ID_SVGLINEARGRADIENTPRIMITIVE2D:
-            return "SVGLINEARGRADIENT";
-        case PRIMITIVE2D_ID_SVGRADIALGRADIENTPRIMITIVE2D:
-            return "SVGRADIALGRADIENT";
-        case PRIMITIVE2D_ID_SVGLINEARATOMPRIMITIVE2D:
-            return "SVGLINEARATOM";
-        case PRIMITIVE2D_ID_SVGRADIALATOMPRIMITIVE2D:
-            return "SVGRADIALATOM";
-        case PRIMITIVE2D_ID_CROPPRIMITIVE2D:
-            return "CROP";
-        case PRIMITIVE2D_ID_PATTERNFILLPRIMITIVE2D:
-            return "PATTERNFILL";
-        case PRIMITIVE2D_ID_OBJECTINFOPRIMITIVE2D:
-            return "OBJECTINFO";
-        case PRIMITIVE2D_ID_POLYPOLYGONSELECTIONPRIMITIVE2D:
-            return "POLYPOLYGONSELECTION";
-        case PRIMITIVE2D_ID_PAGEHIERARCHYPRIMITIVE2D:
-            return "PAGEHIERARCHY";
-        default:
-            return OUString::number((nId >> 16) & 0xFF) + "|" + OUString::number(nId & 0xFF);
-    }
-}
-
 } // end of namespace drawinglayer::primitive2d
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
index 68e8f70c0269..199fb13e3c81 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
@@ -20,6 +20,7 @@
 #include "vclpixelprocessor2d.hxx"
 #include <vcl/outdev.hxx>
 #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
+#include <drawinglayer/primitive2d/Tools.hxx>
 #include <drawinglayer/primitive2d/textprimitive2d.hxx>
 #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
 #include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
diff --git a/drawinglayer/source/tools/primitive2dxmldump.cxx b/drawinglayer/source/tools/primitive2dxmldump.cxx
index af4718ff9620..e4fadac945a3 100644
--- a/drawinglayer/source/tools/primitive2dxmldump.cxx
+++ b/drawinglayer/source/tools/primitive2dxmldump.cxx
@@ -16,6 +16,7 @@
 #include <memory>
 
 #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
+#include <drawinglayer/primitive2d/Tools.hxx>
 #include <drawinglayer/primitive2d/transformprimitive2d.hxx>
 #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
 #include <drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx>