[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - svx/source

Markus Mohrhard markus.mohrhard at googlemail.com
Mon May 15 12:12:46 UTC 2017


 svx/source/tbxctrls/tbcontrl.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e4fdaa5d9a7b0c507278ef70aab7ce4c9e7ee62d
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sat May 13 23:39:16 2017 +0200

    fix gdi resource leak with unreleased virtual device
    
    Change-Id: I1fd8c76a206cfc940e3d646e4025618785985e52
    Reviewed-on: https://gerrit.libreoffice.org/37583
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    (cherry picked from commit 289711c2a469bfbe06aef3b3870b65f9c788f56d)
    Reviewed-on: https://gerrit.libreoffice.org/37585
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 4c93b9bba0b5..95ec9f400143 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -3267,7 +3267,7 @@ void SvxColorListBox::ShowPreview(const NamedColor &rColor)
     const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
     Size aImageSize(rStyleSettings.GetListBoxPreviewDefaultPixelSize());
 
-    VclPtr<VirtualDevice> xDevice = VclPtr<VirtualDevice>::Create();
+    ScopedVclPtrInstance<VirtualDevice> xDevice;
     xDevice->SetOutputSize(aImageSize);
     const Rectangle aRect(Point(0, 0), aImageSize);
     if (m_bShowNoneButton && rColor.first == COL_NONE_COLOR)


More information about the Libreoffice-commits mailing list