[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - sc/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Wed Jan 30 19:20:21 UTC 2019


 sc/source/ui/unoobj/filtuno.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit d3ffa88402839cf6ee6fdb16e9150fa3fb3f7ba5
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Wed Jan 30 18:59:29 2019 +0100
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Wed Jan 30 20:19:56 2019 +0100

    sc: set default charset for CSV export to UTF-16
    
    The import doesn't need changing, it reads the UTF-16 BOM in
    ScImportAsciiDlg ctor.
    
    Change-Id: I66eb95d7c2b6502a0c4a2f727c768a9441b1f200
    Reviewed-on: https://gerrit.libreoffice.org/67176
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/sc/source/ui/unoobj/filtuno.cxx b/sc/source/ui/unoobj/filtuno.cxx
index 1ee2b3665d07..e59a7fe719d6 100644
--- a/sc/source/ui/unoobj/filtuno.cxx
+++ b/sc/source/ui/unoobj/filtuno.cxx
@@ -225,6 +225,7 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute() throw(uno::RuntimeException, st
         if ( aFilterString == ScDocShell::GetAsciiFilterName() )
         {
             //  ascii export (import is handled above)
+            eEncoding = RTL_TEXTENCODING_UCS2; // UTF-16 default for LHM
 
             INetURLObject aURL( aFileName );
             OUString aExt(aURL.getExtension());


More information about the Libreoffice-commits mailing list