summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2022-12-04 16:07:03 +0000
committerCaolán McNamara <caolanm@redhat.com>2022-12-04 20:48:22 +0000
commit836e001c8632702c2eda7b5bac799ef5f1a24cdf (patch)
tree803d5bad8ac96c680e737ac8d7a80172aaf1a7b5
parent616c4c6bcb5ddeb932cf1e154f0a1a79c6a8bd45 (diff)
cid#1517255 Dereference null return value
Change-Id: Idb1a7790851a3416f84e99c7fd95e12e18b449f8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143632 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--sd/source/ui/func/fuinsfil.cxx10
1 files changed, 4 insertions, 6 deletions
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index 729652e03c34..f18d6779f203 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -237,12 +237,10 @@ void FuInsertFile::DoExecute( SfxRequest& rReq )
else
{
const SfxStringItem* pFileName = rReq.GetArg<SfxStringItem>(ID_VAL_DUMMY0);
- const SfxStringItem* pFilterName = rReq.GetArg<SfxStringItem>(ID_VAL_DUMMY1);
-
- aFile = pFileName->GetValue ();
-
- if( pFilterName )
- aFilterName = pFilterName->GetValue ();
+ assert(pFileName && "must be present");
+ aFile = pFileName->GetValue();
+ if (const SfxStringItem* pFilterName = rReq.GetArg<SfxStringItem>(ID_VAL_DUMMY1))
+ aFilterName = pFilterName->GetValue();
}
mpDocSh->SetWaitCursor( true );