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

[Julien Nabet]

 connectivity/source/drivers/dbase/DTable.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6b978332b603f1dd4ded536d4ab3150a95e2e8a3
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sat Jun 10 00:20:18 2017 +0200

    DBase, encodings mixed
    
    See https://bz.apache.org/ooo/show_bug.cgi?id=18728#c7
    101 - 866 MS-DOS, Russian
    102 - 865 MS-DOS, Nordic
    taken as reference by Muthu Subramanian
    who also added some other encodings with
    https://cgit.freedesktop.org/libreoffice/core/commit/?id=b00c4ec0967f8712d721b31ccb2dd0778c9e973b
    
    Also https://msdn.microsoft.com/en-us/library/aa975345%28v=vs.71%29.aspx
    865 Nordic MS-DOS x66
    866 Russian MS-DOS x65
    
    Change-Id: Iea494bed07d8050fd60e24ffea153ce911c27c8c
    Reviewed-on: https://gerrit.libreoffice.org/38618
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    (cherry picked from commit 8ab2c4b6807bbdabd2cf72a93e0168220bea79d6)
    Reviewed-on: https://gerrit.libreoffice.org/38630

diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index d1b8960f79da..06c8d05d8823 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -254,8 +254,8 @@ void ODbaseTable::readHeader()
                         case 0x03: m_eEncoding = RTL_TEXTENCODING_MS_1252; break;       // Windows ANSI code page 1252
                         case 0x04: m_eEncoding = RTL_TEXTENCODING_APPLE_ROMAN; break;   // Standard Macintosh
                         case 0x64: m_eEncoding = RTL_TEXTENCODING_IBM_852; break;       // EE MS-DOS    code page 852
-                        case 0x65: m_eEncoding = RTL_TEXTENCODING_IBM_865; break;       // Nordic MS-DOS    code page 865
-                        case 0x66: m_eEncoding = RTL_TEXTENCODING_IBM_866; break;       // Russian MS-DOS   code page 866
+                        case 0x65: m_eEncoding = RTL_TEXTENCODING_IBM_866; break;       // Russian MS-DOS   code page 866
+                        case 0x66: m_eEncoding = RTL_TEXTENCODING_IBM_865; break;       // Nordic MS-DOS    code page 865
                         case 0x67: m_eEncoding = RTL_TEXTENCODING_IBM_861; break;       // Icelandic MS-DOS
                         //case 0x68: m_eEncoding = ; break;     // Kamenicky (Czech) MS-DOS
                         //case 0x69: m_eEncoding = ; break;     // Mazovia (Polish) MS-DOS