[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - dbaccess/source

[Julien Nabet]

 dbaccess/source/ui/misc/TokenWriter.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3951d44110df55589ff80f5eab752817c2475c0d
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Tue May 30 23:50:18 2017 +0200

    tdf#37859: Odb data copied to Calc showed wrong encoding in Windows
    
    Blind fix since I don't have Windows.
    If it works, many thanks to:
    - Urmas (see https://bugs.documentfoundation.org/show_bug.cgi?id=37859#c16)
    - Himajin100000 (see https://bugs.documentfoundation.org/show_bug.cgi?id=37859#c35)
    
    Change-Id: I9fd84977eab8410ec022b6e34f1a636326eaf56a
    Reviewed-on: https://gerrit.libreoffice.org/38253
    (cherry picked from commit 39487b14956d883899311b6294f6f09ca2371366)
    Reviewed-on: https://gerrit.libreoffice.org/38547
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Eike Rathke <erack at redhat.com>

diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx
index 9399f1ea3db8..eee419355bb5 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -688,7 +688,7 @@ void OHTMLImportExport::WriteHeader()
     IncIndent(1); TAG_ON_LF( OOO_STRING_SVTOOLS_HTML_head );
 
     SfxFrameHTMLWriter::Out_DocInfo( (*m_pStream), OUString(),
-        xDocProps, sIndent );
+        xDocProps, sIndent, osl_getThreadTextEncoding() );
     OUT_LF();
     IncIndent(-1); OUT_LF(); TAG_OFF_LF( OOO_STRING_SVTOOLS_HTML_head );
 }