[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - sw/source

[Michael Meeks]

 sw/source/uibase/shells/textsh.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 909d104b9e144f42087783acda6e71b1c1e54290
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Thu Apr 26 21:04:01 2018 +0100

    Fix OSL_ENSURE invocations.
    
    Change-Id: Ic217a75276956f200eaa539da0f5c06475106d0a
    Reviewed-on: https://gerrit.libreoffice.org/53540
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx
index 3d0172219d11..5a04e358dcd2 100644
--- a/sw/source/uibase/shells/textsh.cxx
+++ b/sw/source/uibase/shells/textsh.cxx
@@ -531,9 +531,9 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
     case FN_FORMAT_COLUMN :
     {
         SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
-        OSL_ENSURE(pFact && "Dialog creation failed!");
+        OSL_ENSURE(pFact, "Dialog creation failed!");
         VclPtr<VclAbstractDialog> pColDlg(pFact->CreateVclAbstractDialog( GetView().GetWindow(), rSh, DLG_COLUMN));
-        assert(pColDlg && "Dialog creation failed!");
+        OSL_ENSURE(pColDlg, "Dialog creation failed!");
         pColDlg->StartExecuteAsync([](sal_Int32 /*nResult*/){});
     }
     break;