diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-04-04 10:22:34 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-04-04 16:03:21 +0200 |
| commit | 3ff4800fe400de916c97f587322104af06cc0879 (patch) | |
| tree | 0e7b2d29b6998445da0cec98bd924e5178a4ef60 /include | |
| parent | 265e1305e4f9bf8a4897069a020c9c65e8047f58 (diff) | |
weld SvInsertOleDlg
and
weld SfxInsertFloatingFrameDialog
and smuggle in the parent widget for the Gtk File dialog via
an XWindow interface
Change-Id: I971b3a0ffe661c9268115fd5d00bf8eee80e77b3
Reviewed-on: https://gerrit.libreoffice.org/52373
Tested-by: Jenkins <ci@libreoffice.org>
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/filedlghelper.hxx | 13 | ||||
| -rw-r--r-- | include/sfx2/sfxdlg.hxx | 4 | ||||
| -rw-r--r-- | include/vcl/weld.hxx | 2 |
3 files changed, 16 insertions, 3 deletions
diff --git a/include/sfx2/filedlghelper.hxx b/include/sfx2/filedlghelper.hxx index 5a6cefa5ba5a..8a5b0015a705 100644 --- a/include/sfx2/filedlghelper.hxx +++ b/include/sfx2/filedlghelper.hxx @@ -107,6 +107,10 @@ public: FileDialogHelper(sal_Int16 nDialogType, FileDialogFlags nFlags, + weld::Window* _pPreferredParent); + + FileDialogHelper(sal_Int16 nDialogType, + FileDialogFlags nFlags, const OUString& rFactory, SfxFilterFlags nMust, SfxFilterFlags nDont, @@ -115,6 +119,13 @@ public: FileDialogHelper(sal_Int16 nDialogType, FileDialogFlags nFlags, const OUString& rFactory, + SfxFilterFlags nMust, + SfxFilterFlags nDont, + weld::Window* _pPreferredParent); + + FileDialogHelper(sal_Int16 nDialogType, + FileDialogFlags nFlags, + const OUString& rFactory, sal_Int16 nDialog, SfxFilterFlags nMust, SfxFilterFlags nDont, @@ -255,7 +266,7 @@ ErrCode FileOpenDialog_Impl( const vcl::Window* pParent, const css::uno::Sequence< OUString >& rBlackList = css::uno::Sequence< OUString >()); -ErrCode RequestPassword(const std::shared_ptr<const SfxFilter>& pCurrentFilter, OUString const & aURL, SfxItemSet* pSet, vcl::Window* pParent); +ErrCode RequestPassword(const std::shared_ptr<const SfxFilter>& pCurrentFilter, OUString const & aURL, SfxItemSet* pSet, const css::uno::Reference<css::awt::XWindow>& rParent); } #endif diff --git a/include/sfx2/sfxdlg.hxx b/include/sfx2/sfxdlg.hxx index 732bb30f2ee7..9d3f23f0e3d2 100644 --- a/include/sfx2/sfxdlg.hxx +++ b/include/sfx2/sfxdlg.hxx @@ -134,10 +134,10 @@ public: const css::uno::Reference< css::frame::XFrame >& xViewFrame ) = 0; virtual CreateTabPage GetTabPageCreatorFunc( sal_uInt16 nId ) = 0; virtual GetTabPageRanges GetTabPageRangesFunc( sal_uInt16 nId ) = 0; - virtual VclPtr<SfxAbstractInsertObjectDialog> CreateInsertObjectDialog( vcl::Window* pParent, const OUString& rCommand, + virtual VclPtr<SfxAbstractInsertObjectDialog> CreateInsertObjectDialog(weld::Window* pParent, const OUString& rCommand, const css::uno::Reference < css::embed::XStorage >& xStor, const SvObjectServerList* pList )=0; - virtual VclPtr<VclAbstractDialog> CreateEditObjectDialog( const OUString& rCommand, + virtual VclPtr<VclAbstractDialog> CreateEditObjectDialog(weld::Window* pParent, const OUString& rCommand, const css::uno::Reference < css::embed::XEmbeddedObject >& xObj )=0; virtual VclPtr<SfxAbstractPasteDialog> CreatePasteDialog(weld::Window* pParent) = 0; virtual VclPtr<SfxAbstractLinksDialog> CreateLinksDialog( vcl::Window* pParent, sfx2::LinkManager* pMgr, bool bHTML=false, sfx2::SvBaseLink* p=nullptr )=0; diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx index 63b27b0f7162..52f247921289 100644 --- a/include/vcl/weld.hxx +++ b/include/vcl/weld.hxx @@ -142,6 +142,8 @@ public: virtual OUString get_title() const = 0; virtual void set_busy_cursor(bool bBusy) = 0; + virtual css::uno::Reference<css::awt::XWindow> GetXWindow() = 0; + void connect_help(const Link<Widget&, bool>& rLink) { m_aHelpRequestHdl = rLink; } }; |