tdf#69977: uno::Sequence is expensive

when used as a mutable data-structure. Plain std::vector halves the time
taken to display the chart dialog

Create a class to represent the std::vector we are going to be passing
around, and move some of the utility methods into it to make the code
prettier.
Also create an optimised append(&&) method for the common case of
appending small temporaries.

Change-Id: I7f5b43fb4a8a84e40e6a52fcb7e9f974091b4485

22 files changed, 54 insertions, 54 deletions

diff --git a/include/svx/sdr/animation/animationstate.hxx b/include/svx/sdr/animation/animationstate.hxx
index e072a02f983a..7b83945169d7 100644
--- a/include/svx/sdr/animation/animationstate.hxx
+++ b/include/svx/sdr/animation/animationstate.hxx
@@ -44,7 +44,7 @@ namespace sdr
             sdr::contact::ViewObjectContact&                    mrVOContact;
 
             // the vetor of animated primitives
-            drawinglayer::primitive2d::Primitive2DSequence      maAnimatedPrimitives;
+            drawinglayer::primitive2d::Primitive2DContainer      maAnimatedPrimitives;
 
             // local helpers
             double getSmallestNextTime(double fCurrentTime);
@@ -52,7 +52,7 @@ namespace sdr
 
         public:
             // basic constructor.
-            PrimitiveAnimation(sdr::contact::ViewObjectContact& rVOContact, const drawinglayer::primitive2d::Primitive2DSequence& rAnimatedPrimitives);
+            PrimitiveAnimation(sdr::contact::ViewObjectContact& rVOContact, const drawinglayer::primitive2d::Primitive2DContainer& rAnimatedPrimitives);
 
             // destructor
             virtual ~PrimitiveAnimation();
diff --git a/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx b/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx
index 580bee23966c..64ac5d21dfdf 100644
--- a/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx
+++ b/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx
@@ -40,7 +40,7 @@ namespace drawinglayer
             basegfx::B2DRange                                                   maLastDefineRange;
             std::shared_ptr< drawinglayer::attribute::SdrFillAttribute >      maFillAttribute;
             std::shared_ptr< drawinglayer::attribute::FillGradientAttribute > maFillGradientAttribute;
