drawinglayer: clang-format BasePrimitive2D + remove from blacklist

No functional change was made, only formatting of the code.

The code was formatted with clang-format and moves the files
baseprimitve2d.{cxx,hxx} out of blacklist so it will be auto
formatted with every change from now on.

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

1 files changed, 375 insertions, 291 deletions

diff --git a/drawinglayer/source/primitive2d/baseprimitive2d.cxx b/drawinglayer/source/primitive2d/baseprimitive2d.cxx
index 4db80991dd93..72b0f33734ee 100644
--- a/drawinglayer/source/primitive2d/baseprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/baseprimitive2d.cxx
@@ -28,349 +28,433 @@
 #include <basegfx/utils/canvastools.hxx>
 #include <comphelper/sequence.hxx>
 
-
 using namespace com::sun::star;
 
-
 namespace drawinglayer
 {
-    namespace primitive2d
-    {
-        Primitive2DDecompositionVisitor::~Primitive2DDecompositionVisitor() {}
-
-        BasePrimitive2D::BasePrimitive2D()
-        :   BasePrimitive2DImplBase(m_aMutex)
-        {
-        }
-
-        BasePrimitive2D::~BasePrimitive2D()
-        {
-        }
-
-        bool BasePrimitive2D::operator==( const BasePrimitive2D& rPrimitive ) const
-        {
-            return (getPrimitive2DID() == rPrimitive.getPrimitive2DID());
-        }
+namespace primitive2d
+{
+Primitive2DDecompositionVisitor::~Primitive2DDecompositionVisitor() {}
 
-        namespace {
-
-        // Visitor class to get the B2D range from a tree of Primitive2DReference's
-        //
-        class B2DRangeVisitor : public Primitive2DDecompositionVisitor {
-        public:
-            const geometry::ViewInformation2D& mrViewInformation;
-            basegfx::B2DRange maRetval;
-            B2DRangeVisitor(const geometry::ViewInformation2D& rViewInformation) : mrViewInformation(rViewInformation) {}
-            virtual void append(const Primitive2DReference& r) override {
-                maRetval.expand(getB2DRangeFromPrimitive2DReference(r, mrViewInformation));
-            }
-            virtual void append(const Primitive2DContainer& r) override {
-                maRetval.expand(r.getB2DRange(mrViewInformation));
-            }
-            virtual void append(Primitive2DContainer&& r) override {
-                maRetval.expand(r.getB2DRange(mrViewInformation));
-            }
-        };
+BasePrimitive2D::BasePrimitive2D()
+    : BasePrimitive2DImplBase(m_aMutex)
+{
+}
 
-        }
+BasePrimitive2D::~BasePrimitive2D() {}
 
-        basegfx::B2DRange BasePrimitive2D::getB2DRange(const geometry::ViewInformation2D& rViewInformation) const
-        {
-            B2DRangeVisitor aVisitor(rViewInformation);
-            get2DDecomposition(aVisitor, rViewInformation);
-            return aVisitor.maRetval;
-        }
+bool BasePrimitive2D::operator==(const BasePrimitive2D& rPrimitive) const
+{
+    return (getPrimitive2DID() == rPrimitive.getPrimitive2DID());
+}
 
-        void BasePrimitive2D::get2DDecomposition(Primitive2DDecompositionVisitor& /*rVisitor*/, const geometry::ViewInformation2D& /*rViewInformation*/) const
-        {
-        }
+namespace
+{
+// Visitor class to get the B2D range from a tree of Primitive2DReference's
+//
+class B2DRangeVisitor : public Primitive2DDecompositionVisitor
+{
+public:
+    const geometry::ViewInformation2D& mrViewInformation;
+    basegfx::B2DRange maRetval;
+    B2DRangeVisitor(const geometry::ViewInformation2D& rViewInformation)
+        : mrViewInformation(rViewInformation)
+    {
+    }
+    virtual void append(const Primitive2DReference& r) override
+    {
+        maRetval.expand(getB2DRangeFromPrimitive2DReference(r, mrViewInformation));
+    }
+    virtual void append(const Primitive2DContainer& r) override
+    {
+        maRetval.expand(r.getB2DRange(mrViewInformation));
+    }
+    virtual void append(Primitive2DContainer&& r) override
+    {
+        maRetval.expand(r.getB2DRange(mrViewInformation));
+    }
+};
+}
 
-        css::uno::Sequence< ::css::uno::Reference< ::css::graphic::XPrimitive2D > > SAL_CALL BasePrimitive2D::getDecomposition( const uno::Sequence< beans::PropertyValue >& rViewParameters )
-        {
-            const geometry::ViewInformation2D aViewInformation(rViewParameters);
-            Primitive2DContainer aContainer;
-            get2DDecomposition(aContainer, aViewInformation);
-            return comphelper::containerToSequence(aContainer);
-        }
+basegfx::B2DRange
+BasePrimitive2D::getB2DRange(const geometry::ViewInformation2D& rViewInformation) const
+{
+    B2DRangeVisitor aVisitor(rViewInformation);
+    get2DDecomposition(aVisitor, rViewInformation);
+    return aVisitor.maRetval;
+}
+
+void BasePrimitive2D::get2DDecomposition(
+    Primitive2DDecompositionVisitor& /*rVisitor*/,
+    const geometry::ViewInformation2D& /*rViewInformation*/) const
+{
+}
 
-        css::geometry::RealRectangle2D SAL_CALL BasePrimitive2D::getRange( const uno::Sequence< beans::PropertyValue >& rViewParameters )
-        {
-            const geometry::ViewInformation2D aViewInformation(rViewParameters);
-            return basegfx::unotools::rectangle2DFromB2DRectangle(getB2DRange(aViewInformation));
-        }
+css::uno::Sequence<::css::uno::Reference<::css::graphic::XPrimitive2D>> SAL_CALL
+BasePrimitive2D::getDecomposition(const uno::Sequence<beans::PropertyValue>& rViewParameters)
+{
+    const geometry::ViewInformation2D aViewInformation(rViewParameters);
+    Primitive2DContainer aContainer;
+    get2DDecomposition(aContainer, aViewInformation);
+    return comphelper::containerToSequence(aContainer);
+}
+
+css::geometry::RealRectangle2D SAL_CALL
+BasePrimitive2D::getRange(const uno::Sequence<beans::PropertyValue>& rViewParameters)
+{
+    const geometry::ViewInformation2D aViewInformation(rViewParameters);
+    return basegfx::unotools::rectangle2DFromB2DRectangle(getB2DRange(aViewInformation));
+}
 
-        sal_Int64 SAL_CALL BasePrimitive2D::estimateUsage()
-        {
-            return 0; // for now ignore the objects themselves
-        }
-    } // end of namespace primitive2d
+sal_Int64 SAL_CALL BasePrimitive2D::estimateUsage()
+{
+    return 0; // for now ignore the objects themselves
+}
+} // end of namespace primitive2d
 } // end of namespace drawinglayer
 
