diff options
author | Caolán McNamara <caolanm@redhat.com> | 2019-04-12 12:07:22 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2019-04-12 22:18:13 +0200 |
commit | 7a092e254111a2d98446e7140ef24c652c245bfa (patch) | |
tree | e35e013e71ffbc31eb3c1dd990d872d140514b17 /sfx2 | |
parent | 1453c2c8f13bac64ecd1981af7cebf1c421808ac (diff) |
Resolves: tdf#124698 bubble down parent for modal dialog
Change-Id: If03c6ff8043bb39f2efdf4cde19d8277886bf36f
Reviewed-on: https://gerrit.libreoffice.org/70658
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/source/appl/linkmgr2.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx index 459ded0e88b3..965417572ba5 100644 --- a/sfx2/source/appl/linkmgr2.cxx +++ b/sfx2/source/appl/linkmgr2.cxx @@ -502,7 +502,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; @@ -513,7 +514,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); |