diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-03-05 11:45:16 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-03-05 14:48:28 +0100 |
| commit | 972a4a88cf1caec63cb3dcd3be610d1a840f50c9 (patch) | |
| tree | 35cdfc924bce421424c5e4f9768ad3b18e33fd70 /include | |
| parent | ddd43218e9900536381733735adf8681d345e775 (diff) | |
there's already a way to pass around the SfxRequest source frame
Change-Id: I790497c3e651890e0971ee334d599a98a7aae7f0
Reviewed-on: https://gerrit.libreoffice.org/50768
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/dispatch.hxx | 3 | ||||
| -rw-r--r-- | include/sfx2/request.hxx | 16 |
2 files changed, 8 insertions, 11 deletions
diff --git a/include/sfx2/dispatch.hxx b/include/sfx2/dispatch.hxx index 3daa2b0087d8..49777df94687 100644 --- a/include/sfx2/dispatch.hxx +++ b/include/sfx2/dispatch.hxx @@ -128,8 +128,7 @@ public: SfxCallMode nCall, SfxItemSet const * pArgs, SfxItemSet const * pInternalArgs, - sal_uInt16 nModi, - vcl::Window* pDialogParent); + sal_uInt16 nModi); const SfxPoolItem* ExecuteList( sal_uInt16 nSlot, SfxCallMode nCall, diff --git a/include/sfx2/request.hxx b/include/sfx2/request.hxx index eb6e1fb0832a..60b5dfe4f8e7 100644 --- a/include/sfx2/request.hxx +++ b/include/sfx2/request.hxx @@ -41,10 +41,8 @@ class SfxViewFrame; struct SfxRequest_Impl; enum class SfxCallMode : sal_uInt16; -namespace vcl -{ - class Window; -} +namespace vcl { class Window; } +namespace weld { class Window; } class SFX2_DLLPUBLIC SfxRequest: public SfxHint { @@ -66,7 +64,7 @@ public: SfxRequest( sal_uInt16 nSlot, SfxCallMode nCallMode, SfxItemPool &rPool ); SfxRequest( const SfxSlot* pSlot, const css::uno::Sequence < css::beans::PropertyValue >& rArgs, SfxCallMode nCallMode, SfxItemPool &rPool ); - SfxRequest(sal_uInt16 nSlot, SfxCallMode nCallMode, const SfxAllItemSet& rSfxArgs, vcl::Window* pDialogParent = nullptr); + SfxRequest(sal_uInt16 nSlot, SfxCallMode nCallMode, const SfxAllItemSet& rSfxArgs); SfxRequest( sal_uInt16 nSlot, SfxCallMode nCallMode, const SfxAllItemSet& rSfxArgs, const SfxAllItemSet& rSfxInternalArgs ); SfxRequest( const SfxRequest& rOrig ); virtual ~SfxRequest() override; @@ -95,10 +93,6 @@ public: return nullptr; } - /** Return the window that should be used as the parent for any dialogs this request creates - */ - vcl::Window* GetDialogParent() const; - void ReleaseArgs(); void SetReturnValue(const SfxPoolItem &); const SfxPoolItem* GetReturnValue() const; @@ -122,6 +116,10 @@ public: void ForgetAllArgs(); + /** Return the window that should be used as the parent for any dialogs this request creates + */ + vcl::Window* GetFrameWindow() const; + weld::Window* GetFrameWeld() const; private: const SfxRequest& operator=(const SfxRequest &) = delete; }; |