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 /vcl/source/graphic | |
| 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 'vcl/source/graphic')
| -rw-r--r-- | vcl/source/graphic/GraphicLoader.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/vcl/source/graphic/GraphicLoader.cxx b/vcl/source/graphic/GraphicLoader.cxx index 770cb2158fba..8343b513942a 100644 --- a/vcl/source/graphic/GraphicLoader.cxx +++ b/vcl/source/graphic/GraphicLoader.cxx @@ -12,6 +12,7 @@ #include <unotools/ucbstreamhelper.hxx> #include <vcl/graphicfilter.hxx> +#include <vcl/weld.hxx> #include <vcl/wmf.hxx> using namespace css; @@ -20,12 +21,12 @@ namespace vcl { namespace graphic { -Graphic loadFromURL(OUString const& rURL) +Graphic loadFromURL(OUString const& rURL, weld::Window* pParentWin) { Graphic aGraphic; - std::unique_ptr<SvStream> pInputStream - = utl::UcbStreamHelper::CreateStream(rURL, StreamMode::READ); + std::unique_ptr<SvStream> pInputStream = utl::UcbStreamHelper::CreateStream( + rURL, StreamMode::READ, pParentWin ? pParentWin->GetXWindow() : nullptr); if (pInputStream) { |