diff options
| author | Ariel Constenla-Haile <arielch@apache.org> | 2013-05-28 10:01:32 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-06-24 11:25:34 +0100 |
| commit | 57207cab004cb78c3fa6d9ed43cc4bf81f4e6981 (patch) | |
| tree | 064fa263ec60f38b437df1d93c570e2e787f4173 /include | |
| parent | a1748501d81425d26d09509eec2fd141f2f28f05 (diff) | |
Add missing copy&paste of SfxAppToolBoxControl_Impl::Select
(cherry picked from commit 47204c74d9e52f54f6983af19b66af2a96b42e61)
Conflicts:
framework/inc/uielement/popuptoolbarcontroller.hxx
svtools/inc/svtools/toolboxcontroller.hxx
Change-Id: I304d17c662450f29eeffb17f576b418986f3fb0a
Diffstat (limited to 'include')
| -rw-r--r-- | include/svtools/toolboxcontroller.hxx | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/include/svtools/toolboxcontroller.hxx b/include/svtools/toolboxcontroller.hxx index 02126611c342..217d6cdf2dab 100644 --- a/include/svtools/toolboxcontroller.hxx +++ b/include/svtools/toolboxcontroller.hxx @@ -46,8 +46,6 @@ class ToolBox; namespace svt { -struct DispatchInfo; - class SVT_DLLPUBLIC ToolboxController : public ::com::sun::star::frame::XStatusListener, public ::com::sun::star::frame::XToolbarController, public ::com::sun::star::lang::XInitialization, @@ -116,13 +114,10 @@ class SVT_DLLPUBLIC ToolboxController : public ::com::sun::star::frame::XStatusL const OUString& getCommandURL() const { return m_aCommandURL; } const OUString& getModuleName() const { return m_sModuleName; } - - void dispatchCommand( const OUString& sCommandURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArgs ); + void dispatchCommand( const OUString& sCommandURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArgs, const OUString &rTarget = OUString() ); void enable( bool bEnable ); - DECL_STATIC_LINK( ToolboxController, ExecuteHdl_Impl, DispatchInfo* ); - protected: bool getToolboxId( sal_uInt16& rItemId, ToolBox** ppToolBox ); void setSupportVisibleProperty(sal_Bool bValue); //shizhoubo @@ -135,6 +130,23 @@ class SVT_DLLPUBLIC ToolboxController : public ::com::sun::star::frame::XStatusL ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch; }; + struct DispatchInfo + { + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > mxDispatch; + const ::com::sun::star::util::URL maURL; + const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > maArgs; + + DispatchInfo( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& xDispatch, + const ::com::sun::star::util::URL& rURL, + const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArgs ) + : mxDispatch( xDispatch ) + , maURL( rURL ) + , maArgs( rArgs ) + {} + }; + + DECL_STATIC_LINK( ToolboxController, ExecuteHdl_Impl, DispatchInfo* ); + typedef ::boost::unordered_map< OUString, com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >, OUStringHash, |