diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-06-06 15:19:44 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-06-06 15:28:14 +0200 |
| commit | 296125b0bf28af9ec6f0ab1459b392e26ed3eb3f (patch) | |
| tree | ab9918832a0ec99e689ab64970a219a64df3b3f5 /connectivity | |
| parent | 722f6109296e115f56281bae548f809ef60327c2 (diff) | |
connectivity: -Werror=unused-variable
Change-Id: Idaef923205a5f21d7c4c84cc74d3a369107f7325
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/drivers/dbase/DIndex.cxx | 7 | ||||
| -rw-r--r-- | connectivity/source/drivers/dbase/DTable.cxx | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx index d5470de00650..423fd3a358bd 100644 --- a/connectivity/source/drivers/dbase/DIndex.cxx +++ b/connectivity/source/drivers/dbase/DIndex.cxx @@ -352,7 +352,9 @@ ONDXPage* ODbaseIndex::CreatePage(sal_uInt32 nPagePos, ONDXPage* pParent, bool b void connectivity::dbase::ReadHeader( SvStream & rStream, ODbaseIndex::NDXHeader & rHeader) { +#if !defined(NDEBUG) sal_uInt64 const nOldPos(rStream.Tell()); +#endif rStream.ReadUInt32(rHeader.db_rootpage); rStream.ReadUInt32(rHeader.db_pagecount); rStream.Read(&rHeader.db_frei, 4); @@ -379,7 +381,6 @@ SvStream& connectivity::dbase::operator >> (SvStream &rStream, ODbaseIndex& rInd SvStream& connectivity::dbase::WriteODbaseIndex(SvStream &rStream, ODbaseIndex& rIndex) { rStream.Seek(0); - sal_uInt64 const nOldPos(rStream.Tell()); rStream.WriteUInt32(rIndex.m_aHeader.db_rootpage); rStream.WriteUInt32(rIndex.m_aHeader.db_pagecount); rStream.Write(&rIndex.m_aHeader.db_frei, 4); @@ -390,8 +391,8 @@ SvStream& connectivity::dbase::WriteODbaseIndex(SvStream &rStream, ODbaseIndex& rStream.Write(&rIndex.m_aHeader.db_frei1, 3); rStream.WriteUChar(rIndex.m_aHeader.db_unique); rStream.Write(&rIndex.m_aHeader.db_name, 488); - assert(rStream.GetError() || rStream.Tell() == nOldPos + DINDEX_PAGE_SIZE); - SAL_WARN_IF(rStream.GetError(), "connectivity.drivers", "write error"); + assert(rStream.GetError() || rStream.Tell() == DINDEX_PAGE_SIZE); + SAL_WARN_IF(rStream.GetError(), "connectivity.dbase", "write error"); return rStream; } diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index 95c65ca73825..7dce6fe9beb1 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -323,7 +323,9 @@ void ODbaseTable::fillColumns() for (; i < nFieldCount; i++) { DBFColumn aDBFColumn; +#if !defined(NDEBUG) sal_uInt64 const nOldPos(m_pFileStream->Tell()); +#endif m_pFileStream->Read(aDBFColumn.db_fnm, 11); m_pFileStream->ReadUChar(aDBFColumn.db_typ); m_pFileStream->ReadUInt32(aDBFColumn.db_adr); |