From e599716735a8d992ae614462412d4b82c119d40a Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Tue, 13 Jun 2017 23:51:44 +0200 Subject: dBASE: remove wrong m_ prefix introduced in a recent commit Change-Id: I9f05facd98d60604256b15c4b35871f7d0a825f9 Reviewed-on: https://gerrit.libreoffice.org/38755 Reviewed-by: Julien Nabet Tested-by: Julien Nabet --- connectivity/source/inc/dbase/DTable.hxx | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'connectivity/source/inc/dbase') diff --git a/connectivity/source/inc/dbase/DTable.hxx b/connectivity/source/inc/dbase/DTable.hxx index ead441308dfa..867cde2e8e00 100644 --- a/connectivity/source/inc/dbase/DTable.hxx +++ b/connectivity/source/inc/dbase/DTable.hxx @@ -58,22 +58,22 @@ namespace connectivity // sources: https://www.clicketyclick.dk/databases/xbase/format/dbf.html (dBASE III and 5) // http://www.dbase.com/KnowledgeBase/int/db7_file_fmt.htm (dBASE 7) which is similar at least for this part struct DBFHeader { - DBFType m_type; // dBASE/xBASE type, see DBFType - sal_uInt8 m_dateElems[3]; // Date of last change (YYMMDD) - sal_uInt32 m_nbRecords; // Number of records - sal_uInt16 m_headerLength; - sal_uInt16 m_recordLength; // length of 1 record - sal_uInt8 m_reserved1[2]; // should be filled with 0 - sal_uInt8 m_incompTransact; // Incomplete transaction (dBASE IV): + DBFType type; // dBASE/xBASE type, see DBFType + sal_uInt8 dateElems[3]; // Date of last change (YYMMDD) + sal_uInt32 nbRecords; // Number of records + sal_uInt16 headerLength; + sal_uInt16 recordLength; // length of 1 record + sal_uInt8 reserved1[2]; // should be filled with 0 + sal_uInt8 incompTransact; // Incomplete transaction (dBASE IV): // 00h Transaction ended (or rolled back) // 01h Transaction started - sal_uInt8 m_encryptionFlag; // dBASE IV: 00h not encrypted, 01h data encrypted - sal_uInt8 m_freeRecordThread[4]; // reserved for LAN only - sal_uInt8 m_multiUserdBASE[8]; // reserved for multi-user dBASE (dBASE III+) - sal_uInt8 m_MDXFlag; // dBASE IV 0x01 if a production .MDX file exists for this table + sal_uInt8 encryptionFlag; // dBASE IV: 00h not encrypted, 01h data encrypted + sal_uInt8 freeRecordThread[4]; // reserved for LAN only + sal_uInt8 multiUserdBASE[8]; // reserved for multi-user dBASE (dBASE III+) + sal_uInt8 MDXFlag; // dBASE IV 0x01 if a production .MDX file exists for this table // 0x00 if no .MDX file exists - sal_uInt8 m_languageDriver; // codepage (from Foxpro) - sal_uInt8 m_reserved2[2]; // should be filled with 0 + sal_uInt8 languageDriver; // codepage (from Foxpro) + sal_uInt8 reserved2[2]; // should be filled with 0 }; struct DBFColumn { /* Column descriptors */ sal_uInt8 db_fnm[11]; /* Field name */ @@ -114,7 +114,7 @@ namespace connectivity void copyData(ODbaseTable* _pNewTable,sal_Int32 _nPos); bool CreateFile(const INetURLObject& aFile, bool& bCreateMemo); bool CreateMemoFile(const INetURLObject& aFile); - bool HasMemoFields() const { return m_aHeader.m_type > dBaseIV;} + bool HasMemoFields() const { return m_aHeader.type > dBaseIV;} bool ReadMemoHeader(); bool ReadMemo(std::size_t nBlockNo, ORowSetValue& aVariable); -- cgit