diff options
author | Marcos Paulo de Souza <marcos.souza.org@gmail.com> | 2012-12-30 13:07:28 -0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@suse.cz> | 2013-01-03 10:07:39 +0100 |
commit | c40cd8a4f203a4f817a77ab850e5027f8bae9b91 (patch) | |
tree | ee6c7cc0ca9fc79570898f31ff5b96dfc3b8d31a /basic/source/basmgr | |
parent | 329f3cd02546dfe58bf00f6ad3b71bc84a8d4320 (diff) |
Remove all occurences of RTL_* and ::rtl prefix from basic
This is a big commit, so thanks for your time reviewing this :)
Conflicts:
basic/source/sbx/sbxscan.cxx
Change-Id: Ib9bc710b87475b5695764557321e5dcef25e5933
Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
Diffstat (limited to 'basic/source/basmgr')
-rw-r--r-- | basic/source/basmgr/basicmanagerrepository.cxx | 8 | ||||
-rw-r--r-- | basic/source/basmgr/basmgr.cxx | 4 | ||||
-rw-r--r-- | basic/source/basmgr/vbahelper.cxx | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/basic/source/basmgr/basicmanagerrepository.cxx b/basic/source/basmgr/basicmanagerrepository.cxx index 7175fe93ebe3..2d281dc3ab64 100644 --- a/basic/source/basmgr/basicmanagerrepository.cxx +++ b/basic/source/basmgr/basicmanagerrepository.cxx @@ -291,14 +291,14 @@ namespace basic OUString aAppBasicDir( aPathCFG.GetBasicPath() ); if ( aAppBasicDir.isEmpty() ) { - aPathCFG.SetBasicPath(rtl::OUString("$(prog)")); + aPathCFG.SetBasicPath(OUString("$(prog)")); } // soffice.new search only in user dir => first dir OUString aAppFirstBasicDir = aAppBasicDir.getToken(1, ';'); // Create basic and load it // AppBasicDir is now a PATH - INetURLObject aAppBasic( SvtPathOptions().SubstituteVariable(rtl::OUString("$(progurl)")) ); + INetURLObject aAppBasic( SvtPathOptions().SubstituteVariable(OUString("$(progurl)")) ); aAppBasic.insertName( Application::GetAppName() ); BasicManager* pBasicManager = new BasicManager( new StarBASIC, &aAppBasicDir ); @@ -308,8 +308,8 @@ namespace basic OUString aFileName( aAppBasic.getName() ); aAppBasic = INetURLObject( aAppBasicDir.getToken(1, ';') ); DBG_ASSERT(aAppBasic.GetProtocol() != INET_PROT_NOT_VALID, - rtl::OStringBuffer(RTL_CONSTASCII_STRINGPARAM("Invalid URL: \"")). - append(rtl::OUStringToOString(aAppBasicDir, + OStringBuffer("Invalid URL: \""). + append(OUStringToOString(aAppBasicDir, osl_getThreadTextEncoding())). append('"').getStr() ); diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx index 14ffe0902826..ec9c9d6be22c 100644 --- a/basic/source/basmgr/basmgr.cxx +++ b/basic/source/basmgr/basmgr.cxx @@ -1652,7 +1652,7 @@ uno::Any BasicManager::SetGlobalUNOConstant( const sal_Char* _pAsciiName, const if ( !pStandardLib ) return aOldValue; - OUString sVarName( ::rtl::OUString::createFromAscii( _pAsciiName ) ); + OUString sVarName( OUString::createFromAscii( _pAsciiName ) ); // obtain the old value SbxVariable* pVariable = pStandardLib->Find( sVarName, SbxCLASS_OBJECT ); @@ -1988,7 +1988,7 @@ uno::Any ModuleContainer_Impl::getByName( const OUString& aName ) if( !pMod ) throw container::NoSuchElementException(); uno::Reference< script::XStarBasicModuleInfo > xMod = (XStarBasicModuleInfo*)new ModuleInfo_Impl - ( aName, ::rtl::OUString::createFromAscii( szScriptLanguage ), pMod->GetSource32() ); + ( aName, OUString::createFromAscii( szScriptLanguage ), pMod->GetSource32() ); uno::Any aRetAny; aRetAny <<= xMod; return aRetAny; diff --git a/basic/source/basmgr/vbahelper.cxx b/basic/source/basmgr/vbahelper.cxx index d1c34e4025c8..8f870bb143d4 100644 --- a/basic/source/basmgr/vbahelper.cxx +++ b/basic/source/basmgr/vbahelper.cxx @@ -69,7 +69,7 @@ DocumentsEnumeration::DocumentsEnumeration( const uno::Reference< frame::XModel try { uno::Reference< frame::XModuleManager2 > xModuleManager( lclCreateModuleManager() ); - ::rtl::OUString aIdentifier = xModuleManager->identify( rxModel ); + OUString aIdentifier = xModuleManager->identify( rxModel ); uno::Reference< frame::XDesktop2 > xDesktop = frame::Desktop::create( ::comphelper::getProcessComponentContext() ); uno::Reference< container::XEnumerationAccess > xComponentsEA( xDesktop->getComponents(), uno::UNO_SET_THROW ); uno::Reference< container::XEnumeration > xEnumeration( xComponentsEA->createEnumeration(), uno::UNO_SET_THROW ); @@ -173,7 +173,7 @@ void lclIterateDocuments( ModifyDocumentFunc pModifyDocumentFunc, const uno::Ref struct CurrDirPool { ::osl::Mutex maMutex; - ::std::map< ::rtl::OUString, ::rtl::OUString > maCurrDirs; + ::std::map< OUString, OUString > maCurrDirs; }; struct StaticCurrDirPool : public ::rtl::Static< CurrDirPool, StaticCurrDirPool > {}; @@ -196,7 +196,7 @@ void enableContainerWindowsOfAllDocuments( const uno::Reference< frame::XModel > // ============================================================================ -void registerCurrentDirectory( const uno::Reference< frame::XModel >& rxModel, const ::rtl::OUString& rPath ) +void registerCurrentDirectory( const uno::Reference< frame::XModel >& rxModel, const OUString& rPath ) { if( !rPath.isEmpty() ) { @@ -205,7 +205,7 @@ void registerCurrentDirectory( const uno::Reference< frame::XModel >& rxModel, c try { uno::Reference< frame::XModuleManager2 > xModuleManager( lclCreateModuleManager() ); - ::rtl::OUString aIdentifier = xModuleManager->identify( rxModel ); + OUString aIdentifier = xModuleManager->identify( rxModel ); if( !aIdentifier.isEmpty() ) rPool.maCurrDirs[ aIdentifier ] = rPath; } |