ByteString->rtl::OString

3 files changed, 19 insertions, 19 deletions

diff --git a/idl/source/cmptools/lex.cxx b/idl/source/cmptools/lex.cxx
index 582170ecc609..0ab749448732 100644
--- a/idl/source/cmptools/lex.cxx
+++ b/idl/source/cmptools/lex.cxx
@@ -99,8 +99,8 @@ SvToken & SvToken::operator = ( const SvToken & rObj )
 
 void SvTokenStream::InitCtor()
 {
-    aStrTrue    = "TRUE";
-    aStrFalse   = "FALSE";
+    aStrTrue = rtl::OString(RTL_CONSTASCII_STRINGPARAM("TRUE"));
+    aStrFalse = rtl::OString(RTL_CONSTASCII_STRINGPARAM("FALSE"));
     nLine       = nColumn = 0;
     nBufPos     = 0;
     nTabSize    = 4;
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index c6d980f20a4b..abc36750a247 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -470,7 +470,7 @@ void SvMetaAttribute::WriteCSource( SvIdlDataBase & rBase, SvStream & rOutStm,
         << rtl::OString::valueOf(static_cast<sal_Int32>(MakeSlotValue(rBase, IsVariable()))).getStr();
     rOutStm << ',' << endl;
     WriteTab( rOutStm, 3 );
-    rOutStm << " h" << rBase.aIFaceName.GetBuffer() << " , ";
+    rOutStm << " h" << rBase.aIFaceName.getStr() << " , ";
 
     ByteString aParserStr;
     if( pBaseType->GetType() == TYPE_METHOD || bSet )
@@ -625,9 +625,9 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
                     // allocation
                     WriteTab( rOutStm, nTab );
                     rOutStm << "void ";
-                    rOutStm << rBase.aIFaceName.GetBuffer()
+                    rOutStm << rBase.aIFaceName.getStr()
                             << "Set" << name.GetBuffer() << "( " << C_PREF
-                            << "Object h" << rBase.aIFaceName.GetBuffer() << ", " << endl;
+                            << "Object h" << rBase.aIFaceName.getStr() << ", " << endl;
                     WriteTab( rOutStm, nTab+1 );
                     pBaseType->WriteTypePrefix( rBase, rOutStm, nTab, nT );
                     rOutStm << ' ' << name.GetBuffer() << " )";
@@ -641,9 +641,9 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
                 WriteTab( rOutStm, nTab );
                 pBaseType->WriteTypePrefix( rBase, rOutStm, nTab, nT );
                 rOutStm << ' ';
-                rOutStm << rBase.aIFaceName.GetBuffer()
+                rOutStm << rBase.aIFaceName.getStr()
                         << "Get" << name.GetBuffer() << "( " << C_PREF
-                        << "Object h" << rBase.aIFaceName.GetBuffer() << " )";
+                        << "Object h" << rBase.aIFaceName.getStr() << " )";
                 if( nT == WRITE_C_HEADER )
                     rOutStm << ';' << endl << endl;
                 else
@@ -1536,7 +1536,7 @@ void SvMetaType::WriteMethodArgs
         rOutStm << '(';
         if( nT == WRITE_C_HEADER || nT == WRITE_C_SOURCE )
         {
-            rOutStm << ' ' << C_PREF << "Object h" << rBase.aIFaceName.GetBuffer();
+            rOutStm << ' ' << C_PREF << "Object h" << rBase.aIFaceName.getStr();
             if( GetAttrCount() )
                 rOutStm << ',';
             else
diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx
index c0bf3c2905f1..5655180d1957 100644
--- a/idl/source/prj/database.cxx
+++ b/idl/source/prj/database.cxx
@@ -87,10 +87,10 @@ SvMetaTypeMemberList & SvIdlDataBase::GetTypeList()
     return aTypeList;
 }
 
-SvMetaModule * SvIdlDataBase::GetModule( const ByteString & rName )
+SvMetaModule * SvIdlDataBase::GetModule( const rtl::OString& rName )
 {
     for( sal_uLong n = 0; n < aModuleList.Count(); n++ )
-        if( aModuleList.GetObject( n )->GetName() == rName )
+        if( aModuleList.GetObject( n )->GetName().Equals(rName) )
             return aModuleList.GetObject( n );
     return NULL;
 }
@@ -169,7 +169,7 @@ void SvIdlDataBase::Save( SvStream & rStm, sal_uInt32 nFlags )
     aPStm << nUniqueId;
 }
 
-void SvIdlDataBase::SetError( const ByteString & rError, SvToken * pTok )
+void SvIdlDataBase::SetError( const rtl::OString& rError, SvToken * pTok )
 {
     if( pTok->GetLine() > 10000 )
         aError.SetText( "hgchcg" );
@@ -188,7 +188,7 @@ void SvIdlDataBase::Push( SvMetaObject * pObj )
 }
 
 #ifdef IDL_COMPILER
-sal_Bool SvIdlDataBase::FindId( const ByteString & rIdName, sal_uLong * pVal )
+sal_Bool SvIdlDataBase::FindId( const rtl::OString& rIdName, sal_uLong * pVal )
 {
     if( pIdTable )
     {
@@ -202,7 +202,7 @@ sal_Bool SvIdlDataBase::FindId( const ByteString & rIdName, sal_uLong * pVal )
     return sal_False;
 }
 
-sal_Bool SvIdlDataBase::InsertId( const ByteString & rIdName, sal_uLong nVal )
+sal_Bool SvIdlDataBase::InsertId( const rtl::OString& rIdName, sal_uLong nVal )
 {
     if( !pIdTable )
         pIdTable = new SvStringHashTable( 20003 );
@@ -364,10 +364,10 @@ SvMetaType * SvIdlDataBase::FindType( const SvMetaType * pPType,
     return pType;
 }
 
-SvMetaType * SvIdlDataBase::FindType( const ByteString & rName )
+SvMetaType * SvIdlDataBase::FindType( const rtl::OString& rName )
 {
     SvMetaType * pType = aTypeList.First();
-    while( pType && rName != pType->GetName() )
+    while( pType && !rName.equals(pType->GetName()) )
         pType = aTypeList.Next();
     return pType;
 }
@@ -544,14 +544,14 @@ void SvIdlDataBase::Write(const rtl::OString& rText)
         fprintf( stdout, "%s", rText.getStr() );
 }
 
-void SvIdlDataBase::WriteError( const ByteString & rErrWrn,
-                                const ByteString & rFileName,
+void SvIdlDataBase::WriteError( const rtl::OString& rErrWrn,
+                                const rtl::OString& rFileName,
                                 const rtl::OString& rErrorText,
                                 sal_uLong nRow, sal_uLong nColumn ) const
 {
     // error treatment
     fprintf( stderr, "\n%s --- %s: ( %ld, %ld )\n",
-             rFileName.GetBuffer(), rErrWrn.GetBuffer(), nRow, nColumn );
+             rFileName.getStr(), rErrWrn.getStr(), nRow, nColumn );
 
     if( !rErrorText.isEmpty() )
     { // error set
@@ -577,7 +577,7 @@ void SvIdlDataBase::WriteError( SvTokenStream & rInStm )
     { // error set
         // search error token
         // error text
-        if( aError.GetText().Len() )
+        if( aError.GetText().getLength() )
         {
             aErrorText.append(RTL_CONSTASCII_STRINGPARAM("may be <"));
             aErrorText.append(aError.GetText());