-            drawinglayer::primitive2d::Primitive2DSequence                      maPrimitives;
+            drawinglayer::primitive2d::Primitive2DContainer                      maPrimitives;
 
             void createPrimitive2DSequence(
                 const basegfx::B2DRange& rPaintRange,
@@ -59,7 +59,7 @@ namespace drawinglayer
 
             const drawinglayer::attribute::SdrFillAttribute& getFillAttribute() const;
             const drawinglayer::attribute::FillGradientAttribute& getFillGradientAttribute() const;
-            const drawinglayer::primitive2d::Primitive2DSequence& getPrimitive2DSequence(
+            const drawinglayer::primitive2d::Primitive2DContainer& getPrimitive2DSequence(
                 const basegfx::B2DRange& rPaintRange,
                 const basegfx::B2DRange& rDefineRange) const;
 
diff --git a/include/svx/sdr/contact/viewcontact.hxx b/include/svx/sdr/contact/viewcontact.hxx
index c34f5e9304df..a70c2530cd5c 100644
--- a/include/svx/sdr/contact/viewcontact.hxx
+++ b/include/svx/sdr/contact/viewcontact.hxx
@@ -46,10 +46,10 @@ private:
     // Registering and de-registering is done in the VOC constructors/destructors.
     std::vector< ViewObjectContact* >               maViewObjectContactVector;
 
-    // Primitive2DSequence of the ViewContact. This contains all necessary information
+    // Primitive2DContainer of the ViewContact. This contains all necessary information
     // for the graphical visualisation and needs to be supported by all VCs which
     // can be visualized.
-    drawinglayer::primitive2d::Primitive2DSequence  mxViewIndependentPrimitive2DSequence;
+    drawinglayer::primitive2d::Primitive2DContainer    mxViewIndependentPrimitive2DSequence;
 
     // A new ViewObjectContact was created and shall be remembered.
     void AddViewObjectContact(ViewObjectContact& rVOContact);
@@ -77,10 +77,10 @@ protected:
     // visualisation method and will also be used for BoundRect computations in the long run.
     // This means it's always an error when the default implementation is called and thus gets
     // asserted there
-    virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const;
+    virtual drawinglayer::primitive2d::Primitive2DContainer createViewIndependentPrimitive2DSequence() const;
 
-    // method for flushing View Independent Primitive2DSequence for VOC implementations
-    void flushViewIndependentPrimitive2DSequence() { mxViewIndependentPrimitive2DSequence.realloc(0); }
+    // method for flushing View Independent Primitive2DContainer for VOC implementations
+    void flushViewIndependentPrimitive2DSequence() { mxViewIndependentPrimitive2DSequence.clear(); }
 
     // basic constructor. Since this is a base class only, it shall
     // never be called directly
@@ -122,15 +122,15 @@ public:
 
     // access to the local primitive. This will ensure that the primitive is
     // current in comparing the local one with a fresh created incarnation
-    drawinglayer::primitive2d::Primitive2DSequence getViewIndependentPrimitive2DSequence() const;
+    drawinglayer::primitive2d::Primitive2DContainer getViewIndependentPrimitive2DSequence() const;
 
     // add Gluepoints (if available)
-    virtual drawinglayer::primitive2d::Primitive2DSequence createGluePointPrimitive2DSequence() const;
+    virtual drawinglayer::primitive2d::Primitive2DContainer createGluePointPrimitive2DSequence() const;
 
     // allow embedding if needed (e.g. for SdrObjects, evtl. Name, Title and description get added). This
     // is a helper normally used from getViewIndependentPrimitive2DSequence(), but there is one exception
     // for 3D scenes
-    virtual drawinglayer::primitive2d::Primitive2DSequence embedToObjectSpecificInformation(const drawinglayer::primitive2d::Primitive2DSequence& rSource) const;
+    virtual drawinglayer::primitive2d::Primitive2DContainer embedToObjectSpecificInformation(const drawinglayer::primitive2d::Primitive2DContainer& rSource) const;
 
     virtual basegfx::B2DRange getRange( const drawinglayer::geometry::ViewInformation2D& rViewInfo2D ) const;
 
diff --git a/include/svx/sdr/contact/viewcontactofe3d.hxx b/include/svx/sdr/contact/viewcontactofe3d.hxx
index 1b0aee383c5a..eed59dded3d6 100644
--- a/include/svx/sdr/contact/viewcontactofe3d.hxx
+++ b/include/svx/sdr/contact/viewcontactofe3d.hxx
@@ -56,7 +56,7 @@ public:
     }
 
     // public helpers
-    drawinglayer::primitive2d::Primitive2DSequence impCreateWithGivenPrimitive3DSequence(
+    drawinglayer::primitive2d::Primitive2DContainer impCreateWithGivenPrimitive3DSequence(
         const drawinglayer::primitive3d::Primitive3DSequence& rxContent3D) const;
 
 
@@ -76,7 +76,7 @@ protected:
     // This method is responsible for creating the graphical visualisation data derived ONLY from
     // the model data. The default implementation will try to create a 3D to 2D embedding (will work
     // when scene is known) which can then be used for 2D processing concerning ranges
-    virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const override;
+    virtual drawinglayer::primitive2d::Primitive2DContainer createViewIndependentPrimitive2DSequence() const override;
 
 public:
     // access to the local primitive without the object's local 3D transform. This is e.g. needed
diff --git a/include/svx/sdr/contact/viewcontactofe3dscene.hxx b/include/svx/sdr/contact/viewcontactofe3dscene.hxx
index b860417bedd4..ce9e85113963 100644
--- a/include/svx/sdr/contact/viewcontactofe3dscene.hxx
+++ b/include/svx/sdr/contact/viewcontactofe3dscene.hxx
@@ -66,7 +66,7 @@ public:
 
     // scene primitive creators. If pLayerVisibility is given, a visibility test with the LayerID and the
     // given SetOfByte is done.
-    drawinglayer::primitive2d::Primitive2DSequence createScenePrimitive2DSequence(const SetOfByte* pLayerVisibility) const;
+    drawinglayer::primitive2d::Primitive2DContainer createScenePrimitive2DSequence(const SetOfByte* pLayerVisibility) const;
 
     // helpers to get the sequence of all contained 3D primitives and its range,
     // regardless of layer or visibility constraints and using a neutral ViewInformation3D
@@ -94,7 +94,7 @@ protected:
 
     // This method is responsible for creating the graphical visualisation data
     // ONLY based on model data
-    virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const override;
+    virtual drawinglayer::primitive2d::Primitive2DContainer createViewIndependentPrimitive2DSequence() const override;
 };
 
 }}
