[Libreoffice-commits] core.git: connectivity/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Aug 13 08:48:38 UTC 2018
connectivity/source/drivers/dbase/DIndex.cxx | 8 ++++----
connectivity/source/drivers/dbase/DTable.cxx | 6 +++---
connectivity/source/inc/dbase/DIndex.hxx | 4 ++--
connectivity/source/inc/dbase/DTable.hxx | 2 +-
4 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit f4eba92cc70985fa5850b284f1d9fd5f9f8eeaa0
Author: Johnny_M <klasse at partyheld.de>
AuthorDate: Sat Aug 11 11:46:11 2018 +0200
Commit: Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Mon Aug 13 10:48:15 2018 +0200
Translate German variable names
frei -> free
Change-Id: Ib402bd7829a2ac519350ad1294510adefc872514
Reviewed-on: https://gerrit.libreoffice.org/58874
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx
index 84047f811244..e43223460457 100644
--- a/connectivity/source/drivers/dbase/DIndex.cxx
+++ b/connectivity/source/drivers/dbase/DIndex.cxx
@@ -341,12 +341,12 @@ void connectivity::dbase::ReadHeader(
#endif
rStream.ReadUInt32(rHeader.db_rootpage);
rStream.ReadUInt32(rHeader.db_pagecount);
- rStream.ReadBytes(&rHeader.db_frei, 4);
+ rStream.ReadBytes(&rHeader.db_free, 4);
rStream.ReadUInt16(rHeader.db_keylen);
rStream.ReadUInt16(rHeader.db_maxkeys);
rStream.ReadUInt16(rHeader.db_keytype);
rStream.ReadUInt16(rHeader.db_keyrec);
- rStream.ReadBytes(&rHeader.db_frei1, 3);
+ rStream.ReadBytes(&rHeader.db_free1, 3);
rStream.ReadUChar(rHeader.db_unique);
rStream.ReadBytes(&rHeader.db_name, 488);
assert(rStream.GetError() || rStream.Tell() == nOldPos + DINDEX_PAGE_SIZE);
@@ -367,12 +367,12 @@ SvStream& connectivity::dbase::WriteODbaseIndex(SvStream &rStream, ODbaseIndex&
rStream.Seek(0);
rStream.WriteUInt32(rIndex.m_aHeader.db_rootpage);
rStream.WriteUInt32(rIndex.m_aHeader.db_pagecount);
- rStream.WriteBytes(&rIndex.m_aHeader.db_frei, 4);
+ rStream.WriteBytes(&rIndex.m_aHeader.db_free, 4);
rStream.WriteUInt16(rIndex.m_aHeader.db_keylen);
rStream.WriteUInt16(rIndex.m_aHeader.db_maxkeys);
rStream.WriteUInt16(rIndex.m_aHeader.db_keytype);
rStream.WriteUInt16(rIndex.m_aHeader.db_keyrec);
- rStream.WriteBytes(&rIndex.m_aHeader.db_frei1, 3);
+ rStream.WriteBytes(&rIndex.m_aHeader.db_free1, 3);
rStream.WriteUChar(rIndex.m_aHeader.db_unique);
rStream.WriteBytes(&rIndex.m_aHeader.db_name, 488);
assert(rStream.GetError() || rStream.Tell() == DINDEX_PAGE_SIZE);
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index b4c8a7c5fd5c..a1c116fe316c 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -306,7 +306,7 @@ void ODbaseTable::fillColumns()
m_pFileStream->ReadUInt32(aDBFColumn.db_adr);
m_pFileStream->ReadUChar(aDBFColumn.db_flng);
m_pFileStream->ReadUChar(aDBFColumn.db_dez);
- m_pFileStream->ReadBytes(aDBFColumn.db_frei2, 14);
+ m_pFileStream->ReadBytes(aDBFColumn.db_free2, 14);
assert(m_pFileStream->GetError() || m_pFileStream->Tell() == nOldPos + sizeof(aDBFColumn));
if (m_pFileStream->GetError())
{
@@ -319,7 +319,7 @@ void ODbaseTable::fillColumns()
aDBFColumn.db_fnm[sizeof(aDBFColumn.db_fnm)-1] = 0; //ensure null termination for broken input
const OUString aColumnName(reinterpret_cast<char *>(aDBFColumn.db_fnm), strlen(reinterpret_cast<char *>(aDBFColumn.db_fnm)), m_eEncoding);
- bool bIsRowVersion = bFoxPro && ( aDBFColumn.db_frei2[0] & 0x01 ) == 0x01;
+ bool bIsRowVersion = bFoxPro && ( aDBFColumn.db_free2[0] & 0x01 ) == 0x01;
m_aRealFieldLengths.push_back(aDBFColumn.db_flng);
sal_Int32 nPrecision = aDBFColumn.db_flng;
@@ -372,7 +372,7 @@ void ODbaseTable::fillColumns()
aTypeName = "INTEGER";
break;
case 'M':
- if ( bFoxPro && ( aDBFColumn.db_frei2[0] & 0x04 ) == 0x04 )
+ if ( bFoxPro && ( aDBFColumn.db_free2[0] & 0x04 ) == 0x04 )
{
eType = DataType::LONGVARBINARY;
aTypeName = "LONGVARBINARY";
diff --git a/connectivity/source/inc/dbase/DIndex.hxx b/connectivity/source/inc/dbase/DIndex.hxx
index 337e7780c185..de079cbff907 100644
--- a/connectivity/source/inc/dbase/DIndex.hxx
+++ b/connectivity/source/inc/dbase/DIndex.hxx
@@ -54,7 +54,7 @@ namespace connectivity
{
sal_uInt32 db_rootpage; /* Rootpage position */
sal_uInt32 db_pagecount; /* Page count */
- sal_uInt8 db_frei[4]; /* Reserved */
+ sal_uInt8 db_free[4]; /* Reserved */
sal_uInt16 db_keylen; /* Key length */
sal_uInt16 db_maxkeys; /* Maximum number of keys per page */
sal_uInt16 db_keytype; /* Type of key:
@@ -62,7 +62,7 @@ namespace connectivity
1 = Numerical */
sal_uInt16 db_keyrec; /* Length of an index record
RecordNumber + keylen */
- sal_uInt8 db_frei1[3]; /* Reserved */
+ sal_uInt8 db_free1[3]; /* Reserved */
sal_uInt8 db_unique; /* Unique */
char db_name[488]; /* index_name (field name) */
};
diff --git a/connectivity/source/inc/dbase/DTable.hxx b/connectivity/source/inc/dbase/DTable.hxx
index 5a509bb59542..ace8f3c54959 100644
--- a/connectivity/source/inc/dbase/DTable.hxx
+++ b/connectivity/source/inc/dbase/DTable.hxx
@@ -86,7 +86,7 @@ namespace connectivity
sal_uInt32 db_adr; /* Field address */
sal_uInt8 db_flng; /* Field length */
sal_uInt8 db_dez; /* Decimal places for N */
- sal_uInt8 db_frei2[14]; /* Reserved */
+ sal_uInt8 db_free2[14]; /* Reserved */
};
struct DBFMemoHeader
{
More information about the Libreoffice-commits
mailing list