diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-05-14 12:41:09 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-05-14 17:11:56 +0200 |
| commit | 430b3f4db745dfe08b989745e340e0503dd0ac34 (patch) | |
| tree | 8c66cfd8fa3c9e90786d1e14f38cc84a05b2f7a3 /include | |
| parent | f264b2ffc4f8cad28cfe852ddba63f30293e321c (diff) | |
Resolves: tdf#120423 dispatch against the correct Frame
Change-Id: I5ea2e5d7b79efbd2b14d0b528e5a5c3e44e643bc
Reviewed-on: https://gerrit.libreoffice.org/72284
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/comphelper/dispatchcommand.hxx | 9 | ||||
| -rw-r--r-- | include/svx/svxdlg.hxx | 3 |
2 files changed, 9 insertions, 3 deletions
diff --git a/include/comphelper/dispatchcommand.hxx b/include/comphelper/dispatchcommand.hxx index 475317742157..f0b67eda70eb 100644 --- a/include/comphelper/dispatchcommand.hxx +++ b/include/comphelper/dispatchcommand.hxx @@ -15,7 +15,7 @@ #include <com/sun/star/uno/Reference.hxx> namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } } -namespace com { namespace sun { namespace star { namespace frame { class XDispatchResultListener; } } } } +namespace com { namespace sun { namespace star { namespace frame { class XDispatchResultListener; class XFrame; } } } } namespace com { namespace sun { namespace star { namespace uno { template <typename > class Sequence; } } } } namespace comphelper @@ -29,7 +29,12 @@ namespace comphelper */ COMPHELPER_DLLPUBLIC bool dispatchCommand(const OUString& rCommand, const css::uno::Sequence<css::beans::PropertyValue>& rArguments, - const css::uno::Reference<css::frame::XDispatchResultListener>& aListener = css::uno::Reference<css::frame::XDispatchResultListener>()); + const css::uno::Reference<css::frame::XDispatchResultListener>& rListener = css::uno::Reference<css::frame::XDispatchResultListener>()); + +COMPHELPER_DLLPUBLIC bool dispatchCommand(const OUString& rCommand, + const css::uno::Reference<css::frame::XFrame>& rFrame, + const css::uno::Sequence<css::beans::PropertyValue>& rArguments, + const css::uno::Reference<css::frame::XDispatchResultListener>& rListener = css::uno::Reference<css::frame::XDispatchResultListener>()); } diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx index 4926a7be9f42..9708710b02f2 100644 --- a/include/svx/svxdlg.hxx +++ b/include/svx/svxdlg.hxx @@ -425,7 +425,8 @@ public: const SfxItemSet& rAttr, const SdrView* pView, sal_uInt32 nResId )=0; - virtual VclPtr<SfxAbstractDialog> CreateCharMapDialog(weld::Window* pParent, const SfxItemSet& rAttr, bool bInsert) = 0; + virtual VclPtr<SfxAbstractDialog> CreateCharMapDialog(weld::Window* pParent, const SfxItemSet& rAttr, + const css::uno::Reference<css::frame::XFrame>& rFrame) = 0; virtual VclPtr<SfxAbstractDialog> CreateEventConfigDialog(weld::Window* pParent, const SfxItemSet& rAttr, const css::uno::Reference< css::frame::XFrame >& _rxFrame) = 0; virtual VclPtr<AbstractSvxPostItDialog> CreateSvxPostItDialog(weld::Widget* pParent, const SfxItemSet& rCoreSet, bool bPrevNext = false) = 0; |