diff options
author | Noel Grandin <noel@peralex.com> | 2015-12-15 10:31:06 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-12-15 10:42:52 +0200 |
commit | 4463da0488099b52959544923407b15d73d3e172 (patch) | |
tree | c0fd9ada0bfdf2d3925fc1c94bac3782d332ef5a /svx/source/engine3d/obj3d.cxx | |
parent | 00ea9e5e4ef2f20353c881ec5844ed3862897239 (diff) |
use vector as container for Primitive3DReference
rather than uno::Sequence, since we modify this container a lot
and uno::Sequence is expensive to update
Change-Id: Id5bc5171cbc4b90b243e6dda6d572f21b3bdf00d
Diffstat (limited to 'svx/source/engine3d/obj3d.cxx')
-rw-r--r-- | svx/source/engine3d/obj3d.cxx | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx index 9d67c722261b..cd553f6111c6 100644 --- a/svx/source/engine3d/obj3d.cxx +++ b/svx/source/engine3d/obj3d.cxx @@ -548,15 +548,14 @@ basegfx::B3DRange E3dObject::RecalcBoundVolume() const if(pVCOfE3D) { // BoundVolume is without 3D object transformation, use correct sequence - const drawinglayer::primitive3d::Primitive3DSequence xLocalSequence(pVCOfE3D->getVIP3DSWithoutObjectTransform()); + const drawinglayer::primitive3d::Primitive3DContainer xLocalSequence(pVCOfE3D->getVIP3DSWithoutObjectTransform()); - if(xLocalSequence.hasElements()) + if(!xLocalSequence.empty()) { const uno::Sequence< beans::PropertyValue > aEmptyParameters; const drawinglayer::geometry::ViewInformation3D aLocalViewInformation3D(aEmptyParameters); - aRetval = drawinglayer::primitive3d::getB3DRangeFromPrimitive3DSequence( - xLocalSequence, aLocalViewInformation3D); + aRetval = xLocalSequence.getB3DRange(aLocalViewInformation3D); } } } @@ -907,13 +906,12 @@ void E3dCompoundObject::RecalcSnapRect() if(pVCOfE3D) { // get 3D primitive sequence - const drawinglayer::primitive3d::Primitive3DSequence xLocalSequence(pVCOfE3D->getViewIndependentPrimitive3DSequence()); + const drawinglayer::primitive3d::Primitive3DContainer xLocalSequence(pVCOfE3D->getViewIndependentPrimitive3DContainer()); - if(xLocalSequence.hasElements()) + if(!xLocalSequence.empty()) { // get BoundVolume - basegfx::B3DRange aBoundVolume(drawinglayer::primitive3d::getB3DRangeFromPrimitive3DSequence( - xLocalSequence, aViewInfo3D)); + basegfx::B3DRange aBoundVolume(xLocalSequence.getB3DRange(aViewInfo3D)); // transform bound volume to relative scene coordinates aBoundVolume.transform(aViewInfo3D.getObjectToView()); |