mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

jsdialogs: fix CID 1455691 & CID 1455690

Browse Source 
Change-Id: Idbb3e70c1a09be7dd7c43747250f3a6368251cd9
Reviewed-on: https://gerrit.libreoffice.org/82662
Tested-by: Jenkins
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
This commit is contained in:
Szymon Kłos
2019-11-14 11:16:04 +01:00
parent 2c35455845
commit 77cc0e929e
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sw/source/uibase/shells/drwtxtex.cxx
View File

@@ -653,16 +653,19 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
return; return;
} }
std::unique_ptr<SfxItemSet> pNewArgs = pNewAttrs->Clone(); std::unique_ptr<SfxItemSet> pNewArgs = pNewAttrs ? pNewAttrs->Clone() : nullptr;
if (pNewArgs)
{
lcl_convertStringArguments(nSlot, pNewArgs); lcl_convertStringArguments(nSlot, pNewArgs);
if(nEEWhich && pNewAttrs) if (nEEWhich)
{ {
std::unique_ptr<SfxPoolItem> pNewItem(pNewArgs->Get(nWhich).CloneSetWhich(nEEWhich)); std::unique_ptr<SfxPoolItem> pNewItem(pNewArgs->Get(nWhich).CloneSetWhich(nEEWhich));
pNewArgs->Put(*pNewItem); pNewArgs->Put(*pNewItem);
} }
SetAttrToMarked(*pNewArgs); SetAttrToMarked(*pNewArgs);
}
GetView().GetViewFrame()->GetBindings().InvalidateAll(false); GetView().GetViewFrame()->GetBindings().InvalidateAll(false);