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 /include | |
| 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 'include')
| -rw-r--r-- | include/sfx2/linkmgr.hxx | 3 | ||||
| -rw-r--r-- | include/unotools/ucbstreamhelper.hxx | 8 | ||||
| -rw-r--r-- | include/vcl/GraphicLoader.hxx | 7 |
3 files changed, 13 insertions, 5 deletions
diff --git a/include/sfx2/linkmgr.hxx b/include/sfx2/linkmgr.hxx index 2646d2d61cdd..7f3bf021eeed 100644 --- a/include/sfx2/linkmgr.hxx +++ b/include/sfx2/linkmgr.hxx @@ -158,7 +158,8 @@ public: static bool GetGraphicFromAny(const OUString& rMimeType, const css::uno::Any & rValue, const OUString& rReferer, - Graphic& rGrf); + Graphic& rGrf, + weld::Window* pParentWin); private: LinkManager( const LinkManager& ) = delete; diff --git a/include/unotools/ucbstreamhelper.hxx b/include/unotools/ucbstreamhelper.hxx index fd0a8cd13bad..0d7d867d21f6 100644 --- a/include/unotools/ucbstreamhelper.hxx +++ b/include/unotools/ucbstreamhelper.hxx @@ -19,6 +19,8 @@ #ifndef INCLUDED_UNOTOOLS_UCBSTREAMHELPER_HXX #define INCLUDED_UNOTOOLS_UCBSTREAMHELPER_HXX +#include <com/sun/star/awt/XWindow.hpp> + #include <unotools/unotoolsdllapi.h> #include <tools/stream.hxx> @@ -45,9 +47,9 @@ namespace utl class UNOTOOLS_DLLPUBLIC UcbStreamHelper { public: - static std::unique_ptr<SvStream> CreateStream( const OUString& rFileName, StreamMode eOpenMode ); - static std::unique_ptr<SvStream> CreateStream( const OUString& rFileName, StreamMode eOpenMode, - bool bFileExists ); + static std::unique_ptr<SvStream> CreateStream(const OUString& rFileName, StreamMode eOpenMode, css::uno::Reference<css::awt::XWindow> xParentWin = nullptr); + static std::unique_ptr<SvStream> CreateStream(const OUString& rFileName, StreamMode eOpenMode, + bool bFileExists, css::uno::Reference<css::awt::XWindow> xParentWin = nullptr); static std::unique_ptr<SvStream> CreateStream( const css::uno::Reference < css::io::XInputStream >& xStream ); static std::unique_ptr<SvStream> CreateStream( const css::uno::Reference < css::io::XStream >& xStream ); static std::unique_ptr<SvStream> CreateStream( const css::uno::Reference < css::io::XInputStream >& xStream, bool bCloseStream ); diff --git a/include/vcl/GraphicLoader.hxx b/include/vcl/GraphicLoader.hxx index 9b96ec13b8a2..5cca83a99d94 100644 --- a/include/vcl/GraphicLoader.hxx +++ b/include/vcl/GraphicLoader.hxx @@ -12,11 +12,16 @@ #include <vcl/graph.hxx> +namespace weld +{ +class Window; +} + namespace vcl { namespace graphic { -Graphic VCL_DLLPUBLIC loadFromURL(OUString const& rURL); +Graphic VCL_DLLPUBLIC loadFromURL(OUString const& rURL, weld::Window* pParentWin = nullptr); } } // end vcl::graphic |