From 8cbfe4e211e1aafe6cab64682b3e326153bdfb1e Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Tue, 13 Dec 2011 23:13:22 +0000
Subject: ByteString->rtl::OString[Buffer]

---
 idl/source/objects/module.cxx |  6 +++---
 idl/source/objects/object.cxx | 20 ++++++++++----------
 idl/source/prj/command.cxx    |  6 +++---
 idl/source/prj/database.cxx   | 13 +++++++------
 idl/source/prj/globals.cxx    |  2 +-
 5 files changed, 24 insertions(+), 23 deletions(-)

(limited to 'idl')

diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx
index 75af0cfc25a1..ef141a2135b7 100644
--- a/idl/source/objects/module.cxx
+++ b/idl/source/objects/module.cxx
@@ -154,9 +154,9 @@ void SvMetaModule::ReadAttributesSvIdl( SvIdlDataBase & rBase,
         sal_uInt32 nTokPos = rInStm.Tell();
         if( !rBase.ReadIdFile( String::CreateFromAscii( aSlotIdFile.GetBuffer() ) ) )
         {
-            ByteString aStr = "cannot read file: ";
-            aStr += aSlotIdFile;
-            rBase.SetError( aStr, rInStm.GetToken() );
+            rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("cannot read file: "));
+            aStr.append(aSlotIdFile);
+            rBase.SetError( aStr.makeStringAndClear(), rInStm.GetToken() );
             rBase.WriteError( rInStm );
 
             rInStm.Seek( nTokPos );
diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx
index 01dd2d5071c4..30cd08c758f5 100644
--- a/idl/source/objects/object.cxx
+++ b/idl/source/objects/object.cxx
@@ -341,10 +341,10 @@ sal_Bool SvMetaClass::TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInS
                 OSL_FAIL( pS->GetSlotId().GetBuffer() );
                 OSL_FAIL( rAttr.GetSlotId().GetBuffer() );
 
-                ByteString aStr( "Attribute's " );
-                aStr += pS->GetName();
-                aStr += " with different id's";
-                rBase.SetError( aStr, rInStm.GetToken() );
+                rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("Attribute's "));
+                aStr.append(pS->GetName());
+                aStr.append(RTL_CONSTASCII_STRINGPARAM(" with different id's"));
+                rBase.SetError(aStr.makeStringAndClear(), rInStm.GetToken());
                 rBase.WriteError( rInStm );
                 return sal_False;
              }
@@ -361,12 +361,12 @@ sal_Bool SvMetaClass::TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInS
                 OSL_FAIL( pS->GetSlotId().GetBuffer() );
                 OSL_FAIL( rAttr.GetSlotId().GetBuffer() );
 
-                ByteString aStr( "Attribute " );
-                aStr += pS->GetName();
-                aStr += " and Attribute ";
-                aStr += rAttr.GetName();
-                aStr += " with equal id's";
-                rBase.SetError( aStr, rInStm.GetToken() );
+                rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("Attribute "));
+                aStr.append(pS->GetName());
+                aStr.append(RTL_CONSTASCII_STRINGPARAM(" and Attribute "));
+                aStr.append(rAttr.GetName());
+                aStr.append(RTL_CONSTASCII_STRINGPARAM(" with equal id's"));
+                rBase.SetError(aStr.makeStringAndClear(), rInStm.GetToken());
                 rBase.WriteError( rInStm );
                 return sal_False;
              }
diff --git a/idl/source/prj/command.cxx b/idl/source/prj/command.cxx
index 0eece073c550..b7943b66f67b 100644
--- a/idl/source/prj/command.cxx
+++ b/idl/source/prj/command.cxx
@@ -363,13 +363,13 @@ SvCommand::SvCommand( int argc, char ** argv )
         delete aList[ i ];
     aList.clear();
 
-    ByteString aInc( getenv( "INCLUDE" ) );
+    rtl::OString aInc(getenv("INCLUDE"));
     // append include environment variable
-    if( aInc.Len() )
+    if( aInc.getLength() )
     {
         if( aPath.Len() )
             aPath += DirEntry::GetSearchDelimiter();
-        aPath += String::CreateFromAscii( aInc.GetBuffer() );
+        aPath += String::CreateFromAscii( aInc.getStr() );
     }
 }
 
diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx
index e76434e7996c..06d0037511c7 100644
--- a/idl/source/prj/database.cxx
+++ b/idl/source/prj/database.cxx
@@ -239,12 +239,13 @@ sal_Bool SvIdlDataBase::ReadIdFile( const String & rFileName )
                 if( pTok->Is( SvHash_define() ) )
                 {
                     pTok = aTokStm.GetToken_Next();
-                    ByteString aDefName;
+                    rtl::OString aDefName;
                     if( pTok->IsIdentifier() )
                         aDefName = pTok->GetString();
                     else
                     {
-                        ByteString aStr( "unexpected token after define" );
+                        rtl::OString aStr(RTL_CONSTASCII_STRINGPARAM(
+                            "unexpected token after define"));
                         // set error
                         SetError( aStr, pTok );
                         WriteError( aTokStm );
@@ -300,7 +301,7 @@ sal_Bool SvIdlDataBase::ReadIdFile( const String & rFileName )
                     {
                         if( !InsertId( aDefName, nVal ) )
                         {
-                            ByteString aStr = "hash table overflow: ";
+                            rtl::OString aStr(RTL_CONSTASCII_STRINGPARAM("hash table overflow: "));
                             SetError( aStr, pTok );
                             WriteError( aTokStm );
                             return sal_False;
@@ -616,9 +617,9 @@ void SvIdlDataBase::WriteError( SvTokenStream & rInStm )
     }
     if( pTok && pTok->IsIdentifier() )
     {
-        ByteString aN = IDLAPP->pHashTable->GetNearString( pTok->GetString() );
-        if( aN.Len() )
-            fprintf( stderr, "%s versus %s\n", pTok->GetString().GetBuffer(), aN.GetBuffer() );
+        rtl::OString aN = IDLAPP->pHashTable->GetNearString( pTok->GetString() );
+        if( aN.getLength() )
+            fprintf( stderr, "%s versus %s\n", pTok->GetString().GetBuffer(), aN.getStr() );
     }
 }
 
diff --git a/idl/source/prj/globals.cxx b/idl/source/prj/globals.cxx
index 6def78c4ae64..6ed455d1b035 100644
--- a/idl/source/prj/globals.cxx
+++ b/idl/source/prj/globals.cxx
@@ -76,7 +76,7 @@ IdlDll::~IdlDll()
     delete pHashTable;
 }
 
-inline SvStringHashEntry * INS( const ByteString & rName )
+inline SvStringHashEntry * INS( const rtl::OString& rName )
 {
     sal_uInt32  nIdx;
     IDLAPP->pHashTable->Insert( rName, &nIdx );
-- 
cgit