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

17 files changed, 111 insertions, 119 deletions

diff --git a/sw/source/core/crsr/overlayrangesoutline.cxx b/sw/source/core/crsr/overlayrangesoutline.cxx
index 724e0bf0ed5c..011fc6c393ff 100644
--- a/sw/source/core/crsr/overlayrangesoutline.cxx
+++ b/sw/source/core/crsr/overlayrangesoutline.cxx
@@ -54,9 +54,9 @@ namespace sw
 {
     namespace overlay
     {
-        drawinglayer::primitive2d::Primitive2DSequence OverlayRangesOutline::createOverlayObjectPrimitive2DSequence()
+        drawinglayer::primitive2d::Primitive2DContainer OverlayRangesOutline::createOverlayObjectPrimitive2DSequence()
         {
-            drawinglayer::primitive2d::Primitive2DSequence aRetval;
+            drawinglayer::primitive2d::Primitive2DContainer aRetval;
             const sal_uInt32 nCount(getRanges().size());
 
             if( nCount )
@@ -68,7 +68,7 @@ namespace sw
                     aPolyPolygon,
                     aRGBColor));
 
-                aRetval.realloc(1);
+                aRetval.resize(1);
                 aRetval[0] = aOutline;
             }
 
diff --git a/sw/source/core/crsr/overlayrangesoutline.hxx b/sw/source/core/crsr/overlayrangesoutline.hxx
index 2bd9b7734249..0584df449b13 100644
--- a/sw/source/core/crsr/overlayrangesoutline.hxx
+++ b/sw/source/core/crsr/overlayrangesoutline.hxx
@@ -35,7 +35,7 @@ namespace sw
             std::vector< basegfx::B2DRange > maRanges;
 
             // geometry creation for OverlayObject
