diff options
Diffstat (limited to 'svx/source/sdr/contact/viewcontact.cxx')
| -rw-r--r-- | svx/source/sdr/contact/viewcontact.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
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; |