mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename getViewIndependentPrimitive2DSequence..

Browse Source 
to getViewIndependentPrimitive2DContainer

to match it's new return type

Change-Id: I767bdef45316e355d49f6509ca1b50138a45b3fa
This commit is contained in:
Noel Grandin
2016-11-30 11:12:39 +02:00
parent 70c03ec408
commit 0b2801922d
19 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/svx/sdr/contact/viewcontact.hxx
View File

@@ -122,13 +122,13 @@ public:
// access to the local primitive. This will ensure that the primitive is // access to the local primitive. This will ensure that the primitive is
// current in comparing the local one with a fresh created incarnation // 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) // add Gluepoints (if available)
virtual drawinglayer::primitive2d::Primitive2DContainer createGluePointPrimitive2DSequence() const; virtual drawinglayer::primitive2d::Primitive2DContainer createGluePointPrimitive2DSequence() const;
// allow embedding if needed (e.g. for SdrObjects, evtl. Name, Title and description get added). This // 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 // for 3D scenes
virtual drawinglayer::primitive2d::Primitive2DContainer embedToObjectSpecificInformation(const drawinglayer::primitive2d::Primitive2DContainer& rSource) const; virtual drawinglayer::primitive2d::Primitive2DContainer embedToObjectSpecificInformation(const drawinglayer::primitive2d::Primitive2DContainer& rSource) const;

2
include/svx/sdr/contact/viewcontactofsdrobj.hxx
View File

@@ -75,7 +75,7 @@ public:
virtual drawinglayer::primitive2d::Primitive2DContainer createGluePointPrimitive2DSequence() const override; virtual drawinglayer::primitive2d::Primitive2DContainer createGluePointPrimitive2DSequence() const override;
// allow embedding if needed (e.g. for SdrObjects, evtl. Name, Title and description get added). This // 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 // for 3D scenes
virtual drawinglayer::primitive2d::Primitive2DContainer embedToObjectSpecificInformation(const drawinglayer::primitive2d::Primitive2DContainer& rSource) const override; virtual drawinglayer::primitive2d::Primitive2DContainer embedToObjectSpecificInformation(const drawinglayer::primitive2d::Primitive2DContainer& rSource) const override;
}; };

2
include/svx/sdr/contact/viewobjectcontact.hxx
View File

@@ -71,7 +71,7 @@ protected:
// This method is responsible for creating the graphical visualisation data which is // This method is responsible for creating the graphical visualisation data which is
// stored/cached in the local primitive. Default gets view-independent Primitive // 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. // visibility, handles glue and ghosted.
// This method will not handle included hierarchies and not check geometric visibility. // This method will not handle included hierarchies and not check geometric visibility.
virtual drawinglayer::primitive2d::Primitive2DContainer createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const; virtual drawinglayer::primitive2d::Primitive2DContainer createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const;

2
sd/source/core/CustomAnimationEffect.cxx
View File

@@ -1631,7 +1631,7 @@ void CustomAnimationEffect::updatePathFromSdrPathObj( const SdrPathObj& rPathObj
{ {
Rectangle aBoundRect(0,0,0,0); 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 drawinglayer::geometry::ViewInformation2D aViewInformation2D;
const basegfx::B2DRange aRange(xPrimitives.getB2DRange(aViewInformation2D)); const basegfx::B2DRange aRange(xPrimitives.getB2DRange(aViewInformation2D));

2
sd/source/ui/animations/motionpathtag.cxx
View File

@@ -289,7 +289,7 @@ void SdPathHdl::CreateB2dIAObject()
if (xManager.is() && mpPathObj) if (xManager.is() && mpPathObj)
{ {
const sdr::contact::ViewContact& rVC = mpPathObj->GetViewContact(); 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); sdr::overlay::OverlayObject* pNew = new sdr::overlay::OverlayPrimitive2DSequenceObject(aSequence);
xManager->add(*pNew); xManager->add(*pNew);

2
svx/source/sdr/contact/viewcontact.cxx
View File

@@ -233,7 +233,7 @@ drawinglayer::primitive2d::Primitive2DContainer ViewContact::createViewIndepende
return drawinglayer::primitive2d::Primitive2DContainer { xReference }; 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. // local up-to-date checks. Create new list and compare.
drawinglayer::primitive2d::Primitive2DContainer xNew(createViewIndependentPrimitive2DSequence()); drawinglayer::primitive2d::Primitive2DContainer xNew(createViewIndependentPrimitive2DSequence());

2
svx/source/sdr/contact/viewcontactofgroup.cxx
View File

@@ -63,7 +63,7 @@ namespace sdr
for(sal_uInt32 a(0); a < nObjectCount; a++) for(sal_uInt32 a(0); a < nObjectCount; a++)
{ {
const ViewContact& rCandidate(GetViewContact(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()); xRetval.insert(xRetval.end(), aCandSeq.begin(), aCandSeq.end());
} }

2
svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
View File

@@ -138,7 +138,7 @@ namespace sdr
b3DShape = true; 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()); xGroup.insert(xGroup.end(), xNew.begin(), xNew.end());
} }
} }

