From 6c9ed5cba433a7233efe1746ef2b135fa7c27140 Mon Sep 17 00:00:00 2001 From: Kurt Zenker Date: Tue, 24 Jun 2008 16:04:36 +0000 Subject: 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 --- framework/source/uifactory/addonstoolboxfactory.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'framework/source') 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, } } + -- cgit