summaryrefslogtreecommitdiff
path: root/basic/source/sbx
diff options
context:
space:
mode:
Diffstat (limited to 'basic/source/sbx')
-rw-r--r--basic/source/sbx/sbxbase.cxx10
-rw-r--r--basic/source/sbx/sbxcoll.cxx10
-rw-r--r--basic/source/sbx/sbxcurr.cxx14
-rw-r--r--basic/source/sbx/sbxform.cxx24
-rw-r--r--basic/source/sbx/sbxobj.cxx34
-rw-r--r--basic/source/sbx/sbxvar.cxx10
6 files changed, 51 insertions, 51 deletions
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() << "'";
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-01 03:13:33 +0000