diff options
Diffstat (limited to 'basic/source')
26 files changed, 130 insertions, 130 deletions
diff --git a/basic/source/classes/image.cxx b/basic/source/classes/image.cxx index 6ff0b9203b78..8a4412d1b5c5 100644 --- a/basic/source/classes/image.cxx +++ b/basic/source/classes/image.cxx @@ -351,7 +351,7 @@ bool SbiImage::Save( SvStream& r, sal_uInt32 nVer ) for( i = 0; i < nStrings; i++ ) { sal_uInt16 nOff = (sal_uInt16) pStringOff[ i ]; - rtl::OString aStr(rtl::OUStringToOString(rtl::OUString(pStrings + nOff), eCharSet)); + OString aStr(OUStringToOString(OUString(pStrings + nOff), eCharSet)); memcpy( pByteStrings + nOff, aStr.getStr(), (aStr.getLength() + 1) * sizeof( char ) ); } r << (sal_uInt32) nStringSize; diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index abf94b05621e..63347374e08b 100644 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -1058,7 +1058,7 @@ SbModule* StarBASIC::MakeModule32( const OUString& rName, const OUString& rSrc ) SbModule* StarBASIC::MakeModule32( const OUString& rName, const ModuleInfo& mInfo, const OUString& rSrc ) { - OSL_TRACE("create module %s type mInfo %d", rtl::OUStringToOString( rName, RTL_TEXTENCODING_UTF8 ).getStr(), mInfo.ModuleType ); + OSL_TRACE("create module %s type mInfo %d", OUStringToOString( rName, RTL_TEXTENCODING_UTF8 ).getStr(), mInfo.ModuleType ); SbModule* p = NULL; switch ( mInfo.ModuleType ) { diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index b10d00c63d8f..f16fc449c88c 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -296,7 +296,7 @@ SbUnoObject* createOLEObject_Impl( const OUString& aType ) Any aAny; aAny <<= xOLEObject; pUnoObj = new SbUnoObject( aType, aAny ); - ::rtl::OUString sDfltPropName; + OUString sDfltPropName; if ( SbUnoObject::getDefaultPropName( pUnoObj, sDfltPropName ) ) pUnoObj->SetDfltProperty( sDfltPropName ); diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index 7592943d77a5..a48bffca4ba9 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -2668,7 +2668,7 @@ void SbUserFormModule::InitObject() aArgs[ 0 ] = uno::Any(); aArgs[ 1 ] <<= m_xDialog; aArgs[ 2 ] <<= m_xModel; - aArgs[ 3 ] <<= rtl::OUString( GetParent()->GetName() ); + aArgs[ 3 ] <<= OUString( GetParent()->GetName() ); pDocObject = new SbUnoObject( GetName(), uno::makeAny( xVBAFactory->createInstanceWithArguments( "ooo.vba.msforms.UserForm", aArgs ) ) ); uno::Reference< lang::XComponent > xComponent( m_xDialog, uno::UNO_QUERY_THROW ); 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 ) ); } /*************************************************************************** diff --git a/basic/source/inc/iosys.hxx b/basic/source/inc/iosys.hxx index 2f35789d33e0..d6d6c6aab6bf 100644 --- a/basic/source/inc/iosys.hxx +++ b/basic/source/inc/iosys.hxx @@ -40,7 +40,7 @@ class SbiStream { SvStream* pStrm; sal_uIntPtr nExpandOnWriteTo; // during writing access expand the stream to this size - rtl::OString aLine; + OString aLine; sal_uIntPtr nLine; short nLen; // buffer length short nMode; @@ -51,11 +51,11 @@ class SbiStream public: SbiStream(); ~SbiStream(); - SbError Open( short, const rtl::OString&, short, short, short ); + SbError Open( short, const OString&, short, short, short ); SbError Close(); - SbError Read(rtl::OString&, sal_uInt16 = 0, bool bForceReadingPerByte=false); + SbError Read(OString&, sal_uInt16 = 0, bool bForceReadingPerByte=false); SbError Read( char& ); - SbError Write( const rtl::OString&, sal_uInt16 = 0 ); + SbError Write( const OString&, sal_uInt16 = 0 ); bool IsText() const { return (nMode & SBSTRM_BINARY) == 0; } bool IsRandom() const { return (nMode & SBSTRM_RANDOM) != 0; } @@ -73,27 +73,27 @@ public: class SbiIoSystem { SbiStream* pChan[ CHANNELS ]; - rtl::OString aPrompt; - rtl::OString aIn; - rtl::OString aOut; + OString aPrompt; + OString aIn; + OString aOut; short nChan; SbError nError; - void ReadCon(rtl::OString&); - void WriteCon(const rtl::OString&); + void ReadCon(OString&); + void WriteCon(const OString&); public: SbiIoSystem(); ~SbiIoSystem(); SbError GetError(); void Shutdown(); - void SetPrompt(const rtl::OString& r) { aPrompt = r; } + void SetPrompt(const OString& r) { aPrompt = r; } void SetChannel( short n ) { nChan = n; } short GetChannel() const { return nChan;} void ResetChannel() { nChan = 0; } - void Open( short, const rtl::OString&, short, short, short ); + void Open( short, const OString&, short, short, short ); void Close(); - void Read(rtl::OString&, short = 0); + void Read(OString&, short = 0); char Read(); - void Write(const rtl::OString&, short = 0); + void Write(const OString&, short = 0); // 0 == bad channel or no SvStream (nChannel=0..CHANNELS-1) SbiStream* GetStream( short nChannel ) const; void CloseAll(); // JSM diff --git a/basic/source/runtime/ddectrl.cxx b/basic/source/runtime/ddectrl.cxx index fd942b0d3815..1eda66c0cfbe 100644 --- a/basic/source/runtime/ddectrl.cxx +++ b/basic/source/runtime/ddectrl.cxx @@ -69,7 +69,7 @@ SbError SbiDdeControl::GetLastErr( DdeConnection* pConv ) IMPL_LINK_INLINE( SbiDdeControl,Data , DdeData*, pData, { - aData = rtl::OUString::createFromAscii( (const char*)(const void*)*pData ); + aData = OUString::createFromAscii( (const char*)(const void*)*pData ); return 1; } ) diff --git a/basic/source/runtime/dllmgr-none.cxx b/basic/source/runtime/dllmgr-none.cxx index 79b985d28d28..95c02b71cb65 100644 --- a/basic/source/runtime/dllmgr-none.cxx +++ b/basic/source/runtime/dllmgr-none.cxx @@ -43,13 +43,13 @@ struct SbiDllMgr::Impl {}; SbError SbiDllMgr::Call( - rtl::OUString const &, rtl::OUString const &, SbxArray *, SbxVariable &, + OUString const &, OUString const &, SbxArray *, SbxVariable &, bool) { return ERRCODE_BASIC_NOT_IMPLEMENTED; } -void SbiDllMgr::FreeDll(rtl::OUString const &) {} +void SbiDllMgr::FreeDll(OUString const &) {} SbiDllMgr::SbiDllMgr(): impl_(new Impl) {} diff --git a/basic/source/runtime/dllmgr.hxx b/basic/source/runtime/dllmgr.hxx index 5a8803487995..51cb7cc3fa38 100644 --- a/basic/source/runtime/dllmgr.hxx +++ b/basic/source/runtime/dllmgr.hxx @@ -38,10 +38,10 @@ public: ~SbiDllMgr(); SbError Call( - rtl::OUString const & function, rtl::OUString const & library, + OUString const & function, OUString const & library, SbxArray * arguments, SbxVariable & result, bool cdeclConvention); - void FreeDll(rtl::OUString const & library); + void FreeDll(OUString const & library); private: struct Impl; diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx index de08aaacccea..c4a6d649c011 100644 --- a/basic/source/runtime/iosys.cxx +++ b/basic/source/runtime/iosys.cxx @@ -554,7 +554,7 @@ void UCBStream::SetSize( sal_uIntPtr nSize ) SbError SbiStream::Open -( short nCh, const rtl::OString& rName, short nStrmMode, short nFlags, short nL ) +( short nCh, const OString& rName, short nStrmMode, short nFlags, short nL ) { nMode = nFlags; nLen = nL; @@ -565,7 +565,7 @@ SbError SbiStream::Open { nStrmMode |= STREAM_NOCREATE; } - OUString aStr(rtl::OStringToOUString(rName, osl_getThreadTextEncoding())); + OUString aStr(OStringToOUString(rName, osl_getThreadTextEncoding())); OUString aNameStr = getFullPath( aStr ); if( hasUno() ) @@ -632,7 +632,7 @@ SbError SbiStream::Close() return nError; } -SbError SbiStream::Read(rtl::OString& rBuf, sal_uInt16 n, bool bForceReadingPerByte) +SbError SbiStream::Read(OString& rBuf, sal_uInt16 n, bool bForceReadingPerByte) { nExpandOnWriteTo = 0; if( !bForceReadingPerByte && IsText() ) @@ -650,7 +650,7 @@ SbError SbiStream::Read(rtl::OString& rBuf, sal_uInt16 n, bool bForceReadingPerB { return nError = SbERR_BAD_RECORD_LENGTH; } - rtl::OStringBuffer aBuffer(read_uInt8s_ToOString(*pStrm, n)); + OStringBuffer aBuffer(read_uInt8s_ToOString(*pStrm, n)); //Pad it out with ' ' to the requested length on short read sal_Int32 nRequested = sal::static_int_cast<sal_Int32>(n); comphelper::string::padToLength(aBuffer, nRequested, ' '); @@ -670,7 +670,7 @@ SbError SbiStream::Read( char& ch ) if (aLine.isEmpty()) { Read( aLine, 0 ); - aLine = aLine + rtl::OString('\n'); + aLine = aLine + OString('\n'); } ch = aLine[0]; aLine = aLine.copy(1); @@ -701,15 +701,15 @@ void SbiStream::ExpandFile() namespace { - void WriteLines(SvStream &rStream, const rtl::OString& rStr) + void WriteLines(SvStream &rStream, const OString& rStr) { - rtl::OString aStr(convertLineEnd(rStr, rStream.GetLineDelimiter()) ); + OString aStr(convertLineEnd(rStr, rStream.GetLineDelimiter()) ); write_uInt8s_FromOString(rStream, aStr); endl( rStream ); } } -SbError SbiStream::Write( const rtl::OString& rBuf, sal_uInt16 n ) +SbError SbiStream::Write( const OString& rBuf, sal_uInt16 n ) { ExpandFile(); if( IsAppend() ) @@ -730,7 +730,7 @@ SbError SbiStream::Write( const rtl::OString& rBuf, sal_uInt16 n ) aLine = aLine.copy(0, nLineLen); } WriteLines(*pStrm, aLine); - aLine = rtl::OString(); + aLine = OString(); } } else @@ -779,7 +779,7 @@ SbError SbiIoSystem::GetError() return n; } -void SbiIoSystem::Open(short nCh, const rtl::OString& rName, short nMode, short nFlags, short nLen) +void SbiIoSystem::Open(short nCh, const OString& rName, short nMode, short nFlags, short nLen) { nError = 0; if( nCh >= CHANNELS || !nCh ) @@ -842,7 +842,7 @@ void SbiIoSystem::Shutdown() // anything left to PRINT? if( !aOut.isEmpty() ) { - OUString aOutStr(rtl::OStringToOUString(aOut, osl_getThreadTextEncoding())); + OUString aOutStr(OStringToOUString(aOut, osl_getThreadTextEncoding())); #if defined __GNUC__ Window* pParent = Application::GetDefDialogParent(); MessBox( pParent, WinBits( WB_OK ), OUString(), aOutStr ).Execute(); @@ -850,11 +850,11 @@ void SbiIoSystem::Shutdown() MessBox( GetpApp()->GetDefDialogParent(), WinBits( WB_OK ), OUString(), aOutStr ).Execute(); #endif } - aOut = rtl::OString(); + aOut = OString(); } -void SbiIoSystem::Read(rtl::OString& rBuf, short n) +void SbiIoSystem::Read(OString& rBuf, short n) { if( !nChan ) { @@ -878,7 +878,7 @@ char SbiIoSystem::Read() if( aIn.isEmpty() ) { ReadCon( aIn ); - aIn = aIn + rtl::OString('\n'); + aIn = aIn + OString('\n'); } ch = aIn[0]; aIn = aIn.copy(1); @@ -894,7 +894,7 @@ char SbiIoSystem::Read() return ch; } -void SbiIoSystem::Write(const rtl::OString& rBuf, short n) +void SbiIoSystem::Write(const OString& rBuf, short n) { if( !nChan ) { @@ -946,9 +946,9 @@ void SbiIoSystem::CloseAll(void) ***************************************************************************/ -void SbiIoSystem::ReadCon(rtl::OString& rIn) +void SbiIoSystem::ReadCon(OString& rIn) { - OUString aPromptStr(rtl::OStringToOUString(aPrompt, osl_getThreadTextEncoding())); + OUString aPromptStr(OStringToOUString(aPrompt, osl_getThreadTextEncoding())); SbiInputDialog aDlg( NULL, aPromptStr ); if( aDlg.Execute() ) { @@ -958,12 +958,12 @@ void SbiIoSystem::ReadCon(rtl::OString& rIn) { nError = SbERR_USER_ABORT; } - aPrompt = rtl::OString(); + aPrompt = OString(); } // output of a MessageBox, if theres a CR in the console-buffer -void SbiIoSystem::WriteCon(const rtl::OString& rText) +void SbiIoSystem::WriteCon(const OString& rText) { aOut += rText; sal_Int32 n1 = aOut.indexOf('\n'); @@ -988,7 +988,7 @@ void SbiIoSystem::WriteCon(const rtl::OString& rText) { aOut = aOut.copy(1); } - OUString aStr(rtl::OStringToOUString(s, osl_getThreadTextEncoding())); + OUString aStr(OStringToOUString(s, osl_getThreadTextEncoding())); { SolarMutexGuard aSolarGuard; if( !MessBox( GetpApp()->GetDefDialogParent(), diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx index dc9456692af6..f9872b43616b 100644 --- a/basic/source/runtime/methods1.cxx +++ b/basic/source/runtime/methods1.cxx @@ -1063,7 +1063,7 @@ static sal_Bool lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm, { // without any length information! without end-identifier! // What does that mean for Unicode?! Choosing conversion to ByteString... - rtl::OString aByteStr(rtl::OUStringToOString(rStr, osl_getThreadTextEncoding())); + OString aByteStr(OUStringToOString(rStr, osl_getThreadTextEncoding())); *pStrm << (const char*)aByteStr.getStr(); } } @@ -1322,7 +1322,7 @@ RTLFUNC(Environ) } OUString aResult; // should be ANSI but that's not possible under Win16 in the DLL - rtl::OString aByteStr(rtl::OUStringToOString(rPar.Get(1)->GetOUString(), + OString aByteStr(OUStringToOString(rPar.Get(1)->GetOUString(), osl_getThreadTextEncoding())); const char* pEnvStr = getenv(aByteStr.getStr()); if ( pEnvStr ) @@ -2661,7 +2661,7 @@ RTLFUNC(Round) rPar.Get(0)->PutDouble( dRes ); } -void CallFunctionAccessFunction( const Sequence< Any >& aArgs, const rtl::OUString& sFuncName, SbxVariable* pRet ) +void CallFunctionAccessFunction( const Sequence< Any >& aArgs, const OUString& sFuncName, SbxVariable* pRet ) { static Reference< XFunctionAccess > xFunc; Any aRes; @@ -3268,7 +3268,7 @@ RTLFUNC(Input) return; } - rtl::OString aByteBuffer; + OString aByteBuffer; SbError err = pSbStrm->Read( aByteBuffer, nByteCount, true ); if( !err ) err = pIosys->GetError(); @@ -3278,7 +3278,7 @@ RTLFUNC(Input) StarBASIC::Error( err ); return; } - rPar.Get(0)->PutString(rtl::OStringToOUString(aByteBuffer, osl_getThreadTextEncoding())); + rPar.Get(0)->PutString(OStringToOUString(aByteBuffer, osl_getThreadTextEncoding())); } RTLFUNC(Me) diff --git a/basic/source/runtime/sbdiagnose.cxx b/basic/source/runtime/sbdiagnose.cxx index 2168c04956f2..3fab4909c758 100644 --- a/basic/source/runtime/sbdiagnose.cxx +++ b/basic/source/runtime/sbdiagnose.cxx @@ -63,7 +63,7 @@ void DbgReportAssertion( const sal_Char* i_assertionMessage ) SbxArrayRef const xArguments( new SbxArray( SbxVARIANT ) ); SbxVariableRef const xMessageText = new SbxVariable( SbxSTRING ); - xMessageText->PutString( rtl::OUString::createFromAscii(i_assertionMessage) ); + xMessageText->PutString( OUString::createFromAscii(i_assertionMessage) ); xArguments->Put( xMessageText, 1 ); ErrCode const nError = xAssertionChannelBasic->Call( sCaptureFunctionName, xArguments ); diff --git a/basic/source/runtime/stdobj.cxx b/basic/source/runtime/stdobj.cxx index 752e6cd5b854..08158045689e 100644 --- a/basic/source/runtime/stdobj.cxx +++ b/basic/source/runtime/stdobj.cxx @@ -715,7 +715,7 @@ SbiStdObject::SbiStdObject( const OUString& r, StarBASIC* pb ) : SbxObject( r ) if( !p->nHash ) while( p->nArgs != -1 ) { - OUString aName_ = rtl::OUString::createFromAscii( p->pName ); + OUString aName_ = OUString::createFromAscii( p->pName ); p->nHash = SbxVariable::MakeHashCode( aName_ ); p += ( p->nArgs & _ARGSMASK ) + 1; } @@ -791,7 +791,7 @@ SbxVariable* SbiStdObject::Find( const OUString& rName, SbxClassType t ) short nType = ( p->nArgs & _TYPEMASK ); if( p->nArgs & _CONST ) nAccess |= SBX_CONST; - OUString aName_ = rtl::OUString::createFromAscii( p->pName ); + OUString aName_ = OUString::createFromAscii( p->pName ); SbxClassType eCT = SbxCLASS_OBJECT; if( nType & _PROPERTY ) { @@ -866,7 +866,7 @@ SbxInfo* SbiStdObject::GetInfo( short nIdx ) for( short i = 0; i < nPar; i++ ) { p++; - OUString aName_ = rtl::OUString::createFromAscii( p->pName ); + OUString aName_ = OUString::createFromAscii( p->pName ); sal_uInt16 nFlags_ = ( p->nArgs >> 8 ) & 0x03; if( p->nArgs & _OPT ) { diff --git a/basic/source/runtime/step0.cxx b/basic/source/runtime/step0.cxx index 413548308c81..37e21162c353 100644 --- a/basic/source/runtime/step0.cxx +++ b/basic/source/runtime/step0.cxx @@ -1307,7 +1307,7 @@ void SbiRuntime::StepLINPUT() pIosys->Read( aInput ); Error( pIosys->GetError() ); SbxVariableRef p = PopVar(); - p->PutString(rtl::OStringToOUString(aInput, osl_getThreadTextEncoding())); + p->PutString(OStringToOUString(aInput, osl_getThreadTextEncoding())); } // end of program @@ -1425,7 +1425,7 @@ void SbiRuntime::StepPRINT() // print TOS s = " "; // one blank before } s += s1; - OString aByteStr(rtl::OUStringToOString(s, osl_getThreadTextEncoding())); + OString aByteStr(OUStringToOString(s, osl_getThreadTextEncoding())); pIosys->Write( aByteStr ); Error( pIosys->GetError() ); } @@ -1469,7 +1469,7 @@ void SbiRuntime::StepWRITE() // write TOS { s += OUString(ch); } - OString aByteStr(rtl::OUStringToOString(s, osl_getThreadTextEncoding())); + OString aByteStr(OUStringToOString(s, osl_getThreadTextEncoding())); pIosys->Write( aByteStr ); Error( pIosys->GetError() ); } @@ -1496,7 +1496,7 @@ void SbiRuntime::StepRENAME() // Rename Tos+1 to Tos void SbiRuntime::StepPROMPT() { SbxVariableRef p = PopVar(); - rtl::OString aStr(rtl::OUStringToOString(p->GetOUString(), osl_getThreadTextEncoding())); + OString aStr(OUStringToOString(p->GetOUString(), osl_getThreadTextEncoding())); pIosys->SetPrompt( aStr ); } diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx index f6b39b4952a7..07b94b398ec0 100644 --- a/basic/source/sbx/sbxbase.cxx +++ b/basic/source/sbx/sbxbase.cxx @@ -170,7 +170,7 @@ SbxBase* SbxBase::Create( sal_uInt16 nSbxId, sal_uInt32 nCreator ) if( nSbxId == 0x65 ) // Dialog Id return new SbxVariable; - rtl::OUString aEmptyStr; + OUString aEmptyStr; if( nCreator == SBXCR_SBX ) switch( nSbxId ) { @@ -198,7 +198,7 @@ SbxBase* SbxBase::Create( sal_uInt16 nSbxId, sal_uInt32 nCreator ) return pNew; } -SbxObject* SbxBase::CreateObject( const rtl::OUString& rClass ) +SbxObject* SbxBase::CreateObject( const OUString& rClass ) { SbxAppData& r = GetSbxData_Impl(); SbxObject* pNew = NULL; @@ -341,7 +341,7 @@ SbxBase* SbxFactory::Create( sal_uInt16, sal_uInt32 ) return NULL; } -SbxObject* SbxFactory::CreateObject( const rtl::OUString& ) +SbxObject* SbxFactory::CreateObject( const OUString& ) { return NULL; } @@ -351,7 +351,7 @@ SbxObject* SbxFactory::CreateObject( const rtl::OUString& ) SbxInfo::~SbxInfo() {} -void SbxInfo::AddParam(const rtl::OUString& rName, SbxDataType eType, sal_uInt16 nFlags) +void SbxInfo::AddParam(const OUString& rName, SbxDataType eType, sal_uInt16 nFlags) { aParams.push_back(new SbxParamInfo(rName, eType, nFlags)); } @@ -377,7 +377,7 @@ sal_Bool SbxInfo::LoadData( SvStream& rStrm, sal_uInt16 nVer ) { sal_uInt16 nType, nFlags; sal_uInt32 nUserData = 0; - rtl::OUString aName = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rStrm, + OUString aName = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rStrm, RTL_TEXTENCODING_ASCII_US); rStrm >> nType >> nFlags; if( nVer > 1 ) diff --git a/basic/source/sbx/sbxcoll.cxx b/basic/source/sbx/sbxcoll.cxx index 40b4a9fb2fd7..581d98d2a976 100644 --- a/basic/source/sbx/sbxcoll.cxx +++ b/basic/source/sbx/sbxcoll.cxx @@ -37,10 +37,10 @@ SbxCollection::SbxCollection( const OUString& rClass ) { if( !nCountHash ) { - pCount = rtl::OUString::createFromAscii(GetSbxRes( STRING_COUNTPROP )); - pAdd = rtl::OUString::createFromAscii(GetSbxRes( STRING_ADDMETH )); - pItem = rtl::OUString::createFromAscii(GetSbxRes( STRING_ITEMMETH )); - pRemove = rtl::OUString::createFromAscii(GetSbxRes( STRING_REMOVEMETH )); + pCount = OUString::createFromAscii(GetSbxRes( STRING_COUNTPROP )); + pAdd = OUString::createFromAscii(GetSbxRes( STRING_ADDMETH )); + pItem = OUString::createFromAscii(GetSbxRes( STRING_ITEMMETH )); + pRemove = OUString::createFromAscii(GetSbxRes( STRING_REMOVEMETH )); nCountHash = MakeHashCode( pCount ); nAddHash = MakeHashCode( pAdd ); nItemHash = MakeHashCode( pItem ); @@ -101,7 +101,7 @@ SbxVariable* SbxCollection::FindUserData( sal_uInt32 nData ) } } -SbxVariable* SbxCollection::Find( const rtl::OUString& rName, SbxClassType t ) +SbxVariable* SbxCollection::Find( const OUString& rName, SbxClassType t ) { if( GetParameters() ) { diff --git a/basic/source/sbx/sbxcurr.cxx b/basic/source/sbx/sbxcurr.cxx index 7b4bde230f2e..328bbcf72a9c 100644 --- a/basic/source/sbx/sbxcurr.cxx +++ b/basic/source/sbx/sbxcurr.cxx @@ -26,7 +26,7 @@ #include "sbxconv.hxx" -static rtl::OUString ImpCurrencyToString( const sal_Int64 &rVal ) +static OUString ImpCurrencyToString( const sal_Int64 &rVal ) { bool isNeg = ( rVal < 0 ); sal_Int64 absVal = isNeg ? -rVal : rVal; @@ -37,8 +37,8 @@ static rtl::OUString ImpCurrencyToString( const sal_Int64 &rVal ) ImpGetIntntlSep( cDecimalSep, cThousandSep ); #endif - rtl::OUString aAbsStr = rtl::OUString::valueOf( absVal ); - rtl::OUStringBuffer aBuf; + OUString aAbsStr = OUString::valueOf( absVal ); + OUStringBuffer aBuf; sal_Int32 initialLen = aAbsStr.getLength(); @@ -102,7 +102,7 @@ static rtl::OUString ImpCurrencyToString( const sal_Int64 &rVal ) } -static sal_Int64 ImpStringToCurrency( const rtl::OUString &rStr ) +static sal_Int64 ImpStringToCurrency( const OUString &rStr ) { sal_Int32 nFractDigit = 4; @@ -155,11 +155,11 @@ static sal_Int64 ImpStringToCurrency( const rtl::OUString &rStr ) // we should share some existing ( possibly from calc is there a currency // conversion there ? #TODO check ) - rtl::OUString sTmp( rStr.trim() ); + OUString sTmp( rStr.trim() ); const sal_Unicode* p = sTmp.getStr(); // normalise string number by removeing thousands & decimal point seperators - rtl::OUStringBuffer sNormalisedNumString( sTmp.getLength() + nFractDigit ); + OUStringBuffer sNormalisedNumString( sTmp.getLength() + nFractDigit ); if ( *p == '-' || *p == '+' ) sNormalisedNumString.append( *p ); @@ -430,7 +430,7 @@ start: case SbxSTRING: case SbxLPSTR: if( !p->pOUString ) - p->pOUString = new rtl::OUString; + p->pOUString = new OUString; *p->pOUString = ImpCurrencyToString( r ); break; diff --git a/basic/source/sbx/sbxform.cxx b/basic/source/sbx/sbxform.cxx index de96b62ecd53..3a3d5bfe73db 100644 --- a/basic/source/sbx/sbxform.cxx +++ b/basic/source/sbx/sbxform.cxx @@ -246,7 +246,7 @@ void SbxBasicFormater::InitScan( double _dNum ) InitExp( get_number_of_digits( dNum ) ); // maximum of 15 positions behind the decimal point, example: -1.234000000000000E-001 /*int nCount =*/ sprintf( sBuffer,"%+22.15lE",dNum ); - sSciNumStrg = rtl::OUString::createFromAscii( sBuffer ); + sSciNumStrg = OUString::createFromAscii( sBuffer ); } @@ -255,7 +255,7 @@ void SbxBasicFormater::InitExp( double _dNewExp ) char sBuffer[ MAX_DOUBLE_BUFFER_LENGTH ]; nNumExp = (short)_dNewExp; /*int nCount =*/ sprintf( sBuffer,"%+i",nNumExp ); - sNumExpStrg = rtl::OUString::createFromAscii( sBuffer ); + sNumExpStrg = OUString::createFromAscii( sBuffer ); nExpExp = (short)get_number_of_digits( (double)nNumExp ); } @@ -386,7 +386,7 @@ OUString SbxBasicFormater::GetPosFormatString( const OUString& sFormatStrg, sal_ } OUString aRetStr; - aRetStr = rtl::OUString::createFromAscii( EMPTYFORMATSTRING ); + aRetStr = OUString::createFromAscii( EMPTYFORMATSTRING ); return aRetStr; } @@ -413,7 +413,7 @@ OUString SbxBasicFormater::GetNegFormatString( const OUString& sFormatStrg, sal_ } } OUString aRetStr; - aRetStr = rtl::OUString::createFromAscii( EMPTYFORMATSTRING ); + aRetStr = OUString::createFromAscii( EMPTYFORMATSTRING ); return aRetStr; } @@ -446,7 +446,7 @@ OUString SbxBasicFormater::Get0FormatString( const OUString& sFormatStrg, sal_Bo } OUString aRetStr; - aRetStr = rtl::OUString::createFromAscii( EMPTYFORMATSTRING ); + aRetStr = OUString::createFromAscii( EMPTYFORMATSTRING ); return aRetStr; } @@ -475,7 +475,7 @@ OUString SbxBasicFormater::GetNullFormatString( const OUString& sFormatStrg, sal } OUString aRetStr; - aRetStr = rtl::OUString::createFromAscii( EMPTYFORMATSTRING ); + aRetStr = OUString::createFromAscii( EMPTYFORMATSTRING ); return aRetStr; } @@ -961,7 +961,7 @@ OUString SbxBasicFormater::BasicFormatNull( OUString sFormatStrg ) return sNullFormatStrg; } OUString aRetStr; - aRetStr = rtl::OUString::createFromAscii( "null" ); + aRetStr = OUString::createFromAscii( "null" ); return aRetStr; } @@ -972,7 +972,7 @@ OUString SbxBasicFormater::BasicFormat( double dNumber, OUString sFormatStrg ) // analyse format-string concerning predefined formats: if( sFormatStrg.equalsIgnoreAsciiCase( BASICFORMAT_GENERALNUMBER ) ) { - sFormatStrg = rtl::OUString::createFromAscii( GENERALNUMBER_FORMAT ); + sFormatStrg = OUString::createFromAscii( GENERALNUMBER_FORMAT ); } if( sFormatStrg.equalsIgnoreAsciiCase( BASICFORMAT_CURRENCY ) ) { @@ -980,19 +980,19 @@ OUString SbxBasicFormater::BasicFormat( double dNumber, OUString sFormatStrg ) } if( sFormatStrg.equalsIgnoreAsciiCase( BASICFORMAT_FIXED ) ) { - sFormatStrg = rtl::OUString::createFromAscii( FIXED_FORMAT ); + sFormatStrg = OUString::createFromAscii( FIXED_FORMAT ); } if( sFormatStrg.equalsIgnoreAsciiCase( BASICFORMAT_STANDARD ) ) { - sFormatStrg = rtl::OUString::createFromAscii( STANDARD_FORMAT ); + sFormatStrg = OUString::createFromAscii( STANDARD_FORMAT ); } if( sFormatStrg.equalsIgnoreAsciiCase( BASICFORMAT_PERCENT ) ) { - sFormatStrg = rtl::OUString::createFromAscii( PERCENT_FORMAT ); + sFormatStrg = OUString::createFromAscii( PERCENT_FORMAT ); } if( sFormatStrg.equalsIgnoreAsciiCase( BASICFORMAT_SCIENTIFIC ) ) { - sFormatStrg = rtl::OUString::createFromAscii( SCIENTIFIC_FORMAT ); + sFormatStrg = OUString::createFromAscii( SCIENTIFIC_FORMAT ); } if( sFormatStrg.equalsIgnoreAsciiCase( BASICFORMAT_YESNO ) ) { diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx index 6cbef74a6876..625917eb2fab 100644 --- a/basic/source/sbx/sbxobj.cxx +++ b/basic/source/sbx/sbxobj.cxx @@ -214,8 +214,8 @@ SbxVariable* SbxObject::Find( const OUString& rName, SbxClassType t ) #ifdef DBG_UTIL static sal_uInt16 nLvl = 0; static const char* pCls[] = { "DontCare","Array","Value","Variable","Method","Property","Object" }; - rtl::OString aNameStr1(OUStringToOString(rName, RTL_TEXTENCODING_ASCII_US)); - rtl::OString aNameStr2(OUStringToOString(SbxVariable::GetName(), RTL_TEXTENCODING_ASCII_US)); + OString aNameStr1(OUStringToOString(rName, RTL_TEXTENCODING_ASCII_US)); + OString aNameStr2(OUStringToOString(SbxVariable::GetName(), RTL_TEXTENCODING_ASCII_US)); DbgOutf( "SBX: Search %.*s %s %s in %s", nLvl++, " ", ( t >= SbxCLASS_DONTCARE && t <= SbxCLASS_OBJECT ) @@ -283,8 +283,8 @@ SbxVariable* SbxObject::Find( const OUString& rName, SbxClassType t ) nLvl--; if( pRes ) { - rtl::OString aNameStr3(OUStringToOString(rName, RTL_TEXTENCODING_ASCII_US)); - rtl::OString aNameStr4(OUStringToOString(SbxVariable::GetName(), RTL_TEXTENCODING_ASCII_US)); + OString aNameStr3(OUStringToOString(rName, RTL_TEXTENCODING_ASCII_US)); + OString aNameStr4(OUStringToOString(SbxVariable::GetName(), RTL_TEXTENCODING_ASCII_US)); DbgOutf( "SBX: Found %.*s %s in %s", nLvl, " ", aNameStr3.getStr(), aNameStr4.getStr() ); } @@ -499,8 +499,8 @@ void SbxObject::Insert( SbxVariable* pVar ) { aVarName = PTR_CAST(SbxObject,pVar)->GetClassName(); } - rtl::OString aNameStr1(OUStringToOString(aVarName, RTL_TEXTENCODING_ASCII_US)); - rtl::OString aNameStr2(OUStringToOString(SbxVariable::GetName(), RTL_TEXTENCODING_ASCII_US)); + OString aNameStr1(OUStringToOString(aVarName, RTL_TEXTENCODING_ASCII_US)); + OString aNameStr2(OUStringToOString(SbxVariable::GetName(), RTL_TEXTENCODING_ASCII_US)); DbgOutf( "SBX: Insert %s %s in %s", ( pVar->GetClass() >= SbxCLASS_DONTCARE && pVar->GetClass() <= SbxCLASS_OBJECT ) @@ -542,8 +542,8 @@ void SbxObject::QuickInsert( SbxVariable* pVar ) { aVarName = PTR_CAST(SbxObject,pVar)->GetClassName(); } - rtl::OString aNameStr1(OUStringToOString(aVarName, RTL_TEXTENCODING_ASCII_US)); - rtl::OString aNameStr2(OUStringToOString(SbxVariable::GetName(), RTL_TEXTENCODING_ASCII_US)); + OString aNameStr1(OUStringToOString(aVarName, RTL_TEXTENCODING_ASCII_US)); + OString aNameStr2(OUStringToOString(SbxVariable::GetName(), RTL_TEXTENCODING_ASCII_US)); DbgOutf( "SBX: Insert %s %s in %s", ( pVar->GetClass() >= SbxCLASS_DONTCARE && pVar->GetClass() <= SbxCLASS_OBJECT ) @@ -569,8 +569,8 @@ void SbxObject::Remove( SbxVariable* pVar ) { aVarName = PTR_CAST(SbxObject,pVar)->GetClassName(); } - rtl::OString aNameStr1(OUStringToOString(aVarName, RTL_TEXTENCODING_ASCII_US)); - rtl::OString aNameStr2(OUStringToOString(SbxVariable::GetName(), RTL_TEXTENCODING_ASCII_US)); + OString aNameStr1(OUStringToOString(aVarName, RTL_TEXTENCODING_ASCII_US)); + OString aNameStr2(OUStringToOString(SbxVariable::GetName(), RTL_TEXTENCODING_ASCII_US)); DbgOutf( "SBX: Remove %s in %s", aNameStr1.getStr(), aNameStr2.getStr() ); #endif @@ -825,10 +825,10 @@ void SbxObject::Dump( SvStream& rStrm, sal_Bool bFill ) GetAll( SbxCLASS_DONTCARE ); } // Output the data of the object itself - rtl::OString aNameStr(OUStringToOString(GetName(), RTL_TEXTENCODING_ASCII_US)); - rtl::OString aClassNameStr(OUStringToOString(aClassName, RTL_TEXTENCODING_ASCII_US)); + OString aNameStr(OUStringToOString(GetName(), RTL_TEXTENCODING_ASCII_US)); + OString aClassNameStr(OUStringToOString(aClassName, RTL_TEXTENCODING_ASCII_US)); rStrm << "Object( " - << rtl::OString::valueOf(reinterpret_cast<sal_Int64>(this)).getStr()<< "=='" + << OString::valueOf(reinterpret_cast<sal_Int64>(this)).getStr()<< "=='" << ( aNameStr.isEmpty() ? "<unnamed>" : aNameStr.getStr() ) << "', " << "of class '" << aClassNameStr.getStr() << "', " << "counts " @@ -836,9 +836,9 @@ void SbxObject::Dump( SvStream& rStrm, sal_Bool bFill ) << " refs, "; if ( GetParent() ) { - rtl::OString aParentNameStr(OUStringToOString(GetName(), RTL_TEXTENCODING_ASCII_US)); + OString aParentNameStr(OUStringToOString(GetName(), RTL_TEXTENCODING_ASCII_US)); rStrm << "in parent " - << rtl::OString::valueOf(reinterpret_cast<sal_Int64>(GetParent())).getStr() + << OString::valueOf(reinterpret_cast<sal_Int64>(GetParent())).getStr() << "=='" << ( aParentNameStr.isEmpty() ? "<unnamed>" : aParentNameStr.getStr() ) << "'"; } else @@ -846,14 +846,14 @@ void SbxObject::Dump( SvStream& rStrm, sal_Bool bFill ) rStrm << "no parent "; } rStrm << " )" << endl; - rtl::OString aIndentNameStr(OUStringToOString(aIndent, RTL_TEXTENCODING_ASCII_US)); + OString aIndentNameStr(OUStringToOString(aIndent, RTL_TEXTENCODING_ASCII_US)); rStrm << aIndentNameStr.getStr() << "{" << endl; // Flags OUString aAttrs; if( CollectAttrs( this, aAttrs ) ) { - rtl::OString aAttrStr(OUStringToOString(aAttrs, RTL_TEXTENCODING_ASCII_US)); + OString aAttrStr(OUStringToOString(aAttrs, RTL_TEXTENCODING_ASCII_US)); rStrm << aIndentNameStr.getStr() << "- Flags: " << aAttrStr.getStr() << endl; } diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx index e7b02c4043dd..b6927200fb03 100644 --- a/basic/source/sbx/sbxvar.cxx +++ b/basic/source/sbx/sbxvar.cxx @@ -132,7 +132,7 @@ void removeDimAsNewRecoverItem( SbxVariable* pVar ); SbxVariable::~SbxVariable() { #ifdef DBG_UTIL - OString aBStr(rtl::OUStringToOString(maName, RTL_TEXTENCODING_ASCII_US)); + OString aBStr(OUStringToOString(maName, RTL_TEXTENCODING_ASCII_US)); DbgOutf( "SbxVariable::Dtor %lx (%s)", (void*)this, aBStr.getStr() ); if ( maName.equalsAscii( "Cells")) { @@ -451,7 +451,7 @@ void SbxVariable::SetParent( SbxObject* p ) aMsg += "].SetParent(["; aMsg += p->GetName(); aMsg += "])"; - rtl::OString aBStr(rtl::OUStringToOString(aMsg, RTL_TEXTENCODING_ASCII_US)); + OString aBStr(OUStringToOString(aMsg, RTL_TEXTENCODING_ASCII_US)); DbgOut( aBStr.getStr(), DBG_OUT_WARNING, __FILE__, __LINE__); } } @@ -735,11 +735,11 @@ void SbxAlias::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, void SbxVariable::Dump( SvStream& rStrm, sal_Bool bFill ) { - rtl::OString aBNameStr(rtl::OUStringToOString(GetName( SbxNAME_SHORT_TYPES ), RTL_TEXTENCODING_ASCII_US)); + OString aBNameStr(OUStringToOString(GetName( SbxNAME_SHORT_TYPES ), RTL_TEXTENCODING_ASCII_US)); rStrm << "Variable( " - << rtl::OString::valueOf(reinterpret_cast<sal_Int64>(this)).getStr() << "==" + << OString::valueOf(reinterpret_cast<sal_Int64>(this)).getStr() << "==" << aBNameStr.getStr(); - rtl::OString aBParentNameStr(rtl::OUStringToOString(GetParent()->GetName(), RTL_TEXTENCODING_ASCII_US)); + OString aBParentNameStr(OUStringToOString(GetParent()->GetName(), RTL_TEXTENCODING_ASCII_US)); if ( GetParent() ) { rStrm << " in parent '" << aBParentNameStr.getStr() << "'"; diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx index 8f663de41228..f983ba71c41e 100644 --- a/basic/source/uno/namecont.cxx +++ b/basic/source/uno/namecont.cxx @@ -1029,8 +1029,8 @@ void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL, INetURLObject aPrevUserBasicInetObj_1( aUserBasicInetObj ); aPrevUserBasicInetObj_1.removeSegment(); INetURLObject aPrevUserBasicInetObj_2 = aPrevUserBasicInetObj_1; - aPrevUserBasicInetObj_1.Append( rtl::OString( strPrevFolderName_1 )); - aPrevUserBasicInetObj_2.Append( rtl::OString( strPrevFolderName_2 )); + aPrevUserBasicInetObj_1.Append( OString( strPrevFolderName_1 )); + aPrevUserBasicInetObj_2.Append( OString( strPrevFolderName_2 )); // #i93163 bool bCleanUp = false; @@ -1095,7 +1095,7 @@ void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL, OUString aFolderUserBasic = aUserBasicInetObj.GetMainURL( INetURLObject::NO_DECODE ); INetURLObject aUserBasicTmpInetObj( aUserBasicInetObj ); aUserBasicTmpInetObj.removeSegment(); - aUserBasicTmpInetObj.Append( rtl::OString( "__basic_tmp" )); + aUserBasicTmpInetObj.Append( OString( "__basic_tmp" )); OUString aFolderTmp = aUserBasicTmpInetObj.GetMainURL( INetURLObject::NO_DECODE ); mxSFI->move( aFolderUserBasic, aFolderTmp ); @@ -1225,7 +1225,7 @@ void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL, static const char strErrorSavFolderName[] = "__basic_80_err"; INetURLObject aPrevUserBasicInetObj_Err( aUserBasicInetObj ); aPrevUserBasicInetObj_Err.removeSegment(); - aPrevUserBasicInetObj_Err.Append( rtl::OString( strErrorSavFolderName )); + aPrevUserBasicInetObj_Err.Append( OString( strErrorSavFolderName )); OUString aPrevFolder_Err = aPrevUserBasicInetObj_Err.GetMainURL( INetURLObject::NO_DECODE ); bool bSaved = false; |