diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-07-21 08:47:42 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-07-22 10:15:49 +0200 |
| commit | 88c85c8aa377ccc017582d8a08e5f73391b5a446 (patch) | |
| tree | 62d133967cea1bcac6ab62780bf666adb5a7a867 /svx | |
| parent | 0bac5c7e7d71658c5056c4bf0b71fbfb51b92ca0 (diff) | |
flatten vcl::LazyDelete
we can allocate the stored value in-line and avoid some pointer-chasing
Change-Id: I828814b127923cdcec1bf57b3b64dffab4cffaaf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119298
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/sdr/contact/viewcontactofsdrpage.cxx | 3 | ||||
| -rw-r--r-- | svx/source/sdr/primitive2d/sdrprimitivetools.cxx | 4 | ||||
| -rw-r--r-- | svx/source/svdraw/svdhdl.cxx | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/svx/source/sdr/contact/viewcontactofsdrpage.cxx b/svx/source/sdr/contact/viewcontactofsdrpage.cxx index 19911ed53440..d2fab00075fc 100644 --- a/svx/source/sdr/contact/viewcontactofsdrpage.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrpage.cxx @@ -136,8 +136,7 @@ drawinglayer::primitive2d::Primitive2DContainer ViewContactOfPageShadow::createV else { static vcl::DeleteOnDeinit< drawinglayer::primitive2d::DiscreteShadow > aDiscreteShadow( - new drawinglayer::primitive2d::DiscreteShadow( - BitmapEx(SIP_SA_PAGESHADOW35X35))); + BitmapEx(SIP_SA_PAGESHADOW35X35)); if(aDiscreteShadow.get()) { diff --git a/svx/source/sdr/primitive2d/sdrprimitivetools.cxx b/svx/source/sdr/primitive2d/sdrprimitivetools.cxx index 2ad11a523034..cf215a141b11 100644 --- a/svx/source/sdr/primitive2d/sdrprimitivetools.cxx +++ b/svx/source/sdr/primitive2d/sdrprimitivetools.cxx @@ -29,7 +29,7 @@ namespace drawinglayer::primitive2d { BitmapEx createDefaultCross_3x3(const basegfx::BColor& rBColor) { - static vcl::DeleteOnDeinit< BitmapEx > aRetVal(nullptr); + static vcl::DeleteOnDeinit< BitmapEx > aRetVal(vcl::DeleteOnDeinitFlag::Empty); static basegfx::BColor aBColor; static ::osl::Mutex aMutex; @@ -54,7 +54,7 @@ namespace drawinglayer::primitive2d BitmapEx aBitmap = vcl::bitmap::CreateFromData(cross, 3, 3, 12, vcl::PixelFormat::N32_BPP); // create and exchange at aRetVal - aRetVal.set(std::make_unique<BitmapEx>(aBitmap)); + aRetVal.set(aBitmap); } return aRetVal.get() ? *aRetVal.get() : BitmapEx(); diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx index 339f3d638f55..92a68e5ada58 100644 --- a/svx/source/svdraw/svdhdl.cxx +++ b/svx/source/svdraw/svdhdl.cxx @@ -773,7 +773,7 @@ BitmapEx ImpGetBitmapEx(BitmapMarkerKind eKindOfMarker, BitmapColorIndex eIndex) // if we can't load the marker... - static vcl::DeleteOnDeinit< SdrHdlBitmapSet > aModernSet(new SdrHdlBitmapSet); + static vcl::DeleteOnDeinit< SdrHdlBitmapSet > aModernSet {}; return aModernSet.get()->GetBitmapEx(eKindOfMarker, sal_uInt16(eIndex)); } |