summaryrefslogtreecommitdiff
path: root/connectivity
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2017-07-02 14:23:19 +0200
committerAndras Timar <andras.timar@collabora.com>2017-07-12 10:53:23 +0200
commit4517bf30bc5102ea30b343a3ae5cdb48cf658875 (patch)
tree15b65106692e172b60776dc51941c6218dbafc7e /connectivity
parent40c420adf77fc6dd41306dcd1fdf2ce06b456a80 (diff)
tdf#108789 quick fix for 5.3 branch only
Change-Id: Ib3a9475a6eec1551a77fb5b5994ec1073f275708 Reviewed-on: https://gerrit.libreoffice.org/39449 Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 91bafeff8b8a195d9ecc242c0def413361161d79)
Diffstat (limited to 'connectivity')
-rw-r--r--connectivity/source/drivers/dbase/DTable.cxx7
1 files changed, 5 insertions, 2 deletions
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 9c3e777e74e2..06d709032757 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -282,8 +282,11 @@ void ODbaseTable::readHeader()
}
else
{
- // Default Encoding
- m_eEncoding = RTL_TEXTENCODING_IBM_850;
+ if (getConnection()->isTextEncodingDefaulted())
+ {
+ // Default Encoding
+ m_eEncoding = RTL_TEXTENCODING_IBM_850;
+ }
}
break;
case dBaseIVMemo: