ByteString->rtl::OString

6 files changed, 15 insertions, 15 deletions

diff --git a/rsc/source/res/rscclass.cxx b/rsc/source/res/rscclass.cxx
index 678c88c86b58..7e4ea5e21a6b 100644
--- a/rsc/source/res/rscclass.cxx
+++ b/rsc/source/res/rscclass.cxx
@@ -997,7 +997,7 @@ void RscClass::WriteRcAccess
 )
 {
     fprintf( fOutput, "\t\tSet%s( %s ", pName, pHS->getString( GetId() ).getStr() );
-    fprintf( fOutput, "%s ", aCallPar2.GetBuffer() );
+    fprintf( fOutput, "%s ", aCallPar2.getStr() );
     fprintf( fOutput, "ResId( (RSHEADER_TYPE*)(pResData+nOffset) ) ) );\n" );
     fprintf( fOutput, "\t\tnOffset += GetObjSizeRes( (RSHEADER_TYPE*)(pResData+nOffset) );\n" );
 }
@@ -1011,12 +1011,12 @@ void RscClass::WriteRcCtor( FILE * fOutput, RscTypCont * pTC )
         fprintf( fOutput, "%s::%s%s bFreeResource )",
                 pHS->getString( GetId() ).getStr(),
                 pHS->getString( GetId() ).getStr(),
-                aCallParType.GetBuffer() );
+                aCallParType.getStr() );
         if( GetSuperClass() )
         {
             // Superaufruf
             fprintf( fOutput, "\n\t: %s", pHS->getString( GetSuperClass()->GetId() ).getStr() );
-            fprintf( fOutput, "%s", GetSuperClass()->aCallPar1.GetBuffer() );
+            fprintf( fOutput, "%s", GetSuperClass()->aCallPar1.getStr() );
             fprintf( fOutput, " rResId.SetRT2( 0x%lx ) )",
                      sal::static_int_cast< unsigned long >(GetTypId()) );
         }
diff --git a/rsc/source/res/rsccont.cxx b/rsc/source/res/rsccont.cxx
index 3bed42f139ac..e7247216882f 100644
--- a/rsc/source/res/rsccont.cxx
+++ b/rsc/source/res/rsccont.cxx
@@ -816,7 +816,7 @@ void RscBaseCont::ContWriteRcAccess
     else
     {
         fprintf( fOutput, "\t\tSet%s( %s ", pName, pHS->getString( GetId() ).getStr() );
-        fprintf( fOutput, "%s ", aCallPar2.GetBuffer() );
+        fprintf( fOutput, "%s ", aCallPar2.getStr() );
         fprintf( fOutput, "ResId( (RSHEADER_TYPE*)(pResData+nOffset) ) ) );\n" );
         fprintf( fOutput, "\t\tnOffset += GetObjSizeRes( (RSHEADER_TYPE*)(pResData+nOffset) );\n" );
     }
diff --git a/rsc/source/res/rscmgr.cxx b/rsc/source/res/rscmgr.cxx
index c88dad98562d..078be90c5658 100644
--- a/rsc/source/res/rscmgr.cxx
+++ b/rsc/source/res/rscmgr.cxx
@@ -176,9 +176,9 @@ void RscMgr::WriteSrcHeader( const RSCINST & rInst, FILE * fOutput,
 
     fprintf( fOutput, "%s %s",
              pHS->getString( rInst.pClass->GetId() ).getStr(),
-             (rId.GetName()).GetBuffer() );
+             (rId.GetName()).getStr() );
     if( pClassData->aRefId.IsId() )
-        fprintf( fOutput, ",%s", pClassData->aRefId.GetName().GetBuffer() );
+        fprintf( fOutput, ",%s", pClassData->aRefId.GetName().getStr() );
     else
     {
         fprintf( fOutput, "\n" );
@@ -405,7 +405,7 @@ ERRTYPE RscMgr::WriteHxxHeader( const RSCINST & rInst, FILE * fOutput,
             fprintf( fOutput, "%s%s bFreeRes = TRUE )",
                      MakeName( pTC, rInst.pClass,
                                rId.GetName() ).getStr(),
-                     (rInst.pClass->aCallParType).GetBuffer() );
+                     (rInst.pClass->aCallParType).getStr() );
             fprintf( fOutput, ";\n};\n\n" );
         }
     };
