diff options
Diffstat (limited to 'framework/inc')
| -rw-r--r-- | framework/inc/classes/rootactiontriggercontainer.hxx | 11 | ||||
| -rw-r--r-- | framework/inc/helper/actiontriggerhelper.hxx | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/framework/inc/classes/rootactiontriggercontainer.hxx b/framework/inc/classes/rootactiontriggercontainer.hxx index 924089fd3596..70e00d09033e 100644 --- a/framework/inc/classes/rootactiontriggercontainer.hxx +++ b/framework/inc/classes/rootactiontriggercontainer.hxx @@ -33,6 +33,7 @@ #include <helper/propertysetcontainer.hxx> #include <vcl/menu.hxx> +#include <com/sun/star/container/XNamed.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> @@ -48,10 +49,11 @@ class RootActionTriggerContainer : public PropertySetContainer, public com::sun::star::lang::XMultiServiceFactory, public com::sun::star::lang::XServiceInfo, public com::sun::star::lang::XUnoTunnel, - public com::sun::star::lang::XTypeProvider + public com::sun::star::lang::XTypeProvider, + public com::sun::star::container::XNamed { public: - RootActionTriggerContainer( const Menu* pMenu, const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager ); + RootActionTriggerContainer( const Menu* pMenu, const ::rtl::OUString* pMenuIdentifier, const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager ); virtual ~RootActionTriggerContainer(); const Menu* GetMenu(); @@ -109,6 +111,10 @@ class RootActionTriggerContainer : public PropertySetContainer, virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException); + // XNamed + virtual ::rtl::OUString SAL_CALL getName( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException); + private: void FillContainer(); @@ -116,6 +122,7 @@ class RootActionTriggerContainer : public PropertySetContainer, sal_Bool m_bContainerChanged; sal_Bool m_bInContainerCreation; const Menu* m_pMenu; + const ::rtl::OUString* m_pMenuIdentifier; }; } diff --git a/framework/inc/helper/actiontriggerhelper.hxx b/framework/inc/helper/actiontriggerhelper.hxx index b684335d9f0f..76ae24a70a89 100644 --- a/framework/inc/helper/actiontriggerhelper.hxx +++ b/framework/inc/helper/actiontriggerhelper.hxx @@ -64,7 +64,7 @@ namespace framework // #110897# static com::sun::star::uno::Reference< com::sun::star::container::XIndexContainer > CreateActionTriggerContainerFromMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, - const Menu* pMenu ); + const Menu* pMenu, const ::rtl::OUString* pMenuIdentifier ); // Fills the submitted rActionTriggerContainer with the structure of the menu // provided as the second parameter |