[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - chart2/source sfx2/source svx/inc

[Noel Grandin (via logerrit)]

 chart2/source/controller/dialogs/DataBrowser.cxx |    2 +-
 sfx2/source/dialog/infobar.cxx                   |    2 +-
 svx/inc/galbrws2.hxx                             |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit a5041c9102e41f9ec73d991686036eeeff200187
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Wed May 12 13:23:22 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed May 12 19:27:43 2021 +0200

    fix some VirtualDevice leaks
    
    Change-Id: I645543fa27ca8b75b36ed7798f0af7b81fd09f49
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115488
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index eabbdd42ace0..a075e5dc30af 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -302,7 +302,7 @@ void SeriesHeader::SetPos()
     aSize.setWidth(m_nWidth);
     m_spColorBar->set_size_request(aSize.Width(), aSize.Height());
 
-    auto xVirDev(m_spColorBar->create_virtual_device());
+    ScopedVclPtr<VirtualDevice> xVirDev(m_spColorBar->create_virtual_device());
     xVirDev->SetOutputSizePixel(aSize);
     xVirDev->SetFillColor(m_aColor);
     xVirDev->SetLineColor(m_aColor);
diff --git a/sfx2/source/dialog/infobar.cxx b/sfx2/source/dialog/infobar.cxx
index e8b176763c56..ca5a2eb5ec89 100644
--- a/sfx2/source/dialog/infobar.cxx
+++ b/sfx2/source/dialog/infobar.cxx
@@ -103,7 +103,7 @@ void SfxInfoBarWindow::SetCloseButtonImage()
     Size aSize = Image(StockImage::Yes, CLOSEDOC).GetSizePixel();
     aSize = Size(aSize.Width() * 1.5, aSize.Height() * 1.5);
 
-    VclPtr<VirtualDevice> xDevice(m_xCloseBtn->create_virtual_device());
+    ScopedVclPtr<VirtualDevice> xDevice(m_xCloseBtn->create_virtual_device());
     xDevice->SetOutputSizePixel(aSize);
 
     Point aBtnPos(0, 0);
diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx
index bbf13cff5c3f..90d7c4a562cf 100644
--- a/svx/inc/galbrws2.hxx
+++ b/svx/inc/galbrws2.hxx
@@ -85,7 +85,7 @@ private:
     std::unique_ptr<weld::ToggleButton> mxIconButton;
     std::unique_ptr<weld::ToggleButton> mxListButton;
     std::unique_ptr<weld::Label> mxInfoBar;
-    VclPtr<VirtualDevice> mxDev;
+    ScopedVclPtr<VirtualDevice> mxDev;
     Size maPreviewSize;
     rtl::Reference<GalleryTransferable> m_xHelper;
     sal_uInt32 mnCurActionPos;