22
svx/source/sdr/contact/viewcontactofsdrpage.cxx
View File

@@ -399,7 +399,7 @@ drawinglayer::primitive2d::Primitive2DContainer ViewContactOfPageHierarchy::crea
for(sal_uInt32 a(0); a < nObjectCount; a++) for(sal_uInt32 a(0); a < nObjectCount; a++)
{ {
const ViewContact& rCandidate(GetViewContact(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()); xRetval.insert(xRetval.end(), aCandSeq.begin(), aCandSeq.end());
} }
@@ -587,26 +587,26 @@ drawinglayer::primitive2d::Primitive2DContainer ViewContactOfSdrPage::createView
drawinglayer::primitive2d::Primitive2DContainer xRetval; drawinglayer::primitive2d::Primitive2DContainer xRetval;
// collect all sub-sequences including sub hierarchy. // collect all sub-sequences including sub hierarchy.
xRetval.append(maViewContactOfPageBackground.getViewIndependentPrimitive2DSequence()); xRetval.append(maViewContactOfPageBackground.getViewIndependentPrimitive2DContainer());
xRetval.append(maViewContactOfPageShadow.getViewIndependentPrimitive2DSequence()); xRetval.append(maViewContactOfPageShadow.getViewIndependentPrimitive2DContainer());
xRetval.append(maViewContactOfPageFill.getViewIndependentPrimitive2DSequence()); xRetval.append(maViewContactOfPageFill.getViewIndependentPrimitive2DContainer());
const SdrPage& rPage = GetSdrPage(); const SdrPage& rPage = GetSdrPage();
if(rPage.TRG_HasMasterPage()) if(rPage.TRG_HasMasterPage())
{ {
xRetval.append( xRetval.append(
rPage.TRG_GetMasterPageDescriptorViewContact().getViewIndependentPrimitive2DSequence()); rPage.TRG_GetMasterPageDescriptorViewContact().getViewIndependentPrimitive2DContainer());
} }
else if(rPage.IsMasterPage()) else if(rPage.IsMasterPage())
{ {
xRetval.append( xRetval.append(
maViewContactOfMasterPage.getViewIndependentPrimitive2DSequence()); maViewContactOfMasterPage.getViewIndependentPrimitive2DContainer());
} }
xRetval.append(maViewContactOfOuterPageBorder.getViewIndependentPrimitive2DSequence()); xRetval.append(maViewContactOfOuterPageBorder.getViewIndependentPrimitive2DContainer());
xRetval.append(maViewContactOfInnerPageBorder.getViewIndependentPrimitive2DSequence()); xRetval.append(maViewContactOfInnerPageBorder.getViewIndependentPrimitive2DContainer());
xRetval.append(maViewContactOfPageHierarchy.getViewIndependentPrimitive2DSequence()); xRetval.append(maViewContactOfPageHierarchy.getViewIndependentPrimitive2DContainer());
// Only add front versions of grid and helplines since no visibility test is done, // 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 // 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 // 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. // model data (it should not). Keeping the lines commented to hold this hint.
// drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(xRetval, maViewContactOfGridFront.getViewIndependentPrimitive2DSequence()); // drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(xRetval, maViewContactOfGridFront.getViewIndependentPrimitive2DContainer());
// drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(xRetval, maViewContactOfHelplinesFront.getViewIndependentPrimitive2DSequence()); // drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(xRetval, maViewContactOfHelplinesFront.getViewIndependentPrimitive2DContainer());
return xRetval; return xRetval;
} }

