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

[Stephan Bergmann]

 vcl/inc/qt5/Qt5Graphics.hxx |    3 ++-
 vcl/inc/qt5/Qt5Instance.hxx |    2 +-
 vcl/qt5/Qt5Instance.cxx     |    6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 3c2423eaab0138d2940d055ab70fcc1292c0d62b
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Jun 14 16:08:10 2018 +0200

    Adapt --enable-qt5
    
    ...to 8447d31e529985ef7fc71933f0e55685530f9fc9 "return SalBitmap using
    std::shared_ptr"
    
    Change-Id: I7ef70eda5c2f5931b421852d938ae54d6e133e6d

diff --git a/vcl/inc/qt5/Qt5Graphics.hxx b/vcl/inc/qt5/Qt5Graphics.hxx
index 40284db9f33a..0e9de46818a6 100644
--- a/vcl/inc/qt5/Qt5Graphics.hxx
+++ b/vcl/inc/qt5/Qt5Graphics.hxx
@@ -120,7 +120,8 @@ public:
     virtual void drawMask(const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap,
                           Color nMaskColor) override;
 
-    virtual SalBitmap* getBitmap(long nX, long nY, long nWidth, long nHeight) override;
+    virtual std::shared_ptr<SalBitmap> getBitmap(long nX, long nY, long nWidth,
+                                                 long nHeight) override;
     virtual Color getPixel(long nX, long nY) override;
 
     virtual void invert(long nX, long nY, long nWidth, long nHeight, SalInvert nFlags) override;
diff --git a/vcl/inc/qt5/Qt5Instance.hxx b/vcl/inc/qt5/Qt5Instance.hxx
index 06f9c7d4102c..a6d365a7d421 100644
--- a/vcl/inc/qt5/Qt5Instance.hxx
+++ b/vcl/inc/qt5/Qt5Instance.hxx
@@ -85,7 +85,7 @@ public:
 
     virtual SalTimer* CreateSalTimer() override;
     virtual SalSystem* CreateSalSystem() override;
-    virtual SalBitmap* CreateSalBitmap() override;
+    virtual std::shared_ptr<SalBitmap> CreateSalBitmap() override;
 
     virtual bool DoYield(bool bWait, bool bHandleAllCurrentEvents) override;
     virtual bool AnyInput(VclInputFlags nType) override;
diff --git a/vcl/qt5/Qt5Instance.cxx b/vcl/qt5/Qt5Instance.cxx
index 6bc3694883b3..ef618e18fa7f 100644
--- a/vcl/qt5/Qt5Instance.cxx
+++ b/vcl/qt5/Qt5Instance.cxx
@@ -127,12 +127,12 @@ SalTimer* Qt5Instance::CreateSalTimer() { return new Qt5Timer(); }
 
 SalSystem* Qt5Instance::CreateSalSystem() { return new SvpSalSystem(); }
 
-SalBitmap* Qt5Instance::CreateSalBitmap()
+std::shared_ptr<SalBitmap> Qt5Instance::CreateSalBitmap()
 {
     if (m_bUseCairo)
-        return new SvpSalBitmap();
+        return std::make_shared<SvpSalBitmap>();
     else
-        return new Qt5Bitmap();
+        return std::make_shared<Qt5Bitmap>();
 }
 
 bool Qt5Instance::ImplYield(bool bWait, bool bHandleAllCurrentEvents)