diff options
author | Rüdiger Timm <rt@openoffice.org> | 2008-06-06 12:25:17 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-06 12:25:17 +0000 |
commit | 747d1e733c622b405c1ed45f0a695393849049a5 (patch) | |
tree | 90f3c667f35eb6ae6dcc7e558afa6b87272faddf /connectivity/source/inc/dbase/DTable.hxx | |
parent | 5af8ea9d92369b028b1521b35bbcb57396706cf1 (diff) |
INTEGRATION: CWS dba30c (1.40.10); FILE MERGED
2008/05/06 08:14:06 oj 1.40.10.1: #i88577# check for visual foxpro and accept text encoding when set
Diffstat (limited to 'connectivity/source/inc/dbase/DTable.hxx')
-rw-r--r-- | connectivity/source/inc/dbase/DTable.hxx | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/connectivity/source/inc/dbase/DTable.hxx b/connectivity/source/inc/dbase/DTable.hxx index 6e2a435c2f45..3c1ccfaa6516 100644 --- a/connectivity/source/inc/dbase/DTable.hxx +++ b/connectivity/source/inc/dbase/DTable.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: DTable.hxx,v $ - * $Revision: 1.40 $ + * $Revision: 1.41 $ * * This file is part of OpenOffice.org. * @@ -51,15 +51,16 @@ namespace connectivity { // der Typ einer dBase datei wird mit dem ersten Byte bestimmt public: - enum DBFType { dBaseIII = 0x03, - dBaseIV = 0x04, - dBaseV = 0x05, - dBaseFS = 0x43, - dBaseFSMemo = 0xB3, - dBaseIIIMemo = 0x83, - dBaseIVMemo = 0x8B, - dBaseIVMemoSQL = 0x8E, - FoxProMemo = 0xF5 + enum DBFType { dBaseIII = 0x03, + dBaseIV = 0x04, + dBaseV = 0x05, + VisualFoxPro = 0x30, + dBaseFS = 0x43, + dBaseFSMemo = 0xB3, + dBaseIIIMemo = 0x83, + dBaseIVMemo = 0x8B, + dBaseIVMemoSQL = 0x8E, + FoxProMemo = 0xF5 }; enum DBFMemoType { MemodBaseIII = 0, MemodBaseIV, @@ -97,6 +98,7 @@ namespace connectivity DBFHeader m_aHeader; DBFMemoHeader m_aMemoHeader; SvStream* m_pMemoStream; + rtl_TextEncoding m_eEncoding; sal_Bool m_bWriteableMemo; void alterColumn(sal_Int32 index, |