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

[Szymon Kłos (via logerrit)]

 sw/source/uibase/shells/drwtxtex.cxx |   19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

New commits:
commit f652d0f8250e03a9fca70b145fb2b0efc36aee85
Author:     Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Thu Nov 14 11:16:04 2019 +0100
Commit:     Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Thu Nov 14 21:36:10 2019 +0100

    jsdialogs: fix CID 1455691 & CID 1455690
    
    Change-Id: Idbb3e70c1a09be7dd7c43747250f3a6368251cd9
    Reviewed-on: https://gerrit.libreoffice.org/82661
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>

diff --git a/sw/source/uibase/shells/drwtxtex.cxx 
b/sw/source/uibase/shells/drwtxtex.cxx
index e1073389879c..82a6e19beb1f 100644
--- a/sw/source/uibase/shells/drwtxtex.cxx
+++ b/sw/source/uibase/shells/drwtxtex.cxx
@@ -605,16 +605,19 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
             return;
     }
 
-    std::unique_ptr<SfxItemSet> pNewArgs = pNewAttrs->Clone();
-    lcl_convertStringArguments(nSlot, pNewArgs);
-
-    if(nEEWhich && pNewAttrs)
+    std::unique_ptr<SfxItemSet> pNewArgs = pNewAttrs ? pNewAttrs->Clone() : 
nullptr;
+    if (pNewArgs)
     {
-        std::unique_ptr<SfxPoolItem> 
pNewItem(pNewArgs->Get(nWhich).CloneSetWhich(nEEWhich));
-        pNewArgs->Put(*pNewItem);
-    }
+        lcl_convertStringArguments(nSlot, pNewArgs);
+
+        if (nEEWhich)
+        {
+            std::unique_ptr<SfxPoolItem> 
pNewItem(pNewArgs->Get(nWhich).CloneSetWhich(nEEWhich));
+            pNewArgs->Put(*pNewItem);
+        }
 
-    SetAttrToMarked(*pNewArgs);
+        SetAttrToMarked(*pNewArgs);
+    }
 
     GetView().GetViewFrame()->GetBindings().InvalidateAll(false);
 
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits