summaryrefslogtreecommitdiff
path: root/basic/source/comp
diff options
context:
space:
mode:
Diffstat (limited to 'basic/source/comp')
-rw-r--r--basic/source/comp/basiccharclass.cxx2
-rw-r--r--basic/source/comp/buffer.cxx2
-rw-r--r--basic/source/comp/codegen.cxx2
-rw-r--r--basic/source/comp/dim.cxx10
-rw-r--r--basic/source/comp/sbcomp.cxx20
-rw-r--r--basic/source/comp/symtbl.cxx4
6 files changed, 20 insertions, 20 deletions
diff --git a/basic/source/comp/basiccharclass.cxx b/basic/source/comp/basiccharclass.cxx
index 23d814409de7..529be3fb287e 100644
--- a/basic/source/comp/basiccharclass.cxx
+++ b/basic/source/comp/basiccharclass.cxx
@@ -102,7 +102,7 @@ bool BasicCharClass::isLetterUnicode( sal_Unicode c )
if( pCharClass == NULL )
pCharClass = new CharClass( Application::GetSettings().GetLanguageTag() );
// can we get pCharClass to accept a sal_Unicode instead of this waste?
- return pCharClass->isLetter( rtl::OUString(c), 0 );
+ return pCharClass->isLetter( OUString(c), 0 );
}
bool BasicCharClass::isAlpha( sal_Unicode c, bool bCompatible )
diff --git a/basic/source/comp/buffer.cxx b/basic/source/comp/buffer.cxx
index e3312c91e9c4..b08d352eb318 100644
--- a/basic/source/comp/buffer.cxx
+++ b/basic/source/comp/buffer.cxx
@@ -238,7 +238,7 @@ bool SbiBuffer::operator +=( const OUString& n )
sal_uInt32 len = n.getLength() + 1;
if( Check( len ) )
{
- rtl::OString aByteStr(rtl::OUStringToOString(n, osl_getThreadTextEncoding()));
+ OString aByteStr(OUStringToOString(n, osl_getThreadTextEncoding()));
memcpy( pCur, aByteStr.getStr(), len );
pCur += len;
nOff += len;
diff --git a/basic/source/comp/codegen.cxx b/basic/source/comp/codegen.cxx
index c17ecbb6648b..32b1d84a9e79 100644
--- a/basic/source/comp/codegen.cxx
+++ b/basic/source/comp/codegen.cxx
@@ -243,7 +243,7 @@ void SbiCodeGen::Save()
aPropName = aPropName.copy( aIfaceName.getLength() + 1 );
}
OSL_TRACE("*** getProcedureProperty for thing %s",
- rtl::OUStringToOString( aPropName,RTL_TEXTENCODING_UTF8 ).getStr() );
+ OUStringToOString( aPropName,RTL_TEXTENCODING_UTF8 ).getStr() );
rMod.GetProcedureProperty( aPropName, ePropType );
}
if( nPass == 1 )
diff --git a/basic/source/comp/dim.cxx b/basic/source/comp/dim.cxx
index 3f79a2874092..81f6effee2bf 100644
--- a/basic/source/comp/dim.cxx
+++ b/basic/source/comp/dim.cxx
@@ -129,7 +129,7 @@ void SbiParser::TypeDecl( SbiSymDef& rDef, bool bAsNewAlreadyParsed )
// #52709 DIM AS NEW for Uno with full-qualified name
if( Peek() == DOT )
{
- rtl::OUString aDotStr( '.' );
+ OUString aDotStr( '.' );
while( Peek() == DOT )
{
aCompleteName += aDotStr;
@@ -663,8 +663,8 @@ void SbiParser::DefType( bool bPrivate )
}
}
- pType->Remove( rtl::OUString("Name"), SbxCLASS_DONTCARE );
- pType->Remove( rtl::OUString("Parent"), SbxCLASS_DONTCARE );
+ pType->Remove( OUString("Name"), SbxCLASS_DONTCARE );
+ pType->Remove( OUString("Parent"), SbxCLASS_DONTCARE );
rTypeArray->Insert (pType,rTypeArray->Count());
}
@@ -800,8 +800,8 @@ void SbiParser::DefEnum( bool bPrivate )
}
}
- pEnum->Remove( rtl::OUString("Name"), SbxCLASS_DONTCARE );
- pEnum->Remove( rtl::OUString("Parent"), SbxCLASS_DONTCARE );
+ pEnum->Remove( OUString("Name"), SbxCLASS_DONTCARE );
+ pEnum->Remove( OUString("Parent"), SbxCLASS_DONTCARE );
rEnumArray->Insert( pEnum, rEnumArray->Count() );
}
diff --git a/basic/source/comp/sbcomp.cxx b/basic/source/comp/sbcomp.cxx
index 85d91aeac257..20d5262aafb1 100644
--- a/basic/source/comp/sbcomp.cxx
+++ b/basic/source/comp/sbcomp.cxx
@@ -223,8 +223,8 @@ static void lcl_ReadIniFile( const char* pIniFileName )
struct TraceTextData
{
- rtl::OString m_aTraceStr_STMNT;
- rtl::OString m_aTraceStr_PCode;
+ OString m_aTraceStr_STMNT;
+ OString m_aTraceStr_PCode;
};
typedef std::hash_map< sal_Int32, TraceTextData > PCToTextDataMap;
typedef std::hash_map< OUString, PCToTextDataMap*, OUStringHash, ::std::equal_to< OUString > > ModuleTraceMap;
@@ -257,11 +257,11 @@ const char* lcl_getSpaces( int nSpaceCount )
return pSpacesEnd - nSpaceCount;
}
-static rtl::OString lcl_toOStringSkipLeadingWhites( const OUString& aStr )
+static OString lcl_toOStringSkipLeadingWhites( const OUString& aStr )
{
static sal_Char Buffer[1000];
- rtl::OString aOStr = OUStringToOString( OUString( aStr ), RTL_TEXTENCODING_ASCII_US );
+ OString aOStr = OUStringToOString( OUString( aStr ), RTL_TEXTENCODING_ASCII_US );
const sal_Char* pStr = aOStr.getStr();
// Skip whitespace
@@ -276,7 +276,7 @@ static rtl::OString lcl_toOStringSkipLeadingWhites( const OUString& aStr )
strncpy( Buffer, pStr, nLen );
Buffer[nLen] = 0;
- rtl::OString aORetStr( Buffer );
+ OString aORetStr( Buffer );
return aORetStr;
}
@@ -591,7 +591,7 @@ void dbg_traceStep( SbModule* pModule, sal_uInt32 nPC, sal_Int32 nCallLvl )
int nIndent = nCallLvl * GnIndentPerCallLevel;
const TraceTextData& rTraceTextData = itInner->second;
- const rtl::OString& rStr_STMNT = rTraceTextData.m_aTraceStr_STMNT;
+ const OString& rStr_STMNT = rTraceTextData.m_aTraceStr_STMNT;
bool bSTMT = false;
if( rStr_STMNT.getLength() )
{
@@ -626,7 +626,7 @@ void dbg_traceStep( SbModule* pModule, sal_uInt32 nPC, sal_Int32 nCallLvl )
}
nIndent += GnIndentForPCode;
- const rtl::OString& rStr_PCode = rTraceTextData.m_aTraceStr_PCode;
+ const OString& rStr_PCode = rTraceTextData.m_aTraceStr_PCode;
if( rStr_PCode.getLength() )
{
lcl_lineOut( rStr_PCode.getStr(), lcl_getSpaces( nIndent ),
@@ -837,7 +837,7 @@ void dbg_traceNotifyError( SbError nTraceErr, const OUString& aTraceErrMsg,
#endif
GnLastCallLvl = nCallLvl;
- rtl::OString aOTraceErrMsg = OUStringToOString( OUString( aTraceErrMsg ), RTL_TEXTENCODING_ASCII_US );
+ OString aOTraceErrMsg = OUStringToOString( OUString( aTraceErrMsg ), RTL_TEXTENCODING_ASCII_US );
char Buffer[200];
const char* pHandledStr = bTraceErrHandled ? " / HANDLED" : "";
@@ -864,10 +864,10 @@ void dbg_RegisterTraceTextForPC( SbModule* pModule, sal_uInt32 nPC,
TraceTextData aData;
- rtl::OString aOTraceStr_STMNT = lcl_toOStringSkipLeadingWhites( aTraceStr_STMNT );
+ OString aOTraceStr_STMNT = lcl_toOStringSkipLeadingWhites( aTraceStr_STMNT );
aData.m_aTraceStr_STMNT = aOTraceStr_STMNT;
- rtl::OString aOTraceStr_PCode = lcl_toOStringSkipLeadingWhites( aTraceStr_PCode );
+ OString aOTraceStr_PCode = lcl_toOStringSkipLeadingWhites( aTraceStr_PCode );
aData.m_aTraceStr_PCode = aOTraceStr_PCode;
(*pInnerMap)[nPC] = aData;
diff --git a/basic/source/comp/symtbl.cxx b/basic/source/comp/symtbl.cxx
index 005ae381ebcc..0a5e3a22c04c 100644
--- a/basic/source/comp/symtbl.cxx
+++ b/basic/source/comp/symtbl.cxx
@@ -43,7 +43,7 @@ SbiStringPool::SbiStringPool( SbiParser* p )
SbiStringPool::~SbiStringPool()
{}
-const rtl::OUString& SbiStringPool::Find( sal_uInt32 n ) const
+const OUString& SbiStringPool::Find( sal_uInt32 n ) const
{
if( n == 0 || n > aData.size() )
return aEmpty; //hack, returning a reference to a simulation of null
@@ -77,7 +77,7 @@ short SbiStringPool::Add( double n, SbxDataType t )
case SbxDOUBLE: snprintf( buf, sizeof(buf), "%.16g", n ); break;
default: break;
}
- return Add( rtl::OUString::createFromAscii( buf ) );
+ return Add( OUString::createFromAscii( buf ) );
}
/***************************************************************************