-
 namespace drawinglayer
 {
-    namespace primitive2d
-    {
-        void BufferedDecompositionPrimitive2D::create2DDecomposition(Primitive2DContainer& /*rContainer*/, const geometry::ViewInformation2D& /*rViewInformation*/) const
-        {
-        }
-
-        BufferedDecompositionPrimitive2D::BufferedDecompositionPrimitive2D()
-        :   BasePrimitive2D(),
-            maBuffered2DDecomposition()
-        {
-        }
+namespace primitive2d
+{
+void BufferedDecompositionPrimitive2D::create2DDecomposition(
+    Primitive2DContainer& /*rContainer*/,
+    const geometry::ViewInformation2D& /*rViewInformation*/) const
+{
+}
 
-        void BufferedDecompositionPrimitive2D::get2DDecomposition(Primitive2DDecompositionVisitor& rVisitor, const geometry::ViewInformation2D& rViewInformation) const
-        {
-            ::osl::MutexGuard aGuard( m_aMutex );
+BufferedDecompositionPrimitive2D::BufferedDecompositionPrimitive2D()
+    : BasePrimitive2D()
+    , maBuffered2DDecomposition()
+{
+}
 
-            if(getBuffered2DDecomposition().empty())
-            {
-                Primitive2DContainer aNewSequence;
-                create2DDecomposition(aNewSequence, rViewInformation);
-                const_cast< BufferedDecompositionPrimitive2D* >(this)->setBuffered2DDecomposition(aNewSequence);
-            }
+void BufferedDecompositionPrimitive2D::get2DDecomposition(
+    Primitive2DDecompositionVisitor& rVisitor,
+    const geometry::ViewInformation2D& rViewInformation) const
+{
+    ::osl::MutexGuard aGuard(m_aMutex);
 
-            rVisitor.append(getBuffered2DDecomposition());
-        }
-    } // end of namespace primitive2d
+    if (getBuffered2DDecomposition().empty())
+    {
+        Primitive2DContainer aNewSequence;
+        create2DDecomposition(aNewSequence, rViewInformation);
+        const_cast<BufferedDecompositionPrimitive2D*>(this)->setBuffered2DDecomposition(
+            aNewSequence);
+    }
+
+    rVisitor.append(getBuffered2DDecomposition());
+}
+} // end of namespace primitive2d
 } // end of namespace drawinglayer
 
-
 // tooling
 
 namespace drawinglayer
 {
-    namespace primitive2d
+namespace 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++)
     {
-        Primitive2DContainer Primitive2DContainer::maybeInvert(bool bInvert) const
-        {
-            const sal_uInt32 nSize(size());
-            Primitive2DContainer aRetval;
+        aRetval[bInvert ? nSize - 1 - a : a] = (*this)[a];
+    }
 
-            aRetval.resize(nSize);
+    // 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();
 
-            for(sal_uInt32 a(0); a < nSize; a++)
-            {
-                aRetval[bInvert ? nSize - 1 - a : a] = (*this)[a];
-            }
+    return aRetval;
+}
 
