diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-04-22 19:26:38 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-04-22 21:29:50 +0200 |
commit | b546af03ab9e371c70ce72562bc0a492972a8585 (patch) | |
tree | 66913624a9d8e91833302d0254250c33cd5f806c /svx | |
parent | 8ff18ded5970f8bb3e90b284081449235f515df4 (diff) |
remove caching in ViewObjectContactOfE3d
we are re-creating it every time, so caching makes no sense
Change-Id: I8a175c7ebd83c369c644d5936004167906539ad7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114517
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx')
-rw-r--r-- | svx/inc/sdr/contact/viewobjectcontactofe3d.hxx | 14 | ||||
-rw-r--r-- | svx/source/sdr/contact/viewobjectcontactofe3d.cxx | 16 |
2 files changed, 2 insertions, 28 deletions
diff --git a/svx/inc/sdr/contact/viewobjectcontactofe3d.hxx b/svx/inc/sdr/contact/viewobjectcontactofe3d.hxx index ca081d4c11d4..9c0e09e4c036 100644 --- a/svx/inc/sdr/contact/viewobjectcontactofe3d.hxx +++ b/svx/inc/sdr/contact/viewobjectcontactofe3d.hxx @@ -31,18 +31,6 @@ namespace sdr::contact { class ViewObjectContactOfE3d final : public ViewObjectContactOfSdrObj { - // Primitive3D sequence of the ViewContact. This contains all necessary information - // for the graphical visualisation and needs to be supported by all VCs which - // can be visualized. - drawinglayer::primitive3d::Primitive3DContainer mxPrimitive3DContainer; - - // This method is responsible for creating the graphical visualisation data which is - // stored/cached in the local primitive. Default gets view-independent Primitive3D - // from the ViewContact using ViewContact::getViewIndependentPrimitive3DContainer(), takes care of - // visibility and ghosted. - // This method will not handle included hierarchies and not check geometric visibility. - drawinglayer::primitive3d::Primitive3DContainer createPrimitive3DContainer(const DisplayInfo& rDisplayInfo) const; - // also override the 2d method to deliver a 2d object with embedded 3d and the 3d transformation which is able to // answer the get2DRange question accordingly virtual drawinglayer::primitive2d::Primitive2DContainer createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const override; @@ -54,7 +42,7 @@ namespace sdr::contact // access to the local primitive sequence. This will ensure that the list is // current in comparing the local list content with a fresh created incarnation // This method will not handle included hierarchies or visibility. - drawinglayer::primitive3d::Primitive3DContainer const & getPrimitive3DContainer(const DisplayInfo& rDisplayInfo) const; + drawinglayer::primitive3d::Primitive3DContainer getPrimitive3DContainer(const DisplayInfo& rDisplayInfo) const; }; } // end of namespace sdr::contact diff --git a/svx/source/sdr/contact/viewobjectcontactofe3d.cxx b/svx/source/sdr/contact/viewobjectcontactofe3d.cxx index f12290634383..1d6bbe061614 100644 --- a/svx/source/sdr/contact/viewobjectcontactofe3d.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofe3d.cxx @@ -33,7 +33,7 @@ namespace sdr::contact { } - drawinglayer::primitive3d::Primitive3DContainer ViewObjectContactOfE3d::createPrimitive3DContainer(const DisplayInfo& rDisplayInfo) const + drawinglayer::primitive3d::Primitive3DContainer ViewObjectContactOfE3d::getPrimitive3DContainer(const DisplayInfo& rDisplayInfo) const { // get the view-independent Primitive from the viewContact const ViewContactOfE3d& rViewContactOfE3d(dynamic_cast< const ViewContactOfE3d& >(GetViewContact())); @@ -66,20 +66,6 @@ namespace sdr::contact return rViewContact.impCreateWithGivenPrimitive3DContainer(getPrimitive3DContainer(rDisplayInfo)); } - drawinglayer::primitive3d::Primitive3DContainer const & ViewObjectContactOfE3d::getPrimitive3DContainer(const DisplayInfo& rDisplayInfo) const - { - drawinglayer::primitive3d::Primitive3DContainer xNewPrimitive3DSeq(createPrimitive3DContainer(rDisplayInfo)); - - // local up-to-date checks. New list different from local one? - if(mxPrimitive3DContainer != xNewPrimitive3DSeq) - { - // has changed, copy content - const_cast< ViewObjectContactOfE3d* >(this)->mxPrimitive3DContainer = xNewPrimitive3DSeq; - } - - // return current Primitive2DContainer - return mxPrimitive3DContainer; - } } // end of namespace |