[Libreoffice-commits] core.git: Branch 'libreoffice-4-3-1' - tools/source

David Tardon dtardon at redhat.com
Fri Aug 15 12:37:37 PDT 2014


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

New commits:
commit cef219d07557bfeff256e78c583a20912d3d209f
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Aug 15 20:27:44 2014 +0200

    fdo#82644 write sal_Unicode chars as Unicode
    
    Regression from commit de84529b55f5b295b089043a7119d6b0d8b92408.
    
    Change-Id: I8f0b148ec7df4f676341f588c04780a705c80a5c
    (cherry picked from commit 92240691d1c11a003474a322596fcd1ac3513eb5)
    Reviewed-on: https://gerrit.libreoffice.org/10937
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>
    (cherry picked from commit 694766652971c7fa26becd495925dd7ba0ddee7d)
    Reviewed-on: https://gerrit.libreoffice.org/10938
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index 0ed749e..e320f6f 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -783,7 +783,7 @@ bool SvStream::WriteLine(const OString& rStr)
 bool SvStream::WriteUniOrByteChar( sal_Unicode ch, rtl_TextEncoding eDestCharSet )
 {
     if ( eDestCharSet == RTL_TEXTENCODING_UNICODE )
-        WriteChar(ch);
+        WriteUnicode(ch);
     else
     {
         OString aStr(&ch, 1, eDestCharSet);


More information about the Libreoffice-commits mailing list