diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 16:04:52 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 16:04:52 +0000 |
| commit | 6f42cbfac6250d8255781ca820c99fe500a87b20 (patch) | |
| tree | 1cb0deedd009f2c657ee6fbbe9dccac2a298756b /framework/source/uifactory | |
| parent | 6c9ed5cba433a7233efe1746ef2b135fa7c27140 (diff) | |
INTEGRATION: CWS obo30 (1.7.40); FILE MERGED
2008/06/06 06:38:57 obo 1.7.40.2: #i90100# EOL missing
2008/05/29 14:59:27 obo 1.7.40.1: #i90100# ambigous Reference during ENABLE_PCH build
Diffstat (limited to 'framework/source/uifactory')
| -rw-r--r-- | framework/source/uifactory/statusbarfactory.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/framework/source/uifactory/statusbarfactory.cxx b/framework/source/uifactory/statusbarfactory.cxx index de7d1cce93b3..3b3c50a8500e 100644 --- a/framework/source/uifactory/statusbarfactory.cxx +++ b/framework/source/uifactory/statusbarfactory.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: statusbarfactory.cxx,v $ - * $Revision: 1.7 $ + * $Revision: 1.8 $ * * This file is part of OpenOffice.org. * @@ -63,7 +63,6 @@ //_________________________________________________________________________________________________________________ // -using namespace rtl; using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::frame; @@ -102,7 +101,7 @@ StatusBarFactory::StatusBarFactory( const ::com::sun::star::uno::Reference< ::co ThreadHelpBase( &Application::GetSolarMutex() ) , m_xServiceManager( xServiceManager ) , m_xModuleManager( xServiceManager->createInstance( - OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ModuleManager" ))), + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ModuleManager" ))), UNO_QUERY ) { } @@ -168,7 +167,7 @@ throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::l if ( aModuleIdentifier.getLength() ) { Reference< ::com::sun::star::ui::XModuleUIConfigurationManagerSupplier > xModuleCfgSupplier( - m_xServiceManager->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( + m_xServiceManager->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.ModuleUIConfigurationManagerSupplier" ))), UNO_QUERY ); xCfgMgr = xModuleCfgSupplier->getUIConfigurationManager( aModuleIdentifier ); @@ -202,3 +201,4 @@ throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::l } } + |