From 7a092e254111a2d98446e7140ef24c652c245bfa Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 12 Apr 2019 12:07:22 +0100 Subject: Resolves: tdf#124698 bubble down parent for modal dialog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: If03c6ff8043bb39f2efdf4cde19d8277886bf36f Reviewed-on: https://gerrit.libreoffice.org/70658 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- vcl/source/graphic/GraphicLoader.cxx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'vcl') 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 #include +#include #include 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 pInputStream - = utl::UcbStreamHelper::CreateStream(rURL, StreamMode::READ); + std::unique_ptr pInputStream = utl::UcbStreamHelper::CreateStream( + rURL, StreamMode::READ, pParentWin ? pParentWin->GetXWindow() : nullptr); if (pInputStream) { -- cgit