From 51cc4f3e0795156771bc24acd6ae4de407e28da1 Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Wed, 23 Mar 2005 13:11:03 +0000 Subject: INTEGRATION: CWS fwkfinal1 (1.8.4); FILE MERGED 2005/03/04 14:45:36 cd 1.8.4.1: #i38064# Use provided module identifier to retrieve command labels for OLE --- framework/inc/uielement/menubarmanager.hxx | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'framework') diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx index 0f11f0e6ed90..d2b38100bdcc 100644 --- a/framework/inc/uielement/menubarmanager.hxx +++ b/framework/inc/uielement/menubarmanager.hxx @@ -2,9 +2,9 @@ * * $RCSfile: menubarmanager.hxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: kz $ $Date: 2005-03-01 19:29:47 $ + * last change: $Author: vg $ $Date: 2005-03-23 14:11:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -192,6 +192,7 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener MenuBarManager( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, + const rtl::OUString& aModuleIdentifier, Menu* pMenu, sal_Bool bDelete, sal_Bool bDeleteChildren ); @@ -233,8 +234,8 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener Menu* GetMenuBar() const { return m_pVCLMenu; } // Configuration methods - static void FillMenu( USHORT& nId, Menu* pMenu, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rItemContainer ); - void FillMenuManager( Menu* pMenu, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, sal_Bool bDelete, sal_Bool bDeleteChildren ); + static void FillMenu( USHORT& nId, Menu* pMenu, const ::rtl::OUString& rModuleIdentifier, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rItemContainer ); + void FillMenuManager( Menu* pMenu, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const rtl::OUString& rModuleIdentifier, sal_Bool bDelete, sal_Bool bDeleteChildren ); void SetItemContainer( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rItemContainer ); protected: -- cgit /co-23.05 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/sfx2/source/dialog/backingcomp.cxx
AgeCommit message (Expand)Author