[Libreoffice-commits] .: svtools/source

[Caolán McNamara]

 svtools/source/filter/wmf/emfwr.cxx |    4 +++-
 svtools/source/svrtf/rtfout.cxx     |   10 +++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

New commits:
commit 51577286b4445c86f980759f559871b15a7b8f4c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jul 6 23:43:15 2011 +0100

    ByteString::CreateFromInt32->rtl::OString::valueOf

diff --git a/svtools/source/filter/wmf/emfwr.cxx b/svtools/source/filter/wmf/emfwr.cxx
index b08605e..b0d23b6 100644
--- a/svtools/source/filter/wmf/emfwr.cxx
+++ b/svtools/source/filter/wmf/emfwr.cxx
@@ -1429,7 +1429,9 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
             break;
 
             default:
-                OSL_FAIL( ( ByteString( "EMFWriter::ImplWriteActions: unsupported MetaAction #" ) += ByteString::CreateFromInt32( nType ) ).GetBuffer() );
+                OSL_FAIL(rtl::OStringBuffer(RTL_CONSTASCII_STRINGPARAM(
+                    "EMFWriter::ImplWriteActions: unsupported MetaAction #" )).
+                     append(static_cast<sal_Int32>(nType)).getStr());
             break;
         }
     }
diff --git a/svtools/source/svrtf/rtfout.cxx b/svtools/source/svrtf/rtfout.cxx
index ace3ea4..ce0e809 100644
--- a/svtools/source/svrtf/rtfout.cxx
+++ b/svtools/source/svrtf/rtfout.cxx
@@ -141,11 +141,15 @@ SvStream& RTFOutFuncs::Out_Char(SvStream& rStream, sal_Unicode c,
                         // then write as unicode - character
                         if (*pUCMode != nLen)
                         {
-                          rStream << "\\uc" << ByteString::CreateFromInt32(nLen).GetBuffer() << " "; // #i47831# add an additional whitespace, so that "document whitespaces" are not ignored.;
+                            // #i47831# add an additional whitespace, so that
+                            // "document whitespaces" are not ignored.;
+                            rStream << "\\uc"
+                                << rtl::OString::valueOf(nLen).getStr() << " ";
                             *pUCMode = nLen;
                         }
-                        ByteString sNo(ByteString::CreateFromInt32(c));
-                         rStream << "\\u" << sNo.GetBuffer();
+                        rStream << "\\u"
+                            << rtl::OString::valueOf(
+                                static_cast<sal_Int32>(c)).getStr();
                     }
 
                     for (sal_Int32 nI = 0; nI < nLen; ++nI)