diff --git a/include/svx/sdr/contact/viewcontactofpageobj.hxx b/include/svx/sdr/contact/viewcontactofpageobj.hxx
index 874b2140d4f8..b8d995bc52ab 100644
--- a/include/svx/sdr/contact/viewcontactofpageobj.hxx
+++ b/include/svx/sdr/contact/viewcontactofpageobj.hxx
@@ -36,7 +36,7 @@ protected:
     virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) override;
 
     // create graphical visualisation data
-    virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const override;
+    virtual drawinglayer::primitive2d::Primitive2DContainer createViewIndependentPrimitive2DSequence() const override;
 public:
     // basic constructor, used from SdrObject.
     explicit ViewContactOfPageObj(SdrPageObj& rPageObj);
diff --git a/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx b/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx
index e440ee67a4af..3ecf81ed7441 100644
--- a/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx
+++ b/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx
@@ -64,7 +64,7 @@ protected:
 protected:
     // This method is responsible for creating the graphical visualisation data
     // ONLY based on model data
-    virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const override;
+    virtual drawinglayer::primitive2d::Primitive2DContainer createViewIndependentPrimitive2DSequence() const override;
 };
 
 }}
diff --git a/include/svx/sdr/contact/viewcontactofsdrobj.hxx b/include/svx/sdr/contact/viewcontactofsdrobj.hxx
index 724865ed8905..2dbfdea043e8 100644
--- a/include/svx/sdr/contact/viewcontactofsdrobj.hxx
+++ b/include/svx/sdr/contact/viewcontactofsdrobj.hxx
@@ -72,12 +72,12 @@ public:
     // primitive stuff
 
     // add Gluepoints (if available)
-    virtual drawinglayer::primitive2d::Primitive2DSequence createGluePointPrimitive2DSequence() const override;
+    virtual drawinglayer::primitive2d::Primitive2DContainer createGluePointPrimitive2DSequence() const override;
 
     // allow embedding if needed (e.g. for SdrObjects, evtl. Name, Title and description get added). This
     // is a helper normally used from getViewIndependentPrimitive2DSequence(), but there is one exception
     // for 3D scenes
-    virtual drawinglayer::primitive2d::Primitive2DSequence embedToObjectSpecificInformation(const drawinglayer::primitive2d::Primitive2DSequence& rSource) const override;
+    virtual drawinglayer::primitive2d::Primitive2DContainer embedToObjectSpecificInformation(const drawinglayer::primitive2d::Primitive2DContainer& rSource) const override;
 };
 
 }}
diff --git a/include/svx/sdr/contact/viewcontactofsdrrectobj.hxx b/include/svx/sdr/contact/viewcontactofsdrrectobj.hxx
index c5fad1af395e..5892952808cd 100644
--- a/include/svx/sdr/contact/viewcontactofsdrrectobj.hxx
+++ b/include/svx/sdr/contact/viewcontactofsdrrectobj.hxx
@@ -42,7 +42,7 @@ public:
 protected:
     // This method is responsible for creating the graphical visualisation data
     // ONLY based on model data
