summaryrefslogtreecommitdiff
path: root/basic/source/runtime
diff options
context:
space:
mode:
Diffstat (limited to 'basic/source/runtime')
-rw-r--r--basic/source/runtime/ddectrl.cxx2
-rw-r--r--basic/source/runtime/dllmgr-none.cxx4
-rw-r--r--basic/source/runtime/dllmgr.hxx4
-rw-r--r--basic/source/runtime/iosys.cxx40
-rw-r--r--basic/source/runtime/methods1.cxx10
-rw-r--r--basic/source/runtime/sbdiagnose.cxx2
-rw-r--r--basic/source/runtime/stdobj.cxx6
-rw-r--r--basic/source/runtime/step0.cxx8
8 files changed, 38 insertions, 38 deletions
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 );
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-30 17:43:58 +0000