diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-11-11 11:08:19 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-11-11 11:08:19 +0000 |
| commit | 5c693a636649c7118ba7969e30fc9b7734e47223 (patch) | |
| tree | ed25b62381764d1f8d4044f0b7145a43d38ddaa5 /framework | |
| parent | d5ed2f543b212447cfd0f5084ccc9c22e364a53c (diff) | |
INTEGRATION: CWS c06 (1.9.92); FILE MERGED
2005/09/01 11:25:03 cd 1.9.92.1: #i54030# Remove empty popups if the commands are disabled by disabled command feature
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/uielement/menubarwrapper.cxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/framework/source/uielement/menubarwrapper.cxx b/framework/source/uielement/menubarwrapper.cxx index e8d8db5c87ca..2b641d1b6ddb 100644 --- a/framework/source/uielement/menubarwrapper.cxx +++ b/framework/source/uielement/menubarwrapper.cxx @@ -4,9 +4,9 @@ * * $RCSfile: menubarwrapper.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: rt $ $Date: 2005-09-09 01:56:09 $ + * last change: $Author: rt $ $Date: 2005-11-11 12:08:19 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -107,6 +107,7 @@ using namespace com::sun::star::frame; using namespace com::sun::star::lang; using namespace com::sun::star::container; using namespace com::sun::star::awt; +using namespace com::sun::star::util; using namespace ::com::sun::star::ui; namespace framework @@ -183,8 +184,11 @@ void SAL_CALL MenuBarWrapper::initialize( const Sequence< Any >& aArguments ) th if ( m_xConfigData.is() ) { // Fill menubar with container contents + Reference< XURLTransformer > xTrans( getServiceFactory()->createInstance( + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.util.URLTransformer" ))), UNO_QUERY ); USHORT nId = 1; - MenuBarManager::FillMenu( nId, pVCLMenuBar, aModuleIdentifier, m_xConfigData ); + MenuBarManager::FillMenuWithConfiguration( nId, pVCLMenuBar, aModuleIdentifier, m_xConfigData, xTrans ); } } catch ( NoSuchElementException& ) |