-    virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const override;
+    virtual drawinglayer::primitive2d::Primitive2DContainer createViewIndependentPrimitive2DSequence() const override;
 };
 
 }}
diff --git a/include/svx/sdr/contact/viewcontactofvirtobj.hxx b/include/svx/sdr/contact/viewcontactofvirtobj.hxx
index 96b0da316d8a..65b50fb0a1d8 100644
--- a/include/svx/sdr/contact/viewcontactofvirtobj.hxx
+++ b/include/svx/sdr/contact/viewcontactofvirtobj.hxx
@@ -44,7 +44,7 @@ public:
 protected:
     // This method is responsible for creating the graphical visualisation data
     // ONLY based on model data
-    virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const override;
+    virtual drawinglayer::primitive2d::Primitive2DContainer createViewIndependentPrimitive2DSequence() const override;
 };
 
 }}
diff --git a/include/svx/sdr/contact/viewobjectcontact.hxx b/include/svx/sdr/contact/viewobjectcontact.hxx
index 9e8b4e972ffd..ddf54b437477 100644
--- a/include/svx/sdr/contact/viewobjectcontact.hxx
+++ b/include/svx/sdr/contact/viewobjectcontact.hxx
@@ -52,9 +52,9 @@ private:
     // PrimitiveSequence of the ViewContact. This contains all necessary information
     // for the graphical visualisation and needs to be supported by all VCs which
     // can be visualized.
-    drawinglayer::primitive2d::Primitive2DSequence  mxPrimitive2DSequence;
+    drawinglayer::primitive2d::Primitive2DContainer  mxPrimitive2DSequence;
 
-    // the PrimitiveAnimation if Primitive2DSequence contains animations
+    // the PrimitiveAnimation if Primitive2DContainer contains animations
     sdr::animation::PrimitiveAnimation*             mpPrimitiveAnimation;
 
     // bitfield
@@ -75,10 +75,10 @@ protected:
     // from the ViewContact using ViewContact::getViewIndependentPrimitive2DSequence(), takes care of
     // visibility, handles glue and ghosted.
     // This method will not handle included hierarchies and not check geometric visibility.
-    virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const;
+    virtual drawinglayer::primitive2d::Primitive2DContainer createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const;
 
-    // method for flushing Primitive2DSequence for VOC implementations
-    void flushPrimitive2DSequence() { mxPrimitive2DSequence.realloc(0); }
+    // method for flushing Primitive2DContainer for VOC implementations
+    void flushPrimitive2DSequence() { mxPrimitive2DSequence.clear(); }
 
 public:
     // basic constructor.
@@ -110,7 +110,7 @@ public:
     // access to the local primitive. This will ensure that the local primitive is
     // current in comparing the local one with a fresh created incarnation
     // This method will not handle included hierarchies and not check visibility.
-    drawinglayer::primitive2d::Primitive2DSequence getPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const;
+    drawinglayer::primitive2d::Primitive2DContainer getPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const;
 
     // test this VOC for visibility concerning model-view stuff like e.g. Layer
     virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const;
@@ -120,10 +120,10 @@ public:
 
     // process this primitive: Eventually also recursively travel an existing hierarchy,
     // e.g. for group objects, scenes or pages. This method will test geometrical visibility.
-    virtual drawinglayer::primitive2d::Primitive2DSequence getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const;
+    virtual drawinglayer::primitive2d::Primitive2DContainer getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const;
 
     // just process the sub-hierarchy, used as tooling from getPrimitive2DSequenceHierarchy
-    drawinglayer::primitive2d::Primitive2DSequence getPrimitive2DSequenceSubHierarchy(DisplayInfo& rDisplayInfo) const;
+    drawinglayer::primitive2d::Primitive2DContainer getPrimitive2DSequenceSubHierarchy(DisplayInfo& rDisplayInfo) const;
 };
 
 }}
