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

[Noel Grandin]

 sw/source/ui/dialog/swdlgfact.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1866cd8654496fd8052409b1f36d018affe3eb4b
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Fri Nov 25 15:41:30 2016 +0200

    tdf#104158 - Crash upon opening Table -> Number Format... in Writer
    
    Change-Id: Ic5d30199250fbb5cc911cc5e7a58e0b7b9b1127c
    Reviewed-on: https://gerrit.libreoffice.org/31201
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>
    (cherry picked from commit 94ea966354609f8030872f1520ffbf910a9d28b4)
    Reviewed-on: https://gerrit.libreoffice.org/31211

diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index d19b2e7..291d7f5 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -647,7 +647,7 @@ VclPtr<SfxAbstractDialog> SwAbstractDialogFactory_Impl::CreateSfxDialog( vcl::Wi
                                                                   sal_uInt32 nResId
                                                                 )
 {
-    SfxModalDialog* pDlg=nullptr;
+    VclPtr<SfxModalDialog> pDlg;
     switch ( nResId )
     {
         case RC_DLG_ADDR :
@@ -667,7 +667,7 @@ VclPtr<SfxAbstractDialog> SwAbstractDialogFactory_Impl::CreateSfxDialog( vcl::Wi
     }
 
     if ( pDlg )
-        VclPtr<SwAbstractSfxDialog_Impl>::Create( pDlg );
+        return VclPtr<SwAbstractSfxDialog_Impl>::Create( pDlg );
     return nullptr;
 }