diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-11-17 11:51:14 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-11-17 11:51:14 +0000 |
| commit | a963a58e82e99876c82b6e3f69435a94dec468e2 (patch) | |
| tree | 4214a183417e00fbd589ca42870caedf16696187 | |
| parent | 1dd74b0f0c4b878fe3828e7904fd4f817d9577ff (diff) | |
INTEGRATION: CWS fwkbugfix03 (1.3.16); FILE MERGED
2004/10/07 13:31:39 cd 1.3.16.1: #i35049# Support generic Add-On title for Add-on components
| -rw-r--r-- | framework/inc/uielement/toolbarsmenucontroller.hxx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/framework/inc/uielement/toolbarsmenucontroller.hxx b/framework/inc/uielement/toolbarsmenucontroller.hxx index 6eaa65c279ab..efe90846347e 100644 --- a/framework/inc/uielement/toolbarsmenucontroller.hxx +++ b/framework/inc/uielement/toolbarsmenucontroller.hxx @@ -2,9 +2,9 @@ * * $RCSfile: toolbarsmenucontroller.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: obo $ $Date: 2004-11-16 14:51:33 $ + * last change: $Author: obo $ $Date: 2004-11-17 12:51:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -102,6 +102,9 @@ #ifndef _DRAFTS_COM_SUN_STAR_FRAME_XPOPUPMENUCONTROLLER_HPP_ #include <drafts/com/sun/star/frame/XPopupMenuController.hpp> #endif +#ifndef _DRAFTS_COM_SUN_STAR_FRAME_XLAYOUTMANAGER_HPP_ +#include <drafts/com/sun/star/frame/XLayoutManager.hpp> +#endif #ifndef _COM_SUN_STAR_FRAME_XMODEL_HPP_ #include <com/sun/star/frame/XModel.hpp> #endif @@ -174,6 +177,7 @@ namespace framework private: void fillPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu ); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > > getLayoutManagerToolbars( const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::frame::XLayoutManager >& rLayoutManager ); rtl::OUString getUINameFromCommand( const rtl::OUString& rCommandURL ); ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > getDispatchFromCommandURL( const rtl::OUString& rCommandURL ); void addCommand( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu, const rtl::OUString& rCommandURL, USHORT nHelpId ); @@ -184,6 +188,8 @@ namespace framework ::com::sun::star::uno::Reference< ::drafts::com::sun::star::ui::XUIConfigurationManager > m_xModuleCfgMgr; ::com::sun::star::uno::Reference< ::drafts::com::sun::star::ui::XUIConfigurationManager > m_xDocCfgMgr; rtl::OUString m_aModuleIdentifier; + rtl::OUString m_aPropUIName; + rtl::OUString m_aPropResourceURL; sal_Bool m_bModuleIdentified; std::vector< rtl::OUString > m_aCommandVector; IntlWrapper m_aIntlWrapper; |