From fee307d452753efbcb3d450e6a5dcd945ba41463 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Thu, 22 Sep 2011 23:43:19 +0100
Subject: deugly HTMLOutFuncs::ConvertStringToHTML

---
 svtools/source/svhtml/htmlout.cxx | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'svtools/source/svhtml')

diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx
index 25fd6dfb165e..da7ff07fc92e 100644
--- a/svtools/source/svhtml/htmlout.cxx
+++ b/svtools/source/svhtml/htmlout.cxx
@@ -515,16 +515,16 @@ rtl::OString lcl_FlushToAscii( HTMLOutContext& rContext )
     return aDest.makeStringAndClear();
 }
 
-void HTMLOutFuncs::ConvertStringToHTML( const String& rSrc,
-                                        ByteString& rDest,
-                                        rtl_TextEncoding eDestEnc,
-                                         String *pNonConvertableChars )
+rtl::OString HTMLOutFuncs::ConvertStringToHTML( const String& rSrc,
+    rtl_TextEncoding eDestEnc, String *pNonConvertableChars )
 {
     HTMLOutContext aContext( eDestEnc );
+    rtl::OStringBuffer aDest;
     for( sal_uInt32 i=0UL, nLen = rSrc.Len(); i < nLen; i++ )
-        rDest += ByteString(lcl_ConvertCharToHTML(
+        aDest.append(lcl_ConvertCharToHTML(
             rSrc.GetChar( (xub_StrLen)i ), aContext, pNonConvertableChars));
-    rDest += ByteString(lcl_FlushToAscii( aContext ));
+    aDest.append(lcl_FlushToAscii(aContext));
+    return aDest.makeStringAndClear();
 }
 
 SvStream& HTMLOutFuncs::Out_AsciiTag( SvStream& rStream, const sal_Char *pStr,
@@ -972,12 +972,12 @@ rtl::OString HTMLOutFuncs::CreateTableDataOptionsValNum(
             append(';'); // Language fuer Format 0
         if ( nFormat )
         {
-            ByteString aNumStr;
+            rtl::OString aNumStr;
             LanguageType nLang;
             const SvNumberformat* pFormatEntry = rFormatter.GetEntry( nFormat );
             if ( pFormatEntry )
             {
-                ConvertStringToHTML( pFormatEntry->GetFormatstring(), aNumStr,
+                aNumStr = ConvertStringToHTML( pFormatEntry->GetFormatstring(),
                     eDestEnc, pNonConvertableChars );
                 nLang = pFormatEntry->GetLanguage();
             }
-- 
cgit