-            virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() override;
+            virtual drawinglayer::primitive2d::Primitive2DContainer createOverlayObjectPrimitive2DSequence() override;
 
         public:
             OverlayRangesOutline(
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index 4267bca0362f..1caa817cbe0b 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -706,11 +706,11 @@ static void lcl_correctlyAlignRect( SwRect& rAlignedGrfArea, const SwRect& rInAr
 
 bool paintUsingPrimitivesHelper(
     vcl::RenderContext& rOutputDevice,
-    const drawinglayer::primitive2d::Primitive2DSequence& rSequence,
+    const drawinglayer::primitive2d::Primitive2DContainer& rSequence,
     const basegfx::B2DRange& rSourceRange,
     const basegfx::B2DRange& rTargetRange)
 {
-    if(rSequence.hasElements() && !basegfx::fTools::equalZero(rSourceRange.getWidth()) && !basegfx::fTools::equalZero(rSourceRange.getHeight()))
+    if(!rSequence.empty() && !basegfx::fTools::equalZero(rSourceRange.getWidth()) && !basegfx::fTools::equalZero(rSourceRange.getHeight()))
     {
         if(!basegfx::fTools::equalZero(rTargetRange.getWidth()) && !basegfx::fTools::equalZero(rTargetRange.getHeight()))
         {
@@ -768,7 +768,7 @@ void paintGraphicUsingPrimitivesHelper(vcl::RenderContext & rOutputDevice,
             aTargetRange.getRange(),
             aTargetRange.getMinimum()));
 
-    drawinglayer::primitive2d::Primitive2DSequence aContent(1);
+    drawinglayer::primitive2d::Primitive2DContainer aContent(1);
     bool bDone(false);
 
     // #i125171# The mechanism to get lossless jpegs into pdf is based on having the original
@@ -1000,12 +1000,12 @@ void SwNoTextFrame::PaintPicture( vcl::RenderContext* pOut, const SwRect &rGrfAr
             {
                 basegfx::B2DRange aSourceRange;
 
-                const drawinglayer::primitive2d::Primitive2DSequence aSequence(
+                const drawinglayer::primitive2d::Primitive2DContainer aSequence(
                     ChartHelper::tryToGetChartContentAsPrimitive2DSequence(
                         aXModel,
                         aSourceRange));
 
-                if(aSequence.hasElements() && !aSourceRange.isEmpty())
+                if(!aSequence.empty() && !aSourceRange.isEmpty())
                 {
                     const basegfx::B2DRange aTargetRange(
                         aAlignedGrfArea.Left(), aAlignedGrfArea.Top(),
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index 3ded66f433e5..b8304cb75f42 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -1995,7 +1995,7 @@ namespace sdr
              *
              * 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:
             VOCOfDrawVirtObj(ObjectContact& rObjectContact, ViewContact& rViewContact)
@@ -2038,7 +2038,7 @@ namespace sdr
     namespace contact
     {
         /// recursively collect primitive data from given VOC with given offset
-        void impAddPrimitivesFromGroup(const ViewObjectContact& rVOC, const basegfx::B2DHomMatrix& rOffsetMatrix, const DisplayInfo& rDisplayInfo, drawinglayer::primitive2d::Primitive2DSequence& rxTarget)
+        void impAddPrimitivesFromGroup(const ViewObjectContact& rVOC, const basegfx::B2DHomMatrix& rOffsetMatrix, const DisplayInfo& rDisplayInfo, drawinglayer::primitive2d::Primitive2DContainer& rxTarget)
         {
             const sal_uInt32 nSubHierarchyCount(rVOC.GetViewContact().GetObjectCount());
 
@@ -2056,9 +2056,9 @@ namespace sdr
                     // single object, add primitives; check model-view visibility
                     if(rCandidate.isPrimitiveVisible(rDisplayInfo))
                     {
-                        drawinglayer::primitive2d::Primitive2DSequence aNewSequence(rCandidate.getPrimitive2DSequence(rDisplayInfo));
+                        drawinglayer::primitive2d::Primitive2DContainer aNewSequence(rCandidate.getPrimitive2DSequence(rDisplayInfo));
 
-                        if(aNewSequence.hasElements())
+                        if(!aNewSequence.empty())
                         {
                             // get ranges
                             const drawinglayer::geometry::ViewInformation2D& rViewInformation2D(rCandidate.GetObjectContact().getViewInformation2D());
@@ -2072,24 +2072,24 @@ namespace sdr
                             if(!aViewRange.overlaps(aObjectRange))
                             {
                                 // not visible, release
-                                aNewSequence.realloc(0);
+                                aNewSequence.clear();
                             }
                         }
 
-                        if(aNewSequence.hasElements())
+                        if(!aNewSequence.empty())
                         {
-                            drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(rxTarget, aNewSequence);
+                            rxTarget.append(aNewSequence);
                         }
                     }
                 }
             }
         }
 
-        drawinglayer::primitive2d::Primitive2DSequence VOCOfDrawVirtObj::createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const
+        drawinglayer::primitive2d::Primitive2DContainer VOCOfDrawVirtObj::createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const
         {
             const VCOfDrawVirtObj& rVC = static_cast< const VCOfDrawVirtObj& >(GetViewContact());
             const SdrObject& rReferencedObject = rVC.GetSwDrawVirtObj().GetReferencedObj();
-            drawinglayer::primitive2d::Primitive2DSequence xRetval;
+            drawinglayer::primitive2d::Primitive2DContainer xRetval;
 
             // create offset transformation
             basegfx::B2DHomMatrix aOffsetMatrix;
@@ -2119,11 +2119,11 @@ namespace sdr
                 xRetval = rReferencedObject.GetViewContact().getViewIndependentPrimitive2DSequence();
             }
 
-            if(xRetval.hasElements())
+            if(!xRetval.empty())
             {
                 // create transform primitive
                 const drawinglayer::primitive2d::Primitive2DReference xReference(new drawinglayer::primitive2d::TransformPrimitive2D(aOffsetMatrix, xRetval));
-                xRetval = drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1);
+                xRetval = drawinglayer::primitive2d::Primitive2DContainer { xReference };
             }
 
             return xRetval;
diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx
index 90262203ad3a..b672d7e40aba 100644
--- a/sw/source/core/draw/dflyobj.cxx
+++ b/sw/source/core/draw/dflyobj.cxx
@@ -84,7 +84,7 @@ namespace sdr
              *
              * @note ONLY based on model data
              */
-            virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const override;
+            virtual drawinglayer::primitive2d::Primitive2DContainer createViewIndependentPrimitive2DSequence() const override;
 
         public:
             /// basic constructor, used from SdrObject.
@@ -95,10 +95,10 @@ namespace sdr
             virtual ~VCOfSwFlyDrawObj();
         };
 
-        drawinglayer::primitive2d::Primitive2DSequence VCOfSwFlyDrawObj::createViewIndependentPrimitive2DSequence() const
+        drawinglayer::primitive2d::Primitive2DContainer VCOfSwFlyDrawObj::createViewIndependentPrimitive2DSequence() const
         {
             // currently gets not visualized, return empty sequence
-            return drawinglayer::primitive2d::Primitive2DSequence();
+            return drawinglayer::primitive2d::Primitive2DContainer();
         }
 
         VCOfSwFlyDrawObj::~VCOfSwFlyDrawObj()
@@ -154,7 +154,7 @@ namespace drawinglayer
 
         protected:
             /// method which is to be used to implement the local decomposition of a 2D primitive
-            virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override;
+            virtual Primitive2DContainer create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override;
 
         public:
             SwVirtFlyDrawObjPrimitive(
@@ -171,7 +171,7 @@ namespace drawinglayer
             virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override;
 
             // override to allow callbacks to wrap_DoPaintObject
-            virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override;
+            virtual Primitive2DContainer get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override;
 
             // data read access
             const SwVirtFlyDrawObj& getSwVirtFlyDrawObj() const { return mrSwVirtFlyDrawObj; }
@@ -187,9 +187,9 @@ namespace drawinglayer
 {
     namespace primitive2d
     {
-        Primitive2DSequence SwVirtFlyDrawObjPrimitive::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const
+        Primitive2DContainer SwVirtFlyDrawObjPrimitive::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const
         {
-            Primitive2DSequence aRetval;
+            Primitive2DContainer aRetval;
 
             if(!getOuterRange().isEmpty())
             {
@@ -204,7 +204,7 @@ namespace drawinglayer
                         true,
                         getOuterRange()));
 
-                aRetval = Primitive2DSequence(&aHitTestReference, 1);
+                aRetval = Primitive2DContainer { aHitTestReference };
             }
 
             return aRetval;
@@ -228,7 +228,7 @@ namespace drawinglayer
             return getOuterRange();
         }
 
-        Primitive2DSequence SwVirtFlyDrawObjPrimitive::get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const
+        Primitive2DContainer SwVirtFlyDrawObjPrimitive::get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const
         {
             // This is the callback to keep the FlyFrame painting in SW alive as long as it
             // is not changed to primitives. This is the method which will be called by the processors
@@ -263,7 +263,7 @@ namespace sdr
              *
              * @note ONLY based on model data
              */
-            virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const override;
+            virtual drawinglayer::primitive2d::Primitive2DContainer createViewIndependentPrimitive2DSequence() const override;
 
         public:
             /// basic constructor, used from SdrObject.
@@ -286,9 +286,9 @@ namespace sdr
 {
     namespace contact
     {
-        drawinglayer::primitive2d::Primitive2DSequence VCOfSwVirtFlyDrawObj::createViewIndependentPrimitive2DSequence() const
+        drawinglayer::primitive2d::Primitive2DContainer VCOfSwVirtFlyDrawObj::createViewIndependentPrimitive2DSequence() const
         {
-            drawinglayer::primitive2d::Primitive2DSequence xRetval;
+            drawinglayer::primitive2d::Primitive2DContainer xRetval;
             const SdrObject& rReferencedObject = GetSwVirtFlyDrawObj().GetReferencedObj();
 
             if(dynamic_cast<const SwFlyDrawObj*>( &rReferencedObject) !=  nullptr)
@@ -304,7 +304,7 @@ namespace sdr
                             GetSwVirtFlyDrawObj(),
                             aOuterRange));
 
-                    xRetval = drawinglayer::primitive2d::Primitive2DSequence(&xPrimitive, 1);
+                    xRetval = drawinglayer::primitive2d::Primitive2DContainer { xPrimitive };
                 }
             }
 
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index d50ac70fe465..98469537cc82 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -338,9 +338,9 @@ void SwGrfNode::onGraphicChanged()
 
         if(rSvgDataPtr.get())
         {
-            const drawinglayer::primitive2d::Primitive2DSequence aSequence(rSvgDataPtr->getPrimitive2DSequence());
+            const drawinglayer::primitive2d::Primitive2DContainer aSequence(rSvgDataPtr->getPrimitive2DSequence());
 
-            if(aSequence.hasElements())
+            if(!aSequence.empty())
             {
                 drawinglayer::geometry::ViewInformation2D aViewInformation2D;
                 drawinglayer::processor2d::ObjectInfoPrimitiveExtractor2D aProcessor(aViewInformation2D);
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index e94231525c30..f45b8966a5d5 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -393,7 +393,7 @@ public:
                           const editeng::SvxBorderStyle = css::table::BorderLineStyle::SOLID ) const;
 
     drawinglayer::processor2d::BaseProcessor2D * CreateProcessor2D( ) const;
-    void ProcessPrimitives( const drawinglayer::primitive2d::Primitive2DSequence& rSequence ) const;
+    void ProcessPrimitives( const drawinglayer::primitive2d::Primitive2DContainer& rSequence ) const;
 
     // FIXME: EasyHack (refactoring): rename method name in all files
     // retouch, not in the area of the given Rect!
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 683202a63037..83a8638d00ab 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -210,22 +210,14 @@ public:
 
 class BorderLines
 {
-    typedef ::std::vector<
-        ::rtl::Reference<BorderLinePrimitive2D> > Lines_t;
-    Lines_t m_Lines;
+    drawinglayer::primitive2d::Primitive2DContainer m_Lines;
 public:
-    void AddBorderLine(::rtl::Reference<BorderLinePrimitive2D> const& xLine, SwPaintProperties& properties);
-    drawinglayer::primitive2d::Primitive2DSequence GetBorderLines_Clear()
+    void AddBorderLine(css::uno::Reference<BorderLinePrimitive2D> const& xLine, SwPaintProperties& properties);
+    drawinglayer::primitive2d::Primitive2DContainer GetBorderLines_Clear()
     {
-        ::std::vector<
-            ::drawinglayer::primitive2d::Primitive2DReference> lines;
-        for (Lines_t::const_iterator it = m_Lines.begin(); it != m_Lines.end();
-                ++it)
-        {
-            lines.push_back(it->get());
-        }
-        m_Lines.clear();
-        return comphelper::containerToSequence(lines);
+        drawinglayer::primitive2d::Primitive2DContainer lines;
+        lines.swap(m_Lines);
+        return lines;
     }
 };
 
@@ -510,7 +502,7 @@ static sal_uInt8 lcl_TryMergeLines(
  * @param[in]   rEnd        ending point of merged primitive
  * @return      merged primitive
 **/
-static ::rtl::Reference<BorderLinePrimitive2D>
+static css::uno::Reference<BorderLinePrimitive2D>
 lcl_MergeBorderLines(
     BorderLinePrimitive2D const& rLine, BorderLinePrimitive2D const& rOther,
     basegfx::B2DPoint const& rStart, basegfx::B2DPoint const& rEnd)
@@ -538,7 +530,7 @@ lcl_MergeBorderLines(
  * @return      merged borderline including the two input primitive, if they can be merged
  *              0, otherwise
 **/
-static ::rtl::Reference<BorderLinePrimitive2D>
+static css::uno::Reference<BorderLinePrimitive2D>
 lcl_TryMergeBorderLine(BorderLinePrimitive2D const& rThis,
                        BorderLinePrimitive2D const& rOther,
                        SwPaintProperties& properties)
@@ -610,13 +602,13 @@ lcl_TryMergeBorderLine(BorderLinePrimitive2D const& rThis,
 }
 
 void BorderLines::AddBorderLine(
-        rtl::Reference<BorderLinePrimitive2D> const& xLine, SwPaintProperties& properties)
+        css::uno::Reference<BorderLinePrimitive2D> const& xLine, SwPaintProperties& properties)
 {
-    for (Lines_t::reverse_iterator it = m_Lines.rbegin(); it != m_Lines.rend();
+    for (drawinglayer::primitive2d::Primitive2DContainer::reverse_iterator it = m_Lines.rbegin(); it != m_Lines.rend();
          ++it)
     {
-        ::rtl::Reference<BorderLinePrimitive2D> const xMerged =
-            lcl_TryMergeBorderLine(**it, *xLine, properties);
+        css::uno::Reference<BorderLinePrimitive2D> const xMerged(
+            lcl_TryMergeBorderLine(*static_cast<BorderLinePrimitive2D*>((*it).get()), *xLine.get(), properties));
         if (xMerged.is())
         {
             *it = xMerged; // replace existing line with merged
@@ -1915,15 +1907,15 @@ bool DrawFillAttributes(
                 rOriginalLayoutRect.Right(),
                 rOriginalLayoutRect.Bottom());
 
-            const drawinglayer::primitive2d::Primitive2DSequence& rSequence = rFillAttributes->getPrimitive2DSequence(
+            const drawinglayer::primitive2d::Primitive2DContainer& rSequence = rFillAttributes->getPrimitive2DSequence(
                 aPaintRange,
                 aDefineRange);
 
-            if(rSequence.getLength())
+            if(rSequence.size())
             {
-                drawinglayer::primitive2d::Primitive2DSequence const*
+                drawinglayer::primitive2d::Primitive2DContainer const*
                     pPrimitives(&rSequence);
-                drawinglayer::primitive2d::Primitive2DSequence primitives;
+                drawinglayer::primitive2d::Primitive2DContainer primitives;
                 // tdf#86578 the awful lcl_SubtractFlys hack
                 if (rPaintRegion.size() > 1 || rPaintRegion[0] != rPaintRegion.GetOrigin())
                 {
@@ -1934,12 +1926,12 @@ bool DrawFillAttributes(
                     }
                     basegfx::B2DPolyPolygon const maskRegion( tempRegion.getB2DPolyPolygon());
 
-                    primitives.realloc(1);
+                    primitives.resize(1);
                     primitives[0] = new drawinglayer::primitive2d::MaskPrimitive2D(
                             maskRegion, rSequence);
                     pPrimitives = &primitives;
                 }
-                assert(pPrimitives && pPrimitives->getLength());
+                assert(pPrimitives && pPrimitives->size());
 
                 const drawinglayer::geometry::ViewInformation2D aViewInformation2D(
                     basegfx::B2DHomMatrix(),
@@ -3138,7 +3130,7 @@ namespace
             virtual ~SwViewObjectContactRedirector()
             {}
 
-            virtual drawinglayer::primitive2d::Primitive2DSequence createRedirectedPrimitive2DSequence(
+            virtual drawinglayer::primitive2d::Primitive2DContainer createRedirectedPrimitive2DSequence(
                                     const sdr::contact::ViewObjectContact& rOriginal,
                                     const sdr::contact::DisplayInfo& rDisplayInfo) override
             {
@@ -3152,7 +3144,7 @@ namespace
 
                 if ( !bPaint )
                 {
-                    return drawinglayer::primitive2d::Primitive2DSequence();
+                    return drawinglayer::primitive2d::Primitive2DContainer();
                 }
 
                 return sdr::contact::ViewObjectContactRedirector::createRedirectedPrimitive2DSequence(
@@ -3697,11 +3689,11 @@ void SwLayoutFrame::Paint(vcl::RenderContext& rRenderContext, SwRect const& rRec
     }
 }
 
-static drawinglayer::primitive2d::Primitive2DSequence lcl_CreateDashedIndicatorPrimitive(
+static drawinglayer::primitive2d::Primitive2DContainer lcl_CreateDashedIndicatorPrimitive(
         const basegfx::B2DPoint& rStart, const basegfx::B2DPoint& rEnd,
         basegfx::BColor aColor )
 {
-    drawinglayer::primitive2d::Primitive2DSequence aSeq( 1 );
+    drawinglayer::primitive2d::Primitive2DContainer aSeq( 1 );
 
     std::vector< double > aStrokePattern;
     basegfx::B2DPolygon aLinePolygon;
@@ -3737,7 +3729,7 @@ static drawinglayer::primitive2d::Primitive2DSequence lcl_CreateDashedIndicatorP
         aStrokePattern.push_back( 40 );
         aStrokePattern.push_back( 40 );
 
-        aSeq.realloc( 2 );
+        aSeq.resize( 2 );
     }
 
     // Compute the dashed line primitive
@@ -3747,7 +3739,7 @@ static drawinglayer::primitive2d::Primitive2DSequence lcl_CreateDashedIndicatorP
                 drawinglayer::attribute::LineAttribute( aColor ),
                 drawinglayer::attribute::StrokeAttribute( aStrokePattern ) );
 
-    aSeq[ aSeq.getLength( ) - 1 ] = drawinglayer::primitive2d::Primitive2DReference( pLine );
+    aSeq[ aSeq.size( ) - 1 ] = drawinglayer::primitive2d::Primitive2DReference( pLine );
 
     return aSeq;
 }
@@ -3829,9 +3821,9 @@ void SwColumnFrame::PaintBreak( ) const
 
                     basegfx::BColor aLineColor = SwViewOption::GetPageBreakColor().getBColor();
 
-                    drawinglayer::primitive2d::Primitive2DSequence aSeq =
+                    drawinglayer::primitive2d::Primitive2DContainer aSeq =
                         lcl_CreateDashedIndicatorPrimitive( aStart, aEnd, aLineColor );
-                    aSeq.realloc( aSeq.getLength( ) + 1 );
+                    aSeq.resize( aSeq.size( ) + 1 );
 
                     // Add the text above
                     OUString aBreakText = SW_RESSTR(STR_COLUMN_BREAK);
@@ -3866,7 +3858,7 @@ void SwColumnFrame::PaintBreak( ) const
                                 aFontAttr,
                                 lang::Locale(),
                                 aLineColor );
-                    aSeq[ aSeq.getLength() - 1 ] = drawinglayer::primitive2d::Primitive2DReference( pText );
+                    aSeq[ aSeq.size() - 1 ] = drawinglayer::primitive2d::Primitive2DReference( pText );
 
                     ProcessPrimitives( aSeq );
                 }
@@ -4912,7 +4904,7 @@ static void lcl_MakeBorderLine(SwRect const& rRect,
     Color const aLeftColor = rBorder.GetColorOut(isLeftOrTopBorder);
     Color const aRightColor = rBorder.GetColorIn(isLeftOrTopBorder);
 
-    ::rtl::Reference<BorderLinePrimitive2D> const xLine =
+    css::uno::Reference<BorderLinePrimitive2D> const xLine =
         new BorderLinePrimitive2D(
             aStart, aEnd, nLeftWidth, rBorder.GetDistance(), nRightWidth,
             nExtentLeftStart, nExtentLeftEnd,
@@ -5405,7 +5397,7 @@ drawinglayer::processor2d::BaseProcessor2D * SwFrame::CreateProcessor2D( ) const
                     aNewViewInfos );
 }
 
-void SwFrame::ProcessPrimitives( const drawinglayer::primitive2d::Primitive2DSequence& rSequence ) const
+void SwFrame::ProcessPrimitives( const drawinglayer::primitive2d::Primitive2DContainer& rSequence ) const
 {
     drawinglayer::processor2d::BaseProcessor2D * pProcessor2D = CreateProcessor2D();
 
@@ -6896,10 +6888,10 @@ static void lcl_RefreshLine( const SwLayoutFrame *pLay,
     }
 }
 
-static drawinglayer::primitive2d::Primitive2DSequence lcl_CreatePageAreaDelimiterPrimitives(
+static drawinglayer::primitive2d::Primitive2DContainer lcl_CreatePageAreaDelimiterPrimitives(
         const SwRect& rRect )
 {
-    drawinglayer::primitive2d::Primitive2DSequence aSeq( 4 );
+    drawinglayer::primitive2d::Primitive2DContainer aSeq( 4 );
 
     basegfx::BColor aLineColor = SwViewOption::GetDocBoundariesColor().getBColor();
     double nLineLength = 200.0; // in Twips
@@ -6930,10 +6922,10 @@ static drawinglayer::primitive2d::Primitive2DSequence lcl_CreatePageAreaDelimite
     return aSeq;
 }
 
-static drawinglayer::primitive2d::Primitive2DSequence lcl_CreateRectangleDelimiterPrimitives (
+static drawinglayer::primitive2d::Primitive2DContainer lcl_CreateRectangleDelimiterPrimitives (
         const SwRect& rRect )
 {
-    drawinglayer::primitive2d::Primitive2DSequence aSeq( 1 );
+    drawinglayer::primitive2d::Primitive2DContainer aSeq( 1 );
     basegfx::BColor aLineColor = SwViewOption::GetDocBoundariesColor().getBColor();
 
     basegfx::B2DPolygon aPolygon;
@@ -6951,10 +6943,10 @@ static drawinglayer::primitive2d::Primitive2DSequence lcl_CreateRectangleDelimit
     return aSeq;
 }
 
-static drawinglayer::primitive2d::Primitive2DSequence lcl_CreateColumnAreaDelimiterPrimitives(
+static drawinglayer::primitive2d::Primitive2DContainer lcl_CreateColumnAreaDelimiterPrimitives(
         const SwRect& rRect )
 {
-    drawinglayer::primitive2d::Primitive2DSequence aSeq( 4 );
+    drawinglayer::primitive2d::Primitive2DContainer aSeq( 4 );
 
     basegfx::BColor aLineColor = SwViewOption::GetDocBoundariesColor().getBColor();
     double nLineLength = 100.0; // in Twips
diff --git a/sw/source/uibase/docvw/AnchorOverlayObject.cxx b/sw/source/uibase/docvw/AnchorOverlayObject.cxx
index 67f4e3bcda9e..9adf4699f6f3 100644
--- a/sw/source/uibase/docvw/AnchorOverlayObject.cxx
+++ b/sw/source/uibase/docvw/AnchorOverlayObject.cxx
@@ -52,7 +52,7 @@ private:
     bool                            mbLineSolid : 1;
 
 protected:
-    virtual drawinglayer::primitive2d::Primitive2DSequence create2DDecomposition(
+    virtual drawinglayer::primitive2d::Primitive2DContainer create2DDecomposition(
         const drawinglayer::geometry::ViewInformation2D& rViewInformation) const override;
 
 public:
@@ -90,10 +90,10 @@ public:
     DeclPrimitive2DIDBlock()
 };
 
-drawinglayer::primitive2d::Primitive2DSequence AnchorPrimitive::create2DDecomposition(
+drawinglayer::primitive2d::Primitive2DContainer AnchorPrimitive::create2DDecomposition(
     const drawinglayer::geometry::ViewInformation2D& /*rViewInformation*/) const
 {
-    drawinglayer::primitive2d::Primitive2DSequence aRetval;
+    drawinglayer::primitive2d::Primitive2DContainer aRetval;
 
     if ( AS_TRI == maAnchorState ||
          AS_ALL == maAnchorState ||
@@ -105,7 +105,7 @@ drawinglayer::primitive2d::Primitive2DSequence AnchorPrimitive::create2DDecompos
                 basegfx::B2DPolyPolygon(getTriangle()),
                 getColor()));
 
-        drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, aTriangle);
+        aRetval.push_back(aTriangle);
     }
 
     // prepare view-independent LineWidth and color
@@ -124,7 +124,7 @@ drawinglayer::primitive2d::Primitive2DSequence AnchorPrimitive::create2DDecompos
                     getLine(),
                     aLineAttribute));
 
-            drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, aSolidLine);
+            aRetval.push_back(aSolidLine);
         }
         else
         {
@@ -145,11 +145,11 @@ drawinglayer::primitive2d::Primitive2DSequence AnchorPrimitive::create2DDecompos
                     aLineAttribute,
                     aStrokeAttribute));
 
-            drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, aStrokedLine);
+            aRetval.push_back(aStrokedLine);
         }
     }
 
-    if(aRetval.hasElements() && getShadow())
+    if(!aRetval.empty() && getShadow())
     {
         // shadow is only for triangle and line start, and in upper left
         // and lower right direction, in different colors
@@ -162,7 +162,7 @@ drawinglayer::primitive2d::Primitive2DSequence AnchorPrimitive::create2DDecompos
         aDarkerColor.clamp();
 
         // create shadow sequence
-        drawinglayer::primitive2d::Primitive2DSequence aShadows(2);
+        drawinglayer::primitive2d::Primitive2DContainer aShadows(2);
         basegfx::B2DHomMatrix aTransform;
 
         aTransform.set(0, 2, -getDiscreteUnit());
@@ -184,10 +184,10 @@ drawinglayer::primitive2d::Primitive2DSequence AnchorPrimitive::create2DDecompos
                 aRetval));
 
         // add shadow before geometry to make it be proccessed first
-        const drawinglayer::primitive2d::Primitive2DSequence aTemporary(aRetval);
+        const drawinglayer::primitive2d::Primitive2DContainer aTemporary(aRetval);
 
         aRetval = aShadows;
-        drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(aRetval, aTemporary);
+        aRetval.append(aTemporary);
     }
 
     if ( AS_ALL == maAnchorState ||
@@ -200,7 +200,7 @@ drawinglayer::primitive2d::Primitive2DSequence AnchorPrimitive::create2DDecompos
                 getLineTop(),
                 aLineAttribute));
 
-        drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, aLineTop);
+        aRetval.push_back(aLineTop);
     }
 
     return aRetval;
@@ -339,7 +339,7 @@ void AnchorOverlayObject::implResetGeometry()
     maLineTop.clear();
 }
 
-drawinglayer::primitive2d::Primitive2DSequence AnchorOverlayObject::createOverlayObjectPrimitive2DSequence()
+drawinglayer::primitive2d::Primitive2DContainer AnchorOverlayObject::createOverlayObjectPrimitive2DSequence()
 {
     implEnsureGeometry();
 
@@ -354,7 +354,7 @@ drawinglayer::primitive2d::Primitive2DSequence AnchorOverlayObject::createOverla
                              getShadowedEffect(),
                              getLineSolid()) );
 
-    return drawinglayer::primitive2d::Primitive2DSequence(&aReference, 1);
+    return drawinglayer::primitive2d::Primitive2DContainer { aReference };
 }
 
 void AnchorOverlayObject::SetAllPosition( const basegfx::B2DPoint& rPoint1,
diff --git a/sw/source/uibase/docvw/AnchorOverlayObject.hxx b/sw/source/uibase/docvw/AnchorOverlayObject.hxx
index 5c9d611d88ef..9492aef5c0f5 100644
--- a/sw/source/uibase/docvw/AnchorOverlayObject.hxx
+++ b/sw/source/uibase/docvw/AnchorOverlayObject.hxx
@@ -100,7 +100,7 @@ class AnchorOverlayObject: public sdr::overlay::OverlayObjectWithBasePosition
         void implResetGeometry();
 
         // geometry creation for OverlayObject
-        virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() override;
+        virtual drawinglayer::primitive2d::Primitive2DContainer createOverlayObjectPrimitive2DSequence() override;
 
     private:
         // object's geometry
diff --git a/sw/source/uibase/docvw/DashedLine.cxx b/sw/source/uibase/docvw/DashedLine.cxx
index 6b766f8e79d5..7da108fb6dcc 100644
--- a/sw/source/uibase/docvw/DashedLine.cxx
+++ b/sw/source/uibase/docvw/DashedLine.cxx
@@ -46,7 +46,7 @@ void SwDashedLine::Paint(vcl::RenderContext& rRenderContext, const Rectangle&)
     aPolygon.append(aStart);
     aPolygon.append(aEnd);
 
-    drawinglayer::primitive2d::Primitive2DSequence aSeq(1);
+    drawinglayer::primitive2d::Primitive2DContainer aSeq(1);
 
     const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
 
@@ -77,7 +77,7 @@ void SwDashedLine::Paint(vcl::RenderContext& rRenderContext, const Rectangle&)
         aStrokePattern.push_back(3);
         aStrokePattern.push_back(3);
 
-        aSeq.realloc(2);
+        aSeq.resize(2);
     }
 
     // Compute the dashed line primitive
@@ -87,7 +87,7 @@ void SwDashedLine::Paint(vcl::RenderContext& rRenderContext, const Rectangle&)
                 drawinglayer::attribute::LineAttribute(m_pColorFn().getBColor()),
                 drawinglayer::attribute::StrokeAttribute(aStrokePattern));
 
-    aSeq[aSeq.getLength() - 1] = drawinglayer::primitive2d::Primitive2DReference(pLine);
+    aSeq[aSeq.size() - 1] = drawinglayer::primitive2d::Primitive2DReference(pLine);
 
     pProcessor->process(aSeq);
 }
