[Libreoffice-commits] core.git: vcl/inc vcl/quartz

[Stephan Bergmann (via logerrit)]

 vcl/inc/quartz/salbmp.h |    2 ++
 vcl/quartz/salbmp.cxx   |    7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 080931eb5c49b8a05d1bf6f9ddc1203b3e75aaa2
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Mon Sep 23 12:35:46 2019 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Mon Sep 23 14:57:18 2019 +0200

    loplugin:fragiledestructor (macOS)
    
    Change-Id: I8ac1f67999ccbb6c411359ac6fd4c473dc339d44
    Reviewed-on: https://gerrit.libreoffice.org/79398
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/vcl/inc/quartz/salbmp.h b/vcl/inc/quartz/salbmp.h
index a5e6f510bc5d..87929249f787 100644
--- a/vcl/inc/quartz/salbmp.h
+++ b/vcl/inc/quartz/salbmp.h
@@ -96,6 +96,8 @@ public:
     CGImageRef      CreateWithMask( const QuartzSalBitmap& rMask, int nX, int nY, int nWidth, int nHeight ) const;
     CGImageRef      CreateColorMask( int nX, int nY, int nWidth, int nHeight, Color nMaskColor ) const;
     CGImageRef      CreateCroppedImage( int nX, int nY, int nWidth, int nHeight ) const;
+
+    void doDestroy();
 };
 
 #endif // INCLUDED_VCL_INC_QUARTZ_SALBMP_H
diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx
index ee6598f7e0b6..710a9eb408ee 100644
--- a/vcl/quartz/salbmp.cxx
+++ b/vcl/quartz/salbmp.cxx
@@ -70,7 +70,7 @@ QuartzSalBitmap::QuartzSalBitmap()
 
 QuartzSalBitmap::~QuartzSalBitmap()
 {
-    Destroy();
+    doDestroy();
 }
 
 bool QuartzSalBitmap::Create(CGLayerHolder const & rLayerHolder, int nBitmapBits, int nX, int nY, int nWidth, int nHeight, bool bFlipped)
@@ -176,6 +176,11 @@ bool QuartzSalBitmap::Create( const css::uno::Reference< css::rendering::XBitmap
 
 void QuartzSalBitmap::Destroy()
 {
+    doDestroy();
+}
+
+void QuartzSalBitmap::doDestroy()
+{
     DestroyContext();
     m_pUserBuffer.reset();
 }