ByteString->rtl::OString[Buffer]

5 files changed, 20 insertions, 17 deletions

diff --git a/idl/inc/lex.hxx b/idl/inc/lex.hxx
index 607f0ec67a8d..c3d28f117a8f 100644
--- a/idl/inc/lex.hxx
+++ b/idl/inc/lex.hxx
@@ -66,7 +66,7 @@ public:
 
     SvToken & operator = ( const SvToken & rObj );
 
-    ByteString          GetTokenAsString() const;
+    rtl::OString GetTokenAsString() const;
     SVTOKEN_ENUM    GetType() const { return nType; }
 
     void        SetLine( sal_uLong nLineP )     { nLine = nLineP;       }
diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx
index e4f405d9e693..b6bdfdbc5779 100644
--- a/idl/inc/types.hxx
+++ b/idl/inc/types.hxx
@@ -245,7 +245,7 @@ public:
     void                WriteTypePrefix( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, WriteType );
     void                WriteMethodArgs( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, WriteType );
     void                WriteTheType( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, WriteType );
-    ByteString              GetParserString() const;
+    rtl::OString GetParserString() const;
     void                WriteParamNames( SvIdlDataBase & rBase, SvStream & rOutStm,
                                         const ByteString & rChief );
 #endif
diff --git a/idl/source/cmptools/lex.cxx b/idl/source/cmptools/lex.cxx
index 244aa23069f1..ace8e064d0de 100644
--- a/idl/source/cmptools/lex.cxx
+++ b/idl/source/cmptools/lex.cxx
@@ -38,9 +38,9 @@
 #include <globals.hxx>
 #include <tools/bigint.hxx>
 
-ByteString SvToken::GetTokenAsString() const
+rtl::OString SvToken::GetTokenAsString() const
 {
-    ByteString aStr;
+    rtl::OString aStr;
     switch( nType )
     {
         case SVTOKEN_EMPTY:
@@ -61,7 +61,7 @@ ByteString SvToken::GetTokenAsString() const
             aStr = aString;
             break;
         case SVTOKEN_CHAR:
-            aStr = cChar;
+            aStr = rtl::OString(cChar);
             break;
         case SVTOKEN_RTTIBASE:
             aStr = "RTTIBASE";
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index 625b06678a8f..d027e8610391 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -1699,14 +1699,14 @@ void SvMetaType::WriteTheType( SvIdlDataBase & rBase, SvStream & rOutStm,
         WriteMethodArgs( rBase, rOutStm, nTab +2, nT );
 }
 
-ByteString SvMetaType::GetParserString() const
+rtl::OString SvMetaType::GetParserString() const
 {
     SvMetaType * pBT = GetBaseType();
     if( pBT != this )
         return pBT->GetParserString();
 
     int type = GetType();
-    ByteString aPStr;
+    rtl::OString aPStr;
 
     if( TYPE_METHOD == type || TYPE_STRUCT == type )
     {
@@ -1719,7 +1719,7 @@ ByteString SvMetaType::GetParserString() const
         }
     }
     else
-        aPStr = GetParserChar();
+        aPStr = rtl::OString(GetParserChar());
     return aPStr;
 }
 
diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx
index 5761a459c50e..e823bdf7f5f7 100644
--- a/idl/source/prj/database.cxx
+++ b/idl/source/prj/database.cxx
@@ -311,32 +311,35 @@ sal_Bool SvIdlDataBase::ReadIdFile( const String & rFileName )
                 else if( pTok->Is( SvHash_include() ) )
                 {
                     pTok = aTokStm.GetToken_Next();
-                    ByteString aName;
+                    rtl::OStringBuffer aName;
                     if( pTok->IsString() )
-                        aName = pTok->GetString();
+                        aName.append(pTok->GetString());
                     else if( pTok->IsChar() && pTok->GetChar() == '<' )
                     {
                         pTok = aTokStm.GetToken_Next();
                         while( !pTok->IsEof()
                           && !(pTok->IsChar() && pTok->GetChar() == '>') )
                         {
-                            aName += pTok->GetTokenAsString();
+                            aName.append(pTok->GetTokenAsString());
                             pTok = aTokStm.GetToken_Next();
                         }
                         if( pTok->IsEof() )
                         {
-                            ByteString aStr( "unexpected eof in #include" );
+                            rtl::OString aStr(RTL_CONSTASCII_STRINGPARAM(
+                                "unexpected eof in #include"));
                             // set error
-                            SetError( aStr, pTok );
+                            SetError(aStr, pTok);
                             WriteError( aTokStm );
                             return sal_False;
                         }
                     }
-                    if( !ReadIdFile( String::CreateFromAscii(aName.GetBuffer()) ) )
+                    if (!ReadIdFile(rtl::OStringToOUString(aName.toString(),
+                        RTL_TEXTENCODING_ASCII_US)))
                     {
-                        ByteString aStr = "cannot read file: ";
-                        aStr += aName;
-                        SetError( aStr, pTok );
+                        rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
+                            "cannot read file: "));
+                        aStr.append(aName);
+                        SetError(aStr.makeStringAndClear(), pTok);
                         WriteError( aTokStm );
                         return sal_False;
                     }