diff --git a/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx b/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx
index a4d3ff3e616f..28eb5d7cdd36 100644
--- a/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx
+++ b/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx
@@ -38,7 +38,7 @@ protected:
     // This method is responsible for creating the graphical visualisation data which is
     // stored/cached in the local primitive.
     // This method will not handle included hierarchies and not check geometric visibility.
-    virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const override;
+    virtual drawinglayer::primitive2d::Primitive2DContainer createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const override;
 
 public:
     ViewObjectContactOfPageObj(ObjectContact& rObjectContact, ViewContact& rViewContact);
diff --git a/include/svx/sdr/contact/viewobjectcontactredirector.hxx b/include/svx/sdr/contact/viewobjectcontactredirector.hxx
index 6dee41409975..7679564028ff 100644
--- a/include/svx/sdr/contact/viewobjectcontactredirector.hxx
+++ b/include/svx/sdr/contact/viewobjectcontactredirector.hxx
@@ -43,7 +43,7 @@ public:
 
     // all default implementations just call the same methods at the original. To do something
     // different, override the method and at least do what the method does.
-    virtual drawinglayer::primitive2d::Primitive2DSequence createRedirectedPrimitive2DSequence(
+    virtual drawinglayer::primitive2d::Primitive2DContainer createRedirectedPrimitive2DSequence(
         const sdr::contact::ViewObjectContact& rOriginal,
         const sdr::contact::DisplayInfo& rDisplayInfo);
 };
diff --git a/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx b/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx
index 8594e683ce71..af77c3a4ca40 100644
--- a/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx
+++ b/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx
@@ -54,7 +54,7 @@ namespace sdr
             bool                                    mbOverlayState : 1;
 
             // geometry creation for OverlayObject
