[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - sax/source

Caolán McNamara caolanm at redhat.com
Thu Jan 21 04:46:11 PST 2016


 sax/source/tools/fastserializer.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6c0535b2b0e3f6d4bd5a9515a2c1a43e32e22a25
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Jan 17 20:32:07 2016 +0000

    crashtesting: plain-text import allows liberal with the UTF-8 input
    
    see ImplConvertUtf8ToUnicode which allows surrogates, so we need a non-liberal
    utf-input there if we want to enfore non-liberal utf-output here.
    
    Change-Id: I713818d7b6d79922d9b08f2b137a803384eccb65
    (cherry picked from commit 734cadff24b3e8555b40c58b4abd1f1c366c25cb)
    Signed-off-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sax/source/tools/fastserializer.cxx b/sax/source/tools/fastserializer.cxx
index 8437ff0..b81886e 100644
--- a/sax/source/tools/fastserializer.cxx
+++ b/sax/source/tools/fastserializer.cxx
@@ -94,7 +94,7 @@ namespace sax_fastparser {
 
     void FastSaxSerializer::write( const OUString& sOutput, bool bEscape )
     {
-        write( sOutput.toUtf8(), bEscape );
+        write( OUStringToOString(sOutput, RTL_TEXTENCODING_UTF8), bEscape );
 
     }
 


More information about the Libreoffice-commits mailing list