5 files changed, 16 insertions, 12 deletions
diff --git a/idl/source/objects/basobj.cxx b/idl/source/objects/basobj.cxx
index f5a5c3fd6288..4f9c15d3e762 100644
--- a/idl/source/objects/basobj.cxx
+++ b/idl/source/objects/basobj.cxx
@@ -583,7 +583,7 @@ void SvMetaExtern::WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm,
     WriteTab( rOutStm, nTab );
     rOutStm << "// class SvMetaExtern" << endl;
     WriteTab( rOutStm, nTab );
-    rOutStm << "uuid(" << ByteString( GetUUId().GetHexName(), RTL_TEXTENCODING_UTF8 ).GetBuffer() << ")," << endl;
+    rOutStm << "uuid(" << rtl::OUStringToOString(GetUUId().GetHexName(), RTL_TEXTENCODING_UTF8).getStr() << ")," << endl;
     WriteTab( rOutStm, nTab );
     rOutStm << "version("
         << rtl::OString::valueOf(static_cast<sal_Int32>(aVersion.GetMajorVersion())).getStr()
diff --git a/idl/source/objects/bastype.cxx b/idl/source/objects/bastype.cxx
index b60477aef45f..c7c391d60533 100644
--- a/idl/source/objects/bastype.cxx
+++ b/idl/source/objects/bastype.cxx
@@ -398,7 +398,7 @@ sal_Bool SvUUId::WriteSvIdl( SvStream & rOutStm )
 {
     // write global id
     rOutStm << SvHash_uuid()->GetName().GetBuffer() << "(\"";
-    rOutStm << ByteString( GetHexName(), RTL_TEXTENCODING_UTF8 ).GetBuffer() << "\")";
+    rOutStm << rtl::OUStringToOString(GetHexName(), RTL_TEXTENCODING_UTF8).getStr() << "\")";
     return sal_True;
 }
 
diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx
index 08b42adc6ce5..75af0cfc25a1 100644
--- a/idl/source/objects/module.cxx
+++ b/idl/source/objects/module.cxx
@@ -272,16 +272,20 @@ void SvMetaModule::ReadContextSvIdl( SvIdlDataBase & rBase,
                 }
                 else
                 {
-                    ByteString aStr = "cannot open file: ";
-                    aStr += ByteString( aFullName.GetFull(), RTL_TEXTENCODING_UTF8 );
-                    rBase.SetError( aStr, pTok );
+                    rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
+                        "cannot open file: "));
+                    aStr.append(rtl::OUStringToOString(aFullName.GetFull(),
+                        RTL_TEXTENCODING_UTF8));
+                    rBase.SetError(aStr.makeStringAndClear(), pTok);
                 }
             }
             else
             {
-                ByteString aStr = "cannot find file: ";
-                aStr += ByteString( aFullName.GetFull(), RTL_TEXTENCODING_UTF8 );
-                rBase.SetError( aStr, pTok );
+                rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
+                    "cannot find file:"));
+                aStr.append(rtl::OUStringToOString(aFullName.GetFull(),
+                    RTL_TEXTENCODING_UTF8));
+                rBase.SetError(aStr.makeStringAndClear(), pTok);
             }
         }
         if( !bOk )
diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx
index 99cb16b584b8..01dd2d5071c4 100644
--- a/idl/source/objects/object.cxx
+++ b/idl/source/objects/object.cxx
@@ -695,7 +695,7 @@ void SvMetaClass::WriteHxx( SvIdlDataBase &, SvStream & rOutStm, sal_uInt16 )
     << "\tvirtual void          Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) = 0;" << endl
     << "public:" << endl
     << "\t static SvGlobalName  ClassName()" << endl
-    << "\t                      { return SvGlobalName( " << ByteString( GetUUId().GetctorName(), RTL_TEXTENCODING_UTF8 ).GetBuffer() << " ); }" << endl
+    << "\t                      { return SvGlobalName( " << rtl::OUStringToOString(GetUUId().GetctorName(), RTL_TEXTENCODING_UTF8).getStr() << " ); }" << endl
     << "};" << endl;
 }
 
@@ -719,7 +719,7 @@ void SvMetaClass::WriteCxx( SvIdlDataBase &, SvStream & rOutStm, sal_uInt16 )
     << "\t                               sal_uInt16 * pMajor," << endl
     << "\t                               sal_uInt16 * pMinor ) const" << endl
     << '{' << endl
-    << "\tSvGlobalName aN( " << ByteString( pMod->GetUUId().GetctorName(), RTL_TEXTENCODING_UTF8 ).GetBuffer() << " );" << endl;
+    << "\tSvGlobalName aN( " << rtl::OUStringToOString(pMod->GetUUId().GetctorName(), RTL_TEXTENCODING_UTF8).getStr() << " );" << endl;
     rOutStm << "\t*pGN = aN;" << endl
     << "\t*pMajor = "
     << rtl::OString::valueOf(static_cast<sal_Int32>(pMod->GetVersion().GetMajorVersion())).getStr()
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index f352abf00423..2434a10ecb62 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -519,14 +519,14 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase,
     bOk |= aDisableFlags.ReadSvIdl( SvHash_DisableFlags(), rInStm );
     if( aGet.ReadSvIdl( SvHash_Get(), rInStm ) )
     {
-        rBase.WriteError( "warning", ByteString( rInStm.GetFileName(), RTL_TEXTENCODING_UTF8 ),
+        rBase.WriteError( "warning", rtl::OUStringToOString(rInStm.GetFileName(), RTL_TEXTENCODING_UTF8),
                     "<Get> old style, use Readonly",
                     rInStm.GetToken()->GetLine(),
                     rInStm.GetToken()->GetColumn() );
     }
     if( aSet.ReadSvIdl( SvHash_Set(), rInStm ) )
     {
-        rBase.WriteError( "warning", ByteString( rInStm.GetFileName(), RTL_TEXTENCODING_UTF8 ),
+        rBase.WriteError( "warning", rtl::OUStringToOString(rInStm.GetFileName(), RTL_TEXTENCODING_UTF8),
                     "<Set> old style, use method declaration",
                     rInStm.GetToken()->GetLine(),
                     rInStm.GetToken()->GetColumn() );