diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 16:04:36 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 16:04:36 +0000 |
| commit | 6c9ed5cba433a7233efe1746ef2b135fa7c27140 (patch) | |
| tree | b4ae9f9ca586a6396c8f301e19313d34b3879b00 /framework/source | |
| parent | e70fed6da1a4e79c09b34b92dbee6e6f293adf72 (diff) | |
INTEGRATION: CWS obo30 (1.9.40); FILE MERGED
2008/06/06 06:38:57 obo 1.9.40.2: #i90100# EOL missing
2008/05/29 14:59:27 obo 1.9.40.1: #i90100# ambigous Reference during ENABLE_PCH build
Diffstat (limited to 'framework/source')
| -rw-r--r-- | framework/source/uifactory/addonstoolboxfactory.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/framework/source/uifactory/addonstoolboxfactory.cxx b/framework/source/uifactory/addonstoolboxfactory.cxx index 0570710648bc..4cefafe14e7c 100644 --- a/framework/source/uifactory/addonstoolboxfactory.cxx +++ b/framework/source/uifactory/addonstoolboxfactory.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: addonstoolboxfactory.cxx,v $ - * $Revision: 1.9 $ + * $Revision: 1.10 $ * * 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; @@ -103,7 +102,7 @@ AddonsToolBoxFactory::AddonsToolBoxFactory( 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 ) { } @@ -156,14 +155,14 @@ sal_Bool AddonsToolBoxFactory::hasButtonsInContext( { if ( rPropSeq[j].Name.equalsAsciiL( "Context", 7 )) { - OUString aContextList; + ::rtl::OUString aContextList; if ( rPropSeq[j].Value >>= aContextList ) bIsCorrectContext = IsCorrectContext( aModuleIdentifier, aContextList ); nPropChecked++; } else if ( rPropSeq[j].Name.equalsAsciiL( "URL", 3 )) { - OUString aURL; + ::rtl::OUString aURL; rPropSeq[j].Value >>= aURL; bIsButton = !aURL.equalsAsciiL( "private:separator", 17 ); nPropChecked++; @@ -237,3 +236,4 @@ throw ( ::com::sun::star::container::NoSuchElementException, } } + |