[Libreoffice-commits] core.git: sc/source

[Julien Nabet]

 sc/source/ui/docshell/docsh8.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 1cb3100db964be082ce2eb86a20a38193ad51fb1
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sun Jun 11 09:31:24 2017 +0200

    Revert "tdf#55631: DBASE import with CP850 encoding"
    
    This reverts commit 9fe9685627c51926459a897594ead9f64deee579.
    
    Will propose a new fix
    
    Change-Id: I5c4eb38453251d2c2243ee1bae8841428c8780bf
    Reviewed-on: https://gerrit.libreoffice.org/38658
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    Tested-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx
index 67a944b3f583..85d73f4070d7 100644
--- a/sc/source/ui/docshell/docsh8.cxx
+++ b/sc/source/ui/docshell/docsh8.cxx
@@ -301,6 +301,10 @@ sal_uLong ScDocShell::DBaseImport( const OUString& rFullFileName, rtl_TextEncodi
 
     sal_uLong nErr = ERRCODE_NONE;
 
+    // Try to get the Text Encoding from the driver
+    if( eCharSet == RTL_TEXTENCODING_IBM_850 )
+        eCharSet = RTL_TEXTENCODING_DONTKNOW;
+
     try
     {
         long i;