commit dc9b1ee0a5144ce182407d10466eab682f7da62a
author Szymon Kłos <szymon.klos@collabora.com> Thu Nov 14 11:16:04 2019 +0100
committer Miklos Vajna <vmiklos@collabora.com> Thu Jan 30 17:38:13 2020 +0100
tree aa531bd9967b38c61eb2529a79909ed30a2d6c79
parent 813e9e6cfeec5f3120fcf585d51503dd1ad98c8b

tdf#130286: jsdialogs: fix CID 1455691 & CID 1455690

Change-Id: Idbb3e70c1a09be7dd7c43747250f3a6368251cd9
Reviewed-on: https://gerrit.libreoffice.org/82662
Tested-by: Jenkins
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
(cherry picked from commit 77cc0e929ee331af6b97b65e9b6ec5400ef05cd4)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87733
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

sw/source/uibase/shells/drwtxtex.cxx

diff --git a/sw/source/uibase/shells/drwtxtex.cxx b/sw/source/uibase/shells/drwtxtex.cxx
index 519c6a9..fae34754 100644
--- a/sw/source/uibase/shells/drwtxtex.cxx
+++ b/sw/source/uibase/shells/drwtxtex.cxx
@@ -651,16 +651,19 @@
            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);

    SetAttrToMarked(*pNewArgs);
        if (nEEWhich)
        {
            std::unique_ptr<SfxPoolItem> pNewItem(pNewArgs->Get(nWhich).CloneSetWhich(nEEWhich));
            pNewArgs->Put(*pNewItem);
        }

        SetAttrToMarked(*pNewArgs);
    }

    GetView().GetViewFrame()->GetBindings().InvalidateAll(false);