[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - cui/source

[Caolán McNamara]

 cui/source/factory/init.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c98f16943a95f498cecbfc9345b592b5a2144fd7
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jan 30 14:46:21 2017 +0000

    crash on exit from undisposed insert special character dialog
    
    right click on style combobox in writer toolbar, insert character, esc,
    ctrl+f4 and crash
    
    Change-Id: I83c88584c6d772bf629121a2bcdc16076bee8003
    (cherry picked from commit cfdfe1be91101654456bdf1f16d92461e1e5dbfa)
    Reviewed-on: https://gerrit.libreoffice.org/33701
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/cui/source/factory/init.cxx b/cui/source/factory/init.cxx
index 5f53852..fd7cbc6 100644
--- a/cui/source/factory/init.cxx
+++ b/cui/source/factory/init.cxx
@@ -27,7 +27,7 @@ extern "C"
 SAL_DLLPUBLIC_EXPORT bool GetSpecialCharsForEdit(vcl::Window* i_pParent, const vcl::Font& i_rFont, OUString& o_rResult)
 {
     bool bRet = false;
-    VclPtrInstance< SvxCharacterMap > aDlg( i_pParent );
+    ScopedVclPtrInstance<SvxCharacterMap> aDlg(i_pParent);
     aDlg->DisableFontSelection();
     aDlg->SetCharFont(i_rFont);
     if ( aDlg->Execute() == RET_OK )