[Libreoffice-commits] core.git: include/svx sd/source svx/source sw/source
Noel Grandin
noel.grandin at collabora.co.uk
Wed Nov 30 09:14:29 UTC 2016
include/svx/sdr/contact/viewcontact.hxx | 4 -
include/svx/sdr/contact/viewcontactofsdrobj.hxx | 2
include/svx/sdr/contact/viewobjectcontact.hxx | 2
sd/source/core/CustomAnimationEffect.cxx | 2
sd/source/ui/animations/motionpathtag.cxx | 2
svx/source/sdr/contact/viewcontact.cxx | 2
svx/source/sdr/contact/viewcontactofgroup.cxx | 2
svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx | 2
svx/source/sdr/contact/viewcontactofsdrpage.cxx | 22 +++++-----
svx/source/sdr/contact/viewcontactofvirtobj.cxx | 2
svx/source/sdr/contact/viewobjectcontact.cxx | 2
svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx | 2
svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx | 2
svx/source/sdr/primitive2d/primitivefactory2d.cxx | 4 -
svx/source/svdraw/svdcrtv.cxx | 2
svx/source/svdraw/svdobj.cxx | 6 +-
svx/source/svdraw/svdotxtr.cxx | 2
svx/source/svdraw/svdxcgv.cxx | 2
sw/source/core/draw/dcontact.cxx | 4 -
19 files changed, 34 insertions(+), 34 deletions(-)
New commits:
commit 0b2801922d6972eeb607e37a8a1de210e825c95e
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Wed Nov 30 11:12:39 2016 +0200
rename getViewIndependentPrimitive2DSequence..
to getViewIndependentPrimitive2DContainer
to match it's new return type
Change-Id: I767bdef45316e355d49f6509ca1b50138a45b3fa
diff --git a/include/svx/sdr/contact/viewcontact.hxx b/include/svx/sdr/contact/viewcontact.hxx
index 8e1a882..2034712 100644
--- a/include/svx/sdr/contact/viewcontact.hxx
+++ b/include/svx/sdr/contact/viewcontact.hxx
@@ -122,13 +122,13 @@ public:
// access to the local primitive. This will ensure that the primitive is
// current in comparing the local one with a fresh created incarnation
- drawinglayer::primitive2d::Primitive2DContainer const & getViewIndependentPrimitive2DSequence() const;
+ drawinglayer::primitive2d::Primitive2DContainer const & getViewIndependentPrimitive2DContainer() const;
// add Gluepoints (if available)
virtual drawinglayer::primitive2d::Primitive2DContainer createGluePointPrimitive2DSequence() const;
// allow embedding if needed (e.g. for SdrObjects, evtl. Name, Title and description get added). This
- // is a helper normally used from getViewIndependentPrimitive2DSequence(), but there is one exception
+ // is a helper normally used from getViewIndependentPrimitive2DContainer(), but there is one exception
// for 3D scenes
virtual drawinglayer::primitive2d::Primitive2DContainer embedToObjectSpecificInformation(const drawinglayer::primitive2d::Primitive2DContainer& rSource) const;
diff --git a/include/svx/sdr/contact/viewcontactofsdrobj.hxx b/include/svx/sdr/contact/viewcontactofsdrobj.hxx
index 81583a7..039bf43 100644
--- a/include/svx/sdr/contact/viewcontactofsdrobj.hxx
+++ b/include/svx/sdr/contact/viewcontactofsdrobj.hxx
@@ -75,7 +75,7 @@ public:
virtual drawinglayer::primitive2d::Primitive2DContainer createGluePointPrimitive2DSequence() const override;
// allow embedding if needed (e.g. for SdrObjects, evtl. Name, Title and description get added). This
- // is a helper normally used from getViewIndependentPrimitive2DSequence(), but there is one exception
+ // is a helper normally used from getViewIndependentPrimitive2DContainer(), but there is one exception
// for 3D scenes
virtual drawinglayer::primitive2d::Primitive2DContainer embedToObjectSpecificInformation(const drawinglayer::primitive2d::Primitive2DContainer& rSource) const override;
};
diff --git a/include/svx/sdr/contact/viewobjectcontact.hxx b/include/svx/sdr/contact/viewobjectcontact.hxx
index 11ad3d8..b5b1a35 100644
--- a/include/svx/sdr/contact/viewobjectcontact.hxx
+++ b/include/svx/sdr/contact/viewobjectcontact.hxx
@@ -71,7 +71,7 @@ protected:
// This method is responsible for creating the graphical visualisation data which is
// stored/cached in the local primitive. Default gets view-independent Primitive
- // from the ViewContact using ViewContact::getViewIndependentPrimitive2DSequence(), takes care of
+ // from the ViewContact using ViewContact::getViewIndependentPrimitive2DContainer(), takes care of
// visibility, handles glue and ghosted.
// This method will not handle included hierarchies and not check geometric visibility.
virtual drawinglayer::primitive2d::Primitive2DContainer createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const;
diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx
index 469e06e..770ab0b 100644
--- a/sd/source/core/CustomAnimationEffect.cxx
+++ b/sd/source/core/CustomAnimationEffect.cxx
@@ -1631,7 +1631,7 @@ void CustomAnimationEffect::updatePathFromSdrPathObj( const SdrPathObj& rPathObj
{
Rectangle aBoundRect(0,0,0,0);
- const drawinglayer::primitive2d::Primitive2DContainer xPrimitives(pObj->GetViewContact().getViewIndependentPrimitive2DSequence());
+ const drawinglayer::primitive2d::Primitive2DContainer xPrimitives(pObj->GetViewContact().getViewIndependentPrimitive2DContainer());
const drawinglayer::geometry::ViewInformation2D aViewInformation2D;
const basegfx::B2DRange aRange(xPrimitives.getB2DRange(aViewInformation2D));
diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx
index cbf0a7f..f1f36e5 100644
--- a/sd/source/ui/animations/motionpathtag.cxx
+++ b/sd/source/ui/animations/motionpathtag.cxx
@@ -289,7 +289,7 @@ void SdPathHdl::CreateB2dIAObject()
if (xManager.is() && mpPathObj)
{
const sdr::contact::ViewContact& rVC = mpPathObj->GetViewContact();
- const drawinglayer::primitive2d::Primitive2DContainer aSequence = rVC.getViewIndependentPrimitive2DSequence();
+ const drawinglayer::primitive2d::Primitive2DContainer aSequence = rVC.getViewIndependentPrimitive2DContainer();
sdr::overlay::OverlayObject* pNew = new sdr::overlay::OverlayPrimitive2DSequenceObject(aSequence);
xManager->add(*pNew);
diff --git a/svx/source/sdr/contact/viewcontact.cxx b/svx/source/sdr/contact/viewcontact.cxx
index c4e5f11..c558467 100644
--- a/svx/source/sdr/contact/viewcontact.cxx
+++ b/svx/source/sdr/contact/viewcontact.cxx
@@ -233,7 +233,7 @@ drawinglayer::primitive2d::Primitive2DContainer ViewContact::createViewIndepende
return drawinglayer::primitive2d::Primitive2DContainer { xReference };
}
-drawinglayer::primitive2d::Primitive2DContainer const & ViewContact::getViewIndependentPrimitive2DSequence() const
+drawinglayer::primitive2d::Primitive2DContainer const & ViewContact::getViewIndependentPrimitive2DContainer() const
{
// local up-to-date checks. Create new list and compare.
drawinglayer::primitive2d::Primitive2DContainer xNew(createViewIndependentPrimitive2DSequence());
diff --git a/svx/source/sdr/contact/viewcontactofgroup.cxx b/svx/source/sdr/contact/viewcontactofgroup.cxx
index 637f304..54d3b01 100644
--- a/svx/source/sdr/contact/viewcontactofgroup.cxx
+++ b/svx/source/sdr/contact/viewcontactofgroup.cxx
@@ -63,7 +63,7 @@ namespace sdr
for(sal_uInt32 a(0); a < nObjectCount; a++)
{
const ViewContact& rCandidate(GetViewContact(a));
- const drawinglayer::primitive2d::Primitive2DContainer aCandSeq(rCandidate.getViewIndependentPrimitive2DSequence());
+ const drawinglayer::primitive2d::Primitive2DContainer aCandSeq(rCandidate.getViewIndependentPrimitive2DContainer());
xRetval.insert(xRetval.end(), aCandSeq.begin(), aCandSeq.end());
}
diff --git a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
index 783d0f0..62f097b 100644
--- a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
@@ -138,7 +138,7 @@ namespace sdr
b3DShape = true;
}
- const drawinglayer::primitive2d::Primitive2DContainer xNew(rCandidate.GetViewContact().getViewIndependentPrimitive2DSequence());
+ const drawinglayer::primitive2d::Primitive2DContainer xNew(rCandidate.GetViewContact().getViewIndependentPrimitive2DContainer());
xGroup.insert(xGroup.end(), xNew.begin(), xNew.end());
}
}
diff --git a/svx/source/sdr/contact/viewcontactofsdrpage.cxx b/svx/source/sdr/contact/viewcontactofsdrpage.cxx
index 607eae0..5c452a6 100644
--- a/svx/source/sdr/contact/viewcontactofsdrpage.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrpage.cxx
@@ -399,7 +399,7 @@ drawinglayer::primitive2d::Primitive2DContainer ViewContactOfPageHierarchy::crea
for(sal_uInt32 a(0); a < nObjectCount; a++)
{
const ViewContact& rCandidate(GetViewContact(a));
- const drawinglayer::primitive2d::Primitive2DContainer aCandSeq(rCandidate.getViewIndependentPrimitive2DSequence());
+ const drawinglayer::primitive2d::Primitive2DContainer aCandSeq(rCandidate.getViewIndependentPrimitive2DContainer());
xRetval.insert(xRetval.end(), aCandSeq.begin(), aCandSeq.end());
}
@@ -587,26 +587,26 @@ drawinglayer::primitive2d::Primitive2DContainer ViewContactOfSdrPage::createView
drawinglayer::primitive2d::Primitive2DContainer xRetval;
// collect all sub-sequences including sub hierarchy.
- xRetval.append(maViewContactOfPageBackground.getViewIndependentPrimitive2DSequence());
- xRetval.append(maViewContactOfPageShadow.getViewIndependentPrimitive2DSequence());
- xRetval.append(maViewContactOfPageFill.getViewIndependentPrimitive2DSequence());
+ xRetval.append(maViewContactOfPageBackground.getViewIndependentPrimitive2DContainer());
+ xRetval.append(maViewContactOfPageShadow.getViewIndependentPrimitive2DContainer());
+ xRetval.append(maViewContactOfPageFill.getViewIndependentPrimitive2DContainer());
const SdrPage& rPage = GetSdrPage();
if(rPage.TRG_HasMasterPage())
{
xRetval.append(
- rPage.TRG_GetMasterPageDescriptorViewContact().getViewIndependentPrimitive2DSequence());
+ rPage.TRG_GetMasterPageDescriptorViewContact().getViewIndependentPrimitive2DContainer());
}
else if(rPage.IsMasterPage())
{
xRetval.append(
- maViewContactOfMasterPage.getViewIndependentPrimitive2DSequence());
+ maViewContactOfMasterPage.getViewIndependentPrimitive2DContainer());
}
- xRetval.append(maViewContactOfOuterPageBorder.getViewIndependentPrimitive2DSequence());
- xRetval.append(maViewContactOfInnerPageBorder.getViewIndependentPrimitive2DSequence());
- xRetval.append(maViewContactOfPageHierarchy.getViewIndependentPrimitive2DSequence());
+ xRetval.append(maViewContactOfOuterPageBorder.getViewIndependentPrimitive2DContainer());
+ xRetval.append(maViewContactOfInnerPageBorder.getViewIndependentPrimitive2DContainer());
+ xRetval.append(maViewContactOfPageHierarchy.getViewIndependentPrimitive2DContainer());
// 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
@@ -617,8 +617,8 @@ drawinglayer::primitive2d::Primitive2DContainer ViewContactOfSdrPage::createView
// do not need to be called ATM. This may change later if grid or helpline info gets
// model data (it should not). Keeping the lines commented to hold this hint.
- // drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(xRetval, maViewContactOfGridFront.getViewIndependentPrimitive2DSequence());
- // drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(xRetval, maViewContactOfHelplinesFront.getViewIndependentPrimitive2DSequence());
+ // drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(xRetval, maViewContactOfGridFront.getViewIndependentPrimitive2DContainer());
+ // drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(xRetval, maViewContactOfHelplinesFront.getViewIndependentPrimitive2DContainer());
return xRetval;
}
diff --git a/svx/source/sdr/contact/viewcontactofvirtobj.cxx b/svx/source/sdr/contact/viewcontactofvirtobj.cxx
index e42fd3c..fed69a8 100644
--- a/svx/source/sdr/contact/viewcontactofvirtobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofvirtobj.cxx
@@ -73,7 +73,7 @@ drawinglayer::primitive2d::Primitive2DContainer ViewContactOfVirtObj::createView
// use method from referenced object to get the Primitive2DContainer
const drawinglayer::primitive2d::Primitive2DContainer xSequenceVirtual(
- GetVirtObj().GetReferencedObj().GetViewContact().getViewIndependentPrimitive2DSequence());
+ GetVirtObj().GetReferencedObj().GetViewContact().getViewIndependentPrimitive2DContainer());
if(!xSequenceVirtual.empty())
{
diff --git a/svx/source/sdr/contact/viewobjectcontact.cxx b/svx/source/sdr/contact/viewobjectcontact.cxx
index d3fe819..6223316 100644
--- a/svx/source/sdr/contact/viewobjectcontact.cxx
+++ b/svx/source/sdr/contact/viewobjectcontact.cxx
@@ -323,7 +323,7 @@ void ViewObjectContact::checkForPrimitive2DAnimations()
drawinglayer::primitive2d::Primitive2DContainer ViewObjectContact::createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const
{
// get the view-independent Primitive from the viewContact
- drawinglayer::primitive2d::Primitive2DContainer xRetval(GetViewContact().getViewIndependentPrimitive2DSequence());
+ drawinglayer::primitive2d::Primitive2DContainer xRetval(GetViewContact().getViewIndependentPrimitive2DContainer());
if(!xRetval.empty())
{
diff --git a/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx b/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx
index fccbabc..cadd37c 100644
--- a/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx
@@ -86,7 +86,7 @@ namespace sdr
if(!GetObjectContact().isDrawModeGray() && !GetObjectContact().isDrawModeHighContrast())
{
// if visible, create the default background primitive sequence
- xRetval = static_cast< ViewContactOfMasterPageDescriptor& >(GetViewContact()).getViewIndependentPrimitive2DSequence();
+ xRetval = static_cast< ViewContactOfMasterPageDescriptor& >(GetViewContact()).getViewIndependentPrimitive2DContainer();
}
}
diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
index 2e6792b..817fb16 100644
--- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
@@ -1573,7 +1573,7 @@ namespace sdr { namespace contact {
// use the default mechanism. This will create a ControlPrimitive2D without
// handing over a XControl. If not even a XControlModel exists, it will
// create the SdrObject fallback visualisation
- drawinglayer::primitive2d::Primitive2DContainer aTmp = rViewContactOfUnoControl.getViewIndependentPrimitive2DSequence();
+ drawinglayer::primitive2d::Primitive2DContainer aTmp = rViewContactOfUnoControl.getViewIndependentPrimitive2DContainer();
rContainer.insert(rContainer.end(), aTmp.begin(), aTmp.end());
return;
}
diff --git a/svx/source/sdr/primitive2d/primitivefactory2d.cxx b/svx/source/sdr/primitive2d/primitivefactory2d.cxx
index 41235cd..77970a8 100644
--- a/svx/source/sdr/primitive2d/primitivefactory2d.cxx
+++ b/svx/source/sdr/primitive2d/primitivefactory2d.cxx
@@ -77,7 +77,7 @@ css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > SAL_CALL
if(pSource)
{
const sdr::contact::ViewContact& rSource(pSource->GetViewContact());
- aRetval = comphelper::containerToSequence(rSource.getViewIndependentPrimitive2DSequence());
+ aRetval = comphelper::containerToSequence(rSource.getViewIndependentPrimitive2DContainer());
}
}
@@ -98,7 +98,7 @@ css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > SAL_CALL
{
const sdr::contact::ViewContact& rSource(pSource->GetViewContact());
- aRetval = comphelper::containerToSequence(rSource.getViewIndependentPrimitive2DSequence());
+ aRetval = comphelper::containerToSequence(rSource.getViewIndependentPrimitive2DContainer());
}
}
diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx
index 1866428..d3b0a28 100644
--- a/svx/source/svdraw/svdcrtv.cxx
+++ b/svx/source/svdraw/svdcrtv.cxx
@@ -149,7 +149,7 @@ void ImpSdrCreateViewExtraData::CreateAndShowOverlay(const SdrCreateView& rView,
if(pObject)
{
const sdr::contact::ViewContact& rVC = pObject->GetViewContact();
- const drawinglayer::primitive2d::Primitive2DContainer aSequence = rVC.getViewIndependentPrimitive2DSequence();
+ const drawinglayer::primitive2d::Primitive2DContainer aSequence = rVC.getViewIndependentPrimitive2DContainer();
sdr::overlay::OverlayObject* pNew = new sdr::overlay::OverlayPrimitive2DSequenceObject(aSequence);
xOverlayManager->add(*pNew);
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index de9124f..d885ed3 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -855,7 +855,7 @@ void SdrObject::RecalcBoundRect()
// central new method which will calculate the BoundRect using primitive geometry
if(aOutRect.IsEmpty())
{
- const drawinglayer::primitive2d::Primitive2DContainer xPrimitives(GetViewContact().getViewIndependentPrimitive2DSequence());
+ const drawinglayer::primitive2d::Primitive2DContainer xPrimitives(GetViewContact().getViewIndependentPrimitive2DContainer());
if(!xPrimitives.empty())
{
@@ -1123,7 +1123,7 @@ basegfx::B2DPolyPolygon SdrObject::TakeContour() const
// get sequence from clone
const sdr::contact::ViewContact& rVC(pClone->GetViewContact());
- const drawinglayer::primitive2d::Primitive2DContainer xSequence(rVC.getViewIndependentPrimitive2DSequence());
+ const drawinglayer::primitive2d::Primitive2DContainer xSequence(rVC.getViewIndependentPrimitive2DContainer());
if(!xSequence.empty())
{
@@ -2381,7 +2381,7 @@ SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, bool bForceLineDas
{
basegfx::B2DPolyPolygon aMergedLineFillPolyPolygon;
basegfx::B2DPolyPolygon aMergedHairlinePolyPolygon;
- const drawinglayer::primitive2d::Primitive2DContainer xSequence(pRet->GetViewContact().getViewIndependentPrimitive2DSequence());
+ const drawinglayer::primitive2d::Primitive2DContainer xSequence(pRet->GetViewContact().getViewIndependentPrimitive2DContainer());
if(!xSequence.empty())
{
diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx
index 03c1416..01c5a79 100644
--- a/svx/source/svdraw/svdotxtr.cxx
+++ b/svx/source/svdraw/svdotxtr.cxx
@@ -295,7 +295,7 @@ SdrObject* SdrTextObj::ImpConvertContainedTextToSdrPathObjs(bool bToPoly) const
}
// get primitives
- const drawinglayer::primitive2d::Primitive2DContainer xSequence(GetViewContact().getViewIndependentPrimitive2DSequence());
+ const drawinglayer::primitive2d::Primitive2DContainer xSequence(GetViewContact().getViewIndependentPrimitive2DContainer());
if(!xSequence.empty())
{
diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx
index 3a12bd5..767b384 100644
--- a/svx/source/svdraw/svdxcgv.cxx
+++ b/svx/source/svdraw/svdxcgv.cxx
@@ -498,7 +498,7 @@ BitmapEx SdrExchangeView::GetMarkedObjBitmapEx(bool bNoVDevIfOneBmpMarked) const
}
xPrimitives[a] = new drawinglayer::primitive2d::GroupPrimitive2D(
- pCandidate->GetViewContact().getViewIndependentPrimitive2DSequence());
+ pCandidate->GetViewContact().getViewIndependentPrimitive2DContainer());
}
// get logic range
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index ded98a2..4908cc9 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -1990,7 +1990,7 @@ namespace sdr
/**
* This method is responsible for creating the graphical visualisation data which is
* stored/cached in the local primitive. Default gets view-independent Primitive from
- * the ViewContact using ViewContact::getViewIndependentPrimitive2DSequence(), takes
+ * the ViewContact using ViewContact::getViewIndependentPrimitive2DContainer(), takes
* care of visibility, handles glue and ghosted.
*
* This method will not handle included hierarchies and not check geometric visibility.
@@ -2116,7 +2116,7 @@ namespace sdr
else
{
// single object, use method from referenced object to get the Primitive2DSequence
- xRetval = rReferencedObject.GetViewContact().getViewIndependentPrimitive2DSequence();
+ xRetval = rReferencedObject.GetViewContact().getViewIndependentPrimitive2DContainer();
}
if(!xRetval.empty())
More information about the Libreoffice-commits
mailing list