diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-12-01 23:31:52 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-12-06 10:33:04 +0000 |
| commit | cd676159ca49756549fa81b29caf77a805cb4a5e (patch) | |
| tree | eae9e14a9dfe2085dd9d0da39c008b6f076d9feb /idl | |
| parent | 73a395cdc7d3ad802182a470c799720307ed408e (diff) | |
ByteString->rtl::OString[Buffer]
Diffstat (limited to 'idl')
| -rw-r--r-- | idl/source/objects/slot.cxx | 22 | ||||
| -rw-r--r-- | idl/source/prj/database.cxx | 6 |
2 files changed, 14 insertions, 14 deletions
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx index 2434a10ecb62..36115d918aab 100644 --- a/idl/source/objects/slot.cxx +++ b/idl/source/objects/slot.cxx @@ -843,10 +843,10 @@ sal_Bool SvMetaSlot::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) } else { - ByteString aStr( "attribute " ); - aStr += pAttr->GetName(); - aStr += " is method or variable but not a slot"; - rBase.SetError( aStr, rInStm.GetToken() ); + rtl::OStringBuffer aStr( "attribute " ); + aStr.append(pAttr->GetName()); + aStr.append(" is method or variable but not a slot"); + rBase.SetError( aStr.makeStringAndClear(), rInStm.GetToken() ); rBase.WriteError( rInStm ); bOk = sal_False; } @@ -876,10 +876,10 @@ sal_Bool SvMetaSlot::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) } else { - ByteString aStr( "attribute " ); - aStr += pAttr2->GetName(); - aStr += " is method or variable but not a slot"; - rBase.SetError( aStr, rInStm.GetToken() ); + rtl::OStringBuffer aStr("attribute "); + aStr.append(pAttr2->GetName()); + aStr.append(" is method or variable but not a slot"); + rBase.SetError( aStr.makeStringAndClear(), rInStm.GetToken() ); rBase.WriteError( rInStm ); bOk = sal_False; } @@ -1084,9 +1084,9 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const ByteString & rPrefix, static ByteString MakeSlotName( SvStringHashEntry * pEntry ) { - ByteString aName( "SFX_SLOT_" ); - aName += pEntry->GetName(); - return aName.ToUpperAscii(); + rtl::OStringBuffer aName(RTL_CONSTASCII_STRINGPARAM("SFX_SLOT_")); + aName.append(pEntry->GetName()); + return aName.makeStringAndClear().toAsciiUpperCase(); }; void SvMetaSlot::WriteSlotStubs( const ByteString & rShellName, diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx index 4ca16cbe9cf9..e76434e7996c 100644 --- a/idl/source/prj/database.cxx +++ b/idl/source/prj/database.cxx @@ -490,9 +490,9 @@ SvMetaAttribute * SvIdlDataBase::ReadKnownAttr } } - ByteString aStr( "Nicht gefunden : " ); - aStr += pTok->GetString(); - OSL_FAIL( aStr.GetBuffer() ); + rtl::OStringBuffer aStr("Nicht gefunden : "); + aStr.append(pTok->GetString()); + OSL_FAIL(aStr.getStr()); } } |