[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - connectivity/source

[Julien Nabet]

 connectivity/source/drivers/dbase/DTable.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 7bb142d830b86d7d2b84ede2f236312e76956175
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sun Jun 11 09:34:47 2017 +0200

    tdf#55631: DBASE import (take 2)
    
    if we can't read head db_frei part, let's also put by default
    m_eEncoding = RTL_TEXTENCODING_IBM_850;
    
    Change-Id: I97601ba4c782dcfc280e975cc4498ea68407dd48
    Reviewed-on: https://gerrit.libreoffice.org/38659
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Muthu Subramanian K <muthusuba at gmail.com>
    (cherry picked from commit 58bb9da339d61981d45cde8e38a2ce1ae33652c4)
    Reviewed-on: https://gerrit.libreoffice.org/38706
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 06c8d05d8823..12e7b1aa7647 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -283,6 +283,11 @@ void ODbaseTable::readHeader()
                             break;
                     }
                 }
+                else
+                {
+                    // Default Encoding
+                    m_eEncoding = RTL_TEXTENCODING_IBM_850;
+                }
                 break;
             case dBaseIVMemo:
                 m_pFileStream->SetEndian(SvStreamEndian::LITTLE);