[Libreoffice-commits] core.git: 3 commits - connectivity/source sc/source svx/source
Michael Stahl
mstahl at redhat.com
Mon Jun 6 13:31:31 UTC 2016
connectivity/source/drivers/dbase/DIndex.cxx | 7 ++++---
connectivity/source/drivers/dbase/DTable.cxx | 2 ++
sc/source/filter/starcalc/scflt.cxx | 2 ++
svx/source/dialog/crashreportdlg.cxx | 12 ------------
4 files changed, 8 insertions(+), 15 deletions(-)
New commits:
commit 55a07417c8df1f451cac33d5dfc6a2ef450fa544
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Jun 6 15:13:44 2016 +0200
svx: -Werror=unused-function
Change-Id: Ifa7e36e44ac1f2bdfb91e9b4bf29e7436dc68509
diff --git a/svx/source/dialog/crashreportdlg.cxx b/svx/source/dialog/crashreportdlg.cxx
index 00dcedd..8cb5c29 100644
--- a/svx/source/dialog/crashreportdlg.cxx
+++ b/svx/source/dialog/crashreportdlg.cxx
@@ -48,18 +48,6 @@ void CrashReportDialog::dispose()
Dialog::dispose();
}
-namespace {
-
-OUString getLibDir()
-{
- OUString aOriginal = "$BRAND_BASE_DIR/" LIBO_LIBEXEC_FOLDER;
- rtl::Bootstrap::expandMacros(aOriginal);
-
- return aOriginal;
-}
-
-}
-
IMPL_LINK_TYPED(CrashReportDialog, BtnHdl, Button*, pBtn, void)
{
if (pBtn == mpBtnSend.get())
commit 296125b0bf28af9ec6f0ab1459b392e26ed3eb3f
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Jun 6 15:19:44 2016 +0200
connectivity: -Werror=unused-variable
Change-Id: Idaef923205a5f21d7c4c84cc74d3a369107f7325
diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx
index d5470de..423fd3a 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 95c65ca..7dce6fe 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);
commit 722f6109296e115f56281bae548f809ef60327c2
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Jun 6 15:17:14 2016 +0200
sc: -Werror=unused-variable
Change-Id: Ife22868a5bdc41b5c30bbd187f207998791487eb
diff --git a/sc/source/filter/starcalc/scflt.cxx b/sc/source/filter/starcalc/scflt.cxx
index 44088e3..b4309cc 100644
--- a/sc/source/filter/starcalc/scflt.cxx
+++ b/sc/source/filter/starcalc/scflt.cxx
@@ -1022,7 +1022,9 @@ void Sc10Import::LoadEditStateInfo()
{
Sc10EditStateInfo EditStateInfo;
+#if !defined(NDEBUG)
sal_uInt64 const nOldPos(rStream.Tell());
+#endif
rStream.ReadUInt16(EditStateInfo.CarretX);
rStream.ReadUInt16(EditStateInfo.CarretY);
More information about the Libreoffice-commits
mailing list