-            virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() override;
+            virtual drawinglayer::primitive2d::Primitive2DContainer createOverlayObjectPrimitive2DSequence() override;
 
         public:
             OverlayAnimatedBitmapEx(
diff --git a/include/svx/sdr/overlay/overlaybitmapex.hxx b/include/svx/sdr/overlay/overlaybitmapex.hxx
index 25913c1633dc..e98bd4953220 100644
--- a/include/svx/sdr/overlay/overlaybitmapex.hxx
+++ b/include/svx/sdr/overlay/overlaybitmapex.hxx
@@ -44,7 +44,7 @@ namespace sdr
             double                                  mfShearX;
             double                                  mfRotation;
 
-            virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() override;
+            virtual drawinglayer::primitive2d::Primitive2DContainer createOverlayObjectPrimitive2DSequence() override;
 
         public:
             OverlayBitmapEx(
diff --git a/include/svx/sdr/overlay/overlayobject.hxx b/include/svx/sdr/overlay/overlayobject.hxx
index d4ada5a75804..6a4da0b11336 100644
--- a/include/svx/sdr/overlay/overlayobject.hxx
+++ b/include/svx/sdr/overlay/overlayobject.hxx
@@ -64,21 +64,21 @@ namespace sdr
             // OverlayManager, do not change Yourself.
             OverlayManager*                                 mpOverlayManager;
 
-            // Primitive2DSequence of the OverlayObject
-            drawinglayer::primitive2d::Primitive2DSequence  maPrimitive2DSequence;
+            // Primitive2DContainer of the OverlayObject
+            drawinglayer::primitive2d::Primitive2DContainer  maPrimitive2DSequence;
 
         protected:
             // access methods to maPrimitive2DSequence. The usage of this methods may allow
             // later thread-safe stuff to be added if needed. Only to be used by getPrimitive2DSequence()
             // implementations for buffering the last decomposition.
-            const drawinglayer::primitive2d::Primitive2DSequence& getPrimitive2DSequence() const { return maPrimitive2DSequence; }
-            void setPrimitive2DSequence(const drawinglayer::primitive2d::Primitive2DSequence& rNew) { maPrimitive2DSequence = rNew; }
+            const drawinglayer::primitive2d::Primitive2DContainer& getPrimitive2DSequence() const { return maPrimitive2DSequence; }
+            void setPrimitive2DSequence(const drawinglayer::primitive2d::Primitive2DContainer& rNew) { maPrimitive2DSequence = rNew; }
 
-            // the creation method for Primitive2DSequence. Called when getPrimitive2DSequence()
+            // the creation method for Primitive2DContainer. Called when getPrimitive2DSequence()
             // sees that maPrimitive2DSequence is empty. Needs to be supported by all
             // OverlayObject implementations. Default implementation will assert
             // a missing implementation
-            virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence();
+            virtual drawinglayer::primitive2d::Primitive2DContainer createOverlayObjectPrimitive2DSequence();
 
             // #i53216# check blink time value range (currently 25 < mnBlinkTime < 10000)
             static sal_uInt32 impCheckBlinkTimeValueRange(sal_uInt64 nBlinkTime);
@@ -123,10 +123,10 @@ namespace sdr
             // get OverlayManager
             OverlayManager* getOverlayManager() const { return mpOverlayManager; }
 
-            // the access method for Primitive2DSequence. Will use createPrimitive2DSequence and
+            // the access method for Primitive2DContainer. Will use createPrimitive2DSequence and
             // setPrimitive2DSequence if needed. Overriding may be used to allow disposal of last
             // created primitives to react on changed circumstances and to re-create primitives
-            virtual drawinglayer::primitive2d::Primitive2DSequence getOverlayObjectPrimitive2DSequence() const;
+            virtual drawinglayer::primitive2d::Primitive2DContainer getOverlayObjectPrimitive2DSequence() const;
 
             // access to visibility state
             bool isVisible() const { return mbIsVisible; }
diff --git a/include/svx/sdr/overlay/overlayobjectcell.hxx b/include/svx/sdr/overlay/overlayobjectcell.hxx
index 989c7c903e89..08e41ca85343 100644
--- a/include/svx/sdr/overlay/overlayobjectcell.hxx
+++ b/include/svx/sdr/overlay/overlayobjectcell.hxx
@@ -44,7 +44,7 @@ namespace sdr
             RangeVector     maRectangles;
 
             // geometry creation for OverlayObject
-            virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() override;
+            virtual drawinglayer::primitive2d::Primitive2DContainer createOverlayObjectPrimitive2DSequence() override;
 
         public:
             OverlayObjectCell( CellOverlayType eType, const Color& rColor, const RangeVector& rRects);
diff --git a/include/svx/sdr/overlay/overlaypolypolygon.hxx b/include/svx/sdr/overlay/overlaypolypolygon.hxx
index 4e331b0356f1..998b805dcb85 100644
--- a/include/svx/sdr/overlay/overlaypolypolygon.hxx
+++ b/include/svx/sdr/overlay/overlaypolypolygon.hxx
@@ -37,7 +37,7 @@ namespace sdr
             basegfx::B2DPolyPolygon             maLinePolyPolygon;
 
             // geometry creation for OverlayObject
-            virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() override;
+            virtual drawinglayer::primitive2d::Primitive2DContainer createOverlayObjectPrimitive2DSequence() override;
 
         public:
             explicit OverlayPolyPolygonStripedAndFilled(
diff --git a/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx b/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx
index dcaf3c7ed886..2c63a1f6e77a 100644
--- a/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx
+++ b/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx
@@ -34,18 +34,18 @@ namespace sdr
         {
         protected:
             // the sequence of primitives to show
-            const drawinglayer::primitive2d::Primitive2DSequence    maSequence;
+            const drawinglayer::primitive2d::Primitive2DContainer    maSequence;
 
             // geometry creation for OverlayObject
-            virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() override;
+            virtual drawinglayer::primitive2d::Primitive2DContainer createOverlayObjectPrimitive2DSequence() override;
 
         public:
-            explicit OverlayPrimitive2DSequenceObject(const drawinglayer::primitive2d::Primitive2DSequence& rSequence);
+            explicit OverlayPrimitive2DSequenceObject(const drawinglayer::primitive2d::Primitive2DContainer& rSequence);
 
             virtual ~OverlayPrimitive2DSequenceObject();
 
             // data read access
-            const drawinglayer::primitive2d::Primitive2DSequence& getSequence() const { return maSequence; }
+            const drawinglayer::primitive2d::Primitive2DContainer& getSequence() const { return maSequence; }
         };
     } // end of namespace overlay
 } // end of namespace sdr
diff --git a/include/svx/sdr/overlay/overlayselection.hxx b/include/svx/sdr/overlay/overlayselection.hxx
index 297a1e08a48d..cdd3448e10ed 100644
--- a/include/svx/sdr/overlay/overlayselection.hxx
+++ b/include/svx/sdr/overlay/overlayselection.hxx
@@ -47,7 +47,7 @@ namespace sdr
             std::vector< basegfx::B2DRange >    maRanges;
 
             // Values of last primitive creation. These are checked in getOverlayObjectPrimitive2DSequence
-            // to evtl. get rid of last Primitive2DSequence. This ensures that these values are up-to-date
+            // to evtl. get rid of last Primitive2DContainer. This ensures that these values are up-to-date
             // and are usable when creating primitives
             OverlayType                         maLastOverlayType;
             sal_uInt16                          mnLastTransparence;
@@ -56,7 +56,7 @@ namespace sdr
             bool                                mbBorder : 1;
 
             // geometry creation for OverlayObject, can use local *Last* values
-            virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() override;
+            virtual drawinglayer::primitive2d::Primitive2DContainer createOverlayObjectPrimitive2DSequence() override;
 
         public:
             OverlaySelection(
@@ -71,7 +71,7 @@ namespace sdr
             bool getBorder() const { return mbBorder; }
 
             /// override to check conditions for last createOverlayObjectPrimitive2DSequence
-            virtual drawinglayer::primitive2d::Primitive2DSequence getOverlayObjectPrimitive2DSequence() const override;
+            virtual drawinglayer::primitive2d::Primitive2DContainer getOverlayObjectPrimitive2DSequence() const override;
 
             // data write access
             void setRanges(const std::vector< basegfx::B2DRange >& rNew);
diff --git a/include/svx/sdr/overlay/overlaytriangle.hxx b/include/svx/sdr/overlay/overlaytriangle.hxx
index a05d6de6ef30..3dcbc52f1151 100644
--- a/include/svx/sdr/overlay/overlaytriangle.hxx
+++ b/include/svx/sdr/overlay/overlaytriangle.hxx
@@ -34,7 +34,7 @@ namespace sdr
             basegfx::B2DPoint                       maThirdPosition;
 
             // geometry creation for OverlayObject
-            virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() override;
+            virtual drawinglayer::primitive2d::Primitive2DContainer createOverlayObjectPrimitive2DSequence() override;
 
         public:
             OverlayTriangle(
diff --git a/include/svx/sdr/primitive2d/sdrdecompositiontools.hxx b/include/svx/sdr/primitive2d/sdrdecompositiontools.hxx
index eb7a29911f6e..8edabccdd18f 100644
--- a/include/svx/sdr/primitive2d/sdrdecompositiontools.hxx
+++ b/include/svx/sdr/primitive2d/sdrdecompositiontools.hxx
@@ -71,8 +71,8 @@ namespace drawinglayer
             bool bWordWrap,
             bool bClipOnBounds);
 
-        Primitive2DSequence SVX_DLLPUBLIC createEmbeddedShadowPrimitive(
-            const Primitive2DSequence& rContent,
+        Primitive2DContainer SVX_DLLPUBLIC createEmbeddedShadowPrimitive(
+            const Primitive2DContainer& rContent,
             const attribute::SdrShadowAttribute& rShadow);
 
     } // end of namespace primitive2d