@@ -466,11 +466,11 @@ ERRTYPE RscMgr::WriteCxxHeader( const RSCINST & rInst, FILE * fOutput,
         fprintf( fOutput, "%s::%s",
                  MakeName( pTC, rInst.pClass, rId.GetName() ).getStr(),
                  MakeName( pTC, rInst.pClass, rId.GetName() ).getStr() );
-        fprintf( fOutput, "%s", (rInst.pClass->aCallParType).GetBuffer() );
+        fprintf( fOutput, "%s", (rInst.pClass->aCallParType).getStr() );
         if( GetCount( rInst ) )
             fprintf( fOutput, " bFreeRes" );
         fprintf( fOutput, " )\n    : %s", pHS->getString( rInst.pClass->GetId() ).getStr() );
-        fprintf( fOutput, "%s", (rInst.pClass->aCallPar1).GetBuffer() );
+        fprintf( fOutput, "%s", (rInst.pClass->aCallPar1).getStr() );
         fprintf( fOutput, " rResId )" );
 
         aError = RscClass::WriteCxx( rInst, fOutput, pTC, rId );
@@ -514,8 +514,8 @@ ERRTYPE RscMgr::WriteCxx( const RSCINST & rInst, FILE * fOutput,
 {
     fprintf( fOutput, ",\n    a%s",
              MakeName( pTC, rInst.pClass, rId.GetName() ).getStr() );
-    fprintf( fOutput, "%s", (rInst.pClass->aCallPar2).GetBuffer() );
-    fprintf( fOutput, " ResId( %s ) )", (rId.GetName()).GetBuffer() );
+    fprintf( fOutput, "%s", (rInst.pClass->aCallPar2).getStr() );
+    fprintf( fOutput, " ResId( %s ) )", (rId.GetName()).getStr() );
 
     return ERR_OK;
 }
diff --git a/rsc/source/res/rscrange.cxx b/rsc/source/res/rscrange.cxx
index e78011b901b7..72a56c114110 100644
--- a/rsc/source/res/rscrange.cxx
+++ b/rsc/source/res/rscrange.cxx
@@ -558,7 +558,7 @@ ERRTYPE RscIdRange::GetRef( const RSCINST & rInst, RscId * pRscId ){
 void RscIdRange::WriteSrc( const RSCINST & rInst, FILE * fOutput,
                            RscTypCont *, sal_uInt32, const char * )
 {
-    fprintf( fOutput, "%s", ((RscId *)rInst.pData)->GetName().GetBuffer() );
+    fprintf( fOutput, "%s", ((RscId *)rInst.pData)->GetName().getStr() );
 }
 
 /*************************************************************************
diff --git a/rsc/source/res/rscstr.cxx b/rsc/source/res/rscstr.cxx
index d19aa828b136..18447c69f708 100644
--- a/rsc/source/res/rscstr.cxx
+++ b/rsc/source/res/rscstr.cxx
@@ -235,7 +235,7 @@ void RscString::WriteSrc( const RSCINST & rInst, FILE * fOutput,
     if ( ((RscStringInst *)rInst.pData)->aRefId.IsId() )
     {
         fprintf( fOutput, "%s",
-                 ((RscStringInst *)rInst.pData)->aRefId.GetName().GetBuffer() );
+                 ((RscStringInst *)rInst.pData)->aRefId.GetName().getStr() );
     }
     else
     {
diff --git a/rsc/source/res/rsctop.cxx b/rsc/source/res/rsctop.cxx
index 2bc78f380345..c5ffa5ac4d77 100644
--- a/rsc/source/res/rsctop.cxx
+++ b/rsc/source/res/rsctop.cxx
@@ -58,8 +58,8 @@ RscTop::RscTop( Atom nId, sal_uInt32 nTypIdent, RscTop * pSuperCl )
 |*    RscTop::SetCallPar()
 |*
 *************************************************************************/
-void RscTop::SetCallPar( const ByteString & rPar1, const ByteString & rPar2,
-                         const ByteString & rParType )
+void RscTop::SetCallPar(const rtl::OString& rPar1, const rtl::OString& rPar2,
+    const rtl::OString& rParType)
 {
     aCallPar1 = rPar1;
     aCallPar2 = rPar2;