-            // 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();
+// get B2DRange from a given Primitive2DReference
+basegfx::B2DRange
+getB2DRangeFromPrimitive2DReference(const Primitive2DReference& rCandidate,
+                                    const geometry::ViewInformation2D& aViewInformation)
+{
+    basegfx::B2DRange aRetval;
 
-            return aRetval;
-        }
+    if (rCandidate.is())
+    {
+        // try to get C++ implementation base
+        const BasePrimitive2D* pCandidate(dynamic_cast<BasePrimitive2D*>(rCandidate.get()));
 
-        // get B2DRange from a given Primitive2DReference
-        basegfx::B2DRange getB2DRangeFromPrimitive2DReference(const Primitive2DReference& rCandidate, const geometry::ViewInformation2D& aViewInformation)
+        if (pCandidate)
         {
-            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;
+            // use it if possible
+            aRetval.expand(pCandidate->getB2DRange(aViewInformation));
         }
-
-        // get B2DRange from a given Primitive2DSequence
-        basegfx::B2DRange Primitive2DContainer::getB2DRange(const geometry::ViewInformation2D& aViewInformation) const
+        else
         {
-            basegfx::B2DRange aRetval;
+            // use UNO API call instead
+            const uno::Sequence<beans::PropertyValue>& rViewParameters(
+                aViewInformation.getViewInformationSequence());
+            aRetval.expand(basegfx::unotools::b2DRectangleFromRealRectangle2D(
+                rCandidate->getRange(rViewParameters)));
+        }
+    }
 
-            if(!empty())
-            {
-                const sal_Int32 nCount(size());
+    return aRetval;
+}
 
-                for(sal_Int32 a(0); a < nCount; a++)
-                {
-                    aRetval.expand(getB2DRangeFromPrimitive2DReference((*this)[a], aViewInformation));
-                }
-            }
+// get B2DRange from a given Primitive2DSequence
+basegfx::B2DRange
+Primitive2DContainer::getB2DRange(const geometry::ViewInformation2D& aViewInformation) const
+{
+    basegfx::B2DRange aRetval;
 
-            return aRetval;
-        }
+    if (!empty())
+    {
+        const sal_Int32 nCount(size());
 
-        bool arePrimitive2DReferencesEqual(const Primitive2DReference& rxA, const Primitive2DReference& rxB)
+        for (sal_Int32 a(0); a < nCount; a++)
         {
-            const bool bAIs(rxA.is());
+            aRetval.expand(getB2DRangeFromPrimitive2DReference((*this)[a], aViewInformation));
+        }
+    }
 
-            if(bAIs != rxB.is())
-            {
-                return false;
-            }
+    return aRetval;
+}
 
-            if(!bAIs)
-            {
-                return true;
-            }
+bool arePrimitive2DReferencesEqual(const Primitive2DReference& rxA, const Primitive2DReference& rxB)
+{
+    const bool bAIs(rxA.is());
 
-            const BasePrimitive2D* pA(dynamic_cast< const BasePrimitive2D* >(rxA.get()));
-            const BasePrimitive2D* pB(dynamic_cast< const BasePrimitive2D* >(rxB.get()));
+    if (bAIs != rxB.is())
+    {
+        return false;
+    }
 
-            if (!pA || !pB)
-            {
-                return false;
-            }
+    if (!bAIs)
+    {
+        return true;
+    }
 
-            return pA->operator==(*pB);
-        }
+    const BasePrimitive2D* pA(dynamic_cast<const BasePrimitive2D*>(rxA.get()));
+    const BasePrimitive2D* pB(dynamic_cast<const BasePrimitive2D*>(rxB.get()));
 
-        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;
-        }
+    if (!pA || !pB)
+    {
+        return false;
+    }
 
-        Primitive2DContainer::~Primitive2DContainer() {}
+    return pA->operator==(*pB);
+}
 
-        void Primitive2DContainer::append(const Primitive2DReference& rSource)
-        {
-            push_back(rSource);
-        }
+bool Primitive2DContainer::operator==(const Primitive2DContainer& rB) const
+{
+    const bool bAHasElements(!empty());
 
-        void Primitive2DContainer::append(const Primitive2DContainer& rSource)
-        {
-            insert(end(), rSource.begin(), rSource.end());
-        }
+    if (bAHasElements != !rB.empty())
+    {
+        return false;
+    }
 
-        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] );
-            }
-        }
+    if (!bAHasElements)
+    {
+        return true;
+    }
 
-        void Primitive2DContainer::append(const Primitive2DSequence& rSource)
-        {
-            std::copy(rSource.begin(), rSource.end(), std::back_inserter(*this));
-        }
+    const size_t nCount(size());
+
+    if (nCount != rB.size())
+    {
+        return false;
+    }
 
-        OUString idToString(sal_uInt32 nId)
+    for (size_t a(0); a < nCount; a++)
+    {
+        if (!arePrimitive2DReferencesEqual((*this)[a], rB[a]))
         {
-            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);
-            }
+            return false;
         }
-    } // end of namespace primitive2d
+    }
+
+    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 primitive2d
 } // end of namespace drawinglayer
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */