From 599fab44ad2ca626f046b9e9e4924110950a897c Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Mon, 21 Sep 2015 13:37:17 +0100
Subject: hide ScopedPtr::reset and add disposeAndClear
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I55d6e789abd408b8478a2b9ae141d8899af2c309
Reviewed-on: https://gerrit.libreoffice.org/18745
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
---
 framework/source/uielement/fontsizemenucontroller.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'framework')

diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx
index 3c6d941b301c..ec5cfa8a12f7 100644
--- a/framework/source/uielement/fontsizemenucontroller.cxx
+++ b/framework/source/uielement/fontsizemenucontroller.cxx
@@ -144,7 +144,7 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r
         aPrinterName = retrievePrinterName( m_xFrame );
         if ( !aPrinterName.isEmpty() )
         {
-            pInfoPrinter.reset(VclPtr<Printer>::Create( aPrinterName ));
+            pInfoPrinter.disposeAndReset(VclPtr<Printer>::Create( aPrinterName ));
             if ( pInfoPrinter && pInfoPrinter->GetDevFontCount() > 0 )
                 pFontList.reset(new FontList( pInfoPrinter.get() ));
         }
-- 
cgit