2
svx/source/sdr/contact/viewcontactofvirtobj.cxx
View File

@@ -73,7 +73,7 @@ drawinglayer::primitive2d::Primitive2DContainer ViewContactOfVirtObj::createView
// use method from referenced object to get the Primitive2DContainer // use method from referenced object to get the Primitive2DContainer
const drawinglayer::primitive2d::Primitive2DContainer xSequenceVirtual( const drawinglayer::primitive2d::Primitive2DContainer xSequenceVirtual(
GetVirtObj().GetReferencedObj().GetViewContact().getViewIndependentPrimitive2DSequence()); GetVirtObj().GetReferencedObj().GetViewContact().getViewIndependentPrimitive2DContainer());
if(!xSequenceVirtual.empty()) if(!xSequenceVirtual.empty())
{ {

2
svx/source/sdr/contact/viewobjectcontact.cxx
View File

@@ -323,7 +323,7 @@ void ViewObjectContact::checkForPrimitive2DAnimations()
drawinglayer::primitive2d::Primitive2DContainer ViewObjectContact::createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const drawinglayer::primitive2d::Primitive2DContainer ViewObjectContact::createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const
{ {
// get the view-independent Primitive from the viewContact // get the view-independent Primitive from the viewContact
drawinglayer::primitive2d::Primitive2DContainer xRetval(GetViewContact().getViewIndependentPrimitive2DSequence()); drawinglayer::primitive2d::Primitive2DContainer xRetval(GetViewContact().getViewIndependentPrimitive2DContainer());
if(!xRetval.empty()) if(!xRetval.empty())
{ {

2
svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx
View File

@@ -86,7 +86,7 @@ namespace sdr
if(!GetObjectContact().isDrawModeGray() && !GetObjectContact().isDrawModeHighContrast()) if(!GetObjectContact().isDrawModeGray() && !GetObjectContact().isDrawModeHighContrast())
{ {
// if visible, create the default background primitive sequence // if visible, create the default background primitive sequence
xRetval = static_cast< ViewContactOfMasterPageDescriptor& >(GetViewContact()).getViewIndependentPrimitive2DSequence(); xRetval = static_cast< ViewContactOfMasterPageDescriptor& >(GetViewContact()).getViewIndependentPrimitive2DContainer();
} }
} }

2
svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
View File

@@ -1573,7 +1573,7 @@ namespace sdr { namespace contact {
// use the default mechanism. This will create a ControlPrimitive2D without // use the default mechanism. This will create a ControlPrimitive2D without
// handing over a XControl. If not even a XControlModel exists, it will // handing over a XControl. If not even a XControlModel exists, it will
// create the SdrObject fallback visualisation // 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()); rContainer.insert(rContainer.end(), aTmp.begin(), aTmp.end());
return; return;
} }

4
svx/source/sdr/primitive2d/primitivefactory2d.cxx
View File

@@ -77,7 +77,7 @@ css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > SAL_CALL
if(pSource) if(pSource)
{ {
const sdr::contact::ViewContact& rSource(pSource->GetViewContact()); 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()); const sdr::contact::ViewContact& rSource(pSource->GetViewContact());
aRetval = comphelper::containerToSequence(rSource.getViewIndependentPrimitive2DSequence()); aRetval = comphelper::containerToSequence(rSource.getViewIndependentPrimitive2DContainer());
} }
} }

2
svx/source/svdraw/svdcrtv.cxx
View File

@@ -149,7 +149,7 @@ void ImpSdrCreateViewExtraData::CreateAndShowOverlay(const SdrCreateView& rView,
if(pObject) if(pObject)
{ {
const sdr::contact::ViewContact& rVC = pObject->GetViewContact(); 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); sdr::overlay::OverlayObject* pNew = new sdr::overlay::OverlayPrimitive2DSequenceObject(aSequence);
xOverlayManager->add(*pNew); xOverlayManager->add(*pNew);

6
svx/source/svdraw/svdobj.cxx
View File

@@ -855,7 +855,7 @@ void SdrObject::RecalcBoundRect()
// central new method which will calculate the BoundRect using primitive geometry // central new method which will calculate the BoundRect using primitive geometry
if(aOutRect.IsEmpty()) if(aOutRect.IsEmpty())
{ {
const drawinglayer::primitive2d::Primitive2DContainer xPrimitives(GetViewContact().getViewIndependentPrimitive2DSequence()); const drawinglayer::primitive2d::Primitive2DContainer xPrimitives(GetViewContact().getViewIndependentPrimitive2DContainer());
if(!xPrimitives.empty()) if(!xPrimitives.empty())
{ {
@@ -1123,7 +1123,7 @@ basegfx::B2DPolyPolygon SdrObject::TakeContour() const
// get sequence from clone // get sequence from clone
const sdr::contact::ViewContact& rVC(pClone->GetViewContact()); const sdr::contact::ViewContact& rVC(pClone->GetViewContact());
const drawinglayer::primitive2d::Primitive2DContainer xSequence(rVC.getViewIndependentPrimitive2DSequence()); const drawinglayer::primitive2d::Primitive2DContainer xSequence(rVC.getViewIndependentPrimitive2DContainer());
if(!xSequence.empty()) if(!xSequence.empty())
{ {
@@ -2381,7 +2381,7 @@ SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, bool bForceLineDas
{ {
basegfx::B2DPolyPolygon aMergedLineFillPolyPolygon; basegfx::B2DPolyPolygon aMergedLineFillPolyPolygon;
basegfx::B2DPolyPolygon aMergedHairlinePolyPolygon; basegfx::B2DPolyPolygon aMergedHairlinePolyPolygon;
const drawinglayer::primitive2d::Primitive2DContainer xSequence(pRet->GetViewContact().getViewIndependentPrimitive2DSequence()); const drawinglayer::primitive2d::Primitive2DContainer xSequence(pRet->GetViewContact().getViewIndependentPrimitive2DContainer());
if(!xSequence.empty()) if(!xSequence.empty())
{ {

2
svx/source/svdraw/svdotxtr.cxx
View File

@@ -295,7 +295,7 @@ SdrObject* SdrTextObj::ImpConvertContainedTextToSdrPathObjs(bool bToPoly) const
} }
// get primitives // get primitives
const drawinglayer::primitive2d::Primitive2DContainer xSequence(GetViewContact().getViewIndependentPrimitive2DSequence()); const drawinglayer::primitive2d::Primitive2DContainer xSequence(GetViewContact().getViewIndependentPrimitive2DContainer());
if(!xSequence.empty()) if(!xSequence.empty())
{ {

2
svx/source/svdraw/svdxcgv.cxx
View File

@@ -498,7 +498,7 @@ BitmapEx SdrExchangeView::GetMarkedObjBitmapEx(bool bNoVDevIfOneBmpMarked) const
} }
xPrimitives[a] = new drawinglayer::primitive2d::GroupPrimitive2D( xPrimitives[a] = new drawinglayer::primitive2d::GroupPrimitive2D(
pCandidate->GetViewContact().getViewIndependentPrimitive2DSequence()); pCandidate->GetViewContact().getViewIndependentPrimitive2DContainer());
} }
// get logic range // get logic range

4
sw/source/core/draw/dcontact.cxx
View File

@@ -1990,7 +1990,7 @@ namespace sdr
/** /**
* This method is responsible for creating the graphical visualisation data which is * This method is responsible for creating the graphical visualisation data which is
* stored/cached in the local primitive. Default gets view-independent Primitive from * 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. * care of visibility, handles glue and ghosted.
* *
* This method will not handle included hierarchies and not check geometric visibility. * This method will not handle included hierarchies and not check geometric visibility.
@@ -2116,7 +2116,7 @@ namespace sdr
else else
{ {
// single object, use method from referenced object to get the Primitive2DSequence // single object, use method from referenced object to get the Primitive2DSequence
xRetval = rReferencedObject.GetViewContact().getViewIndependentPrimitive2DSequence(); xRetval = rReferencedObject.GetViewContact().getViewIndependentPrimitive2DContainer();
} }
if(!xRetval.empty()) if(!xRetval.empty())