sd/source/ui/func/futext.cxx | 38 +++++++++++++++++++++-----------------
1 file changed, 21 insertions(+), 17 deletions(-)
New commits:
commit 41ea53cdbfe669659a88e6f6da52cfefe8ee170b
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Aug 22 10:19:49 2022 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Aug 22 16:12:02 2022 +0200
cid#1509228 Explicit null dereferenced
Change-Id: I60c806e08c23219b7f652fef55dae93a668290f0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138678
Tested-by: Caolán McNamara <caol...@redhat.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index 7e2551ef8a9f..656dc4670c75 100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -365,25 +365,29 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt)
{
// execute URL
mpWindow->ReleaseMouse();
- SfxStringItem aStrItem(SID_FILE_NAME,
aVEvt.mpURLField->GetURL());
- SfxStringItem aReferer(SID_REFERER,
mpDocSh->GetMedium()->GetName());
- SfxBoolItem aBrowseItem( SID_BROWSE, true );
- SfxViewFrame* pFrame = mpViewShell->GetViewFrame();
- if (rMEvt.IsMod1())
+ if (aVEvt.mpURLField)
{
- // open in new frame
- pFrame->GetDispatcher()->ExecuteList(SID_OPENDOC,
- SfxCallMode::ASYNCHRON | SfxCallMode::RECORD,
- { &aStrItem, &aBrowseItem, &aReferer });
- }
- else
- {
- // open in current frame
- SfxFrameItem aFrameItem(SID_DOCFRAME, pFrame);
- pFrame->GetDispatcher()->ExecuteList(SID_OPENDOC,
- SfxCallMode::ASYNCHRON | SfxCallMode::RECORD,
- { &aStrItem, &aFrameItem, &aBrowseItem,
&aReferer });
+ SfxStringItem aStrItem(SID_FILE_NAME,
aVEvt.mpURLField->GetURL());
+ SfxStringItem aReferer(SID_REFERER,
mpDocSh->GetMedium()->GetName());
+ SfxBoolItem aBrowseItem( SID_BROWSE, true );
+ SfxViewFrame* pFrame = mpViewShell->GetViewFrame();
+
+ if (rMEvt.IsMod1())
+ {
+ // open in new frame
+
pFrame->GetDispatcher()->ExecuteList(SID_OPENDOC,
+ SfxCallMode::ASYNCHRON |
SfxCallMode::RECORD,
+ { &aStrItem, &aBrowseItem, &aReferer });
+ }
+ else
+ {
+ // open in current frame
+ SfxFrameItem aFrameItem(SID_DOCFRAME, pFrame);
+
pFrame->GetDispatcher()->ExecuteList(SID_OPENDOC,
+ SfxCallMode::ASYNCHRON |
SfxCallMode::RECORD,
+ { &aStrItem, &aFrameItem, &aBrowseItem,
&aReferer });
+ }
}
}
else