diff --git a/sw/source/uibase/docvw/HeaderFooterWin.cxx b/sw/source/uibase/docvw/HeaderFooterWin.cxx
index 18b746b25977..25f706049841 100644
--- a/sw/source/uibase/docvw/HeaderFooterWin.cxx
+++ b/sw/source/uibase/docvw/HeaderFooterWin.cxx
@@ -260,7 +260,7 @@ void SwHeaderFooterWin::Paint(vcl::RenderContext& rRenderContext, const Rectangl
     SetMapMode(MapMode(MAP_PIXEL));
 
     const Rectangle aRect(Rectangle(Point(0, 0), rRenderContext.PixelToLogic(GetSizePixel())));
-    drawinglayer::primitive2d::Primitive2DSequence aSeq(3);
+    drawinglayer::primitive2d::Primitive2DContainer aSeq(3);
 
     B2DPolygon aPolygon = lcl_GetPolygon(aRect, m_bIsHeader);
 
@@ -355,8 +355,8 @@ void SwHeaderFooterWin::Paint(vcl::RenderContext& rRenderContext, const Rectangl
     if (Application::GetSettings().GetStyleSettings().GetHighContrastMode())
         aSignColor = Color(COL_WHITE).getBColor();
 
-    aSeq.realloc(aSeq.getLength() + 1);
-    aSeq[aSeq.getLength() - 1] = drawinglayer::primitive2d::Primitive2DReference(
+    aSeq.resize(aSeq.size() + 1);
+    aSeq[aSeq.size() - 1] = drawinglayer::primitive2d::Primitive2DReference(
                                     new drawinglayer::primitive2d::PolyPolygonColorPrimitive2D(
                                         B2DPolyPolygon(aSign), aSignColor));
 
@@ -366,7 +366,7 @@ void SwHeaderFooterWin::Paint(vcl::RenderContext& rRenderContext, const Rectangl
         drawinglayer::processor2d::createBaseProcessor2DFromOutputDevice(rRenderContext, aNewViewInfos));
 
     // TODO Ghost it all if needed
-    drawinglayer::primitive2d::Primitive2DSequence aGhostedSeq(1);
+    drawinglayer::primitive2d::Primitive2DContainer aGhostedSeq(1);
     double nFadeRate = double(m_nFadeRate) / 100.0;
 
     const basegfx::BColorModifierSharedPtr aBColorModifier(
diff --git a/sw/source/uibase/docvw/OverlayRanges.cxx b/sw/source/uibase/docvw/OverlayRanges.cxx
index 2f0c4c9e083e..a04b813c5357 100644
--- a/sw/source/uibase/docvw/OverlayRanges.cxx
+++ b/sw/source/uibase/docvw/OverlayRanges.cxx
@@ -59,11 +59,11 @@ namespace sw
 {
     namespace overlay
     {
-        drawinglayer::primitive2d::Primitive2DSequence OverlayRanges::createOverlayObjectPrimitive2DSequence()
+        drawinglayer::primitive2d::Primitive2DContainer OverlayRanges::createOverlayObjectPrimitive2DSequence()
         {
             const sal_uInt32 nCount(getRanges().size());
-            drawinglayer::primitive2d::Primitive2DSequence aRetval;
-            aRetval.realloc(nCount);
+            drawinglayer::primitive2d::Primitive2DContainer aRetval;
+            aRetval.resize(nCount);
             for ( sal_uInt32 a = 0; a < nCount; ++a )
             {
                 const basegfx::BColor aRGBColor(getBaseColor().getBColor());
@@ -91,13 +91,13 @@ namespace sw
                     aPolyPolygon,
                     aRGBColor));
 
-                aRetval.realloc(2);
+                aRetval.resize(2);
                 aRetval[0] = aUnifiedTransparence;
                 aRetval[1] = aOutline;
             }
             else
             {
-                aRetval = drawinglayer::primitive2d::Primitive2DSequence(&aUnifiedTransparence, 1);
+                aRetval = drawinglayer::primitive2d::Primitive2DContainer { aUnifiedTransparence };
             }
 
             return aRetval;
diff --git a/sw/source/uibase/docvw/OverlayRanges.hxx b/sw/source/uibase/docvw/OverlayRanges.hxx
index 521e0a78d033..53dde2ddce06 100644
--- a/sw/source/uibase/docvw/OverlayRanges.hxx
+++ b/sw/source/uibase/docvw/OverlayRanges.hxx
@@ -40,7 +40,7 @@ namespace sw
             bool mbShowSolidBorder;
 
             // geometry creation for OverlayObject
-            virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() override;
+            virtual drawinglayer::primitive2d::Primitive2DContainer createOverlayObjectPrimitive2DSequence() override;
 
         public:
             static OverlayRanges* CreateOverlayRange(
diff --git a/sw/source/uibase/docvw/PageBreakWin.cxx b/sw/source/uibase/docvw/PageBreakWin.cxx
index 7a74b1cfa914..f0f056d4b255 100644
--- a/sw/source/uibase/docvw/PageBreakWin.cxx
+++ b/sw/source/uibase/docvw/PageBreakWin.cxx
@@ -159,7 +159,7 @@ void SwPageBreakWin::Paint(vcl::RenderContext& rRenderContext, const Rectangle&)
 
     bool bRtl = AllSettings::GetLayoutRTL();
 
-    drawinglayer::primitive2d::Primitive2DSequence aSeq(3);
+    drawinglayer::primitive2d::Primitive2DContainer aSeq(3);
     B2DRectangle aBRect(double(aRect.Left()), double(aRect.Top()),
                         double(aRect.Right()), double(aRect.Bottom()));
     B2DPolygon aPolygon = createPolygonFromRect(aBRect, 3.0 / BUTTON_WIDTH, 3.0 / BUTTON_HEIGHT);
@@ -195,11 +195,11 @@ void SwPageBreakWin::Paint(vcl::RenderContext& rRenderContext, const Rectangle&)
     if (Application::GetSettings().GetStyleSettings().GetHighContrastMode())
         aTriangleColor = Color(COL_WHITE).getBColor();
 
-    aSeq.realloc(aSeq.getLength() + 1);
-    aSeq[aSeq.getLength() - 1].set( new drawinglayer::primitive2d::PolyPolygonColorPrimitive2D(
+    aSeq.resize(aSeq.size() + 1);
+    aSeq[aSeq.size() - 1].set( new drawinglayer::primitive2d::PolyPolygonColorPrimitive2D(
                                         B2DPolyPolygon(aTriangle), aTriangleColor));
 
-    css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > aGhostedSeq(1);
+    drawinglayer::primitive2d::Primitive2DContainer aGhostedSeq(1);
     double nFadeRate = double(m_nFadeRate) / 100.0;
     const basegfx::BColorModifierSharedPtr aBColorModifier(
                 new basegfx::BColorModifier_interpolate(Color(COL_WHITE).getBColor(),
diff --git a/sw/source/uibase/docvw/ShadowOverlayObject.cxx b/sw/source/uibase/docvw/ShadowOverlayObject.cxx
index c4700f9baa67..f95efcf22937 100644
--- a/sw/source/uibase/docvw/ShadowOverlayObject.cxx
+++ b/sw/source/uibase/docvw/ShadowOverlayObject.cxx
@@ -44,7 +44,7 @@ private:
     ShadowState                 maShadowState;
 
 protected:
-    virtual drawinglayer::primitive2d::Primitive2DSequence create2DDecomposition(
+    virtual drawinglayer::primitive2d::Primitive2DContainer create2DDecomposition(
         const drawinglayer::geometry::ViewInformation2D& rViewInformation) const override;
 
 public:
@@ -68,11 +68,11 @@ public:
     DeclPrimitive2DIDBlock()
 };
 
-drawinglayer::primitive2d::Primitive2DSequence ShadowPrimitive::create2DDecomposition(
+drawinglayer::primitive2d::Primitive2DContainer ShadowPrimitive::create2DDecomposition(
     const drawinglayer::geometry::ViewInformation2D& /*rViewInformation*/) const
 {
     // get logic sizes in object coordinate system
-    drawinglayer::primitive2d::Primitive2DSequence xRetval;
+    drawinglayer::primitive2d::Primitive2DContainer xRetval;
     basegfx::B2DRange aRange(getBasePosition());
 
     switch(maShadowState)
@@ -95,7 +95,7 @@ drawinglayer::primitive2d::Primitive2DSequence ShadowPrimitive::create2DDecompos
                     aRange,
                     aFillGradientAttribute));
 
-            xRetval = drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1);
+            xRetval = drawinglayer::primitive2d::Primitive2DContainer { xReference };
             break;
         }
         case SS_VIEW:
@@ -116,7 +116,7 @@ drawinglayer::primitive2d::Primitive2DSequence ShadowPrimitive::create2DDecompos
                     aRange,
                     aFillGradientAttribute));
 
-            xRetval = drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1);
+            xRetval = drawinglayer::primitive2d::Primitive2DContainer { xReference };
             break;
         }
         case SS_EDIT:
@@ -137,7 +137,7 @@ drawinglayer::primitive2d::Primitive2DSequence ShadowPrimitive::create2DDecompos
                     aRange,
                     aFillGradientAttribute));
 
-            xRetval = drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1);
+            xRetval = drawinglayer::primitive2d::Primitive2DContainer { xReference };
             break;
         }
         default:
