connectivity/source/drivers/dbase/DTable.cxx | 7 +++++--
sc/source/ui/docshell/docsh8.cxx | 4 ----
2 files changed, 5 insertions(+), 6 deletions(-)
New commits:
commit 91bafeff8b8a195d9ecc242c0def413361161d79
Author: Julien Nabet <serval2...@yahoo.fr>
Date: Sun Jul 2 14:23:19 2017 +0200
tdf#108789 quick fix for 5.3 branch only
Change-Id: Ib3a9475a6eec1551a77fb5b5994ec1073f275708
Reviewed-on: https://gerrit.libreoffice.org/39449
Reviewed-by: Lionel Elie Mamane <lio...@mamane.lu>
Tested-by: Jenkins <c...@libreoffice.org>
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:
diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx
index 646656e56358..f30c95f6f654 100644
--- a/sc/source/ui/docshell/docsh8.cxx
+++ b/sc/source/ui/docshell/docsh8.cxx
@@ -299,10 +299,6 @@ sal_uLong ScDocShell::DBaseImport( const OUString&
rFullFileName, rtl_TextEncodi
sal_uLong nErr = eERR_OK;
- // Try to get the Text Encoding from the driver
- if( eCharSet == RTL_TEXTENCODING_IBM_850 )
- eCharSet = RTL_TEXTENCODING_DONTKNOW;
-
try
{
long i;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
