diff options
Diffstat (limited to 'svx/source')
90 files changed, 589 insertions, 593 deletions
diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx index fd85200dbca5..43bb94ac824b 100644 --- a/svx/source/dialog/framelink.cxx +++ b/svx/source/dialog/framelink.cxx @@ -1405,11 +1405,11 @@ basegfx::B2DPoint lcl_PointToB2DPoint( const Point& rPoint ) return basegfx::B2DPoint(rPoint.getX(), rPoint.getY()); } -drawinglayer::primitive2d::Primitive2DSequence CreateClippedBorderPrimitives ( +drawinglayer::primitive2d::Primitive2DContainer CreateClippedBorderPrimitives ( const Point& rStart, const Point& rEnd, const Style& rBorder, const Rectangle& rClipRect ) { - drawinglayer::primitive2d::Primitive2DSequence aSequence( 1 ); + drawinglayer::primitive2d::Primitive2DContainer aSequence( 1 ); basegfx::B2DPolygon aPolygon; aPolygon.append( lcl_PointToB2DPoint( rClipRect.TopLeft( ) ) ); aPolygon.append( lcl_PointToB2DPoint( rClipRect.TopRight( ) ) ); @@ -1432,13 +1432,13 @@ drawinglayer::primitive2d::Primitive2DSequence CreateClippedBorderPrimitives ( return aSequence; } -drawinglayer::primitive2d::Primitive2DSequence CreateBorderPrimitives( +drawinglayer::primitive2d::Primitive2DContainer CreateBorderPrimitives( const Point& rLPos, const Point& rRPos, const Style& rBorder, const DiagStyle& /*rLFromTR*/, const Style& rLFromT, const Style& /*rLFromL*/, const Style& rLFromB, const DiagStyle& /*rLFromBR*/, const DiagStyle& /*rRFromTL*/, const Style& rRFromT, const Style& /*rRFromR*/, const Style& rRFromB, const DiagStyle& /*rRFromBL*/, const Color* /*pForceColor*/, const long& nRotateT, const long& nRotateB ) { - drawinglayer::primitive2d::Primitive2DSequence aSequence( 1 ); + drawinglayer::primitive2d::Primitive2DContainer aSequence( 1 ); basegfx::B2DPoint aStart( rLPos.getX(), rLPos.getY() ); basegfx::B2DPoint aEnd( rRPos.getX(), rRPos.getY() ); @@ -1460,7 +1460,7 @@ drawinglayer::primitive2d::Primitive2DSequence CreateBorderPrimitives( return aSequence; } -drawinglayer::primitive2d::Primitive2DSequence CreateBorderPrimitives( +drawinglayer::primitive2d::Primitive2DContainer CreateBorderPrimitives( const Point& rLPos, const Point& rRPos, const Style& rBorder, const Style& rLFromT, const Style& rLFromL, const Style& rLFromB, const Style& rRFromT, const Style& rRFromR, const Style& rRFromB, diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx index 65a31f216f5d..4f14fa4613d4 100644 --- a/svx/source/dialog/pagectrl.cxx +++ b/svx/source/dialog/pagectrl.cxx @@ -365,7 +365,7 @@ void SvxPageWindow::drawFillAttributes(vcl::RenderContext& rRenderContext, rDefineRange.Bottom()); // prepare primitive sequence - drawinglayer::primitive2d::Primitive2DSequence aSequence; + drawinglayer::primitive2d::Primitive2DContainer aSequence; // create fill geometry if there is something to fill if (rFillAttributes.get() && rFillAttributes->isUsed()) @@ -380,11 +380,11 @@ void SvxPageWindow::drawFillAttributes(vcl::RenderContext& rRenderContext, new drawinglayer::primitive2d::PolygonHairlinePrimitive2D( basegfx::tools::createPolygonFromRect(aPaintRange), GetLineColor().getBColor())); - drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(aSequence, xOutline); + aSequence.push_back(xOutline); } // draw that if we have something to draw - if (aSequence.getLength()) + if (!aSequence.empty()) { const drawinglayer::geometry::ViewInformation2D aViewInformation2D( basegfx::B2DHomMatrix(), GetViewTransformation(), aPaintRange, nullptr, diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx index 1044492d5ceb..d7fd886b169a 100644 --- a/svx/source/engine3d/view3d.cxx +++ b/svx/source/engine3d/view3d.cxx @@ -89,7 +89,7 @@ class Impl3DMirrorConstructOverlay basegfx::B2DPolyPolygon* mpPolygons; // the overlay geometry from selected objects - drawinglayer::primitive2d::Primitive2DSequence maFullOverlay; + drawinglayer::primitive2d::Primitive2DContainer maFullOverlay; // Copy assignment is forbidden and not implemented. Impl3DMirrorConstructOverlay (const Impl3DMirrorConstructOverlay &) = delete; @@ -132,8 +132,8 @@ Impl3DMirrorConstructOverlay::Impl3DMirrorConstructOverlay(const E3dView& rView) sdr::contact::ViewContact& rVC = pObject->GetViewContact(); sdr::contact::ViewObjectContact& rVOC = rVC.GetViewObjectContact(rOC); - const drawinglayer::primitive2d::Primitive2DSequence aNewSequence(rVOC.getPrimitive2DSequenceHierarchy(aDisplayInfo)); - drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(maFullOverlay, aNewSequence); + const drawinglayer::primitive2d::Primitive2DContainer aNewSequence(rVOC.getPrimitive2DSequenceHierarchy(aDisplayInfo)); + maFullOverlay.append(aNewSequence); } } } @@ -187,21 +187,21 @@ void Impl3DMirrorConstructOverlay::SetMirrorAxis(Point aMirrorAxisA, Point aMirr if(mrView.IsSolidDragging()) { - if(maFullOverlay.hasElements()) + if(!maFullOverlay.empty()) { - drawinglayer::primitive2d::Primitive2DSequence aContent(maFullOverlay); + drawinglayer::primitive2d::Primitive2DContainer aContent(maFullOverlay); if(!aMatrixTransform.isIdentity()) { // embed in transformation group drawinglayer::primitive2d::Primitive2DReference aTransformPrimitive2D(new drawinglayer::primitive2d::TransformPrimitive2D(aMatrixTransform, aContent)); - aContent = drawinglayer::primitive2d::Primitive2DSequence(&aTransformPrimitive2D, 1); + aContent = drawinglayer::primitive2d::Primitive2DContainer { aTransformPrimitive2D }; } // if we have full overlay from selected objects, embed with 50% transparence, the // transformation is added to the OverlayPrimitive2DSequenceObject drawinglayer::primitive2d::Primitive2DReference aUnifiedTransparencePrimitive2D(new drawinglayer::primitive2d::UnifiedTransparencePrimitive2D(aContent, 0.5)); - aContent = drawinglayer::primitive2d::Primitive2DSequence(&aUnifiedTransparencePrimitive2D, 1); + aContent = drawinglayer::primitive2d::Primitive2DContainer { aUnifiedTransparencePrimitive2D }; sdr::overlay::OverlayPrimitive2DSequenceObject* pNew = new sdr::overlay::OverlayPrimitive2DSequenceObject(aContent); diff --git a/svx/source/sdr/animation/animationstate.cxx b/svx/source/sdr/animation/animationstate.cxx index bc7b573fcc16..145b47a47dbb 100644 --- a/svx/source/sdr/animation/animationstate.cxx +++ b/svx/source/sdr/animation/animationstate.cxx @@ -36,9 +36,9 @@ namespace sdr { double fRetval(0.0); - if(maAnimatedPrimitives.hasElements()) + if(!maAnimatedPrimitives.empty()) { - const sal_Int32 nCount(maAnimatedPrimitives.getLength()); + const sal_Int32 nCount(maAnimatedPrimitives.size()); for(sal_Int32 a(0L); a < nCount; a++) { @@ -107,7 +107,7 @@ namespace sdr } } - PrimitiveAnimation::PrimitiveAnimation(sdr::contact::ViewObjectContact& rVOContact, const drawinglayer::primitive2d::Primitive2DSequence& rAnimatedPrimitives) + PrimitiveAnimation::PrimitiveAnimation(sdr::contact::ViewObjectContact& rVOContact, const drawinglayer::primitive2d::Primitive2DContainer& rAnimatedPrimitives) : Event(0L), mrVOContact(rVOContact), maAnimatedPrimitives(rAnimatedPrimitives) diff --git a/svx/source/sdr/attribute/sdrallfillattributeshelper.cxx b/svx/source/sdr/attribute/sdrallfillattributeshelper.cxx index 58965e446b19..f98f1d754fc3 100644 --- a/svx/source/sdr/attribute/sdrallfillattributeshelper.cxx +++ b/svx/source/sdr/attribute/sdrallfillattributeshelper.cxx @@ -43,7 +43,7 @@ namespace drawinglayer if(isUsed()) { - maPrimitives.realloc(1); + maPrimitives.resize(1); maPrimitives[0] = drawinglayer::primitive2d::createPolyPolygonFillPrimitive( basegfx::B2DPolyPolygon( basegfx::tools::createPolygonFromRect( @@ -135,16 +135,16 @@ namespace drawinglayer return *maFillGradientAttribute.get(); } - const drawinglayer::primitive2d::Primitive2DSequence& SdrAllFillAttributesHelper::getPrimitive2DSequence( + const drawinglayer::primitive2d::Primitive2DContainer& SdrAllFillAttributesHelper::getPrimitive2DSequence( const basegfx::B2DRange& rPaintRange, const basegfx::B2DRange& rDefineRange) const { - if(maPrimitives.getLength() && (maLastPaintRange != rPaintRange || maLastDefineRange != rDefineRange)) + if(maPrimitives.size() && (maLastPaintRange != rPaintRange || maLastDefineRange != rDefineRange)) { - const_cast< SdrAllFillAttributesHelper* >(this)->maPrimitives.realloc(0); + const_cast< SdrAllFillAttributesHelper* >(this)->maPrimitives.clear(); } - if(!maPrimitives.getLength()) + if(!maPrimitives.size()) { const_cast< SdrAllFillAttributesHelper* >(this)->createPrimitive2DSequence(rPaintRange, rDefineRange); } diff --git a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx index 69d74b0862ad..5c9fb17a6e27 100644 --- a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx +++ b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx @@ -103,18 +103,17 @@ void ObjectContactOfObjListPainter::ProcessDisplay(DisplayInfo& rDisplayInfo) updateViewInformation2D(aNewViewInformation2D); // collect primitive data in a sequence; this will already use the updated ViewInformation2D - drawinglayer::primitive2d::Primitive2DSequence xPrimitiveSequence; + drawinglayer::primitive2d::Primitive2DContainer xPrimitiveSequence; for(sal_uInt32 a(0L); a < nCount; a++) { const ViewObjectContact& rViewObjectContact = GetPaintObjectViewContact(a).GetViewObjectContact(*this); - drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(xPrimitiveSequence, - rViewObjectContact.getPrimitive2DSequenceHierarchy(rDisplayInfo)); + xPrimitiveSequence.append(rViewObjectContact.getPrimitive2DSequenceHierarchy(rDisplayInfo)); } // if there is something to show, use a vclProcessor to render it - if(xPrimitiveSequence.hasElements()) + if(!xPrimitiveSequence.empty()) { std::unique_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor2D(drawinglayer::processor2d::createProcessor2DFromOutputDevice( *pTargetDevice, diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx b/svx/source/sdr/contact/objectcontactofpageview.cxx index b30c904bb5f1..30b69edf61b3 100644 --- a/svx/source/sdr/contact/objectcontactofpageview.cxx +++ b/svx/source/sdr/contact/objectcontactofpageview.cxx @@ -243,9 +243,9 @@ namespace sdr uno::Sequence<beans::PropertyValue>()); updateViewInformation2D(aNewViewInformation2D); - drawinglayer::primitive2d::Primitive2DSequence xPrimitiveSequence; + drawinglayer::primitive2d::Primitive2DContainer xPrimitiveSequence; #if HAVE_FEATURE_DESKTOP || defined( ANDROID ) - // get whole Primitive2DSequence; this will already make use of updated ViewInformation2D + // get whole Primitive2DContainer; this will already make use of updated ViewInformation2D // and may use the MapMode from the Target OutDev in the DisplayInfo xPrimitiveSequence = rDrawPageVOContact.getPrimitive2DSequenceHierarchy(rDisplayInfo); #else @@ -276,7 +276,7 @@ namespace sdr } if (bGetHierarchy) - // get whole Primitive2DSequence; this will already make use of updated ViewInformation2D + // get whole Primitive2DContainer; this will already make use of updated ViewInformation2D // and may use the MapMode from the Target OutDev in the DisplayInfo xPrimitiveSequence = rDrawPageVOContact.getPrimitive2DSequenceHierarchy(rDisplayInfo); #endif @@ -286,7 +286,7 @@ namespace sdr // createProcessor2DFromOutputDevice and takes into account things like the // Target is a MetaFile, a VDev or something else. The Canvas renderer is triggered // currently using the shown boolean. Canvas is not yet the default. - if(xPrimitiveSequence.hasElements()) + if(!xPrimitiveSequence.empty()) { // prepare OutputDevice (historical stuff, maybe soon removed) rDisplayInfo.ClearGhostedDrawMode(); // reset, else the VCL-paint with the processor will not do the right thing diff --git a/svx/source/sdr/contact/viewcontact.cxx b/svx/source/sdr/contact/viewcontact.cxx index 9e15adb3ad96..48ac905bedc3 100644 --- a/svx/source/sdr/contact/viewcontact.cxx +++ b/svx/source/sdr/contact/viewcontact.cxx @@ -225,7 +225,7 @@ SdrObject* ViewContact::TryToGetSdrObject() const // primitive stuff -drawinglayer::primitive2d::Primitive2DSequence ViewContact::createViewIndependentPrimitive2DSequence() const +drawinglayer::primitive2d::Primitive2DContainer ViewContact::createViewIndependentPrimitive2DSequence() const { // This is the default implementation and should never be called (see header). If this is called, // someone implemented a ViewContact (VC) visualisation object without defining the visualisation by @@ -238,38 +238,38 @@ drawinglayer::primitive2d::Primitive2DSequence ViewContact::createViewIndependen const drawinglayer::primitive2d::Primitive2DReference xReference( new drawinglayer::primitive2d::PolygonHairlinePrimitive2D(aOutline, aYellow)); - return drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1); + return drawinglayer::primitive2d::Primitive2DContainer { xReference }; } -drawinglayer::primitive2d::Primitive2DSequence ViewContact::getViewIndependentPrimitive2DSequence() const +drawinglayer::primitive2d::Primitive2DContainer ViewContact::getViewIndependentPrimitive2DSequence() const { // local up-to-date checks. Create new list and compare. - drawinglayer::primitive2d::Primitive2DSequence xNew(createViewIndependentPrimitive2DSequence()); + drawinglayer::primitive2d::Primitive2DContainer xNew(createViewIndependentPrimitive2DSequence()); - if(xNew.hasElements()) + if(!xNew.empty()) { // allow evtl. embedding in object-specific infos, e.g. Name, Title, Description xNew = embedToObjectSpecificInformation(xNew); } - if(!drawinglayer::primitive2d::arePrimitive2DSequencesEqual(mxViewIndependentPrimitive2DSequence, xNew)) + if(mxViewIndependentPrimitive2DSequence != xNew) { // has changed, copy content const_cast< ViewContact* >(this)->mxViewIndependentPrimitive2DSequence = xNew; } - // return current Primitive2DSequence + // return current Primitive2DContainer return mxViewIndependentPrimitive2DSequence; } // add Gluepoints (if available) -drawinglayer::primitive2d::Primitive2DSequence ViewContact::createGluePointPrimitive2DSequence() const +drawinglayer::primitive2d::Primitive2DContainer ViewContact::createGluePointPrimitive2DSequence() const { // default returns empty reference - return drawinglayer::primitive2d::Primitive2DSequence(); + return drawinglayer::primitive2d::Primitive2DContainer(); } -drawinglayer::primitive2d::Primitive2DSequence ViewContact::embedToObjectSpecificInformation(const drawinglayer::primitive2d::Primitive2DSequence& rSource) const +drawinglayer::primitive2d::Primitive2DContainer ViewContact::embedToObjectSpecificInformation(const drawinglayer::primitive2d::Primitive2DContainer& rSource) const { // nothing to do for default return rSource; diff --git a/svx/source/sdr/contact/viewcontactofe3d.cxx b/svx/source/sdr/contact/viewcontactofe3d.cxx index a07a7ec1cf4c..3e355bbec026 100644 --- a/svx/source/sdr/contact/viewcontactofe3d.cxx +++ b/svx/source/sdr/contact/viewcontactofe3d.cxx @@ -67,10 +67,10 @@ const sdr::contact::ViewContactOfE3dScene* tryToFindVCOfE3DScene( namespace sdr { namespace contact { -drawinglayer::primitive2d::Primitive2DSequence ViewContactOfE3d::impCreateWithGivenPrimitive3DSequence( +drawinglayer::primitive2d::Primitive2DContainer ViewContactOfE3d::impCreateWithGivenPrimitive3DSequence( const drawinglayer::primitive3d::Primitive3DSequence& rxContent3D) const { - drawinglayer::primitive2d::Primitive2DSequence xRetval; + drawinglayer::primitive2d::Primitive2DContainer xRetval; if(rxContent3D.hasElements()) { @@ -119,7 +119,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewContactOfE3d::impCreateWithGi fShadowSlant, rAllContentRange)); - xRetval = drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1); + xRetval = drawinglayer::primitive2d::Primitive2DContainer { xReference }; } } @@ -146,7 +146,7 @@ drawinglayer::primitive3d::Primitive3DSequence ViewContactOfE3d::getVIP3DSWithou const_cast< ViewContactOfE3d* >(this)->mxViewIndependentPrimitive3DSequence = xNew; } - // return current Primitive2DSequence + // return current Primitive2DContainer return mxViewIndependentPrimitive3DSequence; } @@ -171,11 +171,11 @@ drawinglayer::primitive3d::Primitive3DSequence ViewContactOfE3d::getViewIndepend } } - // return current Primitive2DSequence + // return current Primitive2DContainer return xRetval; } -drawinglayer::primitive2d::Primitive2DSequence ViewContactOfE3d::createViewIndependentPrimitive2DSequence() const +drawinglayer::primitive2d::Primitive2DContainer ViewContactOfE3d::createViewIndependentPrimitive2DSequence() const { // also need to create a 2D embedding when the view-independent part is requested, // see view-dependent part in ViewObjectContactOfE3d::createPrimitive2DSequence diff --git a/svx/source/sdr/contact/viewcontactofe3dscene.cxx b/svx/source/sdr/contact/viewcontactofe3dscene.cxx index 383d09fd788c..d3412d6e1a90 100644 --- a/svx/source/sdr/contact/viewcontactofe3dscene.cxx +++ b/svx/source/sdr/contact/viewcontactofe3dscene.cxx @@ -268,10 +268,10 @@ void ViewContactOfE3dScene::createSdrLightingAttribute() maSdrLightingAttribute = drawinglayer::primitive2d::createNewSdrLightingAttribute(rItemSet); } -drawinglayer::primitive2d::Primitive2DSequence ViewContactOfE3dScene::createScenePrimitive2DSequence( +drawinglayer::primitive2d::Primitive2DContainer ViewContactOfE3dScene::createScenePrimitive2DSequence( const SetOfByte* pLayerVisibility) const { - drawinglayer::primitive2d::Primitive2DSequence xRetval; + drawinglayer::primitive2d::Primitive2DContainer xRetval; const sal_uInt32 nChildrenCount(GetObjectCount()); if(nChildrenCount) @@ -321,21 +321,21 @@ drawinglayer::primitive2d::Primitive2DSequence ViewContactOfE3dScene::createScen getObjectTransformation(), getViewInformation3D(aContentRange))); - xRetval = drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1); + xRetval = drawinglayer::primitive2d::Primitive2DContainer{ xReference }; } } // always append an invisible outline for the cases where no visible content exists - drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(xRetval, + xRetval.push_back( drawinglayer::primitive2d::createHiddenGeometryPrimitives2D( false, getObjectTransformation())); return xRetval; } -drawinglayer::primitive2d::Primitive2DSequence ViewContactOfE3dScene::createViewIndependentPrimitive2DSequence() const +drawinglayer::primitive2d::Primitive2DContainer ViewContactOfE3dScene::createViewIndependentPrimitive2DSequence() const { - drawinglayer::primitive2d::Primitive2DSequence xRetval; + drawinglayer::primitive2d::Primitive2DContainer xRetval; if(GetObjectCount()) { diff --git a/svx/source/sdr/contact/viewcontactofgraphic.cxx b/svx/source/sdr/contact/viewcontactofgraphic.cxx index cf1d95d6fe14..862b118d0a81 100644 --- a/svx/source/sdr/contact/viewcontactofgraphic.cxx +++ b/svx/source/sdr/contact/viewcontactofgraphic.cxx @@ -81,11 +81,11 @@ namespace sdr flushViewIndependentPrimitive2DSequence(); } - drawinglayer::primitive2d::Primitive2DSequence ViewContactOfGraphic::createVIP2DSForPresObj( + drawinglayer::primitive2d::Primitive2DContainer ViewContactOfGraphic::createVIP2DSForPresObj( const basegfx::B2DHomMatrix& rObjectMatrix, const drawinglayer::attribute::SdrLineFillShadowTextAttribute& rAttribute) const { - drawinglayer::primitive2d::Primitive2DSequence xRetval; + drawinglayer::primitive2d::Primitive2DContainer xRetval; GraphicObject aEmptyGraphicObject; GraphicAttr aEmptyGraphicAttr; @@ -95,7 +95,7 @@ namespace sdr rAttribute, aEmptyGraphicObject, aEmptyGraphicAttr)); - xRetval = drawinglayer::primitive2d::Primitive2DSequence(&xReferenceA, 1); + xRetval = drawinglayer::primitive2d::Primitive2DContainer { xReferenceA }; // SdrGrafPrimitive2D with content (which is the preview graphic) scaled to smaller size and // without attributes @@ -139,17 +139,17 @@ namespace sdr rGraphicObject, aLocalGrafInfo)); - drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(xRetval, xReferenceB); + xRetval.push_back(xReferenceB); } return xRetval; } - drawinglayer::primitive2d::Primitive2DSequence ViewContactOfGraphic::createVIP2DSForDraft( + drawinglayer::primitive2d::Primitive2DContainer ViewContactOfGraphic::createVIP2DSForDraft( const basegfx::B2DHomMatrix& rObjectMatrix, const drawinglayer::attribute::SdrLineFillShadowTextAttribute& rAttribute) const { - drawinglayer::primitive2d::Primitive2DSequence xRetval; + drawinglayer::primitive2d::Primitive2DContainer xRetval; GraphicObject aEmptyGraphicObject; GraphicAttr aEmptyGraphicAttr; @@ -159,7 +159,7 @@ namespace sdr rAttribute, aEmptyGraphicObject, aEmptyGraphicAttr)); - xRetval = drawinglayer::primitive2d::Primitive2DSequence(&xReferenceA, 1); + xRetval = drawinglayer::primitive2d::Primitive2DContainer { xReferenceA }; if(rAttribute.getLine().isDefault()) { @@ -169,7 +169,7 @@ namespace sdr basegfx::B2DPolygon aOutline(basegfx::tools::createUnitPolygon()); aOutline.transform(rObjectMatrix); - drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(xRetval, + xRetval.push_back( drawinglayer::primitive2d::Primitive2DReference( new drawinglayer::primitive2d::PolygonHairlinePrimitive2D( aOutline, @@ -219,7 +219,7 @@ namespace sdr const basegfx::B2DHomMatrix aBitmapMatrix(basegfx::tools::createScaleShearXRotateTranslateB2DHomMatrix( fWidth, fHeight, fShearX, fRotate, aTranslate.getX(), aTranslate.getY())); - drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(xRetval, + xRetval.push_back( drawinglayer::primitive2d::Primitive2DReference( new drawinglayer::primitive2d::BitmapPrimitive2D( BitmapEx(aDraftBitmap), @@ -284,18 +284,17 @@ namespace sdr // layout the text to more simple TextPrimitives from drawinglayer const drawinglayer::geometry::ViewInformation2D aViewInformation2D; - drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence( - xRetval, - xBlockTextPrimitive->get2DDecomposition(aViewInformation2D)); + drawinglayer::primitive2d::Primitive2DContainer aDecomposition(xBlockTextPrimitive->get2DDecomposition(aViewInformation2D)); + xRetval.insert(xRetval.end(), aDecomposition.begin(), aDecomposition.end()); } } return xRetval; } - drawinglayer::primitive2d::Primitive2DSequence ViewContactOfGraphic::createViewIndependentPrimitive2DSequence() const + drawinglayer::primitive2d::Primitive2DContainer ViewContactOfGraphic::createViewIndependentPrimitive2DSequence() const { - drawinglayer::primitive2d::Primitive2DSequence xRetval; + drawinglayer::primitive2d::Primitive2DContainer xRetval; const SfxItemSet& rItemSet = GetGrafObject().GetMergedItemSet(); // create and fill GraphicAttr @@ -397,11 +396,11 @@ namespace sdr rGraphicObject, aLocalGrafInfo)); - xRetval = drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1); + xRetval = drawinglayer::primitive2d::Primitive2DContainer { xReference }; } // always append an invisible outline for the cases where no visible content exists - drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(xRetval, + xRetval.push_back( drawinglayer::primitive2d::createHiddenGeometryPrimitives2D( false, aObjectMatrix)); diff --git a/svx/source/sdr/contact/viewcontactofgroup.cxx b/svx/source/sdr/contact/viewcontactofgroup.cxx index af037e58dcb3..7fdfb1b358a0 100644 --- a/svx/source/sdr/contact/viewcontactofgroup.cxx +++ b/svx/source/sdr/contact/viewcontactofgroup.cxx @@ -53,9 +53,9 @@ namespace sdr { } - drawinglayer::primitive2d::Primitive2DSequence ViewContactOfGroup::createViewIndependentPrimitive2DSequence() const + drawinglayer::primitive2d::Primitive2DContainer ViewContactOfGroup::createViewIndependentPrimitive2DSequence() const { - drawinglayer::primitive2d::Primitive2DSequence xRetval; + drawinglayer::primitive2d::Primitive2DContainer xRetval; const sal_uInt32 nObjectCount(GetObjectCount()); if(nObjectCount) @@ -64,9 +64,9 @@ namespace sdr for(sal_uInt32 a(0); a < nObjectCount; a++) { const ViewContact& rCandidate(GetViewContact(a)); - const drawinglayer::primitive2d::Primitive2DSequence aCandSeq(rCandidate.getViewIndependentPrimitive2DSequence()); + const drawinglayer::primitive2d::Primitive2DContainer aCandSeq(rCandidate.getViewIndependentPrimitive2DSequence()); - drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(xRetval, aCandSeq); + xRetval.insert(xRetval.end(), aCandSeq.begin(), aCandSeq.end()); } } else @@ -85,7 +85,7 @@ namespace sdr drawinglayer::primitive2d::createHiddenGeometryPrimitives2D( false, aCurrentRange)); - xRetval = drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1); + xRetval = drawinglayer::primitive2d::Primitive2DContainer { xReference }; } return xRetval; diff --git a/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx b/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx index a9893045d222..23f5ab5b21ed 100644 --- a/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx +++ b/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx @@ -47,9 +47,9 @@ namespace sdr return *(new ViewObjectContactOfMasterPageDescriptor(rObjectContact, *this)); } - drawinglayer::primitive2d::Primitive2DSequence ViewContactOfMasterPageDescriptor::createViewIndependentPrimitive2DSequence() const + drawinglayer::primitive2d::Primitive2DContainer ViewContactOfMasterPageDescriptor::createViewIndependentPrimitive2DSequence() const { - drawinglayer::primitive2d::Primitive2DSequence xRetval; + drawinglayer::primitive2d::Primitive2DContainer xRetval; drawinglayer::attribute::SdrFillAttribute aFill; const SdrPageProperties* pCorrectProperties = GetMasterPageDescriptor().getCorrectSdrPageProperties(); @@ -74,7 +74,7 @@ namespace sdr aFill, drawinglayer::attribute::FillGradientAttribute())); - xRetval = drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1); + xRetval = drawinglayer::primitive2d::Primitive2DContainer{ xReference }; } return xRetval; diff --git a/svx/source/sdr/contact/viewcontactofpageobj.cxx b/svx/source/sdr/contact/viewcontactofpageobj.cxx index 98784a868f12..9ef99daf4ad4 100644 --- a/svx/source/sdr/contact/viewcontactofpageobj.cxx +++ b/svx/source/sdr/contact/viewcontactofpageobj.cxx @@ -64,7 +64,7 @@ void ViewContactOfPageObj::ActionChanged() } } -drawinglayer::primitive2d::Primitive2DSequence ViewContactOfPageObj::createViewIndependentPrimitive2DSequence() const +drawinglayer::primitive2d::Primitive2DContainer ViewContactOfPageObj::createViewIndependentPrimitive2DSequence() const { // create graphical visualisation data. Since this is the view-independent version which should not be used, // create a replacement graphic visualisation here. Use GetLastBoundRect to access the model data directly @@ -75,7 +75,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewContactOfPageObj::createViewI const basegfx::BColor aYellow(1.0, 1.0, 0.0); const drawinglayer::primitive2d::Primitive2DReference xReference(new drawinglayer::primitive2d::PolygonHairlinePrimitive2D(aOutline, aYellow)); - return drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1); + return drawinglayer::primitive2d::Primitive2DContainer { xReference }; } }} diff --git a/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx b/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx index 4e119601f823..dfc78ecf7d7d 100644 --- a/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx @@ -51,9 +51,9 @@ namespace sdr { } - drawinglayer::primitive2d::Primitive2DSequence ViewContactOfSdrCaptionObj::createViewIndependentPrimitive2DSequence() const + drawinglayer::primitive2d::Primitive2DContainer ViewContactOfSdrCaptionObj::createViewIndependentPrimitive2DSequence() const { - drawinglayer::primitive2d::Primitive2DSequence xRetval; + drawinglayer::primitive2d::Primitive2DContainer xRetval; const SdrCaptionObj& rCaptionObj(GetCaptionObj()); const SfxItemSet& rItemSet = rCaptionObj.GetMergedItemSet(); const drawinglayer::attribute::SdrLineFillShadowTextAttribute aAttribute( @@ -102,7 +102,7 @@ namespace sdr fCornerRadiusX, fCornerRadiusY)); - xRetval = drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1); + xRetval = drawinglayer::primitive2d::Primitive2DContainer { xReference }; if(!aAttribute.isDefault() && rCaptionObj.GetSpecialTextBoxShadow()) { @@ -189,7 +189,7 @@ namespace sdr { // if we really got a special shadow, create a two-element retval with the shadow // behind the standard object's geometry - xRetval.realloc(2); + xRetval.resize(2); xRetval[0] = xSpecialShadow; xRetval[1] = xReference; diff --git a/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx b/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx index 8e84436b6be3..ccb35bac3f4e 100644 --- a/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx @@ -41,7 +41,7 @@ namespace sdr { } - drawinglayer::primitive2d::Primitive2DSequence ViewContactOfSdrCircObj::createViewIndependentPrimitive2DSequence() const + drawinglayer::primitive2d::Primitive2DContainer ViewContactOfSdrCircObj::createViewIndependentPrimitive2DSequence() const { const SfxItemSet& rItemSet = GetCircObj().GetMergedItemSet(); const drawinglayer::attribute::SdrLineFillShadowTextAttribute aAttribute( @@ -82,7 +82,7 @@ namespace sdr aObjectMatrix, aAttribute)); - return drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1); + return drawinglayer::primitive2d::Primitive2DContainer { xReference }; } else { @@ -102,7 +102,7 @@ namespace sdr bCloseSegment, bCloseUsingCenter)); - return drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1); + return drawinglayer::primitive2d::Primitive2DContainer { xReference }; } } } // end of namespace contact diff --git a/svx/source/sdr/contact/viewcontactofsdredgeobj.cxx b/svx/source/sdr/contact/viewcontactofsdredgeobj.cxx index 8ce64caa6d13..11ca3f9c22d7 100644 --- a/svx/source/sdr/contact/viewcontactofsdredgeobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdredgeobj.cxx @@ -39,7 +39,7 @@ namespace sdr { } - drawinglayer::primitive2d::Primitive2DSequence ViewContactOfSdrEdgeObj::createViewIndependentPrimitive2DSequence() const + drawinglayer::primitive2d::Primitive2DContainer ViewContactOfSdrEdgeObj::createViewIndependentPrimitive2DSequence() const { basegfx::B2DPolygon aEdgeTrack = GetEdgeObj().getEdgeTrack(); Point aGridOff = GetEdgeObj().GetGridOffset(); @@ -66,7 +66,7 @@ namespace sdr aAttribute, aEdgeTrack)); - return drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1); + return drawinglayer::primitive2d::Primitive2DContainer { xReference }; } } // end of namespace contact } // end of namespace sdr diff --git a/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx b/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx index ed1dc0cd6990..4909e6de2daa 100644 --- a/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx @@ -44,7 +44,7 @@ namespace sdr { } - drawinglayer::primitive2d::Primitive2DSequence ViewContactOfSdrMeasureObj::createViewIndependentPrimitive2DSequence() const + drawinglayer::primitive2d::Primitive2DContainer ViewContactOfSdrMeasureObj::createViewIndependentPrimitive2DSequence() const { const SfxItemSet& rItemSet = GetMeasureObj().GetMergedItemSet(); const drawinglayer::attribute::SdrLineShadowTextAttribute aAttribute( @@ -124,7 +124,7 @@ namespace sdr fLeftDelta, fRightDelta, bBelow, bTextRotation, bTextAutoAngle)); - return drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1); + return drawinglayer::primitive2d::Primitive2DContainer { xReference }; } } // end of namespace contact } // end of namespace sdr diff --git a/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx b/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx index 214a871b14d1..a7869c2a0fbd 100644 --- a/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx @@ -96,7 +96,7 @@ void ViewContactOfSdrMediaObj::mediaPropertiesChanged( const ::avmedia::MediaIte static_cast< SdrMediaObj& >(GetSdrObject()).mediaPropertiesChanged(rNewState); } -drawinglayer::primitive2d::Primitive2DSequence ViewContactOfSdrMediaObj::createViewIndependentPrimitive2DSequence() const +drawinglayer::primitive2d::Primitive2DContainer ViewContactOfSdrMediaObj::createViewIndependentPrimitive2DSequence() const { // create range using the model data directly. This is in SdrTextObj::aRect which i will access using // GetGeoRect() to not trigger any calculations. It's the unrotated geometry which is okay for MediaObjects ATM. @@ -127,7 +127,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewContactOfSdrMediaObj::createV aTransform, rURL, aBackgroundColor, nPixelBorder, GetSdrMediaObj().getSnapshot())); - return drawinglayer::primitive2d::Primitive2DSequence(&xRetval, 1); + return drawinglayer::primitive2d::Primitive2DContainer { xRetval }; } }} diff --git a/svx/source/sdr/contact/viewcontactofsdrobj.cxx b/svx/source/sdr/contact/viewcontactofsdrobj.cxx index 1efd086f6f75..9b6713ec99bc 100644 --- a/svx/source/sdr/contact/viewcontactofsdrobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrobj.cxx @@ -33,6 +33,7 @@ #include <svx/sdrpagewindow.hxx> #include <svx/sdrpaintwindow.hxx> #include <svx/svdhdl.hxx> +#include <comphelper/sequence.hxx> namespace sdr { namespace contact { @@ -137,9 +138,9 @@ SdrObject* ViewContactOfSdrObj::TryToGetSdrObject() const // primitive stuff // add Gluepoints (if available) -drawinglayer::primitive2d::Primitive2DSequence ViewContactOfSdrObj::createGluePointPrimitive2DSequence() const +drawinglayer::primitive2d::Primitive2DContainer ViewContactOfSdrObj::createGluePointPrimitive2DSequence() const { - drawinglayer::primitive2d::Primitive2DSequence xRetval; + drawinglayer::primitive2d::Primitive2DContainer xRetval; const SdrGluePointList* pGluePointList = GetSdrObject().GetGluePointList(); if(pGluePointList) @@ -165,7 +166,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewContactOfSdrObj::createGluePo const drawinglayer::primitive2d::Primitive2DReference xReference( new drawinglayer::primitive2d::MarkerArrayPrimitive2D( aGluepointVector, SdrHdl::createGluePointBitmap())); - xRetval = drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1); + xRetval = drawinglayer::primitive2d::Primitive2DContainer{ xReference }; } } } @@ -173,9 +174,9 @@ drawinglayer::primitive2d::Primitive2DSequence ViewContactOfSdrObj::createGluePo return xRetval; } -drawinglayer::primitive2d::Primitive2DSequence ViewContactOfSdrObj::embedToObjectSpecificInformation(const drawinglayer::primitive2d::Primitive2DSequence& rSource) const +drawinglayer::primitive2d::Primitive2DContainer ViewContactOfSdrObj::embedToObjectSpecificInformation(const drawinglayer::primitive2d::Primitive2DContainer& rSource) const { - if(rSource.hasElements() && + if(!rSource.empty() && (!GetSdrObject().GetName().isEmpty() || !GetSdrObject().GetTitle().isEmpty() || !GetSdrObject().GetDescription().isEmpty())) @@ -187,7 +188,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewContactOfSdrObj::embedToObjec GetSdrObject().GetTitle(), GetSdrObject().GetDescription())); - return drawinglayer::primitive2d::Primitive2DSequence(&xRef, 1); + return drawinglayer::primitive2d::Primitive2DContainer { xRef }; } return rSource; diff --git a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx index d620346797db..b17ae54fa2a2 100644 --- a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx @@ -100,9 +100,9 @@ namespace sdr return aTextRange; } - drawinglayer::primitive2d::Primitive2DSequence ViewContactOfSdrObjCustomShape::createViewIndependentPrimitive2DSequence() const + drawinglayer::primitive2d::Primitive2DContainer ViewContactOfSdrObjCustomShape::createViewIndependentPrimitive2DSequence() const { - drawinglayer::primitive2d::Primitive2DSequence xRetval; + drawinglayer::primitive2d::Primitive2DContainer xRetval; const SfxItemSet& rItemSet = GetCustomShapeObj().GetMergedItemSet(); // #i98072# Get shadow and text; eventually suppress the text if it's @@ -112,10 +112,10 @@ namespace sdr rItemSet, GetCustomShapeObj().getText(0), GetCustomShapeObj().IsTextPath())); - drawinglayer::primitive2d::Primitive2DSequence xGroup; + drawinglayer::primitive2d::Primitive2DContainer xGroup; bool bHasText(!aAttribute.getText().isDefault()); - // create Primitive2DSequence from sub-geometry + // create Primitive2DContainer from sub-geometry const SdrObject* pSdrObjRepresentation = GetCustomShapeObj().GetSdrObjectFromCustomShape(); bool b3DShape(false); @@ -139,12 +139,12 @@ namespace sdr b3DShape = true; } - const drawinglayer::primitive2d::Primitive2DSequence xNew(rCandidate.GetViewContact().getViewIndependentPrimitive2DSequence()); - drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(xGroup, xNew); + const drawinglayer::primitive2d::Primitive2DContainer xNew(rCandidate.GetViewContact().getViewIndependentPrimitive2DSequence()); + xGroup.insert(xGroup.end(), xNew.begin(), xNew.end()); } } - if(bHasText || xGroup.hasElements()) + if(bHasText || !xGroup.empty()) { // prepare text box geometry basegfx::B2DHomMatrix aTextBoxMatrix; @@ -228,7 +228,7 @@ namespace sdr bWordWrap, b3DShape, false)); // #SJ# New parameter to force to clipped BlockText for SC - xRetval = drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1); + xRetval = drawinglayer::primitive2d::Primitive2DContainer { xReference }; } return xRetval; diff --git a/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx b/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx index bdbe9ce172bc..630c869a43c8 100644 --- a/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx @@ -79,7 +79,7 @@ basegfx::B2DHomMatrix ViewContactOfSdrOle2Obj::createObjectTransform() const aObjectRange.getMinX(), aObjectRange.getMinY()); } -drawinglayer::primitive2d::Primitive2DSequence ViewContactOfSdrOle2Obj::createPrimitive2DSequenceWithParameters() const +drawinglayer::primitive2d::Primitive2DContainer ViewContactOfSdrOle2Obj::createPrimitive2DSequenceWithParameters() const { // get object transformation const basegfx::B2DHomMatrix aObjectMatrix(createObjectTransform()); @@ -108,14 +108,14 @@ drawinglayer::primitive2d::Primitive2DSequence ViewContactOfSdrOle2Obj::createPr { // try to get chart primitives and chart range directly from xChartModel basegfx::B2DRange aChartContentRange; - const drawinglayer::primitive2d::Primitive2DSequence aChartSequence( + const drawinglayer::primitive2d::Primitive2DContainer aChartSequence( ChartHelper::tryToGetChartContentAsPrimitive2DSequence( GetOle2Obj().getXModel(), aChartContentRange)); const double fWidth(aChartContentRange.getWidth()); const double fHeight(aChartContentRange.getHeight()); - if(aChartSequence.hasElements() + if(!aChartSequence.empty() && basegfx::fTools::more(fWidth, 0.0) && basegfx::fTools::more(fHeight, 0.0)) { @@ -159,11 +159,11 @@ drawinglayer::primitive2d::Primitive2DSequence ViewContactOfSdrOle2Obj::createPr // SdrOle2Primitive2D to create needed invisible elements for HitTest and/or BoundRect const drawinglayer::primitive2d::Primitive2DReference xReference( new drawinglayer::primitive2d::SdrOle2Primitive2D( - drawinglayer::primitive2d::Primitive2DSequence(&xContent, 1), + drawinglayer::primitive2d::Primitive2DContainer { xContent }, aObjectMatrix, aAttribute)); - return drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1); + return drawinglayer::primitive2d::Primitive2DContainer { xReference }; } basegfx::B2DRange ViewContactOfSdrOle2Obj::getRange( const drawinglayer::geometry::ViewInformation2D& rViewInfo2D ) const @@ -185,14 +185,11 @@ basegfx::B2DRange ViewContactOfSdrOle2Obj::getRange( const drawinglayer::geometr const drawinglayer::primitive2d::Primitive2DReference xReference( new drawinglayer::primitive2d::SdrOle2Primitive2D( - drawinglayer::primitive2d::Primitive2DSequence(&xContent, 1), + drawinglayer::primitive2d::Primitive2DContainer { xContent }, aObjectMatrix, aAttribute)); - drawinglayer::primitive2d::Primitive2DSequence xSeq = - drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1); - - return drawinglayer::primitive2d::getB2DRangeFromPrimitive2DSequence(xSeq, rViewInfo2D); + return drawinglayer::primitive2d::getB2DRangeFromPrimitive2DReference(xReference, rViewInfo2D); } void ViewContactOfSdrOle2Obj::ActionChanged() @@ -207,7 +204,7 @@ void ViewContactOfSdrOle2Obj::ActionChanged() } } -drawinglayer::primitive2d::Primitive2DSequence ViewContactOfSdrOle2Obj::createViewIndependentPrimitive2DSequence() const +drawinglayer::primitive2d::Primitive2DContainer ViewContactOfSdrOle2Obj::createViewIndependentPrimitive2DSequence() const { return createPrimitive2DSequenceWithParameters(); } diff --git a/svx/source/sdr/contact/viewcontactofsdrpage.cxx b/svx/source/sdr/contact/viewcontactofsdrpage.cxx index 331d597c666e..dd1224299fd7 100644 --- a/svx/source/sdr/contact/viewcontactofsdrpage.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrpage.cxx @@ -70,7 +70,7 @@ ViewObjectContact& ViewContactOfPageBackground::CreateObjectSpecificViewObjectCo return *pRetval; } -drawinglayer::primitive2d::Primitive2DSequence ViewContactOfPageBackground::createViewIndependentPrimitive2DSequence() const +drawinglayer::primitive2d::Primitive2DContainer ViewContactOfPageBackground::createViewIndependentPrimitive2DSequence() const { // We have only the page information, not the view information. Use the // svtools::DOCCOLOR color for initialisation @@ -80,7 +80,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewContactOfPageBackground::crea const drawinglayer::primitive2d::Primitive2DReference xReference( new drawinglayer::primitive2d::BackgroundColorPrimitive2D(aRGBColor)); - return drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1); + return drawinglayer::primitive2d::Primitive2DContainer { xReference }; } ViewContactOfPageBackground::ViewContactOfPageBackground(ViewContactOfSdrPage& rParentViewContactOfSdrPage) @@ -100,7 +100,7 @@ ViewObjectContact& ViewContactOfPageShadow::CreateObjectSpecificViewObjectContac return *pRetval; } -drawinglayer::primitive2d::Primitive2DSequence ViewContactOfPageShadow::createViewIndependentPrimitive2DSequence() const +drawinglayer::primitive2d::Primitive2DContainer ViewContactOfPageShadow::createViewIndependentPrimitive2DSequence() const { static bool bUseOldPageShadow(false); const SdrPage& rPage = getPage(); @@ -132,7 +132,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewContactOfPageShadow::createVi basegfx::B2DPolyPolygon(aPageShadowPolygon), aRGBShadowColor)); - return drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1); + return drawinglayer::primitive2d::Primitive2DContainer { xReference }; } else { @@ -150,10 +150,10 @@ drawinglayer::primitive2d::Primitive2DSequence ViewContactOfPageShadow::createVi aPageMatrix, *aDiscreteShadow.get())); - return drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1); + return drawinglayer::primitive2d::Primitive2DContainer { xReference }; } - return drawinglayer::primitive2d::Primitive2DSequence(); + return drawinglayer::primitive2d::Primitive2DContainer(); } } @@ -174,9 +174,9 @@ ViewObjectContact& ViewContactOfMasterPage::CreateObjectSpecificViewObjectContac return *pRetval; } -drawinglayer::primitive2d::Primitive2DSequence ViewContactOfMasterPage::createViewIndependentPrimitive2DSequence() const +drawinglayer::primitive2d::Primitive2DContainer ViewContactOfMasterPage::createViewIndependentPrimitive2DSequence() const { - drawinglayer::primitive2d::Primitive2DSequence xRetval; + drawinglayer::primitive2d::Primitive2DContainer xRetval; // this class is used when the page is a MasterPage and is responsible to // create a visualisation for the MPBGO, if exists. This needs to be suppressed @@ -220,7 +220,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewContactOfMasterPage::createVi aFill, drawinglayer::attribute::FillGradientAttribute())); - xRetval = drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1); + xRetval = drawinglayer::primitive2d::Primitive2DContainer { xReference }; } } } @@ -245,7 +245,7 @@ ViewObjectContact& ViewContactOfPageFill::CreateObjectSpecificViewObjectContact( return *pRetval; } -drawinglayer::primitive2d::Primitive2DSequence ViewContactOfPageFill::createViewIndependentPrimitive2DSequence() const +drawinglayer::primitive2d::Primitive2DContainer ViewContactOfPageFill::createViewIndependentPrimitive2DSequence() const { const SdrPage& rPage = getPage(); const basegfx::B2DRange aPageFillRange(0.0, 0.0, (double)rPage.GetWdt(), (double)rPage.GetHgt()); @@ -260,7 +260,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewContactOfPageFill::createView const basegfx::BColor aRGBColor(aPageFillColor.getBColor()); const drawinglayer::primitive2d::Primitive2DReference xReference(new drawinglayer::primitive2d::PolyPolygonColorPrimitive2D(basegfx::B2DPolyPolygon(aPageFillPolygon), aRGBColor)); - return drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1); + return drawinglayer::primitive2d::Primitive2DContainer { xReference }; } ViewContactOfPageFill::ViewContactOfPageFill(ViewContactOfSdrPage& rParentViewContactOfSdrPage) @@ -280,9 +280,9 @@ ViewObjectContact& ViewContactOfOuterPageBorder::CreateObjectSpecificViewObjectC return *pRetval; } -drawinglayer::primitive2d::Primitive2DSequence ViewContactOfOuterPageBorder::createViewIndependentPrimitive2DSequence() const +drawinglayer::primitive2d::Primitive2DContainer ViewContactOfOuterPageBorder::createViewIndependentPrimitive2DSequence() const { - drawinglayer::primitive2d::Primitive2DSequence xRetval; + drawinglayer::primitive2d::Primitive2DContainer xRetval; const SdrPage& rPage = getPage(); const basegfx::B2DRange aPageBorderRange(0.0, 0.0, (double)rPage.GetWdt(), (double)rPage.GetHgt()); @@ -310,13 +310,13 @@ drawinglayer::primitive2d::Primitive2DSequence ViewContactOfOuterPageBorder::cre aRight.append(basegfx::B2DPoint(aPageBorderRange.getMaxX(), aPageBorderRange.getMinY())); aRight.append(basegfx::B2DPoint(aPageBorderRange.getMaxX(), aPageBorderRange.getMaxY())); - xRetval.realloc(2); + xRetval.resize(2); xRetval[0] = drawinglayer::primitive2d::Primitive2DReference(new drawinglayer::primitive2d::PolygonHairlinePrimitive2D(aLeft, aRGBBorderColor)); xRetval[1] = drawinglayer::primitive2d::Primitive2DReference(new drawinglayer::primitive2d::PolygonHairlinePrimitive2D(aRight, aRGBBorderColor)); } else { - xRetval.realloc(1); + xRetval.resize(1); const basegfx::B2DPolygon aPageBorderPolygon(basegfx::tools::createPolygonFromRect(aPageBorderRange)); xRetval[0] = drawinglayer::primitive2d::Primitive2DReference(new drawinglayer::primitive2d::PolygonHairlinePrimitive2D(aPageBorderPolygon, aRGBBorderColor)); } @@ -341,7 +341,7 @@ ViewObjectContact& ViewContactOfInnerPageBorder::CreateObjectSpecificViewObjectC return *pRetval; } -drawinglayer::primitive2d::Primitive2DSequence ViewContactOfInnerPageBorder::createViewIndependentPrimitive2DSequence() const +drawinglayer::primitive2d::Primitive2DContainer ViewContactOfInnerPageBorder::createViewIndependentPrimitive2DSequence() const { const SdrPage& rPage = getPage(); const basegfx::B2DRange aPageBorderRange( @@ -367,7 +367,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewContactOfInnerPageBorder::cre const basegfx::BColor aRGBBorderColor(aBorderColor.getBColor()); const drawinglayer::primitive2d::Primitive2DReference xReference(new drawinglayer::primitive2d::PolygonHairlinePrimitive2D(aPageBorderPolygon, aRGBBorderColor)); - return drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1); + return drawinglayer::primitive2d::Primitive2DContainer { xReference }; } ViewContactOfInnerPageBorder::ViewContactOfInnerPageBorder(ViewContactOfSdrPage& rParentViewContactOfSdrPage) @@ -387,19 +387,19 @@ ViewObjectContact& ViewContactOfPageHierarchy::CreateObjectSpecificViewObjectCon return *pRetval; } -drawinglayer::primitive2d::Primitive2DSequence ViewContactOfPageHierarchy::createViewIndependentPrimitive2DSequence() const +drawinglayer::primitive2d::Primitive2DContainer ViewContactOfPageHierarchy::createViewIndependentPrimitive2DSequence() const { // collect sub-hierarchy - drawinglayer::primitive2d::Primitive2DSequence xRetval; + drawinglayer::primitive2d::Primitive2DContainer xRetval; const sal_uInt32 nObjectCount(GetObjectCount()); // collect all sub-primitives for(sal_uInt32 a(0); a < nObjectCount; a++) { const ViewContact& rCandidate(GetViewContact(a)); - const drawinglayer::primitive2d::Primitive2DSequence aCandSeq(rCandidate.getViewIndependentPrimitive2DSequence()); + const drawinglayer::primitive2d::Primitive2DContainer aCandSeq(rCandidate.getViewIndependentPrimitive2DSequence()); - drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(xRetval, aCandSeq); + xRetval.insert(xRetval.end(), aCandSeq.begin(), aCandSeq.end()); } return xRetval; @@ -434,11 +434,11 @@ ViewObjectContact& ViewContactOfGrid::CreateObjectSpecificViewObjectContact(Obje return *pRetval; } -drawinglayer::primitive2d::Primitive2DSequence ViewContactOfGrid::createViewIndependentPrimitive2DSequence() const +drawinglayer::primitive2d::Primitive2DContainer ViewContactOfGrid::createViewIndependentPrimitive2DSequence() const { // We have only the page information, not the view information and thus no grid settings. Create empty // default. For the view-dependent implementation, see ViewObjectContactOfPageGrid::createPrimitive2DSequence - return drawinglayer::primitive2d::Primitive2DSequence(); + return drawinglayer::primitive2d::Primitive2DContainer(); } ViewContactOfGrid::ViewContactOfGrid(ViewContactOfSdrPage& rParentViewContactOfSdrPage, bool bFront) @@ -459,11 +459,11 @@ ViewObjectContact& ViewContactOfHelplines::CreateObjectSpecificViewObjectContact return *pRetval; } -drawinglayer::primitive2d::Primitive2DSequence ViewContactOfHelplines::createViewIndependentPrimitive2DSequence() const +drawinglayer::primitive2d::Primitive2DContainer ViewContactOfHelplines::createViewIndependentPrimitive2DSequence() const { // We have only the page information, not the view information and thus no helplines. Create empty // default. For the view-dependent implementation, see ViewObjectContactOfPageHelplines::createPrimitive2DSequence - return drawinglayer::primitive2d::Primitive2DSequence(); + return drawinglayer::primitive2d::Primitive2DContainer(); } ViewContactOfHelplines::ViewContactOfHelplines(ViewContactOfSdrPage& rParentViewContactOfSdrPage, bool bFront) @@ -580,31 +580,31 @@ void ViewContactOfSdrPage::ActionChanged() maViewContactOfHelplinesFront.ActionChanged(); } -drawinglayer::primitive2d::Primitive2DSequence ViewContactOfSdrPage::createViewIndependentPrimitive2DSequence() const +drawinglayer::primitive2d::Primitive2DContainer ViewContactOfSdrPage::createViewIndependentPrimitive2DSequence() const { - drawinglayer::primitive2d::Primitive2DSequence xRetval; + drawinglayer::primitive2d::Primitive2DContainer xRetval; // collect all sub-sequences including sub hierarchy. - drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(xRetval, maViewContactOfPageBackground.getViewIndependentPrimitive2DSequence()); - drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(xRetval, maViewContactOfPageShadow.getViewIndependentPrimitive2DSequence()); - drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(xRetval, maViewContactOfPageFill.getViewIndependentPrimitive2DSequence()); + xRetval.append(maViewContactOfPageBackground.getViewIndependentPrimitive2DSequence()); + xRetval.append(maViewContactOfPageShadow.getViewIndependentPrimitive2DSequence()); + xRetval.append(maViewContactOfPageFill.getViewIndependentPrimitive2DSequence()); const SdrPage& rPage = GetSdrPage(); if(rPage.TRG_HasMasterPage()) { - drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(xRetval, + xRetval.append( rPage.TRG_GetMasterPageDescriptorViewContact().getViewIndependentPrimitive2DSequence()); } else if(rPage.IsMasterPage()) { - drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(xRetval, + xRetval.append( maViewContactOfMasterPage.getViewIndependentPrimitive2DSequence()); } - drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(xRetval, maViewContactOfOuterPageBorder.getViewIndependentPrimitive2DSequence()); - drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(xRetval, maViewContactOfInnerPageBorder.getViewIndependentPrimitive2DSequence()); - drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(xRetval, maViewContactOfPageHierarchy.getViewIndependentPrimitive2DSequence()); + xRetval.append(maViewContactOfOuterPageBorder.getViewIndependentPrimitive2DSequence()); + xRetval.append(maViewContactOfInnerPageBorder.getViewIndependentPrimitive2DSequence()); + xRetval.append(maViewContactOfPageHierarchy.getViewIndependentPrimitive2DSequence()); // Only add front versions of grid and helplines since no visibility test is done, // so adding the back incarnations is not necessary. This makes the Front diff --git a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx index b86a9f4bf78b..9666db142973 100644 --- a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx @@ -65,7 +65,7 @@ namespace sdr return nPolyCount; } - drawinglayer::primitive2d::Primitive2DSequence ViewContactOfSdrPathObj::createViewIndependentPrimitive2DSequence() const + drawinglayer::primitive2d::Primitive2DContainer ViewContactOfSdrPathObj::createViewIndependentPrimitive2DSequence() const { const SfxItemSet& rItemSet = GetPathObj().GetMergedItemSet(); const drawinglayer::attribute::SdrLineFillShadowTextAttribute aAttribute( @@ -167,7 +167,7 @@ namespace sdr aAttribute, aUnitPolyPolygon)); - return drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1); + return drawinglayer::primitive2d::Primitive2DContainer { xReference }; } } // end of namespace contact } // end of namespace sdr diff --git a/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx b/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx index 80ded95ec15a..523b814f20fc 100644 --- a/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx @@ -37,7 +37,7 @@ ViewContactOfSdrRectObj::~ViewContactOfSdrRectObj() { } -drawinglayer::primitive2d::Primitive2DSequence ViewContactOfSdrRectObj::createViewIndependentPrimitive2DSequence() const +drawinglayer::primitive2d::Primitive2DContainer ViewContactOfSdrRectObj::createViewIndependentPrimitive2DSequence() const { const SfxItemSet& rItemSet = GetRectObj().GetMergedItemSet(); const drawinglayer::attribute::SdrLineFillShadowTextAttribute aAttribute( @@ -86,7 +86,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewContactOfSdrRectObj::createVi // #i105856# use fill for HitTest when TextFrame and not PickThrough GetRectObj().IsTextFrame() && !bPickThroughTransparentTextFrames)); - return drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1); + return drawinglayer::primitive2d::Primitive2DContainer{ xReference }; } }} diff --git a/svx/source/sdr/contact/viewcontactofunocontrol.cxx b/svx/source/sdr/contact/viewcontactofunocontrol.cxx index fa92aed98b06..c0caf0e5a34d 100644 --- a/svx/source/sdr/contact/viewcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewcontactofunocontrol.cxx @@ -113,7 +113,7 @@ namespace sdr { namespace contact { } - drawinglayer::primitive2d::Primitive2DSequence ViewContactOfUnoControl::createViewIndependentPrimitive2DSequence() const + drawinglayer::primitive2d::Primitive2DContainer ViewContactOfUnoControl::createViewIndependentPrimitive2DSequence() const { // create range. Use model data directly, not getBoundRect()/getSnapRect; these will use // the primitive data themselves in the long run. Use SdrUnoObj's (which is a SdrRectObj) @@ -147,7 +147,7 @@ namespace sdr { namespace contact { aTransform, xControlModel)); - return drawinglayer::primitive2d::Primitive2DSequence(&xRetval, 1); + return drawinglayer::primitive2d::Primitive2DContainer { xRetval }; } else { @@ -156,7 +156,7 @@ namespace sdr { namespace contact { drawinglayer::primitive2d::createHiddenGeometryPrimitives2D( false, aTransform)); - return drawinglayer::primitive2d::Primitive2DSequence(&xRetval, 1); + return drawinglayer::primitive2d::Primitive2DContainer { xRetval }; } } diff --git a/svx/source/sdr/contact/viewcontactofvirtobj.cxx b/svx/source/sdr/contact/viewcontactofvirtobj.cxx index 90997fe7bfa1..606a6112e661 100644 --- a/svx/source/sdr/contact/viewcontactofvirtobj.cxx +++ b/svx/source/sdr/contact/viewcontactofvirtobj.cxx @@ -59,7 +59,7 @@ sal_uInt32 ViewContactOfVirtObj::GetObjectCount() const return 0L; } -drawinglayer::primitive2d::Primitive2DSequence ViewContactOfVirtObj::createViewIndependentPrimitive2DSequence() const +drawinglayer::primitive2d::Primitive2DContainer ViewContactOfVirtObj::createViewIndependentPrimitive2DSequence() const { // create displacement transformation if we have content basegfx::B2DHomMatrix aObjectMatrix; @@ -71,11 +71,11 @@ drawinglayer::primitive2d::Primitive2DSequence ViewContactOfVirtObj::createViewI aObjectMatrix.set(1, 2, aAnchor.Y()); } - // use method from referenced object to get the Primitive2DSequence - const drawinglayer::primitive2d::Primitive2DSequence xSequenceVirtual( + // use method from referenced object to get the Primitive2DContainer + const drawinglayer::primitive2d::Primitive2DContainer xSequenceVirtual( GetVirtObj().GetReferencedObj().GetViewContact().getViewIndependentPrimitive2DSequence()); - if(xSequenceVirtual.hasElements()) + if(!xSequenceVirtual.empty()) { // create transform primitive const drawinglayer::primitive2d::Primitive2DReference xReference( @@ -83,7 +83,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewContactOfVirtObj::createViewI aObjectMatrix, xSequenceVirtual)); - return drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1); + return drawinglayer::primitive2d::Primitive2DContainer { xReference }; } else { @@ -92,7 +92,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewContactOfVirtObj::createViewI drawinglayer::primitive2d::createHiddenGeometryPrimitives2D( false, aObjectMatrix)); - return drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1); + return drawinglayer::primitive2d::Primitive2DContainer { xReference }; } } diff --git a/svx/source/sdr/contact/viewobjectcontact.cxx b/svx/source/sdr/contact/viewobjectcontact.cxx index 8078349251fb..7162d8b1cd2b 100644 --- a/svx/source/sdr/contact/viewobjectcontact.cxx +++ b/svx/source/sdr/contact/viewobjectcontact.cxx @@ -56,7 +56,7 @@ class AnimatedExtractingProcessor2D : public drawinglayer::processor2d::BaseProc { protected: // the found animated primitives - drawinglayer::primitive2d::Primitive2DSequence maPrimitive2DSequence; + drawinglayer::primitive2d::Primitive2DContainer maPrimitive2DSequence; // bitfield // text animation allowed? @@ -77,7 +77,7 @@ public: virtual ~AnimatedExtractingProcessor2D(); // data access - const drawinglayer::primitive2d::Primitive2DSequence& getPrimitive2DSequence() const { return maPrimitive2DSequence; } + const drawinglayer::primitive2d::Primitive2DContainer& getPrimitive2DSequence() const { return maPrimitive2DSequence; } bool isTextAnimationAllowed() const { return mbTextAnimationAllowed; } bool isGraphicAnimationAllowed() const { return mbGraphicAnimationAllowed; } }; @@ -113,7 +113,7 @@ void AnimatedExtractingProcessor2D::processBasePrimitive2D(const drawinglayer::p || (rSwitchPrimitive.isGraphicAnimation() && isGraphicAnimationAllowed())) { const drawinglayer::primitive2d::Primitive2DReference xReference(const_cast< drawinglayer::primitive2d::BasePrimitive2D* >(&rCandidate)); - drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(maPrimitive2DSequence, xReference); + maPrimitive2DSequence.push_back(xReference); } break; } @@ -216,12 +216,12 @@ const basegfx::B2DRange& ViewObjectContact::getObjectRange() const { // if range is not computed (new or LazyInvalidate objects), force it const DisplayInfo aDisplayInfo; - const drawinglayer::primitive2d::Primitive2DSequence xSequence(getPrimitive2DSequence(aDisplayInfo)); + const drawinglayer::primitive2d::Primitive2DContainer xSequence(getPrimitive2DSequence(aDisplayInfo)); - if(xSequence.hasElements()) + if(!xSequence.empty()) { const_cast< ViewObjectContact* >(this)->maObjectRange = - drawinglayer::primitive2d::getB2DRangeFromPrimitive2DSequence(xSequence, rViewInfo2D); + xSequence.getB2DRange(rViewInfo2D); } } } @@ -301,7 +301,7 @@ void ViewObjectContact::checkForPrimitive2DAnimations() } // check for animated primitives - if(mxPrimitive2DSequence.hasElements()) + if(!mxPrimitive2DSequence.empty()) { const bool bTextAnimationAllowed(GetObjectContact().IsTextAnimationAllowed()); const bool bGraphicAnimationAllowed(GetObjectContact().IsGraphicAnimationAllowed()); @@ -312,7 +312,7 @@ void ViewObjectContact::checkForPrimitive2DAnimations() bTextAnimationAllowed, bGraphicAnimationAllowed); aAnimatedExtractor.process(mxPrimitive2DSequence); - if(aAnimatedExtractor.getPrimitive2DSequence().hasElements()) + if(!aAnimatedExtractor.getPrimitive2DSequence().empty()) { // derived primitiveList is animated, setup new PrimitiveAnimation mpPrimitiveAnimation = new sdr::animation::PrimitiveAnimation(*this, aAnimatedExtractor.getPrimitive2DSequence()); @@ -321,21 +321,21 @@ void ViewObjectContact::checkForPrimitive2DAnimations() } } -drawinglayer::primitive2d::Primitive2DSequence ViewObjectContact::createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const +drawinglayer::primitive2d::Primitive2DContainer ViewObjectContact::createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const { // get the view-independent Primitive from the viewContact - drawinglayer::primitive2d::Primitive2DSequence xRetval(GetViewContact().getViewIndependentPrimitive2DSequence()); + drawinglayer::primitive2d::Primitive2DContainer xRetval(GetViewContact().getViewIndependentPrimitive2DSequence()); - if(xRetval.hasElements()) + if(!xRetval.empty()) { // handle GluePoint if(!GetObjectContact().isOutputToPrinter() && GetObjectContact().AreGluePointsVisible()) { - const drawinglayer::primitive2d::Primitive2DSequence xGlue(GetViewContact().createGluePointPrimitive2DSequence()); + const drawinglayer::primitive2d::Primitive2DContainer xGlue(GetViewContact().createGluePointPrimitive2DSequence()); - if(xGlue.hasElements()) + if(!xGlue.empty()) { - drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(xRetval, xGlue); + xRetval.append(xGlue); } } @@ -352,16 +352,16 @@ drawinglayer::primitive2d::Primitive2DSequence ViewObjectContact::createPrimitiv xRetval, aBColorModifier)); - xRetval = drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1); + xRetval = drawinglayer::primitive2d::Primitive2DContainer { xReference }; } } return xRetval; } -drawinglayer::primitive2d::Primitive2DSequence ViewObjectContact::getPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const +drawinglayer::primitive2d::Primitive2DContainer ViewObjectContact::getPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const { - drawinglayer::primitive2d::Primitive2DSequence xNewPrimitiveSequence; + drawinglayer::primitive2d::Primitive2DContainer xNewPrimitiveSequence; // take care of redirectors and create new list ViewObjectContactRedirector* pRedirector = GetObjectContact().GetViewObjectContactRedirector(); @@ -376,7 +376,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewObjectContact::getPrimitive2D } // local up-to-date checks. New list different from local one? - if(!drawinglayer::primitive2d::arePrimitive2DSequencesEqual(mxPrimitive2DSequence, xNewPrimitiveSequence)) + if(mxPrimitive2DSequence != xNewPrimitiveSequence) { // has changed, copy content const_cast< ViewObjectContact* >(this)->mxPrimitive2DSequence = xNewPrimitiveSequence; @@ -387,10 +387,10 @@ drawinglayer::primitive2d::Primitive2DSequence ViewObjectContact::getPrimitive2D // always update object range when PrimitiveSequence changes const drawinglayer::geometry::ViewInformation2D& rViewInformation2D(GetObjectContact().getViewInformation2D()); const_cast< ViewObjectContact* >(this)->maObjectRange = - drawinglayer::primitive2d::getB2DRangeFromPrimitive2DSequence(mxPrimitive2DSequence, rViewInformation2D); + mxPrimitive2DSequence.getB2DRange(rViewInformation2D); } - // return current Primitive2DSequence + // return current Primitive2DContainer return mxPrimitive2DSequence; } @@ -406,20 +406,20 @@ bool ViewObjectContact::isPrimitiveGhosted(const DisplayInfo& rDisplayInfo) cons return (GetObjectContact().DoVisualizeEnteredGroup() && !GetObjectContact().isOutputToPrinter() && rDisplayInfo.IsGhostedDrawModeActive()); } -drawinglayer::primitive2d::Primitive2DSequence ViewObjectContact::getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const +drawinglayer::primitive2d::Primitive2DContainer ViewObjectContact::getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const { - drawinglayer::primitive2d::Primitive2DSequence xRetval; + drawinglayer::primitive2d::Primitive2DContainer xRetval; // check model-view visibility if(isPrimitiveVisible(rDisplayInfo)) { xRetval = getPrimitive2DSequence(rDisplayInfo); - if(xRetval.hasElements()) + if(!xRetval.empty()) { // get ranges const drawinglayer::geometry::ViewInformation2D& rViewInformation2D(GetObjectContact().getViewInformation2D()); - const basegfx::B2DRange aObjectRange(drawinglayer::primitive2d::getB2DRangeFromPrimitive2DSequence(xRetval, rViewInformation2D)); + const basegfx::B2DRange aObjectRange(xRetval.getB2DRange(rViewInformation2D)); const basegfx::B2DRange aViewRange(rViewInformation2D.getViewport()); // check geometrical visibility @@ -427,7 +427,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewObjectContact::getPrimitive2D if(!bVisible) { // not visible, release - xRetval.realloc(0); + xRetval.clear(); } } } @@ -435,16 +435,16 @@ drawinglayer::primitive2d::Primitive2DSequence ViewObjectContact::getPrimitive2D return xRetval; } -drawinglayer::primitive2d::Primitive2DSequence ViewObjectContact::getPrimitive2DSequenceSubHierarchy(DisplayInfo& rDisplayInfo) const +drawinglayer::primitive2d::Primitive2DContainer ViewObjectContact::getPrimitive2DSequenceSubHierarchy(DisplayInfo& rDisplayInfo) const { const sal_uInt32 nSubHierarchyCount(GetViewContact().GetObjectCount()); - drawinglayer::primitive2d::Primitive2DSequence xSeqRetval; + drawinglayer::primitive2d::Primitive2DContainer xSeqRetval; for(sal_uInt32 a(0); a < nSubHierarchyCount; a++) { const ViewObjectContact& rCandidate(GetViewContact().GetViewContact(a).GetViewObjectContact(GetObjectContact())); - drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(xSeqRetval, rCandidate.getPrimitive2DSequenceHierarchy(rDisplayInfo)); + xSeqRetval.append(rCandidate.getPrimitive2DSequenceHierarchy(rDisplayInfo)); } return xSeqRetval; diff --git a/svx/source/sdr/contact/viewobjectcontactofe3d.cxx b/svx/source/sdr/contact/viewobjectcontactofe3d.cxx index 42368b8bbf4f..3ff49dfe446c 100644 --- a/svx/source/sdr/contact/viewobjectcontactofe3d.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofe3d.cxx @@ -24,6 +24,7 @@ #include <sdr/contact/viewobjectcontactofe3dscene.hxx> #include <drawinglayer/primitive2d/embedded3dprimitive2d.hxx> #include <svx/sdr/contact/viewcontactofe3dscene.hxx> +#include <comphelper/sequence.hxx> namespace sdr { @@ -63,7 +64,7 @@ namespace sdr return xRetval; } - drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfE3d::createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const + drawinglayer::primitive2d::Primitive2DContainer ViewObjectContactOfE3d::createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const { const ViewContactOfE3d& rViewContact = static_cast< const ViewContactOfE3d& >(GetViewContact()); @@ -82,7 +83,7 @@ namespace sdr const_cast< ViewObjectContactOfE3d* >(this)->mxPrimitive3DSequence = xNewPrimitive3DSeq; } - // return current Primitive2DSequence + // return current Primitive2DContainer return mxPrimitive3DSequence; } } // end of namespace contact diff --git a/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx b/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx index 8e8e24fb1458..ccb9214cf42f 100644 --- a/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx @@ -68,7 +68,7 @@ namespace sdr { } - drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfE3dScene::createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const + drawinglayer::primitive2d::Primitive2DContainer ViewObjectContactOfE3dScene::createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const { // handle ghosted, else the whole 3d group will be encapsulated to a ghosted primitive set (see below) const bool bHandleGhostedDisplay(GetObjectContact().DoVisualizeEnteredGroup() && !GetObjectContact().isOutputToPrinter() && rDisplayInfo.IsGhostedDrawModeActive()); @@ -86,9 +86,9 @@ namespace sdr // added when sub-groups in 3d will be added one day. const ViewContactOfE3dScene& rViewContact = dynamic_cast< ViewContactOfE3dScene& >(GetViewContact()); const SetOfByte& rVisibleLayers = rDisplayInfo.GetProcessLayers(); - drawinglayer::primitive2d::Primitive2DSequence xRetval(rViewContact.createScenePrimitive2DSequence(&rVisibleLayers)); + drawinglayer::primitive2d::Primitive2DContainer xRetval(rViewContact.createScenePrimitive2DSequence(&rVisibleLayers)); - if(xRetval.hasElements()) + if(!xRetval.empty()) { // allow evtl. embedding in object-specific infos, e.g. Name, Title, Description xRetval = rViewContact.embedToObjectSpecificInformation(xRetval); @@ -96,11 +96,11 @@ namespace sdr // handle GluePoint if(!GetObjectContact().isOutputToPrinter() && GetObjectContact().AreGluePointsVisible()) { - const drawinglayer::primitive2d::Primitive2DSequence xGlue(GetViewContact().createGluePointPrimitive2DSequence()); + const drawinglayer::primitive2d::Primitive2DContainer xGlue(GetViewContact().createGluePointPrimitive2DSequence()); - if(xGlue.hasElements()) + if(!xGlue.empty()) { - drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(xRetval, xGlue); + xRetval.append(xGlue); } } @@ -117,7 +117,7 @@ namespace sdr xRetval, aBColorModifier)); - xRetval = drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1); + xRetval = drawinglayer::primitive2d::Primitive2DContainer { xReference }; } } @@ -130,7 +130,7 @@ namespace sdr return xRetval; } - drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfE3dScene::getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const + drawinglayer::primitive2d::Primitive2DContainer ViewObjectContactOfE3dScene::getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const { // To get the VOCs for the contained 3D objects created to get the correct // Draw hierarchy and ActionChanged() working properly, travel the DrawHierarchy diff --git a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx index dd68629779e6..02f59f183697 100644 --- a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx @@ -251,7 +251,7 @@ namespace sdr return static_cast<ViewContactOfGraphic& >(GetViewContact()).GetGrafObject(); } - drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfGraphic::createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const + drawinglayer::primitive2d::Primitive2DContainer ViewObjectContactOfGraphic::createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const { // prepare primitive generation with evtl. loading the graphic when it's swapped out SdrGrafObj& rGrafObj = const_cast< ViewObjectContactOfGraphic* >(this)->getSdrGrafObj(); @@ -283,9 +283,9 @@ namespace sdr } // get return value by calling parent - drawinglayer::primitive2d::Primitive2DSequence xRetval = ViewObjectContactOfSdrObj::createPrimitive2DSequence(rDisplayInfo); + drawinglayer::primitive2d::Primitive2DContainer xRetval = ViewObjectContactOfSdrObj::createPrimitive2DSequence(rDisplayInfo); - if(xRetval.hasElements()) + if(!xRetval.empty()) { // #i103255# suppress when graphic needs draft visualisation and output // is for PDF export/Printer @@ -297,7 +297,7 @@ namespace sdr if(rObjectContact.isOutputToPDFFile() || rObjectContact.isOutputToPrinter()) { - xRetval = drawinglayer::primitive2d::Primitive2DSequence(); + xRetval = drawinglayer::primitive2d::Primitive2DContainer(); } } } diff --git a/svx/source/sdr/contact/viewobjectcontactofgroup.cxx b/svx/source/sdr/contact/viewobjectcontactofgroup.cxx index 8d9fd7ba96a7..427a0d1f4de1 100644 --- a/svx/source/sdr/contact/viewobjectcontactofgroup.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofgroup.cxx @@ -46,9 +46,9 @@ namespace sdr { } - drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfGroup::getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const + drawinglayer::primitive2d::Primitive2DContainer ViewObjectContactOfGroup::getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const { - drawinglayer::primitive2d::Primitive2DSequence xRetval; + drawinglayer::primitive2d::Primitive2DContainer xRetval; // check model-view visibility if(isPrimitiveVisible(rDisplayInfo)) @@ -70,18 +70,18 @@ namespace sdr // create object hierarchy xRetval = getPrimitive2DSequenceSubHierarchy(rDisplayInfo); - if(xRetval.hasElements()) + if(!xRetval.empty()) { // get ranges const drawinglayer::geometry::ViewInformation2D& rViewInformation2D(GetObjectContact().getViewInformation2D()); - const ::basegfx::B2DRange aObjectRange(drawinglayer::primitive2d::getB2DRangeFromPrimitive2DSequence(xRetval, rViewInformation2D)); + const ::basegfx::B2DRange aObjectRange(xRetval.getB2DRange(rViewInformation2D)); const basegfx::B2DRange aViewRange(rViewInformation2D.getViewport()); // check geometrical visibility if(!aViewRange.isEmpty() && !aViewRange.overlaps(aObjectRange)) { // not visible, release - xRetval.realloc(0); + xRetval.clear(); } } diff --git a/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx b/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx index 437319b6ab39..f26c658b03c7 100644 --- a/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx @@ -28,6 +28,7 @@ #include <drawinglayer/primitive2d/maskprimitive2d.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/polygon/b2dpolygon.hxx> +#include <comphelper/sequence.hxx> @@ -64,10 +65,10 @@ namespace sdr return true; } - drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfMasterPageDescriptor::getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const + drawinglayer::primitive2d::Primitive2DContainer ViewObjectContactOfMasterPageDescriptor::getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const { - drawinglayer::primitive2d::Primitive2DSequence xRetval; - drawinglayer::primitive2d::Primitive2DSequence xMasterPageSequence; + drawinglayer::primitive2d::Primitive2DContainer xRetval; + drawinglayer::primitive2d::Primitive2DContainer xMasterPageSequence; const sdr::MasterPageDescriptor& rDescriptor = GetMasterPageDescriptor(); // used range (retval) is fixed here, it's the MasterPage fill range @@ -109,16 +110,16 @@ namespace sdr rDisplayInfo.SetProcessLayers(aRememberedLayers); rDisplayInfo.SetSubContentActive(false); - if(xMasterPageSequence.hasElements()) + if(!xMasterPageSequence.empty()) { // get range of MasterPage sub hierarchy const drawinglayer::geometry::ViewInformation2D& rViewInformation2D(GetObjectContact().getViewInformation2D()); - const basegfx::B2DRange aSubHierarchyRange(drawinglayer::primitive2d::getB2DRangeFromPrimitive2DSequence(xMasterPageSequence, rViewInformation2D)); + const basegfx::B2DRange aSubHierarchyRange(xMasterPageSequence.getB2DRange(rViewInformation2D)); if(aPageFillRange.isInside(aSubHierarchyRange)) { // completely inside, just render MasterPage content. Add to target - drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(xRetval, xMasterPageSequence); + xRetval.append(xMasterPageSequence); } else if(aPageFillRange.overlaps(aSubHierarchyRange)) { @@ -129,7 +130,7 @@ namespace sdr // need to create a clip primitive, add clipped list to target const drawinglayer::primitive2d::Primitive2DReference xReference(new drawinglayer::primitive2d::MaskPrimitive2D( basegfx::B2DPolyPolygon(basegfx::tools::createPolygonFromRect(aCommonArea)), xMasterPageSequence)); - drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(xRetval, xReference); + xRetval.push_back(xReference); } } diff --git a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx index 8a1b3ccbb4a4..1376c37929cf 100644 --- a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx @@ -57,7 +57,7 @@ public: virtual void Invoke() override; // get primitive visualization - drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequenceForPage(const DisplayInfo& rDisplayInfo); + drawinglayer::primitive2d::Primitive2DContainer createPrimitive2DSequenceForPage(const DisplayInfo& rDisplayInfo); // Own reaction on changes which will be forwarded to the OC of the owner-VOC virtual void InvalidatePartOfView(const basegfx::B2DRange& rRange) const override; @@ -117,9 +117,9 @@ void PagePrimitiveExtractor::Invoke() } } -drawinglayer::primitive2d::Primitive2DSequence PagePrimitiveExtractor::createPrimitive2DSequenceForPage(const DisplayInfo& /*rDisplayInfo*/) +drawinglayer::primitive2d::Primitive2DContainer PagePrimitiveExtractor::createPrimitive2DSequenceForPage(const DisplayInfo& /*rDisplayInfo*/) { - drawinglayer::primitive2d::Primitive2DSequence xRetval; + drawinglayer::primitive2d::Primitive2DContainer xRetval; const SdrPage* pStartPage = GetStartPage(); if(pStartPage) @@ -149,7 +149,7 @@ drawinglayer::primitive2d::Primitive2DSequence PagePrimitiveExtractor::createPri // get page's VOC ViewObjectContact& rDrawPageVOContact = pStartPage->GetViewContact().GetViewObjectContact(*this); - // get whole Primitive2DSequence + // get whole Primitive2DContainer xRetval = rDrawPageVOContact.getPrimitive2DSequenceHierarchy(aDisplayInfo); } @@ -187,9 +187,9 @@ bool PagePrimitiveExtractor::isDrawModeHighContrast() const { return mrViewObjec SdrPageView* PagePrimitiveExtractor::TryToGetSdrPageView() const { return mrViewObjectContactOfPageObj.GetObjectContact().TryToGetSdrPageView(); } OutputDevice* PagePrimitiveExtractor::TryToGetOutputDevice() const { return mrViewObjectContactOfPageObj.GetObjectContact().TryToGetOutputDevice(); } -drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfPageObj::createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const +drawinglayer::primitive2d::Primitive2DContainer ViewObjectContactOfPageObj::createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const { - drawinglayer::primitive2d::Primitive2DSequence xRetval; + drawinglayer::primitive2d::Primitive2DContainer xRetval; const SdrPageObj& rPageObject((static_cast< ViewContactOfPageObj& >(GetViewContact())).GetPageObj()); const SdrPage* pPage = rPageObject.GetReferencedPage(); const svtools::ColorConfig aColorConfig; @@ -215,7 +215,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfPageObj::creat if(mpExtractor && pPage) { // get displayed page's geometry - drawinglayer::primitive2d::Primitive2DSequence xPageContent; + drawinglayer::primitive2d::Primitive2DContainer xPageContent; const Size aPageSize(pPage->GetSize()); const double fPageWidth(aPageSize.getWidth()); const double fPageHeight(aPageSize.getHeight()); @@ -228,7 +228,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfPageObj::creat if(bInCreatePrimitive2D) { // Recursion is possible. Create a replacement primitive - xPageContent.realloc(2); + xPageContent.resize(2); const Color aDocColor(aColorConfig.GetColorValue(svtools::DOCCOLOR).nColor); const Color aBorderColor(aColorConfig.GetColorValue(svtools::DOCBOUNDARIES).nColor); const basegfx::B2DRange aPageBound(0.0, 0.0, fPageWidth, fPageHeight); @@ -265,12 +265,12 @@ drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfPageObj::creat } // prepare retval - if(xPageContent.hasElements()) + if(!xPageContent.empty()) { const uno::Reference< drawing::XDrawPage > xDrawPage(GetXDrawPageForSdrPage(const_cast< SdrPage*>(pPage))); const drawinglayer::primitive2d::Primitive2DReference xPagePreview(new drawinglayer::primitive2d::PagePreviewPrimitive2D( xDrawPage, aPageObjectTransform, fPageWidth, fPageHeight, xPageContent, true)); - xRetval = drawinglayer::primitive2d::Primitive2DSequence(&xPagePreview, 1); + xRetval = drawinglayer::primitive2d::Primitive2DContainer { xPagePreview }; } } else if(bCreateGrayFrame) @@ -281,7 +281,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfPageObj::creat drawinglayer::primitive2d::createHiddenGeometryPrimitives2D( false, aPageObjectTransform)); - xRetval = drawinglayer::primitive2d::Primitive2DSequence(&xFrameHit, 1); + xRetval = drawinglayer::primitive2d::Primitive2DContainer { xFrameHit }; } // add a gray outline frame, except not when printing @@ -294,7 +294,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfPageObj::creat const drawinglayer::primitive2d::Primitive2DReference xGrayFrame( new drawinglayer::primitive2d::PolygonHairlinePrimitive2D(aOwnOutline, aFrameColor.getBColor())); - drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(xRetval, xGrayFrame); + xRetval.push_back(xGrayFrame); } return xRetval; diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx index 9164d7512905..e6ba36506944 100644 --- a/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx @@ -31,6 +31,7 @@ #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <svtools/embedhlp.hxx> +#include <comphelper/sequence.hxx> using namespace com::sun::star; @@ -41,13 +42,13 @@ const SdrOle2Obj& ViewObjectContactOfSdrOle2Obj::getSdrOle2Object() const return static_cast< ViewContactOfSdrOle2Obj& >(GetViewContact()).GetOle2Obj(); } -drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfSdrOle2Obj::createPrimitive2DSequence( +drawinglayer::primitive2d::Primitive2DContainer ViewObjectContactOfSdrOle2Obj::createPrimitive2DSequence( const DisplayInfo& /*rDisplayInfo*/) const { // override this method to do some things the old SdrOle2Obj::DoPaintObject did. // In the future, some of these may be solved different, but ATM try to stay compatible // with the old behaviour - drawinglayer::primitive2d::Primitive2DSequence xRetval; + drawinglayer::primitive2d::Primitive2DContainer xRetval; const SdrOle2Obj& rSdrOle2 = getSdrOle2Object(); sal_Int32 nState(-1); @@ -132,7 +133,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfSdrOle2Obj::cr Color(COL_BLACK).getBColor(), aFillHatch)); - drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(xRetval, xReference); + xRetval.push_back(xReference); } } diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx index dcb83258a249..fcf2ae153b7e 100644 --- a/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx @@ -111,13 +111,13 @@ bool ViewObjectContactOfPageBackground::isPrimitiveVisible(const DisplayInfo& rD return true; } -drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfPageBackground::createPrimitive2DSequence(const DisplayInfo& /*rDisplayInfo*/) const +drawinglayer::primitive2d::Primitive2DContainer ViewObjectContactOfPageBackground::createPrimitive2DSequence(const DisplayInfo& /*rDisplayInfo*/) const { // Initialize background. Dependent of IsPageVisible, use ApplicationBackgroundColor or ApplicationDocumentColor. Most // old renderers for export (html, pdf, gallery, ...) set the page to not visible (SetPageVisible(false)). They expect the // given OutputDevice to be initialized with the ApplicationDocumentColor then. const SdrPageView* pPageView = GetObjectContact().TryToGetSdrPageView(); - drawinglayer::primitive2d::Primitive2DSequence xRetval; + drawinglayer::primitive2d::Primitive2DContainer xRetval; if(pPageView) { @@ -140,7 +140,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfPageBackground } // init background with InitColor - xRetval.realloc(1); + xRetval.resize(1); const basegfx::BColor aRGBColor(aInitColor.getBColor()); xRetval[0] = drawinglayer::primitive2d::Primitive2DReference(new drawinglayer::primitive2d::BackgroundColorPrimitive2D(aRGBColor, aInitColor.GetTransparency() / 255.0)); } @@ -206,10 +206,10 @@ bool ViewObjectContactOfPageFill::isPrimitiveVisible(const DisplayInfo& rDisplay return true; } -drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfPageFill::createPrimitive2DSequence(const DisplayInfo& /*rDisplayInfo*/) const +drawinglayer::primitive2d::Primitive2DContainer ViewObjectContactOfPageFill::createPrimitive2DSequence(const DisplayInfo& /*rDisplayInfo*/) const { const SdrPageView* pPageView = GetObjectContact().TryToGetSdrPageView(); - drawinglayer::primitive2d::Primitive2DSequence xRetval; + drawinglayer::primitive2d::Primitive2DContainer xRetval; if(pPageView) { @@ -230,7 +230,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfPageFill::crea } // create and add primitive - xRetval.realloc(1); + xRetval.resize(1); const basegfx::BColor aRGBColor(aPageFillColor.getBColor()); xRetval[0] = drawinglayer::primitive2d::Primitive2DReference(new drawinglayer::primitive2d::PolyPolygonColorPrimitive2D(basegfx::B2DPolyPolygon(aPageFillPolygon), aRGBColor)); } @@ -367,9 +367,9 @@ ViewObjectContactOfPageHierarchy::~ViewObjectContactOfPageHierarchy() { } -drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfPageHierarchy::getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const +drawinglayer::primitive2d::Primitive2DContainer ViewObjectContactOfPageHierarchy::getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const { - drawinglayer::primitive2d::Primitive2DSequence xRetval; + drawinglayer::primitive2d::Primitive2DContainer xRetval; // process local sub-hierarchy const sal_uInt32 nSubHierarchyCount(GetViewContact().GetObjectCount()); @@ -378,18 +378,18 @@ drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfPageHierarchy: { xRetval = getPrimitive2DSequenceSubHierarchy(rDisplayInfo); - if(xRetval.hasElements()) + if(!xRetval.empty()) { // get ranges const drawinglayer::geometry::ViewInformation2D& rViewInformation2D(GetObjectContact().getViewInformation2D()); - const basegfx::B2DRange aObjectRange(drawinglayer::primitive2d::getB2DRangeFromPrimitive2DSequence(xRetval, rViewInformation2D)); + const basegfx::B2DRange aObjectRange(xRetval.getB2DRange(rViewInformation2D)); const basegfx::B2DRange aViewRange(rViewInformation2D.getViewport()); // check geometrical visibility if(!aViewRange.isEmpty() && !aViewRange.overlaps(aObjectRange)) { // not visible, release - xRetval.realloc(0); + xRetval.clear(); } } } @@ -441,10 +441,10 @@ bool ViewObjectContactOfPageGrid::isPrimitiveVisible(const DisplayInfo& rDisplay return true; } -drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfPageGrid::createPrimitive2DSequence(const DisplayInfo& /*rDisplayInfo*/) const +drawinglayer::primitive2d::Primitive2DContainer ViewObjectContactOfPageGrid::createPrimitive2DSequence(const DisplayInfo& /*rDisplayInfo*/) const { const SdrPageView* pPageView = GetObjectContact().TryToGetSdrPageView(); - drawinglayer::primitive2d::Primitive2DSequence xRetval; + drawinglayer::primitive2d::Primitive2DContainer xRetval; if(pPageView) { @@ -466,7 +466,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfPageGrid::crea const sal_uInt32 nSubdivisionsX(aFine.getWidth() ? aRaw.getWidth() / aFine.getWidth() : 0L); const sal_uInt32 nSubdivisionsY(aFine.getHeight() ? aRaw.getHeight() / aFine.getHeight() : 0L); - xRetval.realloc(1); + xRetval.resize(1); xRetval[0] = drawinglayer::primitive2d::Primitive2DReference(new drawinglayer::primitive2d::GridPrimitive2D( aGridMatrix, fWidthX, fWidthY, 10.0, 3.0, nSubdivisionsX, nSubdivisionsY, aRGBGridColor, drawinglayer::primitive2d::createDefaultCross_3x3(aRGBGridColor))); @@ -519,9 +519,9 @@ bool ViewObjectContactOfPageHelplines::isPrimitiveVisible(const DisplayInfo& rDi return true; } -drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfPageHelplines::createPrimitive2DSequence(const DisplayInfo& /*rDisplayInfo*/) const +drawinglayer::primitive2d::Primitive2DContainer ViewObjectContactOfPageHelplines::createPrimitive2DSequence(const DisplayInfo& /*rDisplayInfo*/) const { - drawinglayer::primitive2d::Primitive2DSequence xRetval; + drawinglayer::primitive2d::Primitive2DContainer xRetval; const SdrPageView* pPageView = GetObjectContact().TryToGetSdrPageView(); if(pPageView) @@ -533,7 +533,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfPageHelplines: { const basegfx::BColor aRGBColorA(1.0, 1.0, 1.0); const basegfx::BColor aRGBColorB(0.0, 0.0, 0.0); - xRetval.realloc(nCount); + xRetval.resize(nCount); for(sal_uInt32 a(0L); a < nCount; a++) { @@ -581,9 +581,9 @@ ViewObjectContactOfSdrPage::~ViewObjectContactOfSdrPage() { } -drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfSdrPage::getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const +drawinglayer::primitive2d::Primitive2DContainer ViewObjectContactOfSdrPage::getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const { - drawinglayer::primitive2d::Primitive2DSequence xRetval; + drawinglayer::primitive2d::Primitive2DContainer xRetval; // process local sub-hierarchy const sal_uInt32 nSubHierarchyCount(GetViewContact().GetObjectCount()); @@ -603,18 +603,18 @@ drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfSdrPage::getPr // create object hierarchy xRetval = getPrimitive2DSequenceSubHierarchy(rDisplayInfo); - if(xRetval.hasElements()) + if(!xRetval.empty()) { // get ranges const drawinglayer::geometry::ViewInformation2D& rViewInformation2D(GetObjectContact().getViewInformation2D()); - const basegfx::B2DRange aObjectRange(drawinglayer::primitive2d::getB2DRangeFromPrimitive2DSequence(xRetval, rViewInformation2D)); + const basegfx::B2DRange aObjectRange(xRetval.getB2DRange(rViewInformation2D)); const basegfx::B2DRange aViewRange(rViewInformation2D.getViewport()); // check geometrical visibility if(!aViewRange.isEmpty() && !aViewRange.overlaps(aObjectRange)) { // not visible, release - xRetval.realloc(0); + xRetval.clear(); } } diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx index d3a46cb5feec..dc8518706782 100644 --- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx @@ -49,6 +49,7 @@ #include <osl/mutex.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/scopeguard.hxx> +#include <comphelper/sequence.hxx> #include <cppuhelper/implbase.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <tools/diagnose_ex.h> @@ -799,12 +800,12 @@ namespace sdr { namespace contact { typedef ::drawinglayer::primitive2d::BufferedDecompositionPrimitive2D BufferedDecompositionPrimitive2D; protected: - virtual ::drawinglayer::primitive2d::Primitive2DSequence + virtual ::drawinglayer::primitive2d::Primitive2DContainer get2DDecomposition( const ::drawinglayer::geometry::ViewInformation2D& rViewInformation ) const override; - virtual ::drawinglayer::primitive2d::Primitive2DSequence + virtual ::drawinglayer::primitive2d::Primitive2DContainer create2DDecomposition( const ::drawinglayer::geometry::ViewInformation2D& rViewInformation ) const override; @@ -1547,7 +1548,7 @@ namespace sdr { namespace contact { } - ::drawinglayer::primitive2d::Primitive2DSequence LazyControlCreationPrimitive2D::get2DDecomposition( const ::drawinglayer::geometry::ViewInformation2D& _rViewInformation ) const + ::drawinglayer::primitive2d::Primitive2DContainer LazyControlCreationPrimitive2D::get2DDecomposition( const ::drawinglayer::geometry::ViewInformation2D& _rViewInformation ) const { #if OSL_DEBUG_LEVEL > 1 ::basegfx::B2DVector aScale, aTranslate; @@ -1560,7 +1561,7 @@ namespace sdr { namespace contact { } - ::drawinglayer::primitive2d::Primitive2DSequence LazyControlCreationPrimitive2D::create2DDecomposition( const ::drawinglayer::geometry::ViewInformation2D& _rViewInformation ) const + ::drawinglayer::primitive2d::Primitive2DContainer LazyControlCreationPrimitive2D::create2DDecomposition( const ::drawinglayer::geometry::ViewInformation2D& _rViewInformation ) const { #if OSL_DEBUG_LEVEL > 1 ::basegfx::B2DVector aScale, aTranslate; @@ -1597,7 +1598,7 @@ namespace sdr { namespace contact { const drawinglayer::primitive2d::Primitive2DReference xRetval( new ::drawinglayer::primitive2d::ControlPrimitive2D( m_aTransformation, xControlModel, rControl.getControl() ) ); - return drawinglayer::primitive2d::Primitive2DSequence(&xRetval, 1); + return drawinglayer::primitive2d::Primitive2DContainer { xRetval }; } @@ -1684,26 +1685,26 @@ namespace sdr { namespace contact { } - drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfUnoControl::createPrimitive2DSequence(const DisplayInfo& /*rDisplayInfo*/) const + drawinglayer::primitive2d::Primitive2DContainer ViewObjectContactOfUnoControl::createPrimitive2DSequence(const DisplayInfo& /*rDisplayInfo*/) const { if ( m_pImpl->isDisposed() ) // our control already died. // TODO: Is it worth re-creating the control? Finally, this is a pathological situation, it means some instance // disposed the control though it doesn't own it. So, /me thinks we should not bother here. - return drawinglayer::primitive2d::Primitive2DSequence(); + return drawinglayer::primitive2d::Primitive2DContainer(); if ( GetObjectContact().getViewInformation2D().getViewTransformation().isIdentity() ) // remove this when #i115754# is fixed - return drawinglayer::primitive2d::Primitive2DSequence(); + return drawinglayer::primitive2d::Primitive2DContainer(); // ignore existing controls which are in alive mode and manually switched to "invisible" // #102090# / 2009-06-05 / frank.schoenheit@sun.com const ControlHolder& rControl( m_pImpl->getExistentControl() ); if ( rControl.is() && !rControl.isDesignMode() && !rControl.isVisible() ) - return drawinglayer::primitive2d::Primitive2DSequence(); + return drawinglayer::primitive2d::Primitive2DContainer(); ::drawinglayer::primitive2d::Primitive2DReference xPrimitive( new LazyControlCreationPrimitive2D( m_pImpl ) ); - return ::drawinglayer::primitive2d::Primitive2DSequence( &xPrimitive, 1 ); + return ::drawinglayer::primitive2d::Primitive2DContainer { xPrimitive }; } @@ -1765,7 +1766,7 @@ namespace sdr { namespace contact { // graphical invalidate at all views ActionChanged(); - // #i93318# flush Primitive2DSequence to force recreation with updated XControlModel + // #i93318# flush Primitive2DContainer to force recreation with updated XControlModel // since e.g. background color has changed and existing decompositions are possibly no // longer valid. Unfortunately this is not detected from ControlPrimitive2D::operator== // since it only has a uno reference to the XControlModel @@ -1783,10 +1784,10 @@ namespace sdr { namespace contact { } - drawinglayer::primitive2d::Primitive2DSequence UnoControlPrintOrPreviewContact::createPrimitive2DSequence(const DisplayInfo& rDisplayInfo ) const + drawinglayer::primitive2d::Primitive2DContainer UnoControlPrintOrPreviewContact::createPrimitive2DSequence(const DisplayInfo& rDisplayInfo ) const { if ( !m_pImpl->isPrintableControl() ) - return drawinglayer::primitive2d::Primitive2DSequence(); + return drawinglayer::primitive2d::Primitive2DContainer(); return ViewObjectContactOfUnoControl::createPrimitive2DSequence( rDisplayInfo ); } diff --git a/svx/source/sdr/contact/viewobjectcontactredirector.cxx b/svx/source/sdr/contact/viewobjectcontactredirector.cxx index 47110839f069..53265cf3b252 100644 --- a/svx/source/sdr/contact/viewobjectcontactredirector.cxx +++ b/svx/source/sdr/contact/viewobjectcontactredirector.cxx @@ -33,7 +33,7 @@ ViewObjectContactRedirector::~ViewObjectContactRedirector() { } -drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactRedirector::createRedirectedPrimitive2DSequence( +drawinglayer::primitive2d::Primitive2DContainer ViewObjectContactRedirector::createRedirectedPrimitive2DSequence( const sdr::contact::ViewObjectContact& rOriginal, const sdr::contact::DisplayInfo& rDisplayInfo) { diff --git a/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx b/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx index bc26abeefab4..7df3b388a4ce 100644 --- a/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx +++ b/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx @@ -29,7 +29,7 @@ namespace sdr { namespace overlay { - drawinglayer::primitive2d::Primitive2DSequence OverlayAnimatedBitmapEx::createOverlayObjectPrimitive2DSequence() + drawinglayer::primitive2d::Primitive2DContainer OverlayAnimatedBitmapEx::createOverlayObjectPrimitive2DSequence() { if(mbOverlayState) { @@ -42,7 +42,7 @@ namespace sdr getShearX(), getRotation())); - return drawinglayer::primitive2d::Primitive2DSequence(&aPrimitive, 1); + return drawinglayer::primitive2d::Primitive2DContainer { aPrimitive }; } else { @@ -55,7 +55,7 @@ namespace sdr getShearX(), getRotation())); - return drawinglayer::primitive2d::Primitive2DSequence(&aPrimitive, 1); + return drawinglayer::primitive2d::Primitive2DContainer { aPrimitive }; } } diff --git a/svx/source/sdr/overlay/overlaybitmapex.cxx b/svx/source/sdr/overlay/overlaybitmapex.cxx index cf24af631a97..a89fdd15478a 100644 --- a/svx/source/sdr/overlay/overlaybitmapex.cxx +++ b/svx/source/sdr/overlay/overlaybitmapex.cxx @@ -29,7 +29,7 @@ namespace sdr { namespace overlay { - drawinglayer::primitive2d::Primitive2DSequence OverlayBitmapEx::createOverlayObjectPrimitive2DSequence() + drawinglayer::primitive2d::Primitive2DContainer OverlayBitmapEx::createOverlayObjectPrimitive2DSequence() { drawinglayer::primitive2d::Primitive2DReference aReference( new drawinglayer::primitive2d::OverlayBitmapExPrimitive( @@ -42,12 +42,12 @@ namespace sdr if(basegfx::fTools::more(mfAlpha, 0.0)) { - const drawinglayer::primitive2d::Primitive2DSequence aNewTransPrimitiveVector(&aReference, 1L); + const drawinglayer::primitive2d::Primitive2DContainer aNewTransPrimitiveVector { aReference }; aReference = drawinglayer::primitive2d::Primitive2DReference( new drawinglayer::primitive2d::UnifiedTransparencePrimitive2D(aNewTransPrimitiveVector, mfAlpha)); } - return drawinglayer::primitive2d::Primitive2DSequence(&aReference, 1); + return drawinglayer::primitive2d::Primitive2DContainer { aReference }; } OverlayBitmapEx::OverlayBitmapEx( diff --git a/svx/source/sdr/overlay/overlaycrosshair.cxx b/svx/source/sdr/overlay/overlaycrosshair.cxx index c3fa5189919d..264ceff75aa2 100644 --- a/svx/source/sdr/overlay/overlaycrosshair.cxx +++ b/svx/source/sdr/overlay/overlaycrosshair.cxx @@ -28,9 +28,9 @@ namespace sdr { namespace overlay { - drawinglayer::primitive2d::Primitive2DSequence OverlayCrosshairStriped::createOverlayObjectPrimitive2DSequence() + drawinglayer::primitive2d::Primitive2DContainer OverlayCrosshairStriped::createOverlayObjectPrimitive2DSequence() { - drawinglayer::primitive2d::Primitive2DSequence aRetval; + drawinglayer::primitive2d::Primitive2DContainer aRetval; if(getOverlayManager()) { @@ -45,7 +45,7 @@ namespace sdr aRGBColorB, fStripeLengthPixel)); - aRetval = drawinglayer::primitive2d::Primitive2DSequence(&aReference, 1); + aRetval = drawinglayer::primitive2d::Primitive2DContainer { aReference }; } return aRetval; diff --git a/svx/source/sdr/overlay/overlayhandle.cxx b/svx/source/sdr/overlay/overlayhandle.cxx index df9947252993..0c89165e4634 100644 --- a/svx/source/sdr/overlay/overlayhandle.cxx +++ b/svx/source/sdr/overlay/overlayhandle.cxx @@ -33,7 +33,7 @@ namespace sdr { namespace overlay { using namespace drawinglayer; using namespace basegfx; -primitive2d::Primitive2DSequence OverlayHandle::createOverlayObjectPrimitive2DSequence() +primitive2d::Primitive2DContainer OverlayHandle::createOverlayObjectPrimitive2DSequence() { basegfx::BColor aStrokeColor = maStrokeColor.getBColor(); basegfx::BColor aFillColor = getBaseColor().getBColor(); @@ -41,7 +41,7 @@ primitive2d::Primitive2DSequence OverlayHandle::createOverlayObjectPrimitive2DSe const primitive2d::Primitive2DReference aReference( new primitive2d::OverlayStaticRectanglePrimitive(maBasePosition, maSize, aStrokeColor, aFillColor, 0.3f, 0.0f)); - return primitive2d::Primitive2DSequence(&aReference, 1); + return primitive2d::Primitive2DContainer { aReference }; } OverlayHandle::OverlayHandle(const B2DPoint& rBasePos, diff --git a/svx/source/sdr/overlay/overlayhelpline.cxx b/svx/source/sdr/overlay/overlayhelpline.cxx index 95958b277c6e..e9e19efacd28 100644 --- a/svx/source/sdr/overlay/overlayhelpline.cxx +++ b/svx/source/sdr/overlay/overlayhelpline.cxx @@ -29,9 +29,9 @@ namespace sdr { namespace overlay { - drawinglayer::primitive2d::Primitive2DSequence OverlayHelplineStriped::createOverlayObjectPrimitive2DSequence() + drawinglayer::primitive2d::Primitive2DContainer OverlayHelplineStriped::createOverlayObjectPrimitive2DSequence() { - drawinglayer::primitive2d::Primitive2DSequence aRetval; + drawinglayer::primitive2d::Primitive2DContainer aRetval; if(getOverlayManager()) { @@ -51,7 +51,7 @@ namespace sdr aRGBColorB, fStripeLengthPixel)); - aRetval = drawinglayer::primitive2d::Primitive2DSequence(&aReference, 1); + aRetval = drawinglayer::primitive2d::Primitive2DContainer { aReference }; } return aRetval; diff --git a/svx/source/sdr/overlay/overlayline.cxx b/svx/source/sdr/overlay/overlayline.cxx index 17da890f3ce9..582a95b644c4 100644 --- a/svx/source/sdr/overlay/overlayline.cxx +++ b/svx/source/sdr/overlay/overlayline.cxx @@ -32,9 +32,9 @@ namespace sdr { namespace overlay { - drawinglayer::primitive2d::Primitive2DSequence OverlayLineStriped::createOverlayObjectPrimitive2DSequence() + drawinglayer::primitive2d::Primitive2DContainer OverlayLineStriped::createOverlayObjectPrimitive2DSequence() { - drawinglayer::primitive2d::Primitive2DSequence aRetval; + drawinglayer::primitive2d::Primitive2DContainer aRetval; if(getOverlayManager()) { @@ -53,7 +53,7 @@ namespace sdr aRGBColorB, fStripeLengthPixel)); - aRetval = drawinglayer::primitive2d::Primitive2DSequence(&aReference, 1); + aRetval = drawinglayer::primitive2d::Primitive2DContainer { aReference }; } return aRetval; diff --git a/svx/source/sdr/overlay/overlaymanager.cxx b/svx/source/sdr/overlay/overlaymanager.cxx index 27faabd67acb..a044338da6c2 100644 --- a/svx/source/sdr/overlay/overlaymanager.cxx +++ b/svx/source/sdr/overlay/overlaymanager.cxx @@ -60,9 +60,9 @@ namespace sdr if(rCandidate.isVisible()) { - const drawinglayer::primitive2d::Primitive2DSequence& rSequence = rCandidate.getOverlayObjectPrimitive2DSequence(); + const drawinglayer::primitive2d::Primitive2DContainer& rSequence = rCandidate.getOverlayObjectPrimitive2DSequence(); - if(rSequence.hasElements()) + if(!rSequence.empty()) { if(rRange.overlaps(rCandidate.getBaseRange())) { diff --git a/svx/source/sdr/overlay/overlayobject.cxx b/svx/source/sdr/overlay/overlayobject.cxx index 09d1d948687f..929fb6b0b06d 100644 --- a/svx/source/sdr/overlay/overlayobject.cxx +++ b/svx/source/sdr/overlay/overlayobject.cxx @@ -38,7 +38,7 @@ namespace sdr { const basegfx::B2DRange aPreviousRange(maBaseRange); maBaseRange.reset(); - setPrimitive2DSequence(drawinglayer::primitive2d::Primitive2DSequence()); + setPrimitive2DSequence(drawinglayer::primitive2d::Primitive2DContainer()); if(getOverlayManager() && !aPreviousRange.isEmpty()) { @@ -54,13 +54,13 @@ namespace sdr } // OverlayObject implementations. - drawinglayer::primitive2d::Primitive2DSequence OverlayObject::createOverlayObjectPrimitive2DSequence() + drawinglayer::primitive2d::Primitive2DContainer OverlayObject::createOverlayObjectPrimitive2DSequence() { // Default implementation has to assert a missing implementation. It cannot // be useful to have overlay object derivations which have no visualisation // at all OSL_FAIL("OverlayObject derivation without visualisation definition (missing createOverlayObjectPrimitive2DSequence implementation) (!)"); - return drawinglayer::primitive2d::Primitive2DSequence(); + return drawinglayer::primitive2d::Primitive2DContainer(); } sal_uInt32 OverlayObject::impCheckBlinkTimeValueRange(sal_uInt64 nBlinkTime) @@ -105,9 +105,9 @@ namespace sdr OSL_ENSURE(nullptr == getOverlayManager(), "OverlayObject is destructed which is still registered at OverlayManager (!)"); } - drawinglayer::primitive2d::Primitive2DSequence OverlayObject::getOverlayObjectPrimitive2DSequence() const + drawinglayer::primitive2d::Primitive2DContainer OverlayObject::getOverlayObjectPrimitive2DSequence() const { - if(!getPrimitive2DSequence().hasElements()) + if(getPrimitive2DSequence().empty()) { // no existing sequence; create one const_cast< OverlayObject* >(this)->setPrimitive2DSequence( @@ -121,14 +121,14 @@ namespace sdr { if(getOverlayManager() && maBaseRange.isEmpty()) { - const drawinglayer::primitive2d::Primitive2DSequence& rSequence = getOverlayObjectPrimitive2DSequence(); + const drawinglayer::primitive2d::Primitive2DContainer& rSequence = getOverlayObjectPrimitive2DSequence(); - if(rSequence.hasElements()) + if(!rSequence.empty()) { const drawinglayer::geometry::ViewInformation2D aViewInformation2D(getOverlayManager()->getCurrentViewInformation2D()); const_cast< sdr::overlay::OverlayObject* >(this)->maBaseRange = - drawinglayer::primitive2d::getB2DRangeFromPrimitive2DSequence(rSequence, aViewInformation2D); + rSequence.getB2DRange(aViewInformation2D); } } diff --git a/svx/source/sdr/overlay/overlayobjectcell.cxx b/svx/source/sdr/overlay/overlayobjectcell.cxx index cfd772a57595..4596fa9e30dd 100644 --- a/svx/source/sdr/overlay/overlayobjectcell.cxx +++ b/svx/source/sdr/overlay/overlayobjectcell.cxx @@ -47,15 +47,15 @@ namespace sdr { } - drawinglayer::primitive2d::Primitive2DSequence OverlayObjectCell::createOverlayObjectPrimitive2DSequence() + drawinglayer::primitive2d::Primitive2DContainer OverlayObjectCell::createOverlayObjectPrimitive2DSequence() { - drawinglayer::primitive2d::Primitive2DSequence aRetval; + drawinglayer::primitive2d::Primitive2DContainer aRetval; const sal_uInt32 nCount(maRectangles.size()); if(nCount) { const basegfx::BColor aRGBColor(getBaseColor().getBColor()); - aRetval.realloc(nCount); + aRetval.resize(nCount); // create primitives for all ranges for(sal_uInt32 a(0); a < nCount; a++) @@ -78,7 +78,7 @@ namespace sdr aRetval, 0.5)); - aRetval = drawinglayer::primitive2d::Primitive2DSequence(&aUnifiedTransparence, 1); + aRetval = drawinglayer::primitive2d::Primitive2DContainer { aUnifiedTransparence }; } else // CELL_OVERLAY_INVERT { @@ -87,7 +87,7 @@ namespace sdr new drawinglayer::primitive2d::InvertPrimitive2D( aRetval)); - aRetval = drawinglayer::primitive2d::Primitive2DSequence(&aInvert, 1); + aRetval = drawinglayer::primitive2d::Primitive2DContainer { aInvert }; } } diff --git a/svx/source/sdr/overlay/overlayobjectlist.cxx b/svx/source/sdr/overlay/overlayobjectlist.cxx index 1f8af0d19867..f15e0ace1b23 100644 --- a/svx/source/sdr/overlay/overlayobjectlist.cxx +++ b/svx/source/sdr/overlay/overlayobjectlist.cxx @@ -102,9 +102,9 @@ namespace sdr if(pCandidate->isHittable()) { - const drawinglayer::primitive2d::Primitive2DSequence& rSequence = pCandidate->getOverlayObjectPrimitive2DSequence(); + const drawinglayer::primitive2d::Primitive2DContainer& rSequence = pCandidate->getOverlayObjectPrimitive2DSequence(); - if(rSequence.hasElements()) + if(!rSequence.empty()) { aHitTestProcessor2D.process(rSequence); diff --git a/svx/source/sdr/overlay/overlaypolypolygon.cxx b/svx/source/sdr/overlay/overlaypolypolygon.cxx index cacb03f52b93..499074facd1e 100644 --- a/svx/source/sdr/overlay/overlaypolypolygon.cxx +++ b/svx/source/sdr/overlay/overlaypolypolygon.cxx @@ -30,9 +30,9 @@ namespace sdr { namespace overlay { - drawinglayer::primitive2d::Primitive2DSequence OverlayPolyPolygonStripedAndFilled::createOverlayObjectPrimitive2DSequence() + drawinglayer::primitive2d::Primitive2DContainer OverlayPolyPolygonStripedAndFilled::createOverlayObjectPrimitive2DSequence() { - drawinglayer::primitive2d::Primitive2DSequence aRetval; + drawinglayer::primitive2d::Primitive2DContainer aRetval; if(getOverlayManager()) { @@ -46,7 +46,7 @@ namespace sdr aRGBColorB, fStripeLengthPixel)); - aRetval = drawinglayer::primitive2d::Primitive2DSequence(&aStriped, 1); + aRetval = drawinglayer::primitive2d::Primitive2DContainer { aStriped }; const SvtOptionsDrawinglayer aSvtOptionsDrawinglayer; const basegfx::BColor aHilightColor(aSvtOptionsDrawinglayer.getHilightColor().getBColor()); @@ -60,7 +60,7 @@ namespace sdr 3.0, false)); - drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, aFilled); + aRetval.push_back(aFilled); } return aRetval; diff --git a/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx b/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx index c62234355dd0..4929b2bf9755 100644 --- a/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx +++ b/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx @@ -28,12 +28,12 @@ namespace sdr { namespace overlay { - drawinglayer::primitive2d::Primitive2DSequence OverlayPrimitive2DSequenceObject::createOverlayObjectPrimitive2DSequence() + drawinglayer::primitive2d::Primitive2DContainer OverlayPrimitive2DSequenceObject::createOverlayObjectPrimitive2DSequence() { return getSequence(); } - OverlayPrimitive2DSequenceObject::OverlayPrimitive2DSequenceObject(const drawinglayer::primitive2d::Primitive2DSequence& rSequence) + OverlayPrimitive2DSequenceObject::OverlayPrimitive2DSequenceObject(const drawinglayer::primitive2d::Primitive2DContainer& rSequence) : OverlayObjectWithBasePosition(basegfx::B2DPoint(), Color(COL_BLACK)), maSequence(rSequence) { diff --git a/svx/source/sdr/overlay/overlayrectangle.cxx b/svx/source/sdr/overlay/overlayrectangle.cxx index 92932f50af51..59136639cffd 100644 --- a/svx/source/sdr/overlay/overlayrectangle.cxx +++ b/svx/source/sdr/overlay/overlayrectangle.cxx @@ -34,7 +34,7 @@ namespace sdr { namespace overlay { - drawinglayer::primitive2d::Primitive2DSequence OverlayRectangle::createOverlayObjectPrimitive2DSequence() + drawinglayer::primitive2d::Primitive2DContainer OverlayRectangle::createOverlayObjectPrimitive2DSequence() { const basegfx::B2DRange aHatchRange(getBasePosition(), maSecondPosition); basegfx::BColor aColor(getBaseColor().getBColor()); @@ -60,7 +60,7 @@ namespace sdr getDiscreteShrink(), getRotation())); - return drawinglayer::primitive2d::Primitive2DSequence(&aReference, 1); + return drawinglayer::primitive2d::Primitive2DContainer { aReference }; } OverlayRectangle::OverlayRectangle( diff --git a/svx/source/sdr/overlay/overlayrollingrectangle.cxx b/svx/source/sdr/overlay/overlayrollingrectangle.cxx index a633ab7f0d50..ad1cbd67baec 100644 --- a/svx/source/sdr/overlay/overlayrollingrectangle.cxx +++ b/svx/source/sdr/overlay/overlayrollingrectangle.cxx @@ -32,9 +32,9 @@ namespace sdr { namespace overlay { - drawinglayer::primitive2d::Primitive2DSequence OverlayRollingRectangleStriped::createOverlayObjectPrimitive2DSequence() + drawinglayer::primitive2d::Primitive2DContainer OverlayRollingRectangleStriped::createOverlayObjectPrimitive2DSequence() { - drawinglayer::primitive2d::Primitive2DSequence aRetval; + drawinglayer::primitive2d::Primitive2DContainer aRetval; if(getOverlayManager() && (getShowBounds() || getExtendedLines())) { @@ -48,7 +48,7 @@ namespace sdr // view-independent part, create directly const basegfx::B2DPolygon aPolygon(basegfx::tools::createPolygonFromRect(aRollingRectangle)); - aRetval.realloc(2); + aRetval.resize(2); aRetval[0] = new drawinglayer::primitive2d::PolyPolygonMarkerPrimitive2D( basegfx::B2DPolyPolygon(aPolygon), aRGBColorA, @@ -77,7 +77,7 @@ namespace sdr aRGBColorB, fStripeLengthPixel)); - drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, aReference); + aRetval.push_back(aReference); } } diff --git a/svx/source/sdr/overlay/overlayselection.cxx b/svx/source/sdr/overlay/overlayselection.cxx index 3c308af8ea09..bab9366054c2 100644 --- a/svx/source/sdr/overlay/overlayselection.cxx +++ b/svx/source/sdr/overlay/overlayselection.cxx @@ -92,9 +92,9 @@ namespace sdr return aOverlayType; } - drawinglayer::primitive2d::Primitive2DSequence OverlaySelection::createOverlayObjectPrimitive2DSequence() + drawinglayer::primitive2d::Primitive2DContainer OverlaySelection::createOverlayObjectPrimitive2DSequence() { - drawinglayer::primitive2d::Primitive2DSequence aRetval; + drawinglayer::primitive2d::Primitive2DContainer aRetval; const sal_uInt32 nCount(getRanges().size()); if(nCount) @@ -102,7 +102,7 @@ namespace sdr // create range primitives const bool bInvert(OVERLAY_INVERT == maLastOverlayType); basegfx::BColor aRGBColor(getBaseColor().getBColor()); - aRetval.realloc(nCount); + aRetval.resize(nCount); if(bInvert) { @@ -125,7 +125,7 @@ namespace sdr const drawinglayer::primitive2d::Primitive2DReference aInvert( new drawinglayer::primitive2d::InvertPrimitive2D( aRetval)); - aRetval = drawinglayer::primitive2d::Primitive2DSequence(&aInvert, 1); + aRetval = drawinglayer::primitive2d::Primitive2DContainer { aInvert }; } else if(OVERLAY_TRANSPARENT == maLastOverlayType) { @@ -145,14 +145,14 @@ namespace sdr aRGBColor)); // add both to result - aRetval.realloc(2); + aRetval.resize(2); aRetval[0] = aUnifiedTransparence; aRetval[1] = aSelectionOutline; } else { // just add transparent part - aRetval = drawinglayer::primitive2d::Primitive2DSequence(&aUnifiedTransparence, 1); + aRetval = drawinglayer::primitive2d::Primitive2DContainer { aUnifiedTransparence }; } } } @@ -184,24 +184,24 @@ namespace sdr } } - drawinglayer::primitive2d::Primitive2DSequence OverlaySelection::getOverlayObjectPrimitive2DSequence() const + drawinglayer::primitive2d::Primitive2DContainer OverlaySelection::getOverlayObjectPrimitive2DSequence() const { // get current values const OverlayType aNewOverlayType(impCheckPossibleOverlayType(meOverlayType)); const SvtOptionsDrawinglayer aSvtOptionsDrawinglayer; const sal_uInt16 nNewTransparence(aSvtOptionsDrawinglayer.GetTransparentSelectionPercent()); - if(getPrimitive2DSequence().hasElements()) + if(!getPrimitive2DSequence().empty()) { if(aNewOverlayType != maLastOverlayType || nNewTransparence != mnLastTransparence) { // conditions of last local decomposition have changed, delete - const_cast< OverlaySelection* >(this)->setPrimitive2DSequence(drawinglayer::primitive2d::Primitive2DSequence()); + const_cast< OverlaySelection* >(this)->setPrimitive2DSequence(drawinglayer::primitive2d::Primitive2DContainer()); } } - if(!getPrimitive2DSequence().hasElements()) + if(getPrimitive2DSequence().empty()) { // remember new values const_cast< OverlaySelection* >(this)->maLastOverlayType = aNewOverlayType; diff --git a/svx/source/sdr/overlay/overlaytools.cxx b/svx/source/sdr/overlay/overlaytools.cxx index b333ce212179..37a14f61f2c8 100644 --- a/svx/source/sdr/overlay/overlaytools.cxx +++ b/svx/source/sdr/overlay/overlaytools.cxx @@ -54,9 +54,9 @@ OverlayStaticRectanglePrimitive::OverlayStaticRectanglePrimitive( , mfRotation(fRotation) {} -Primitive2DSequence OverlayStaticRectanglePrimitive::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const +Primitive2DContainer OverlayStaticRectanglePrimitive::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const { - Primitive2DSequence aPrimitive2DSequence; + Primitive2DContainer aPrimitive2DSequence; const double fHalfWidth = maSize.getX() * getDiscreteUnit() / 2.0; const double fHalfHeight = maSize.getY() * getDiscreteUnit() / 2.0; @@ -83,7 +83,7 @@ Primitive2DSequence OverlayStaticRectanglePrimitive::create2DDecomposition(const const Primitive2DReference aFill( new PolyPolygonColorPrimitive2D(aPolyPolygon, maFillColor)); - aPrimitive2DSequence = Primitive2DSequence(2); + aPrimitive2DSequence = Primitive2DContainer(2); aPrimitive2DSequence[0] = aFill; aPrimitive2DSequence[1] = aStroke; @@ -95,7 +95,7 @@ Primitive2DSequence OverlayStaticRectanglePrimitive::create2DDecomposition(const aPrimitive2DSequence, mfTransparence)); - aPrimitive2DSequence = Primitive2DSequence(&aFillTransparent, 1); + aPrimitive2DSequence = Primitive2DContainer { aFillTransparent }; } } @@ -143,9 +143,9 @@ namespace drawinglayer mfRotation(fRotation) {} - Primitive2DSequence OverlayBitmapExPrimitive::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const + Primitive2DContainer OverlayBitmapExPrimitive::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const { - Primitive2DSequence aRetval; + Primitive2DContainer aRetval; const Size aBitmapSize(getBitmapEx().GetSizePixel()); if(aBitmapSize.Width() && aBitmapSize.Height() && basegfx::fTools::more(getDiscreteUnit(), 0.0)) @@ -184,7 +184,7 @@ namespace drawinglayer aTransform.translate(getBasePosition().getX(), getBasePosition().getY()); const Primitive2DReference aPrimitive(new BitmapPrimitive2D(getBitmapEx(), aTransform)); - aRetval = Primitive2DSequence(&aPrimitive, 1); + aRetval = Primitive2DContainer { aPrimitive }; } return aRetval; @@ -230,14 +230,14 @@ namespace drawinglayer mfDiscreteDashLength(fDiscreteDashLength) {} - Primitive2DSequence OverlayCrosshairPrimitive::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const + Primitive2DContainer OverlayCrosshairPrimitive::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const { // use the prepared Viewport information accessible using getViewport() - Primitive2DSequence aRetval; + Primitive2DContainer aRetval; if(!getViewport().isEmpty()) { - aRetval.realloc(2); + aRetval.resize(2); basegfx::B2DPolygon aPolygon; aPolygon.append(basegfx::B2DPoint(getViewport().getMinX(), getBasePosition().getY())); @@ -307,9 +307,9 @@ namespace drawinglayer mfRotation(fRotation) {} - Primitive2DSequence OverlayRectanglePrimitive::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const + Primitive2DContainer OverlayRectanglePrimitive::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const { - Primitive2DSequence aRetval; + Primitive2DContainer aRetval; basegfx::B2DRange aInnerRange(getObjectRange()); if(!aInnerRange.isEmpty() && basegfx::fTools::more(getDiscreteUnit(), 0.0) && getTransparence() <= 1.0) @@ -369,7 +369,7 @@ namespace drawinglayer aEmptyColor, aFillHatchAttribute)); - aRetval = Primitive2DSequence(&aHatch, 1); + aRetval = Primitive2DContainer { aHatch }; } else { @@ -379,7 +379,7 @@ namespace drawinglayer aPolyPolygon, getColor())); - aRetval = Primitive2DSequence(&aFill, 1); + aRetval = Primitive2DContainer { aFill }; // embed filled to transparency (if used) if(getTransparence() > 0.0) @@ -389,7 +389,7 @@ namespace drawinglayer aRetval, getTransparence())); - aRetval = Primitive2DSequence(&aFillTransparent, 1); + aRetval = Primitive2DContainer { aFillTransparent }; } } } @@ -439,10 +439,10 @@ namespace drawinglayer mfDiscreteDashLength(fDiscreteDashLength) {} - Primitive2DSequence OverlayHelplineStripedPrimitive::create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const + Primitive2DContainer OverlayHelplineStripedPrimitive::create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const { // use the prepared Viewport information accessible using getViewport() - Primitive2DSequence aRetval; + Primitive2DContainer aRetval; if(!getViewport().isEmpty()) { @@ -450,7 +450,7 @@ namespace drawinglayer { case HELPLINESTYLE_VERTICAL : { - aRetval.realloc(1); + aRetval.resize(1); basegfx::B2DPolygon aLine; aLine.append(basegfx::B2DPoint(getBasePosition().getX(), getViewport().getMinY())); @@ -467,7 +467,7 @@ namespace drawinglayer case HELPLINESTYLE_HORIZONTAL : { - aRetval.realloc(1); + aRetval.resize(1); basegfx::B2DPolygon aLine; aLine.append(basegfx::B2DPoint(getViewport().getMinX(), getBasePosition().getY())); @@ -485,7 +485,7 @@ namespace drawinglayer default: // case HELPLINESTYLE_POINT : { const double fDiscreteUnit((rViewInformation.getInverseObjectToViewTransformation() * basegfx::B2DVector(1.0, 0.0)).getLength()); - aRetval.realloc(2); + aRetval.resize(2); basegfx::B2DPolygon aLineA, aLineB; aLineA.append(basegfx::B2DPoint(getBasePosition().getX(), getBasePosition().getY() - fDiscreteUnit)); @@ -555,15 +555,15 @@ namespace drawinglayer mfDiscreteDashLength(fDiscreteDashLength) {} - Primitive2DSequence OverlayRollingRectanglePrimitive::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const + Primitive2DContainer OverlayRollingRectanglePrimitive::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const { // use the prepared Viewport information accessible using getViewport() - Primitive2DSequence aRetval; + Primitive2DContainer aRetval; if(!getViewport().isEmpty()) { basegfx::B2DPolygon aLine; - aRetval.realloc(8); + aRetval.resize(8); // Left lines aLine.append(basegfx::B2DPoint(getViewport().getMinX(), getRollingRectangle().getMinY())); diff --git a/svx/source/sdr/overlay/overlaytriangle.cxx b/svx/source/sdr/overlay/overlaytriangle.cxx index 1785ce8fde30..4f887cd39695 100644 --- a/svx/source/sdr/overlay/overlaytriangle.cxx +++ b/svx/source/sdr/overlay/overlaytriangle.cxx @@ -33,7 +33,7 @@ namespace sdr { namespace overlay { - drawinglayer::primitive2d::Primitive2DSequence OverlayTriangle::createOverlayObjectPrimitive2DSequence() + drawinglayer::primitive2d::Primitive2DContainer OverlayTriangle::createOverlayObjectPrimitive2DSequence() { basegfx::B2DPolygon aPolygon; @@ -47,7 +47,7 @@ namespace sdr basegfx::B2DPolyPolygon(aPolygon), getBaseColor().getBColor())); - return drawinglayer::primitive2d::Primitive2DSequence(&aReference, 1); + return drawinglayer::primitive2d::Primitive2DContainer { aReference }; } OverlayTriangle::OverlayTriangle( diff --git a/svx/source/sdr/primitive2d/primitivefactory2d.cxx b/svx/source/sdr/primitive2d/primitivefactory2d.cxx index 4722122116ea..006cdd5b458f 100644 --- a/svx/source/sdr/primitive2d/primitivefactory2d.cxx +++ b/svx/source/sdr/primitive2d/primitivefactory2d.cxx @@ -28,6 +28,7 @@ #include <svx/svdpage.hxx> #include <svx/unoapi.hxx> #include <svx/sdr/contact/viewcontact.hxx> +#include <comphelper/sequence.hxx> using namespace com::sun::star; @@ -76,7 +77,7 @@ css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > SAL_CALL if(pSource) { const sdr::contact::ViewContact& rSource(pSource->GetViewContact()); - aRetval = rSource.getViewIndependentPrimitive2DSequence(); + aRetval = comphelper::containerToSequence(rSource.getViewIndependentPrimitive2DSequence()); } } @@ -97,7 +98,7 @@ css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > SAL_CALL { const sdr::contact::ViewContact& rSource(pSource->GetViewContact()); - aRetval = rSource.getViewIndependentPrimitive2DSequence(); + aRetval = comphelper::containerToSequence(rSource.getViewIndependentPrimitive2DSequence()); } } diff --git a/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx index 56eeb3012cb0..b5684a70a52b 100644 --- a/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx @@ -34,9 +34,9 @@ namespace drawinglayer { namespace primitive2d { - Primitive2DSequence SdrCaptionPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*aViewInformation*/) const + Primitive2DContainer SdrCaptionPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*aViewInformation*/) const { - Primitive2DSequence aRetval; + Primitive2DContainer aRetval; // create unit outline polygon const basegfx::B2DPolygon aUnitOutline(basegfx::tools::createPolygonFromRect( @@ -48,7 +48,7 @@ namespace drawinglayer if(getSdrLFSTAttribute().getFill().isDefault()) { // create invisible fill for HitTest - appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, + aRetval.push_back( createHiddenGeometryPrimitives2D( true, basegfx::B2DPolyPolygon(aUnitOutline), @@ -59,7 +59,7 @@ namespace drawinglayer basegfx::B2DPolyPolygon aTransformed(aUnitOutline); aTransformed.transform(getTransform()); - appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, + aRetval.push_back( createPolyPolygonFillPrimitive( aTransformed, getSdrLFSTAttribute().getFill(), @@ -70,13 +70,13 @@ namespace drawinglayer if(getSdrLFSTAttribute().getLine().isDefault()) { // create invisible line for HitTest/BoundRect - appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, + aRetval.push_back( createHiddenGeometryPrimitives2D( false, basegfx::B2DPolyPolygon(aUnitOutline), getTransform())); - appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, + aRetval.push_back( createHiddenGeometryPrimitives2D( false, basegfx::B2DPolyPolygon(getTail()), @@ -87,7 +87,7 @@ namespace drawinglayer basegfx::B2DPolygon aTransformed(aUnitOutline); aTransformed.transform(getTransform()); - appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, + aRetval.push_back( createPolygonLinePrimitive( aTransformed, getSdrLFSTAttribute().getLine(), @@ -95,7 +95,7 @@ namespace drawinglayer aTransformed = getTail(); aTransformed.transform(getTransform()); - appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, + aRetval.push_back( createPolygonLinePrimitive( aTransformed, getSdrLFSTAttribute().getLine(), @@ -105,7 +105,7 @@ namespace drawinglayer // add text if(!getSdrLFSTAttribute().getText().isDefault()) { - appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, + aRetval.push_back( createTextPrimitive( basegfx::B2DPolyPolygon(aUnitOutline), getTransform(), diff --git a/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx index 89e390eb2c91..94ba4ead36d6 100644 --- a/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx @@ -35,22 +35,22 @@ namespace drawinglayer { namespace primitive2d { - Primitive2DSequence SdrConnectorPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*aViewInformation*/) const + Primitive2DContainer SdrConnectorPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*aViewInformation*/) const { - Primitive2DSequence aRetval; + Primitive2DContainer aRetval; // add line if(getSdrLSTAttribute().getLine().isDefault()) { // create invisible line for HitTest/BoundRect - appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, + aRetval.push_back( createHiddenGeometryPrimitives2D( false, basegfx::B2DPolyPolygon(getUnitPolygon()))); } else { - appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, + aRetval.push_back( createPolygonLinePrimitive( getUnitPolygon(), getSdrLSTAttribute().getLine(), @@ -60,7 +60,7 @@ namespace drawinglayer // add text if(!getSdrLSTAttribute().getText().isDefault()) { - appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, + aRetval.push_back( createTextPrimitive( basegfx::B2DPolyPolygon(getUnitPolygon()), basegfx::B2DHomMatrix(), diff --git a/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx index e0f9386f915b..4e637502dfe2 100644 --- a/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx @@ -35,16 +35,16 @@ namespace drawinglayer { namespace primitive2d { - Primitive2DSequence SdrCustomShapePrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*aViewInformation*/) const + Primitive2DContainer SdrCustomShapePrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*aViewInformation*/) const { - Primitive2DSequence aRetval(getSubPrimitives()); + Primitive2DContainer aRetval(getSubPrimitives()); // add text if(!getSdrSTAttribute().getText().isDefault()) { const basegfx::B2DPolygon aUnitOutline(basegfx::tools::createUnitPolygon()); - appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, + aRetval.push_back( createTextPrimitive( basegfx::B2DPolyPolygon(aUnitOutline), getTextBox(), @@ -56,7 +56,7 @@ namespace drawinglayer } // add shadow - if(aRetval.hasElements() && !getSdrSTAttribute().getShadow().isDefault()) + if(!aRetval.empty() && !getSdrSTAttribute().getShadow().isDefault()) { // #i105323# add generic shadow only for 2D shapes. For // 3D shapes shadow will be set at the individual created @@ -79,7 +79,7 @@ namespace drawinglayer SdrCustomShapePrimitive2D::SdrCustomShapePrimitive2D( const attribute::SdrShadowTextAttribute& rSdrSTAttribute, - const Primitive2DSequence& rSubPrimitives, + const Primitive2DContainer& rSubPrimitives, const basegfx::B2DHomMatrix& rTextBox, bool bWordWrap, bool b3DShape, diff --git a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx index 7d41b77eb2ed..5e7148814a5b 100644 --- a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx +++ b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx @@ -47,6 +47,7 @@ +class TransparencePrimitive2D; using namespace com::sun::star; @@ -118,14 +119,14 @@ namespace drawinglayer { // create simpleTransparencePrimitive, add created fill primitive const Primitive2DReference xRefA(pNewFillPrimitive); - const Primitive2DSequence aContent(&xRefA, 1L); + const Primitive2DContainer aContent { xRefA }; return Primitive2DReference(new UnifiedTransparencePrimitive2D(aContent, rFill.getTransparence())); } else if(!rFillGradient.isDefault()) { // create sequence with created fill primitive const Primitive2DReference xRefA(pNewFillPrimitive); - const Primitive2DSequence aContent(&xRefA, 1L); + const Primitive2DContainer aContent { xRefA }; // create FillGradientPrimitive2D for transparence and add to new sequence // fillGradientPrimitive is enough here (compared to PolyPolygonGradientPrimitive2D) since float transparence will be masked anyways @@ -135,7 +136,7 @@ namespace drawinglayer aRange, rDefinitionRange, rFillGradient)); - const Primitive2DSequence aAlpha(&xRefB, 1L); + const Primitive2DContainer aAlpha { xRefB }; // create TransparencePrimitive2D using alpha and content return Primitive2DReference(new TransparencePrimitive2D(aContent, aAlpha)); @@ -175,7 +176,7 @@ namespace drawinglayer { // create simpleTransparencePrimitive, add created fill primitive const Primitive2DReference xRefA(pNewLinePrimitive); - const Primitive2DSequence aContent(&xRefA, 1L); + const Primitive2DContainer aContent { xRefA }; return Primitive2DReference(new UnifiedTransparencePrimitive2D(aContent, rLine.getTransparence())); } else @@ -349,7 +350,7 @@ namespace drawinglayer { // create content sequence const Primitive2DReference xRefA(pNew); - const Primitive2DSequence aContent(&xRefA, 1L); + const Primitive2DContainer aContent { xRefA }; // create and add animated switch primitive return Primitive2DReference(new AnimatedBlinkPrimitive2D(aAnimationList, aContent, true)); @@ -433,11 +434,11 @@ namespace drawinglayer if(0.0 != aAnimationList.getDuration()) { - // create a new Primitive2DSequence containing the animated text in it's scaled only state. + // create a new Primitive2DContainer containing the animated text in it's scaled only state. // use the decomposition to force to simple text primitives, those will no longer // need the outliner for formatting (alternatively it is also possible to just add // pNew to aNewPrimitiveSequence) - Primitive2DSequence aAnimSequence(pNew->get2DDecomposition(aViewInformation2D)); + Primitive2DContainer aAnimSequence(pNew->get2DDecomposition(aViewInformation2D)); delete pNew; // create a new animatedInterpolatePrimitive and add it @@ -445,7 +446,7 @@ namespace drawinglayer aMatrixStack.push_back(aLeft); aMatrixStack.push_back(aRight); const Primitive2DReference xRefA(new AnimatedInterpolatePrimitive2D(aMatrixStack, aAnimationList, aAnimSequence, true)); - const Primitive2DSequence aContent(&xRefA, 1L); + const Primitive2DContainer aContent { xRefA }; // scrolling needs an encapsulating clipping primitive const basegfx::B2DRange aClipRange(aClipTopLeft, aClipBottomRight); @@ -467,7 +468,7 @@ namespace drawinglayer // encapsulate with TextHierarchyEditPrimitive2D to allow renderers // to suppress actively edited content if needed const Primitive2DReference xRefA(pNew); - const Primitive2DSequence aContent(&xRefA, 1L); + const Primitive2DContainer aContent { xRefA }; // create and add TextHierarchyEditPrimitive2D primitive return Primitive2DReference(new TextHierarchyEditPrimitive2D(aContent)); @@ -479,13 +480,13 @@ namespace drawinglayer } } - Primitive2DSequence createEmbeddedShadowPrimitive( - const Primitive2DSequence& rContent, + Primitive2DContainer createEmbeddedShadowPrimitive( + const Primitive2DContainer& rContent, const attribute::SdrShadowAttribute& rShadow) { - if(rContent.hasElements()) + if(!rContent.empty()) { - Primitive2DSequence aRetval(2); + Primitive2DContainer aRetval(2); basegfx::B2DHomMatrix aShadowOffset; // prepare shadow offset @@ -502,7 +503,7 @@ namespace drawinglayer if(0.0 != rShadow.getTransparence()) { // create SimpleTransparencePrimitive2D - const Primitive2DSequence aTempContent(&aRetval[0], 1); + const Primitive2DContainer aTempContent { aRetval[0] }; aRetval[0] = Primitive2DReference( new UnifiedTransparencePrimitive2D( diff --git a/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx index 7838393d63a9..730a62c4dbd6 100644 --- a/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx @@ -37,9 +37,9 @@ namespace drawinglayer { namespace primitive2d { - Primitive2DSequence SdrEllipsePrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*aViewInformation*/) const + Primitive2DContainer SdrEllipsePrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*aViewInformation*/) const { - Primitive2DSequence aRetval; + Primitive2DContainer aRetval; // create unit outline polygon // Do use createPolygonFromUnitCircle, but let create from first quadrant to mimic old geometry creation. @@ -60,7 +60,7 @@ namespace drawinglayer basegfx::B2DPolyPolygon aTransformed(aUnitOutline); aTransformed.transform(getTransform()); - appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, + aRetval.push_back( createPolyPolygonFillPrimitive( aTransformed, getSdrLFSTAttribute().getFill(), @@ -71,7 +71,7 @@ namespace drawinglayer if(getSdrLFSTAttribute().getLine().isDefault()) { // create invisible line for HitTest/BoundRect - appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, + aRetval.push_back( createHiddenGeometryPrimitives2D( false, basegfx::B2DPolyPolygon(aUnitOutline), @@ -82,7 +82,7 @@ namespace drawinglayer basegfx::B2DPolygon aTransformed(aUnitOutline); aTransformed.transform(getTransform()); - appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, + aRetval.push_back( createPolygonLinePrimitive( aTransformed, getSdrLFSTAttribute().getLine(), @@ -92,7 +92,7 @@ namespace drawinglayer // add text if(!getSdrLFSTAttribute().getText().isDefault()) { - appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, + aRetval.push_back( createTextPrimitive( basegfx::B2DPolyPolygon(aUnitOutline), getTransform(), @@ -148,9 +148,9 @@ namespace drawinglayer { namespace primitive2d { - Primitive2DSequence SdrEllipseSegmentPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*aViewInformation*/) const + Primitive2DContainer SdrEllipseSegmentPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*aViewInformation*/) const { - Primitive2DSequence aRetval; + Primitive2DContainer aRetval; // create unit outline polygon basegfx::B2DPolygon aUnitOutline(basegfx::tools::createPolygonFromUnitEllipseSegment(mfStartAngle, mfEndAngle)); @@ -180,7 +180,7 @@ namespace drawinglayer basegfx::B2DPolyPolygon aTransformed(aUnitOutline); aTransformed.transform(getTransform()); - appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, + aRetval.push_back( createPolyPolygonFillPrimitive( aTransformed, getSdrLFSTAttribute().getFill(), @@ -191,7 +191,7 @@ namespace drawinglayer if(getSdrLFSTAttribute().getLine().isDefault()) { // create invisible line for HitTest/BoundRect - appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, + aRetval.push_back( createHiddenGeometryPrimitives2D( false, basegfx::B2DPolyPolygon(aUnitOutline), @@ -202,7 +202,7 @@ namespace drawinglayer basegfx::B2DPolygon aTransformed(aUnitOutline); aTransformed.transform(getTransform()); - appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, + aRetval.push_back( createPolygonLinePrimitive( aTransformed, getSdrLFSTAttribute().getLine(), @@ -212,7 +212,7 @@ namespace drawinglayer // add text if(!getSdrLFSTAttribute().getText().isDefault()) { - appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, + aRetval.push_back( createTextPrimitive( basegfx::B2DPolyPolygon(aUnitOutline), getTransform(), diff --git a/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx index 7345867a4316..9c37d4a84f3a 100644 --- a/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx @@ -32,9 +32,9 @@ namespace drawinglayer { namespace primitive2d { - Primitive2DSequence SdrGrafPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*aViewInformation*/) const + Primitive2DContainer SdrGrafPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*aViewInformation*/) const { - Primitive2DSequence aRetval; + Primitive2DContainer aRetval; // create unit outline polygon basegfx::B2DPolygon aUnitOutline(basegfx::tools::createUnitPolygon()); @@ -45,7 +45,7 @@ namespace drawinglayer basegfx::B2DPolyPolygon aTransformed(aUnitOutline); aTransformed.transform(getTransform()); - appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, + aRetval.push_back( createPolyPolygonFillPrimitive( aTransformed, getSdrLFSTAttribute().getFill(), @@ -62,7 +62,7 @@ namespace drawinglayer getGraphicObject(), getGraphicAttr())); - appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, xGraphicContentPrimitive); + aRetval.push_back(xGraphicContentPrimitive); } // add line @@ -85,7 +85,7 @@ namespace drawinglayer basegfx::B2DPolygon aExpandedUnitOutline(basegfx::tools::createPolygonFromRect(aExpandedRange)); aExpandedUnitOutline.transform(getTransform()); - appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, + aRetval.push_back( createPolygonLinePrimitive( aExpandedUnitOutline, getSdrLFSTAttribute().getLine(), @@ -96,7 +96,7 @@ namespace drawinglayer basegfx::B2DPolygon aTransformed(aUnitOutline); aTransformed.transform(getTransform()); - appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, + aRetval.push_back( createPolygonLinePrimitive( aTransformed, getSdrLFSTAttribute().getLine(), @@ -107,7 +107,7 @@ namespace drawinglayer // add text if(!getSdrLFSTAttribute().getText().isDefault()) { - appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, + aRetval.push_back( createTextPrimitive( basegfx::B2DPolyPolygon(aUnitOutline), getTransform(), diff --git a/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx index d9b7a4365b67..9bba956d247f 100644 --- a/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx @@ -82,9 +82,9 @@ namespace drawinglayer aLineStartEnd); } - Primitive2DSequence SdrMeasurePrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const + Primitive2DContainer SdrMeasurePrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const { - Primitive2DSequence aRetval; + Primitive2DContainer aRetval; css::uno::Reference<SdrBlockTextPrimitive2D> xBlockText; basegfx::B2DRange aTextRange; const basegfx::B2DVector aLine(getEnd() - getStart()); @@ -271,12 +271,12 @@ namespace drawinglayer const basegfx::B2DPoint aMainLeftLeft(aMainLeft.getX() - fLenLeft, aMainLeft.getY()); const basegfx::B2DPoint aMainRightRight(aMainRight.getX() + fLenRight, aMainRight.getY()); - appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, impCreatePart(rLineAttribute, aObjectMatrix, aMainLeftLeft, aMainLeft, false, true)); - appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, impCreatePart(rLineAttribute, aObjectMatrix, aMainRight, aMainRightRight, true, false)); + aRetval.push_back(impCreatePart(rLineAttribute, aObjectMatrix, aMainLeftLeft, aMainLeft, false, true)); + aRetval.push_back(impCreatePart(rLineAttribute, aObjectMatrix, aMainRight, aMainRightRight, true, false)); if(!bMainLineSplitted || MEASURETEXTPOSITION_CENTERED != eHorizontal) { - appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, impCreatePart(rLineAttribute, aObjectMatrix, aMainLeft, aMainRight, false, false)); + aRetval.push_back(impCreatePart(rLineAttribute, aObjectMatrix, aMainLeft, aMainRight, false, false)); } } else @@ -287,12 +287,12 @@ namespace drawinglayer const basegfx::B2DPoint aMainInnerLeft(aMainLeft.getX() + fHalfLength, aMainLeft.getY()); const basegfx::B2DPoint aMainInnerRight(aMainRight.getX() - fHalfLength, aMainRight.getY()); - appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, impCreatePart(rLineAttribute, aObjectMatrix, aMainLeft, aMainInnerLeft, true, false)); - appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, impCreatePart(rLineAttribute, aObjectMatrix, aMainInnerRight, aMainRight, false, true)); + aRetval.push_back(impCreatePart(rLineAttribute, aObjectMatrix, aMainLeft, aMainInnerLeft, true, false)); + aRetval.push_back(impCreatePart(rLineAttribute, aObjectMatrix, aMainInnerRight, aMainRight, false, true)); } else { - appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, impCreatePart(rLineAttribute, aObjectMatrix, aMainLeft, aMainRight, true, true)); + aRetval.push_back(impCreatePart(rLineAttribute, aObjectMatrix, aMainLeft, aMainRight, true, true)); } } @@ -305,13 +305,13 @@ namespace drawinglayer const basegfx::B2DPoint aLeftUp(0.0, fTopEdge); const basegfx::B2DPoint aLeftDown(0.0, fBottomLeft); - appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, impCreatePart(rLineAttribute, aObjectMatrix, aLeftDown, aLeftUp, false, false)); + aRetval.push_back(impCreatePart(rLineAttribute, aObjectMatrix, aLeftDown, aLeftUp, false, false)); // right help line const basegfx::B2DPoint aRightUp(fDistance, fTopEdge); const basegfx::B2DPoint aRightDown(fDistance, fBottomRight); - appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, impCreatePart(rLineAttribute, aObjectMatrix, aRightDown, aRightUp, false, false)); + aRetval.push_back(impCreatePart(rLineAttribute, aObjectMatrix, aRightDown, aRightUp, false, false)); // text horizontal position if(MEASURETEXTPOSITION_NEGATIVE == eHorizontal) @@ -397,7 +397,7 @@ namespace drawinglayer // embed line geometry to invisible (100% transparent) line group for HitTest const Primitive2DReference xHiddenLines(new HiddenGeometryPrimitive2D(aRetval)); - aRetval = Primitive2DSequence(&xHiddenLines, 1); + aRetval = Primitive2DContainer { xHiddenLines }; } if(xBlockText.is()) @@ -423,7 +423,7 @@ namespace drawinglayer xBlockText.clear(); // add to local primitives - appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, Primitive2DReference(pNewBlockText)); + aRetval.push_back(Primitive2DReference(pNewBlockText)); } // add shadow diff --git a/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx b/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx index 20b01401b756..bbe103930a47 100644 --- a/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx @@ -35,7 +35,7 @@ namespace drawinglayer namespace primitive2d { SdrOle2Primitive2D::SdrOle2Primitive2D( - const Primitive2DSequence& rOLEContent, + const Primitive2DContainer& rOLEContent, const basegfx::B2DHomMatrix& rTransform, const attribute::SdrLineFillShadowTextAttribute& rSdrLFSTAttribute) : BasePrimitive2D(), @@ -57,7 +57,7 @@ namespace drawinglayer // sequence content, thus i need to use the arePrimitive2DSequencesEqual helper // here instead of the operator== which lead to always returning false and thus // always re-decompositions of the subcontent. - if(arePrimitive2DSequencesEqual(getOLEContent(), rCompare.getOLEContent()) + if(getOLEContent() == rCompare.getOLEContent() && getTransform() == rCompare.getTransform() && getSdrLFSTAttribute() == rCompare.getSdrLFSTAttribute()) { @@ -68,14 +68,14 @@ namespace drawinglayer return false; } - Primitive2DSequence SdrOle2Primitive2D::get2DDecomposition(const geometry::ViewInformation2D& /*aViewInformation*/) const + Primitive2DContainer SdrOle2Primitive2D::get2DDecomposition(const geometry::ViewInformation2D& /*aViewInformation*/) const { // to take care of getSdrLFSTAttribute() later, the same as in SdrGrafPrimitive2D::create2DDecomposition // should happen. For the moment we only need the OLE itself // Added complete primitive preparation using getSdrLFSTAttribute() now. To not do stuff which is not needed now, it // may be suppressed by using a static bool. The paint version only supported text. static bool bBehaveCompatibleToPaintVersion(false); - Primitive2DSequence aRetval; + Primitive2DContainer aRetval; // create unit outline polygon const basegfx::B2DPolygon aUnitOutline(basegfx::tools::createUnitPolygon()); @@ -87,7 +87,7 @@ namespace drawinglayer basegfx::B2DPolyPolygon aTransformed(aUnitOutline); aTransformed.transform(getTransform()); - appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, + aRetval.push_back( createPolyPolygonFillPrimitive( aTransformed, getSdrLFSTAttribute().getFill(), @@ -117,7 +117,7 @@ namespace drawinglayer basegfx::B2DPolygon aExpandedUnitOutline(basegfx::tools::createPolygonFromRect(aExpandedRange)); aExpandedUnitOutline.transform(getTransform()); - appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, + aRetval.push_back( createPolygonLinePrimitive( aExpandedUnitOutline, getSdrLFSTAttribute().getLine(), @@ -128,7 +128,7 @@ namespace drawinglayer basegfx::B2DPolygon aTransformed(aUnitOutline); aTransformed.transform(getTransform()); - appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, + aRetval.push_back( createPolygonLinePrimitive( aTransformed, getSdrLFSTAttribute().getLine(), @@ -138,7 +138,7 @@ namespace drawinglayer else { // if initially no line is defined, create one for HitTest and BoundRect - appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, + aRetval.push_back( createHiddenGeometryPrimitives2D( false, basegfx::B2DPolyPolygon(aUnitOutline), @@ -146,13 +146,13 @@ namespace drawinglayer } // add graphic content - appendPrimitive2DSequenceToPrimitive2DSequence(aRetval, getOLEContent()); + aRetval.append(getOLEContent()); // add text, no need to suppress to stay compatible since text was // always supported by the old paints, too if(!getSdrLFSTAttribute().getText().isDefault()) { - appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, + aRetval.push_back( createTextPrimitive( basegfx::B2DPolyPolygon(aUnitOutline), getTransform(), diff --git a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx index 0594716fd427..bab4e7394cc7 100644 --- a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx @@ -34,9 +34,9 @@ namespace drawinglayer { namespace primitive2d { - Primitive2DSequence SdrOleContentPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*aViewInformation*/) const + Primitive2DContainer SdrOleContentPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*aViewInformation*/) const { - Primitive2DSequence aRetval; + Primitive2DContainer aRetval; const SdrOle2Obj* pSource = (mpSdrOle2Obj.is() ? static_cast< SdrOle2Obj* >(mpSdrOle2Obj.get()) : nullptr); bool bScaleContent(false); Graphic aGraphic; @@ -99,7 +99,7 @@ namespace drawinglayer aInnerObjectMatrix, aGraphicObject, aGraphicAttr)); - drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, aGraphicPrimitive); + aRetval.push_back(aGraphicPrimitive); } } else @@ -110,7 +110,7 @@ namespace drawinglayer getObjectTransform(), aGraphicObject, aGraphicAttr)); - drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, aGraphicPrimitive); + aRetval.push_back(aGraphicPrimitive); } // a standard gray outline is created for scaled content @@ -126,7 +126,7 @@ namespace drawinglayer aOutline.transform(getObjectTransform()); const drawinglayer::primitive2d::Primitive2DReference xOutline( new drawinglayer::primitive2d::PolygonHairlinePrimitive2D(aOutline, aVclColor.getBColor())); - drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, xOutline); + aRetval.push_back(xOutline); } } } diff --git a/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx index 8e5d2cffe3dc..51b22c0b20a4 100644 --- a/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx @@ -34,9 +34,9 @@ namespace drawinglayer { namespace primitive2d { - Primitive2DSequence SdrPathPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*aViewInformation*/) const + Primitive2DContainer SdrPathPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*aViewInformation*/) const { - Primitive2DSequence aRetval; + Primitive2DContainer aRetval; // add fill if(!getSdrLFSTAttribute().getFill().isDefault() @@ -47,7 +47,7 @@ namespace drawinglayer basegfx::B2DPolyPolygon aTransformed(getUnitPolyPolygon()); aTransformed.transform(getTransform()); - appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, + aRetval.push_back( createPolyPolygonFillPrimitive( aTransformed, getSdrLFSTAttribute().getFill(), @@ -58,7 +58,7 @@ namespace drawinglayer if(getSdrLFSTAttribute().getLine().isDefault()) { // if initially no line is defined, create one for HitTest and BoundRect - appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, + aRetval.push_back( createHiddenGeometryPrimitives2D( false, getUnitPolyPolygon(), @@ -66,7 +66,7 @@ namespace drawinglayer } else { - Primitive2DSequence aTemp(getUnitPolyPolygon().count()); + Primitive2DContainer aTemp(getUnitPolyPolygon().count()); for(sal_uInt32 a(0); a < getUnitPolyPolygon().count(); a++) { @@ -79,13 +79,13 @@ namespace drawinglayer getSdrLFSTAttribute().getLineStartEnd()); } - appendPrimitive2DSequenceToPrimitive2DSequence(aRetval, aTemp); + aRetval.append(aTemp); } // add text if(!getSdrLFSTAttribute().getText().isDefault()) { - appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, + aRetval.push_back( createTextPrimitive( getUnitPolyPolygon(), getTransform(), diff --git a/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx index 2e0187bd3aad..a1e9b29a7228 100644 --- a/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx @@ -35,9 +35,9 @@ namespace drawinglayer { namespace primitive2d { - Primitive2DSequence SdrRectanglePrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*aViewInformation*/) const + Primitive2DContainer SdrRectanglePrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*aViewInformation*/) const { - Primitive2DSequence aRetval; + Primitive2DContainer aRetval; // create unit outline polygon const basegfx::B2DPolygon aUnitOutline(basegfx::tools::createPolygonFromRect( @@ -51,7 +51,7 @@ namespace drawinglayer basegfx::B2DPolyPolygon aTransformed(aUnitOutline); aTransformed.transform(getTransform()); - appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, + aRetval.push_back( createPolyPolygonFillPrimitive( aTransformed, getSdrLFSTAttribute().getFill(), @@ -61,7 +61,7 @@ namespace drawinglayer { // if no fill and it's a text frame, create a fill for HitTest and // BoundRect fallback - appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, + aRetval.push_back( createHiddenGeometryPrimitives2D( true, basegfx::B2DPolyPolygon(aUnitOutline), @@ -74,7 +74,7 @@ namespace drawinglayer basegfx::B2DPolygon aTransformed(aUnitOutline); aTransformed.transform(getTransform()); - appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, + aRetval.push_back( createPolygonLinePrimitive( aTransformed, getSdrLFSTAttribute().getLine(), @@ -84,7 +84,7 @@ namespace drawinglayer { // if initially no line is defined and it's not a text frame, create // a line for HitTest and BoundRect - appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, + aRetval.push_back( createHiddenGeometryPrimitives2D( false, basegfx::B2DPolyPolygon(aUnitOutline), @@ -94,7 +94,7 @@ namespace drawinglayer // add text if(!getSdrLFSTAttribute().getText().isDefault()) { - appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, + aRetval.push_back( createTextPrimitive( basegfx::B2DPolyPolygon(aUnitOutline), getTransform(), diff --git a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx index d1b8a003474e..5b62780d99a5 100644 --- a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx @@ -93,10 +93,10 @@ namespace drawinglayer // support for XTEXT_PAINTSHAPE_BEGIN/XTEXT_PAINTSHAPE_END Metafile comments // for slideshow. This uses TextHierarchyBlockPrimitive2D to mark a text block. // ATM there is only one text block per SdrObject, this may get more in the future - Primitive2DSequence SdrTextPrimitive2D::encapsulateWithTextHierarchyBlockPrimitive2D(const Primitive2DSequence& rCandidate) + Primitive2DContainer SdrTextPrimitive2D::encapsulateWithTextHierarchyBlockPrimitive2D(const Primitive2DContainer& rCandidate) { Primitive2DReference xReference(new TextHierarchyBlockPrimitive2D(rCandidate)); - Primitive2DSequence xRetval(&xReference, 1); + Primitive2DContainer xRetval { xReference }; return xRetval; } @@ -143,7 +143,7 @@ namespace drawinglayer return false; } - Primitive2DSequence SdrTextPrimitive2D::get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const + Primitive2DContainer SdrTextPrimitive2D::get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const { uno::Reference< drawing::XDrawPage > xCurrentlyVisualizingPage; bool bCurrentlyVisualizingPageIsSet(false); @@ -152,7 +152,7 @@ namespace drawinglayer sal_Int16 nCurrentlyValidPageNumber(0); sal_Int16 nCurrentlyValidPageCount(0); - if(getBuffered2DDecomposition().hasElements()) + if(!getBuffered2DDecomposition().empty()) { bool bDoDelete(false); @@ -206,11 +206,11 @@ namespace drawinglayer if(bDoDelete) { - const_cast< SdrTextPrimitive2D* >(this)->setBuffered2DDecomposition(Primitive2DSequence()); + const_cast< SdrTextPrimitive2D* >(this)->setBuffered2DDecomposition(Primitive2DContainer()); } } - if(!getBuffered2DDecomposition().hasElements()) + if(getBuffered2DDecomposition().empty()) { if(!bCurrentlyVisualizingPageIsSet && mbContainsPageField) { @@ -251,9 +251,9 @@ namespace drawinglayer { namespace primitive2d { - Primitive2DSequence SdrContourTextPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const + Primitive2DContainer SdrContourTextPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const { - Primitive2DSequence aRetval; + Primitive2DContainer aRetval; getSdrText()->GetObject().impDecomposeContourTextPrimitive(aRetval, *this, aViewInformation); return encapsulateWithTextHierarchyBlockPrimitive2D(aRetval); @@ -304,9 +304,9 @@ namespace drawinglayer { namespace primitive2d { - Primitive2DSequence SdrPathTextPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const + Primitive2DContainer SdrPathTextPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const { - Primitive2DSequence aRetval; + Primitive2DContainer aRetval; getSdrText()->GetObject().impDecomposePathTextPrimitive(aRetval, *this, aViewInformation); return encapsulateWithTextHierarchyBlockPrimitive2D(aRetval); @@ -360,9 +360,9 @@ namespace drawinglayer { namespace primitive2d { - Primitive2DSequence SdrBlockTextPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const + Primitive2DContainer SdrBlockTextPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const { - Primitive2DSequence aRetval; + Primitive2DContainer aRetval; getSdrText()->GetObject().impDecomposeBlockTextPrimitive(aRetval, *this, aViewInformation); return encapsulateWithTextHierarchyBlockPrimitive2D(aRetval); @@ -437,9 +437,9 @@ namespace drawinglayer { namespace primitive2d { - Primitive2DSequence SdrAutoFitTextPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const + Primitive2DContainer SdrAutoFitTextPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const { - Primitive2DSequence aRetval; + Primitive2DContainer aRetval; getSdrText()->GetObject().impDecomposeAutoFitTextPrimitive(aRetval, *this, aViewInformation); return encapsulateWithTextHierarchyBlockPrimitive2D(aRetval); @@ -493,9 +493,9 @@ namespace drawinglayer maTextRangeTransform(rTextRangeTransform) { } - Primitive2DSequence SdrChainedTextPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const + Primitive2DContainer SdrChainedTextPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const { - Primitive2DSequence aRetval; + Primitive2DContainer aRetval; getSdrText()->GetObject().impDecomposeChainedTextPrimitive(aRetval, *this, aViewInformation); return encapsulateWithTextHierarchyBlockPrimitive2D(aRetval); @@ -528,9 +528,9 @@ namespace drawinglayer { namespace primitive2d { - Primitive2DSequence SdrStretchTextPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const + Primitive2DContainer SdrStretchTextPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const { - Primitive2DSequence aRetval; + Primitive2DContainer aRetval; getSdrText()->GetObject().impDecomposeStretchTextPrimitive(aRetval, *this, aViewInformation); return encapsulateWithTextHierarchyBlockPrimitive2D(aRetval); diff --git a/svx/source/svdraw/charthelper.cxx b/svx/source/svdraw/charthelper.cxx index 643a2be5cf1e..bba7151c2ffe 100644 --- a/svx/source/svdraw/charthelper.cxx +++ b/svx/source/svdraw/charthelper.cxx @@ -92,11 +92,11 @@ void ChartHelper::updateChart( const uno::Reference< ::frame::XModel >& rXModel, } } -drawinglayer::primitive2d::Primitive2DSequence ChartHelper::tryToGetChartContentAsPrimitive2DSequence( +drawinglayer::primitive2d::Primitive2DContainer ChartHelper::tryToGetChartContentAsPrimitive2DSequence( const uno::Reference< ::frame::XModel >& rXModel, basegfx::B2DRange& rRange) { - drawinglayer::primitive2d::Primitive2DSequence aRetval; + drawinglayer::primitive2d::Primitive2DContainer aRetval; if (!rXModel.is()) return aRetval; @@ -129,9 +129,7 @@ drawinglayer::primitive2d::Primitive2DSequence ChartHelper::tryToGetChartContent xShape, aParams)); - drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence( - aRetval, - aNew); + aRetval.append(aNew); } } } @@ -141,11 +139,11 @@ drawinglayer::primitive2d::Primitive2DSequence ChartHelper::tryToGetChartContent OSL_ENSURE(false, "Unexpected exception!"); } - if(aRetval.hasElements()) + if(!aRetval.empty()) { const drawinglayer::geometry::ViewInformation2D aViewInformation2D; - rRange = drawinglayer::primitive2d::getB2DRangeFromPrimitive2DSequence(aRetval, aViewInformation2D); + rRange = aRetval.getB2DRange(aViewInformation2D); } return aRetval; diff --git a/svx/source/svdraw/sdrhittesthelper.cxx b/svx/source/svdraw/sdrhittesthelper.cxx index 4ea659954b60..9a01cb62c181 100644 --- a/svx/source/svdraw/sdrhittesthelper.cxx +++ b/svx/source/svdraw/sdrhittesthelper.cxx @@ -137,9 +137,9 @@ bool ViewObjectContactPrimitiveHit( { // get primitive sequence sdr::contact::DisplayInfo aDisplayInfo; - const drawinglayer::primitive2d::Primitive2DSequence& rSequence(rVOC.getPrimitive2DSequence(aDisplayInfo)); + const drawinglayer::primitive2d::Primitive2DContainer& rSequence(rVOC.getPrimitive2DSequence(aDisplayInfo)); - if(rSequence.hasElements()) + if(!rSequence.empty()) { // create a HitTest processor const drawinglayer::geometry::ViewInformation2D& rViewInformation2D = rVOC.GetObjectContact().getViewInformation2D(); diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx index 89f7c3fb3772..d9140bf7a8b6 100644 --- a/svx/source/svdraw/svdcrtv.cxx +++ b/svx/source/svdraw/svdcrtv.cxx @@ -153,7 +153,7 @@ void ImpSdrCreateViewExtraData::CreateAndShowOverlay(const SdrCreateView& rView, if(pObject) { const sdr::contact::ViewContact& rVC = pObject->GetViewContact(); - const drawinglayer::primitive2d::Primitive2DSequence aSequence = rVC.getViewIndependentPrimitive2DSequence(); + const drawinglayer::primitive2d::Primitive2DContainer aSequence = rVC.getViewIndependentPrimitive2DSequence(); sdr::overlay::OverlayObject* pNew = new sdr::overlay::OverlayPrimitive2DSequenceObject(aSequence); xOverlayManager->add(*pNew); diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx index bff9a6c0aead..182a708bdc1e 100644 --- a/svx/source/svdraw/svddrgmt.cxx +++ b/svx/source/svdraw/svddrgmt.cxx @@ -96,9 +96,9 @@ SdrDragEntryPolyPolygon::~SdrDragEntryPolyPolygon() { } -drawinglayer::primitive2d::Primitive2DSequence SdrDragEntryPolyPolygon::createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod) +drawinglayer::primitive2d::Primitive2DContainer SdrDragEntryPolyPolygon::createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod) { - drawinglayer::primitive2d::Primitive2DSequence aRetval; + drawinglayer::primitive2d::Primitive2DContainer aRetval; if(maOriginalPolyPolygon.count()) { @@ -116,7 +116,7 @@ drawinglayer::primitive2d::Primitive2DSequence SdrDragEntryPolyPolygon::createPr aColB.invert(); } - aRetval.realloc(2); + aRetval.resize(2); aRetval[0] = new drawinglayer::primitive2d::PolyPolygonMarkerPrimitive2D( aCopy, aColA, @@ -182,7 +182,7 @@ void SdrDragEntrySdrObject::prepareCurrentState(SdrDragMethod& rDragMethod) } } -drawinglayer::primitive2d::Primitive2DSequence SdrDragEntrySdrObject::createPrimitive2DSequenceInCurrentState(SdrDragMethod&) +drawinglayer::primitive2d::Primitive2DContainer SdrDragEntrySdrObject::createPrimitive2DSequenceInCurrentState(SdrDragMethod&) { const SdrObject* pSource = &maOriginal; @@ -192,7 +192,7 @@ drawinglayer::primitive2d::Primitive2DSequence SdrDragEntrySdrObject::createPrim pSource = mpClone; } - // get VOC and Primitive2DSequence + // get VOC and Primitive2DContainer sdr::contact::ViewContact& rVC = pSource->GetViewContact(); sdr::contact::ViewObjectContact& rVOC = rVC.GetViewObjectContact(mrObjectContact); sdr::contact::DisplayInfo aDisplayInfo; @@ -207,7 +207,7 @@ drawinglayer::primitive2d::Primitive2DSequence SdrDragEntrySdrObject::createPrim SdrDragEntryPrimitive2DSequence::SdrDragEntryPrimitive2DSequence( - const drawinglayer::primitive2d::Primitive2DSequence& rSequence, + const drawinglayer::primitive2d::Primitive2DContainer& rSequence, bool bAddToTransparent) : SdrDragEntry(), maPrimitive2DSequence(rSequence) @@ -220,14 +220,14 @@ SdrDragEntryPrimitive2DSequence::~SdrDragEntryPrimitive2DSequence() { } -drawinglayer::primitive2d::Primitive2DSequence SdrDragEntryPrimitive2DSequence::createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod) +drawinglayer::primitive2d::Primitive2DContainer SdrDragEntryPrimitive2DSequence::createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod) { drawinglayer::primitive2d::Primitive2DReference aTransformPrimitive2D( new drawinglayer::primitive2d::TransformPrimitive2D( rDragMethod.getCurrentTransformation(), maPrimitive2DSequence)); - return drawinglayer::primitive2d::Primitive2DSequence(&aTransformPrimitive2D, 1); + return drawinglayer::primitive2d::Primitive2DContainer { aTransformPrimitive2D }; } @@ -244,9 +244,9 @@ SdrDragEntryPointGlueDrag::~SdrDragEntryPointGlueDrag() { } -drawinglayer::primitive2d::Primitive2DSequence SdrDragEntryPointGlueDrag::createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod) +drawinglayer::primitive2d::Primitive2DContainer SdrDragEntryPointGlueDrag::createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod) { - drawinglayer::primitive2d::Primitive2DSequence aRetval; + drawinglayer::primitive2d::Primitive2DContainer aRetval; if(!maPositions.empty()) { @@ -286,14 +286,14 @@ drawinglayer::primitive2d::Primitive2DSequence SdrDragEntryPointGlueDrag::create new drawinglayer::primitive2d::MarkerArrayPrimitive2D(aTransformedPositions, drawinglayer::primitive2d::createDefaultCross_3x3(aColor))); - aRetval = drawinglayer::primitive2d::Primitive2DSequence(&aMarkerArrayPrimitive2D, 1); + aRetval = drawinglayer::primitive2d::Primitive2DContainer { aMarkerArrayPrimitive2D }; } else { drawinglayer::primitive2d::Primitive2DReference aMarkerArrayPrimitive2D( new drawinglayer::primitive2d::MarkerArrayPrimitive2D(aTransformedPositions, SdrHdl::createGluePointBitmap())); - aRetval = drawinglayer::primitive2d::Primitive2DSequence(&aMarkerArrayPrimitive2D, 1); + aRetval = drawinglayer::primitive2d::Primitive2DContainer { aMarkerArrayPrimitive2D }; } } @@ -764,8 +764,8 @@ void SdrDragMethod::CreateOverlayGeometry(sdr::overlay::OverlayManager& rOverlay } // collect primitives for visualisation - drawinglayer::primitive2d::Primitive2DSequence aResult; - drawinglayer::primitive2d::Primitive2DSequence aResultTransparent; + drawinglayer::primitive2d::Primitive2DContainer aResult; + drawinglayer::primitive2d::Primitive2DContainer aResultTransparent; for(a = 0; a < maSdrDragEntries.size(); a++) { @@ -773,17 +773,17 @@ void SdrDragMethod::CreateOverlayGeometry(sdr::overlay::OverlayManager& rOverlay if(pCandidate) { - const drawinglayer::primitive2d::Primitive2DSequence aCandidateResult(pCandidate->createPrimitive2DSequenceInCurrentState(*this)); + const drawinglayer::primitive2d::Primitive2DContainer aCandidateResult(pCandidate->createPrimitive2DSequenceInCurrentState(*this)); - if(aCandidateResult.hasElements()) + if(!aCandidateResult.empty()) { if(pCandidate->getAddToTransparent()) { - drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(aResultTransparent, aCandidateResult); + aResultTransparent.append(aCandidateResult); } else { - drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(aResult, aCandidateResult); + aResult.append(aCandidateResult); } } } @@ -791,26 +791,26 @@ void SdrDragMethod::CreateOverlayGeometry(sdr::overlay::OverlayManager& rOverlay if(DoAddConnectorOverlays()) { - const drawinglayer::primitive2d::Primitive2DSequence aConnectorOverlays(AddConnectorOverlays()); + const drawinglayer::primitive2d::Primitive2DContainer aConnectorOverlays(AddConnectorOverlays()); - if(aConnectorOverlays.hasElements()) + if(!aConnectorOverlays.empty()) { // add connector overlays to transparent part - drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(aResultTransparent, aConnectorOverlays); + aResultTransparent.append(aConnectorOverlays); } } - if(aResult.hasElements()) + if(!aResult.empty()) { sdr::overlay::OverlayObject* pNewOverlayObject = new sdr::overlay::OverlayPrimitive2DSequenceObject(aResult); rOverlayManager.add(*pNewOverlayObject); addToOverlayObjectList(*pNewOverlayObject); } - if(aResultTransparent.hasElements()) + if(!aResultTransparent.empty()) { drawinglayer::primitive2d::Primitive2DReference aUnifiedTransparencePrimitive2D(new drawinglayer::primitive2d::UnifiedTransparencePrimitive2D(aResultTransparent, 0.5)); - aResultTransparent = drawinglayer::primitive2d::Primitive2DSequence(&aUnifiedTransparencePrimitive2D, 1); + aResultTransparent = drawinglayer::primitive2d::Primitive2DContainer { aUnifiedTransparencePrimitive2D }; sdr::overlay::OverlayObject* pNewOverlayObject = new sdr::overlay::OverlayPrimitive2DSequenceObject(aResultTransparent); rOverlayManager.add(*pNewOverlayObject); @@ -882,9 +882,9 @@ bool SdrDragMethod::DoAddConnectorOverlays() return true; } -drawinglayer::primitive2d::Primitive2DSequence SdrDragMethod::AddConnectorOverlays() +drawinglayer::primitive2d::Primitive2DContainer SdrDragMethod::AddConnectorOverlays() { - drawinglayer::primitive2d::Primitive2DSequence aRetval; + drawinglayer::primitive2d::Primitive2DContainer aRetval; const bool bDetail(getSdrDragView().IsDetailedEdgeDragging() && getMoveOnly()); const SdrMarkList& rMarkedNodes = getSdrDragView().GetEdgesOfMarkedNodes(); @@ -929,8 +929,7 @@ drawinglayer::primitive2d::Primitive2DSequence SdrDragMethod::AddConnectorOverla rItemSet, aLine.getWidth())); - drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence( - aRetval, drawinglayer::primitive2d::createPolygonLinePrimitive( + aRetval.push_back(drawinglayer::primitive2d::createPolygonLinePrimitive( aEdgePolygon, aLine, aLineStartEnd)); @@ -952,7 +951,7 @@ drawinglayer::primitive2d::Primitive2DSequence SdrDragMethod::AddConnectorOverla drawinglayer::primitive2d::Primitive2DReference aPolyPolygonMarkerPrimitive2D( new drawinglayer::primitive2d::PolygonMarkerPrimitive2D( aEdgePolygon, aColA, aColB, fStripeLength)); - drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, aPolyPolygonMarkerPrimitive2D); + aRetval.push_back(aPolyPolygonMarkerPrimitive2D); } } } @@ -1488,7 +1487,7 @@ Pointer SdrDragObjOwn::GetSdrDragPointer() const void SdrDragMove::createSdrDragEntryForSdrObject(const SdrObject& rOriginal, sdr::contact::ObjectContact& rObjectContact, bool /*bModify*/) { - // for SdrDragMove, use current Primitive2DSequence of SdrObject visualization + // for SdrDragMove, use current Primitive2DContainer of SdrObject visualization // in given ObjectContact directly sdr::contact::ViewContact& rVC = rOriginal.GetViewContact(); sdr::contact::ViewObjectContact& rVOC = rVC.GetViewObjectContact(rObjectContact); diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 492906d1e4f7..af307c4577d6 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -377,7 +377,7 @@ void SdrObjEditView::ImpPaintOutlinerView(OutlinerView& rOutlView, const Rectang std::max(6, nPixSiz - 2), // grow 0.0, // shrink 0.0)); - const drawinglayer::primitive2d::Primitive2DSequence aSequence(&xReference, 1); + const drawinglayer::primitive2d::Primitive2DContainer aSequence { xReference }; rTargetDevice.EnableMapMode(false); xProcessor->process(aSequence); diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx index af2be461da15..12815c00f023 100644 --- a/svx/source/svdraw/svdhdl.cxx +++ b/svx/source/svdraw/svdhdl.cxx @@ -2545,7 +2545,7 @@ void SdrCropViewHdl::CreateB2dIAObject() aHilightColor)); // combine these - drawinglayer::primitive2d::Primitive2DSequence aCombination(2); + drawinglayer::primitive2d::Primitive2DContainer aCombination(2); aCombination[0] = aGraphic; aCombination[1] = aGraphicOutline; @@ -2558,10 +2558,10 @@ void SdrCropViewHdl::CreateB2dIAObject() // embed to UnifiedTransparencePrimitive2D const drawinglayer::primitive2d::Primitive2DReference aTransparenceMaskedGraphic( new drawinglayer::primitive2d::UnifiedTransparencePrimitive2D( - drawinglayer::primitive2d::Primitive2DSequence(&aMaskedGraphic, 1), + drawinglayer::primitive2d::Primitive2DContainer { aMaskedGraphic }, 0.8)); - const drawinglayer::primitive2d::Primitive2DSequence aSequence(&aTransparenceMaskedGraphic, 1); + const drawinglayer::primitive2d::Primitive2DContainer aSequence { aTransparenceMaskedGraphic }; for(sal_uInt32 b(0L); b < pPageView->PageWindowCount(); b++) { diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 5cbef0802e3e..872fef07cda9 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -873,13 +873,13 @@ void SdrObject::RecalcBoundRect() // central new method which will calculate the BoundRect using primitive geometry if(aOutRect.IsEmpty()) { - const drawinglayer::primitive2d::Primitive2DSequence xPrimitives(GetViewContact().getViewIndependentPrimitive2DSequence()); + const drawinglayer::primitive2d::Primitive2DContainer xPrimitives(GetViewContact().getViewIndependentPrimitive2DSequence()); - if(xPrimitives.hasElements()) + if(!xPrimitives.empty()) { // use neutral ViewInformation and get the range of the primitives const drawinglayer::geometry::ViewInformation2D aViewInformation2D; - const basegfx::B2DRange aRange(drawinglayer::primitive2d::getB2DRangeFromPrimitive2DSequence(xPrimitives, aViewInformation2D)); + const basegfx::B2DRange aRange(xPrimitives.getB2DRange(aViewInformation2D)); if(!aRange.isEmpty()) { @@ -1143,9 +1143,9 @@ basegfx::B2DPolyPolygon SdrObject::TakeContour() const // get sequence from clone const sdr::contact::ViewContact& rVC(pClone->GetViewContact()); - const drawinglayer::primitive2d::Primitive2DSequence xSequence(rVC.getViewIndependentPrimitive2DSequence()); + const drawinglayer::primitive2d::Primitive2DContainer xSequence(rVC.getViewIndependentPrimitive2DSequence()); - if(xSequence.hasElements()) + if(!xSequence.empty()) { // use neutral ViewInformation const drawinglayer::geometry::ViewInformation2D aViewInformation2D; @@ -2375,14 +2375,14 @@ SdrObject* SdrObject::GetConnectedNode(bool /*bTail1*/) const void extractLineContourFromPrimitive2DSequence( - const drawinglayer::primitive2d::Primitive2DSequence& rxSequence, + const drawinglayer::primitive2d::Primitive2DContainer& rxSequence, basegfx::B2DPolygonVector& rExtractedHairlines, basegfx::B2DPolyPolygonVector& rExtractedLineFills) { rExtractedHairlines.clear(); rExtractedLineFills.clear(); - if(rxSequence.hasElements()) + if(!rxSequence.empty()) { // use neutral ViewInformation const drawinglayer::geometry::ViewInformation2D aViewInformation2D; @@ -2409,9 +2409,9 @@ SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, bool bForceLineDas { basegfx::B2DPolyPolygon aMergedLineFillPolyPolygon; basegfx::B2DPolyPolygon aMergedHairlinePolyPolygon; - const drawinglayer::primitive2d::Primitive2DSequence xSequence(pRet->GetViewContact().getViewIndependentPrimitive2DSequence()); + const drawinglayer::primitive2d::Primitive2DContainer xSequence(pRet->GetViewContact().getViewIndependentPrimitive2DSequence()); - if(xSequence.hasElements()) + if(!xSequence.empty()) { basegfx::B2DPolygonVector aExtractedHairlines; basegfx::B2DPolyPolygonVector aExtractedLineFills; diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index 9c37084504fa..e54cb52223f6 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -295,9 +295,9 @@ void SdrGrafObj::onGraphicChanged() if (!rSvgDataPtr.get()) return; - const drawinglayer::primitive2d::Primitive2DSequence aSequence(rSvgDataPtr->getPrimitive2DSequence()); + const drawinglayer::primitive2d::Primitive2DContainer aSequence(rSvgDataPtr->getPrimitive2DSequence()); - if (!aSequence.hasElements()) + if (aSequence.empty()) return; drawinglayer::geometry::ViewInformation2D aViewInformation2D; diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx index 4630658bf8f1..0218d04cec2a 100644 --- a/svx/source/svdraw/svdotextdecomposition.cxx +++ b/svx/source/svdraw/svdotextdecomposition.cxx @@ -61,10 +61,10 @@ using namespace com::sun::star; namespace { - drawinglayer::primitive2d::Primitive2DSequence impConvertVectorToPrimitive2DSequence(const std::vector< drawinglayer::primitive2d::BasePrimitive2D* >& rPrimitiveVector) + drawinglayer::primitive2d::Primitive2DContainer impConvertVectorToPrimitive2DSequence(const std::vector< drawinglayer::primitive2d::BasePrimitive2D* >& rPrimitiveVector) { const sal_Int32 nCount(rPrimitiveVector.size()); - drawinglayer::primitive2d::Primitive2DSequence aRetval(nCount); + drawinglayer::primitive2d::Primitive2DContainer aRetval(nCount); for(sal_Int32 a(0L); a < nCount; a++) { @@ -161,7 +161,7 @@ namespace mrOutliner.SetDrawBulletHdl(Link<DrawBulletInfo*,void>()); } - drawinglayer::primitive2d::Primitive2DSequence getPrimitive2DSequence(); + drawinglayer::primitive2d::Primitive2DContainer getPrimitive2DSequence(); }; bool impTextBreakupHandler::impIsUnderlineAbove(const vcl::Font& rFont) @@ -382,7 +382,7 @@ namespace { // embed in TextHierarchyBulletPrimitive2D const drawinglayer::primitive2d::Primitive2DReference aNewReference(pNewPrimitive); - const drawinglayer::primitive2d::Primitive2DSequence aNewSequence(&aNewReference, 1); + const drawinglayer::primitive2d::Primitive2DContainer aNewSequence { aNewReference } ; pNewPrimitive = new drawinglayer::primitive2d::TextHierarchyBulletPrimitive2D(aNewSequence); } @@ -467,11 +467,11 @@ namespace const SvxPageField* pPageField = dynamic_cast< const SvxPageField* >(rInfo.mpFieldData); // embed current primitive to a sequence - drawinglayer::primitive2d::Primitive2DSequence aSequence; + drawinglayer::primitive2d::Primitive2DContainer aSequence; if(pPrimitive) { - aSequence.realloc(1); + aSequence.resize(1); aSequence[0] = drawinglayer::primitive2d::Primitive2DReference(pPrimitive); } @@ -498,7 +498,7 @@ namespace // empty line primitives (contrary to paragraphs, see below). if(!maTextPortionPrimitives.empty()) { - drawinglayer::primitive2d::Primitive2DSequence aLineSequence(impConvertVectorToPrimitive2DSequence(maTextPortionPrimitives)); + drawinglayer::primitive2d::Primitive2DContainer aLineSequence(impConvertVectorToPrimitive2DSequence(maTextPortionPrimitives)); maTextPortionPrimitives.clear(); maLinePrimitives.push_back(new drawinglayer::primitive2d::TextHierarchyLinePrimitive2D(aLineSequence)); } @@ -509,7 +509,7 @@ namespace // ALWAYS create a paragraph primitive, even when no content was added. This is done to // have the correct paragraph count even with empty paragraphs. Those paragraphs will // have an empty sub-PrimitiveSequence. - drawinglayer::primitive2d::Primitive2DSequence aParagraphSequence(impConvertVectorToPrimitive2DSequence(maLinePrimitives)); + drawinglayer::primitive2d::Primitive2DContainer aParagraphSequence(impConvertVectorToPrimitive2DSequence(maLinePrimitives)); maLinePrimitives.clear(); maParagraphPrimitives.push_back(new drawinglayer::primitive2d::TextHierarchyParagraphPrimitive2D(aParagraphSequence)); } @@ -555,7 +555,7 @@ namespace aGraphicAttr)); // embed in TextHierarchyBulletPrimitive2D - const drawinglayer::primitive2d::Primitive2DSequence aNewSequence(&aNewReference, 1); + const drawinglayer::primitive2d::Primitive2DContainer aNewSequence { aNewReference }; drawinglayer::primitive2d::BasePrimitive2D* pNewPrimitive = new drawinglayer::primitive2d::TextHierarchyBulletPrimitive2D(aNewSequence); // add to output @@ -649,7 +649,7 @@ namespace } } - drawinglayer::primitive2d::Primitive2DSequence impTextBreakupHandler::getPrimitive2DSequence() + drawinglayer::primitive2d::Primitive2DContainer impTextBreakupHandler::getPrimitive2DSequence() { if(!maTextPortionPrimitives.empty()) { @@ -671,7 +671,7 @@ namespace // primitive decompositions void SdrTextObj::impDecomposeContourTextPrimitive( - drawinglayer::primitive2d::Primitive2DSequence& rTarget, + drawinglayer::primitive2d::Primitive2DContainer& rTarget, const drawinglayer::primitive2d::SdrContourTextPrimitive2D& rSdrContourTextPrimitive, const drawinglayer::geometry::ViewInformation2D& aViewInformation) const { @@ -721,7 +721,7 @@ void SdrTextObj::impDecomposeContourTextPrimitive( } void SdrTextObj::impDecomposeAutoFitTextPrimitive( - drawinglayer::primitive2d::Primitive2DSequence& rTarget, + drawinglayer::primitive2d::Primitive2DContainer& rTarget, const drawinglayer::primitive2d::SdrAutoFitTextPrimitive2D& rSdrAutofitTextPrimitive, const drawinglayer::geometry::ViewInformation2D& aViewInformation) const { @@ -855,7 +855,7 @@ void SdrTextObj::impDecomposeAutoFitTextPrimitive( } void SdrTextObj::impDecomposeBlockTextPrimitive( - drawinglayer::primitive2d::Primitive2DSequence& rTarget, + drawinglayer::primitive2d::Primitive2DContainer& rTarget, const drawinglayer::primitive2d::SdrBlockTextPrimitive2D& rSdrBlockTextPrimitive, const drawinglayer::geometry::ViewInformation2D& aViewInformation) const { @@ -1097,7 +1097,7 @@ void SdrTextObj::impDecomposeBlockTextPrimitive( } void SdrTextObj::impDecomposeStretchTextPrimitive( - drawinglayer::primitive2d::Primitive2DSequence& rTarget, + drawinglayer::primitive2d::Primitive2DContainer& rTarget, const drawinglayer::primitive2d::SdrStretchTextPrimitive2D& rSdrStretchTextPrimitive, const drawinglayer::geometry::ViewInformation2D& aViewInformation) const { @@ -1455,7 +1455,7 @@ void SdrTextObj::impHandleChainingEventsDuringDecomposition(SdrOutliner &rOutlin } void SdrTextObj::impDecomposeChainedTextPrimitive( - drawinglayer::primitive2d::Primitive2DSequence& rTarget, + drawinglayer::primitive2d::Primitive2DContainer& rTarget, const drawinglayer::primitive2d::SdrChainedTextPrimitive2D& rSdrChainedTextPrimitive, const drawinglayer::geometry::ViewInformation2D& aViewInformation) const { diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx index 78fc7e796708..bb9d04fefba0 100644 --- a/svx/source/svdraw/svdotextpathdecomposition.cxx +++ b/svx/source/svdraw/svdotextpathdecomposition.cxx @@ -588,7 +588,7 @@ namespace } } - drawinglayer::primitive2d::Primitive2DSequence impAddPathTextOutlines( + drawinglayer::primitive2d::Primitive2DContainer impAddPathTextOutlines( const std::vector< drawinglayer::primitive2d::BasePrimitive2D* >& rSource, const drawinglayer::attribute::SdrFormTextOutlineAttribute& rOutlineAttribute) { @@ -623,7 +623,7 @@ namespace if(rOutlineAttribute.getTransparence()) { // create UnifiedTransparencePrimitive2D - drawinglayer::primitive2d::Primitive2DSequence aStrokePrimitiveSequence(nStrokeCount); + drawinglayer::primitive2d::Primitive2DContainer aStrokePrimitiveSequence(nStrokeCount); for(sal_uInt32 b(0L); b < nStrokeCount; b++) { @@ -650,7 +650,7 @@ namespace if(nNewCount) { - drawinglayer::primitive2d::Primitive2DSequence aRetval(nNewCount); + drawinglayer::primitive2d::Primitive2DContainer aRetval(nNewCount); for(sal_uInt32 a(0L); a < nNewCount; a++) { @@ -661,7 +661,7 @@ namespace } else { - return drawinglayer::primitive2d::Primitive2DSequence(); + return drawinglayer::primitive2d::Primitive2DContainer(); } } } // end of anonymous namespace @@ -670,12 +670,12 @@ namespace // primitive decomposition void SdrTextObj::impDecomposePathTextPrimitive( - drawinglayer::primitive2d::Primitive2DSequence& rTarget, + drawinglayer::primitive2d::Primitive2DContainer& rTarget, const drawinglayer::primitive2d::SdrPathTextPrimitive2D& rSdrPathTextPrimitive, const drawinglayer::geometry::ViewInformation2D& aViewInformation) const { - drawinglayer::primitive2d::Primitive2DSequence aRetvalA; - drawinglayer::primitive2d::Primitive2DSequence aRetvalB; + drawinglayer::primitive2d::Primitive2DContainer aRetvalA; + drawinglayer::primitive2d::Primitive2DContainer aRetvalB; // prepare outliner SdrOutliner& rOutliner = ImpGetDrawOutliner(); @@ -744,7 +744,7 @@ void SdrTextObj::impDecomposePathTextPrimitive( if(nShadowCount) { // add shadow primitives to decomposition - aRetvalA.realloc(nShadowCount); + aRetvalA.resize(nShadowCount); for(a = 0L; a < nShadowCount; a++) { @@ -755,19 +755,19 @@ void SdrTextObj::impDecomposePathTextPrimitive( if(rFormTextAttribute.getFormTextOutline() && !rFormTextAttribute.getShadowOutline().isDefault()) { - const drawinglayer::primitive2d::Primitive2DSequence aOutlines( + const drawinglayer::primitive2d::Primitive2DContainer aOutlines( impAddPathTextOutlines( aShadowDecomposition, rFormTextAttribute.getShadowOutline())); - drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(aRetvalA, aOutlines); + aRetvalA.append(aOutlines); } } if(nRegularCount) { // add normal primitives to decomposition - aRetvalB.realloc(nRegularCount); + aRetvalB.resize(nRegularCount); for(a = 0L; a < nRegularCount; a++) { @@ -778,12 +778,12 @@ void SdrTextObj::impDecomposePathTextPrimitive( if(rFormTextAttribute.getFormTextOutline() && !rFormTextAttribute.getOutline().isDefault()) { - const drawinglayer::primitive2d::Primitive2DSequence aOutlines( + const drawinglayer::primitive2d::Primitive2DContainer aOutlines( impAddPathTextOutlines( aRegularDecomposition, rFormTextAttribute.getOutline())); - drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(aRetvalB, aOutlines); + aRetvalB.append(aOutlines); } } } @@ -795,8 +795,8 @@ void SdrTextObj::impDecomposePathTextPrimitive( rOutliner.setVisualizedPage(nullptr); // concatenate all results - drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(rTarget, aRetvalA); - drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(rTarget, aRetvalB); + rTarget.append(aRetvalA); + rTarget.append(aRetvalB); } diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx index 79dfcf938fe9..b48855ead024 100644 --- a/svx/source/svdraw/svdotxtr.cxx +++ b/svx/source/svdraw/svdotxtr.cxx @@ -296,9 +296,9 @@ SdrObject* SdrTextObj::ImpConvertContainedTextToSdrPathObjs(bool bToPoly) const } // get primitives - const drawinglayer::primitive2d::Primitive2DSequence xSequence(GetViewContact().getViewIndependentPrimitive2DSequence()); + const drawinglayer::primitive2d::Primitive2DContainer xSequence(GetViewContact().getViewIndependentPrimitive2DSequence()); - if(xSequence.hasElements()) + if(!xSequence.empty()) { // create an extractor with neutral ViewInformation const drawinglayer::geometry::ViewInformation2D aViewInformation2D; diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index 432648dc6a59..a5828e270360 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -1808,7 +1808,7 @@ StandardCheckVisisbilityRedirector::~StandardCheckVisisbilityRedirector() { } -drawinglayer::primitive2d::Primitive2DSequence StandardCheckVisisbilityRedirector::createRedirectedPrimitive2DSequence( +drawinglayer::primitive2d::Primitive2DContainer StandardCheckVisisbilityRedirector::createRedirectedPrimitive2DSequence( const sdr::contact::ViewObjectContact& rOriginal, const sdr::contact::DisplayInfo& rDisplayInfo) { @@ -1824,7 +1824,7 @@ drawinglayer::primitive2d::Primitive2DSequence StandardCheckVisisbilityRedirecto } } - return drawinglayer::primitive2d::Primitive2DSequence(); + return drawinglayer::primitive2d::Primitive2DContainer(); } else { diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx index 35f12113ad9f..27eba2b9d5a0 100644 --- a/svx/source/svdraw/svdpntv.cxx +++ b/svx/source/svdraw/svdpntv.cxx @@ -145,7 +145,7 @@ BitmapEx convertMetafileToBitmapEx( rTargetRange.getMinimum()), rMtf)); aBitmapEx = convertPrimitive2DSequenceToBitmapEx( - drawinglayer::primitive2d::Primitive2DSequence(&aMtf, 1), + drawinglayer::primitive2d::Primitive2DContainer { aMtf }, rTargetRange, nMaximumQuadraticPixels); } diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx index ab6c8a4c8d2b..0eeedc95436f 100644 --- a/svx/source/svdraw/svdxcgv.cxx +++ b/svx/source/svdraw/svdxcgv.cxx @@ -485,7 +485,7 @@ BitmapEx SdrExchangeView::GetMarkedObjBitmapEx(bool bNoVDevIfOneBmpMarked) const { // collect sub-primitives as group objects, thus no expensive append // to existing sequence is needed - drawinglayer::primitive2d::Primitive2DSequence xPrimitives(nCount); + drawinglayer::primitive2d::Primitive2DContainer xPrimitives(nCount); for(sal_uInt32 a(0); a < nCount; a++) { @@ -504,10 +504,7 @@ BitmapEx SdrExchangeView::GetMarkedObjBitmapEx(bool bNoVDevIfOneBmpMarked) const // get logic range const drawinglayer::geometry::ViewInformation2D aViewInformation2D; - const basegfx::B2DRange aRange( - drawinglayer::primitive2d::getB2DRangeFromPrimitive2DSequence( - xPrimitives, - aViewInformation2D)); + const basegfx::B2DRange aRange(xPrimitives.getB2DRange(aViewInformation2D)); if(!aRange.isEmpty()) { diff --git a/svx/source/table/tablehandles.cxx b/svx/source/table/tablehandles.cxx index 74227c6f338a..ca9954ea4819 100644 --- a/svx/source/table/tablehandles.cxx +++ b/svx/source/table/tablehandles.cxx @@ -49,7 +49,7 @@ protected: bool mbVisible; // geometry creation for OverlayObject - virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() override; + virtual drawinglayer::primitive2d::Primitive2DContainer createOverlayObjectPrimitive2DSequence() override; public: OverlayTableEdge( const basegfx::B2DPolyPolygon& rPolyPolygon, bool bVisible ); @@ -212,9 +212,9 @@ OverlayTableEdge::~OverlayTableEdge() { } -drawinglayer::primitive2d::Primitive2DSequence OverlayTableEdge::createOverlayObjectPrimitive2DSequence() +drawinglayer::primitive2d::Primitive2DContainer OverlayTableEdge::createOverlayObjectPrimitive2DSequence() { - drawinglayer::primitive2d::Primitive2DSequence aRetval; + drawinglayer::primitive2d::Primitive2DContainer aRetval; if(maPolyPolygon.count()) { @@ -228,16 +228,16 @@ drawinglayer::primitive2d::Primitive2DSequence OverlayTableEdge::createOverlayOb if(mbVisible) { // visible, just return as sequence - aRetval = drawinglayer::primitive2d::Primitive2DSequence(&aReference, 1); + aRetval = drawinglayer::primitive2d::Primitive2DContainer { aReference }; } else { // embed in HiddenGeometryPrimitive2D to support HitTest of this invisible // overlay object - const drawinglayer::primitive2d::Primitive2DSequence aSequence(&aReference, 1); + const drawinglayer::primitive2d::Primitive2DContainer aSequence { aReference }; const drawinglayer::primitive2d::Primitive2DReference aNewReference( new drawinglayer::primitive2d::HiddenGeometryPrimitive2D(aSequence)); - aRetval = drawinglayer::primitive2d::Primitive2DSequence(&aNewReference, 1); + aRetval = drawinglayer::primitive2d::Primitive2DContainer { aNewReference }; } } diff --git a/svx/source/table/viewcontactoftableobj.cxx b/svx/source/table/viewcontactoftableobj.cxx index ead137b261f8..2540bfe9c2fb 100644 --- a/svx/source/table/viewcontactoftableobj.cxx +++ b/svx/source/table/viewcontactoftableobj.cxx @@ -60,7 +60,7 @@ namespace drawinglayer protected: // local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const override; + virtual Primitive2DContainer create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const override; public: SdrCellPrimitive2D( @@ -83,10 +83,10 @@ namespace drawinglayer DeclPrimitive2DIDBlock() }; - Primitive2DSequence SdrCellPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*aViewInformation*/) const + Primitive2DContainer SdrCellPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*aViewInformation*/) const { // prepare unit polygon - Primitive2DSequence aRetval; + Primitive2DContainer aRetval; const basegfx::B2DPolyPolygon aUnitPolyPolygon(basegfx::tools::createUnitPolygon()); // add fill @@ -95,7 +95,7 @@ namespace drawinglayer basegfx::B2DPolyPolygon aTransformed(aUnitPolyPolygon); aTransformed.transform(getTransform()); - appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, + aRetval.push_back( createPolyPolygonFillPrimitive( aTransformed, getSdrFTAttribute().getFill(), @@ -104,7 +104,7 @@ namespace drawinglayer else { // if no fill create one for HitTest and BoundRect fallback - appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, + aRetval.push_back( createHiddenGeometryPrimitives2D( true, aUnitPolyPolygon, @@ -114,7 +114,7 @@ namespace drawinglayer // add text if(!getSdrFTAttribute().getText().isDefault()) { - appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, + aRetval.push_back( createTextPrimitive( aUnitPolyPolygon, getTransform(), @@ -181,7 +181,7 @@ namespace drawinglayer protected: // local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const override; + virtual Primitive2DContainer create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const override; public: SdrBorderlinePrimitive2D( @@ -291,9 +291,9 @@ namespace drawinglayer return (double)nValue; } - Primitive2DSequence SdrBorderlinePrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*aViewInformation*/) const + Primitive2DContainer SdrBorderlinePrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*aViewInformation*/) const { - Primitive2DSequence xRetval(4); + Primitive2DContainer xRetval(4); sal_uInt32 nInsert(0); const double fTwipsToMM(getInTwips() ? (127.0 / 72.0) : 1.0); @@ -431,7 +431,7 @@ namespace drawinglayer } } - xRetval.realloc(nInsert); + xRetval.resize(nInsert); return xRetval; } @@ -519,7 +519,7 @@ namespace sdr aLine = aEmptyLine; } - drawinglayer::primitive2d::Primitive2DSequence ViewContactOfTableObj::createViewIndependentPrimitive2DSequence() const + drawinglayer::primitive2d::Primitive2DContainer ViewContactOfTableObj::createViewIndependentPrimitive2DSequence() const { const sdr::table::SdrTableObj& rTableObj = GetTableObj(); const uno::Reference< css::table::XTable > xTable = rTableObj.getTable(); @@ -527,7 +527,7 @@ namespace sdr if(xTable.is()) { // create primitive representation for table - drawinglayer::primitive2d::Primitive2DSequence xRetval; + drawinglayer::primitive2d::Primitive2DContainer xRetval; const sal_Int32 nRowCount(xTable->getRowCount()); const sal_Int32 nColCount(xTable->getColumnCount()); const sal_Int32 nAllCount(nRowCount * nColCount); @@ -547,8 +547,8 @@ namespace sdr // for each cell we need potentially a cell primitive and a border primitive // (e.g. single cell). Prepare sequences and input counters - drawinglayer::primitive2d::Primitive2DSequence xCellSequence(nAllCount); - drawinglayer::primitive2d::Primitive2DSequence xBorderSequence(nAllCount); + drawinglayer::primitive2d::Primitive2DContainer xCellSequence(nAllCount); + drawinglayer::primitive2d::Primitive2DContainer xBorderSequence(nAllCount); sal_uInt32 nCellInsert(0); sal_uInt32 nBorderInsert(0); @@ -677,18 +677,18 @@ namespace sdr } // no empty references; reallocate sequences by used count - xCellSequence.realloc(nCellInsert); - xBorderSequence.realloc(nBorderInsert); + xCellSequence.resize(nCellInsert); + xBorderSequence.resize(nBorderInsert); // append to target. We want fillings and text first xRetval = xCellSequence; - drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(xRetval, xBorderSequence); + xRetval.append(xBorderSequence); } - if(xRetval.hasElements()) + if(!xRetval.empty()) { // check and create evtl. shadow for created content - const SfxItemSet& rObjectItemSet = rTableObj.GetMergedItemSet(); + const SfxItemSet& rObjectItemSet = rTableObj.GetMergedItemSet(); const drawinglayer::attribute::SdrShadowAttribute aNewShadowAttribute( drawinglayer::primitive2d::createNewSdrShadowAttribute(rObjectItemSet)); @@ -722,7 +722,7 @@ namespace sdr false, aObjectMatrix)); - return drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1); + return drawinglayer::primitive2d::Primitive2DContainer { xReference }; } } diff --git a/svx/source/table/viewcontactoftableobj.hxx b/svx/source/table/viewcontactoftableobj.hxx index 31ad7db60330..9f247bf64cd5 100644 --- a/svx/source/table/viewcontactoftableobj.hxx +++ b/svx/source/table/viewcontactoftableobj.hxx @@ -38,7 +38,7 @@ namespace sdr // This method is responsible for creating the graphical visualisation data derived ONLY from // the model data - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const override; + virtual drawinglayer::primitive2d::Primitive2DContainer createViewIndependentPrimitive2DSequence() const override; public: // basic constructor, used from SdrObject. diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index be31bcf8225a..435f071bda6e 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -285,7 +285,7 @@ public: explicit ImplExportCheckVisisbilityRedirector( SdrPage* pCurrentPage ); virtual ~ImplExportCheckVisisbilityRedirector(); - virtual drawinglayer::primitive2d::Primitive2DSequence createRedirectedPrimitive2DSequence( + virtual drawinglayer::primitive2d::Primitive2DContainer createRedirectedPrimitive2DSequence( const sdr::contact::ViewObjectContact& rOriginal, const sdr::contact::DisplayInfo& rDisplayInfo) override; @@ -302,7 +302,7 @@ ImplExportCheckVisisbilityRedirector::~ImplExportCheckVisisbilityRedirector() { } -drawinglayer::primitive2d::Primitive2DSequence ImplExportCheckVisisbilityRedirector::createRedirectedPrimitive2DSequence( +drawinglayer::primitive2d::Primitive2DContainer ImplExportCheckVisisbilityRedirector::createRedirectedPrimitive2DSequence( const sdr::contact::ViewObjectContact& rOriginal, const sdr::contact::DisplayInfo& rDisplayInfo) { @@ -319,7 +319,7 @@ drawinglayer::primitive2d::Primitive2DSequence ImplExportCheckVisisbilityRedirec return sdr::contact::ViewObjectContactRedirector::createRedirectedPrimitive2DSequence(rOriginal, rDisplayInfo); } - return drawinglayer::primitive2d::Primitive2DSequence(); + return drawinglayer::primitive2d::Primitive2DContainer(); } else { diff --git a/svx/source/xoutdev/xtabdash.cxx b/svx/source/xoutdev/xtabdash.cxx index 8bb9e5a7da93..56fbd47014d6 100644 --- a/svx/source/xoutdev/xtabdash.cxx +++ b/svx/source/xoutdev/xtabdash.cxx @@ -165,7 +165,7 @@ Bitmap XDashList::ImpCreateBitmapForXDash(const XDash* pDash) if(pProcessor2D) { - const drawinglayer::primitive2d::Primitive2DSequence aSequence(&aLinePrimitive, 1); + const drawinglayer::primitive2d::Primitive2DContainer aSequence { aLinePrimitive }; pProcessor2D->process(aSequence); pProcessor2D.reset(); diff --git a/svx/source/xoutdev/xtabgrdt.cxx b/svx/source/xoutdev/xtabgrdt.cxx index 213236c965ae..5ad61a6f622d 100644 --- a/svx/source/xoutdev/xtabgrdt.cxx +++ b/svx/source/xoutdev/xtabgrdt.cxx @@ -196,7 +196,7 @@ Bitmap XGradientList::CreateBitmapForUI( long nIndex ) if(pProcessor2D) { - drawinglayer::primitive2d::Primitive2DSequence aSequence(2); + drawinglayer::primitive2d::Primitive2DContainer aSequence(2); aSequence[0] = aGradientPrimitive; aSequence[1] = aBlackRectanglePrimitive; diff --git a/svx/source/xoutdev/xtabhtch.cxx b/svx/source/xoutdev/xtabhtch.cxx index 90316c15a94c..37a24dbd366d 100644 --- a/svx/source/xoutdev/xtabhtch.cxx +++ b/svx/source/xoutdev/xtabhtch.cxx @@ -171,7 +171,7 @@ Bitmap XHatchList::CreateBitmapForUI( long nIndex ) if(pProcessor2D) { - drawinglayer::primitive2d::Primitive2DSequence aSequence(2); + drawinglayer::primitive2d::Primitive2DContainer aSequence(2); aSequence[0] = aHatchPrimitive; aSequence[1] = aBlackRectanglePrimitive; diff --git a/svx/source/xoutdev/xtablend.cxx b/svx/source/xoutdev/xtablend.cxx index 0429ca43d1da..d27a9c6886c4 100644 --- a/svx/source/xoutdev/xtablend.cxx +++ b/svx/source/xoutdev/xtablend.cxx @@ -154,7 +154,7 @@ Bitmap XLineEndList::CreateBitmapForUI( long nIndex ) if(pProcessor2D) { - const drawinglayer::primitive2d::Primitive2DSequence aSequence(&aLineStartEndPrimitive, 1); + const drawinglayer::primitive2d::Primitive2DContainer aSequence { aLineStartEndPrimitive }; pProcessor2D->process(aSequence); pProcessor2D.reset(); |