@@ -216,13 +216,13 @@ ShadowOverlayObject::~ShadowOverlayObject()
 {
 }
 
-drawinglayer::primitive2d::Primitive2DSequence ShadowOverlayObject::createOverlayObjectPrimitive2DSequence()
+drawinglayer::primitive2d::Primitive2DContainer ShadowOverlayObject::createOverlayObjectPrimitive2DSequence()
 {
     const drawinglayer::primitive2d::Primitive2DReference aReference(
         new ShadowPrimitive( getBasePosition(),
                              GetSecondPosition(),
                              GetShadowState() ) );
-    return drawinglayer::primitive2d::Primitive2DSequence(&aReference, 1);
+    return drawinglayer::primitive2d::Primitive2DContainer { aReference };
 }
 
 void ShadowOverlayObject::SetShadowState(ShadowState aState)
diff --git a/sw/source/uibase/docvw/ShadowOverlayObject.hxx b/sw/source/uibase/docvw/ShadowOverlayObject.hxx
index c42e1a67c2e6..68481aa401c0 100644
--- a/sw/source/uibase/docvw/ShadowOverlayObject.hxx
+++ b/sw/source/uibase/docvw/ShadowOverlayObject.hxx
@@ -37,7 +37,7 @@ class ShadowOverlayObject: public sdr::overlay::OverlayObjectWithBasePosition
 {
 protected:
         // geometry creation for OverlayObject
-        virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() override;
+        virtual drawinglayer::primitive2d::Primitive2DContainer createOverlayObjectPrimitive2DSequence() override;
 
 private:
         basegfx::B2DPoint maSecondPosition;