summaryrefslogtreecommitdiff
path: root/connectivity
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2017-06-11 09:34:47 +0200
committerAndras Timar <andras.timar@collabora.com>2017-06-27 14:02:15 +0200
commitbf8afaddc581f7305d61a3c4a66f84439b7cf0e5 (patch)
tree79e2129632109178a20b5e11eacedbcc68caafd9 /connectivity
parent58b2bfb4f098aab25e45eef43b5f8449cdb2a830 (diff)
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@libreoffice.org> Reviewed-by: Muthu Subramanian K <muthusuba@gmail.com> (cherry picked from commit 58bb9da339d61981d45cde8e38a2ce1ae33652c4) Reviewed-on: https://gerrit.libreoffice.org/38707 Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu> (cherry picked from commit 954931c86cf67876c8324acec31c3e95feeb6b4d)
Diffstat (limited to 'connectivity')
-rw-r--r--connectivity/source/drivers/dbase/DTable.cxx5
1 files changed, 5 insertions, 0 deletions
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 11d35d1359a1..9c3e777e74e2 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -280,6 +280,11 @@ void ODbaseTable::readHeader()
break;
}
}
+ else
+ {
+ // Default Encoding
+ m_eEncoding = RTL_TEXTENCODING_IBM_850;
+ }
break;
case dBaseIVMemo:
m_pFileStream->SetEndian(SvStreamEndian::LITTLE);