summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2019-04-12 12:07:22 +0100
committerMiklos Vajna <vmiklos@collabora.com>2019-04-23 15:11:30 +0200
commitab401b59209ae6bd0d050558063800409278e8c8 (patch)
treefd27687df3845060d00a674d019fc0cd426396db /sfx2
parentb929fd7a369630fa70a74eec3040761cea58b660 (diff)
Resolves: tdf#124698 bubble down parent for modal dialog
Change-Id: If03c6ff8043bb39f2efdf4cde19d8277886bf36f Reviewed-on: https://gerrit.libreoffice.org/70677 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/appl/linkmgr2.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx
index 05c817ab7855..be6ad47b0a38 100644
--- a/sfx2/source/appl/linkmgr2.cxx
+++ b/sfx2/source/appl/linkmgr2.cxx
@@ -501,7 +501,8 @@ SotClipboardFormatId LinkManager::RegisterStatusInfoId()
bool LinkManager::GetGraphicFromAny(const OUString& rMimeType,
const css::uno::Any & rValue,
const OUString& rReferer,
- Graphic& rGraphic )
+ Graphic& rGraphic,
+ weld::Window* pParentWin)
{
bool bRet = false;
@@ -512,7 +513,7 @@ bool LinkManager::GetGraphicFromAny(const OUString& rMimeType,
{
OUString sURL = rValue.get<OUString>();
if (!SvtSecurityOptions().isUntrustedReferer(rReferer))
- rGraphic = vcl::graphic::loadFromURL(sURL);
+ rGraphic = vcl::graphic::loadFromURL(sURL, pParentWin);
if (!rGraphic)
rGraphic.SetDefaultType();
rGraphic.setOriginURL(sURL);