[Libreoffice-commits] .: binfilter/bf_svx binfilter/bf_sw binfilter/inc
Pierre-André Jacquod
pjacquod at kemper.freedesktop.org
Thu Dec 16 13:22:37 PST 2010
binfilter/bf_svx/source/items/svx_flditem.cxx | 2 +-
binfilter/bf_sw/source/core/sw3io/sw_sw3attr.cxx | 4 ++--
binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx | 2 +-
binfilter/bf_sw/source/core/sw3io/sw_sw3npool.cxx | 4 ++--
binfilter/inc/bf_sw/hints.hxx | 4 ++--
5 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 6a4af3c7761b9f39956a0fb88367606ff9d1f9da
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Thu Dec 16 22:18:42 2010 +0100
fix to let compile again with --enable-dbgutil
parameter commented out but used in enable part of code
filters/binfilter/bf_sw/source/core/attr/sw_hints.cxx (line 150)
has the definition of the function of
filters/binfilter/inc/bf_sw/hints.hxx, which needed to be fixed in
order to be empty in case of #ifdef DBG_UTIL
diff --git a/binfilter/bf_svx/source/items/svx_flditem.cxx b/binfilter/bf_svx/source/items/svx_flditem.cxx
index 9fa2d1e..ca4e09c 100644
--- a/binfilter/bf_svx/source/items/svx_flditem.cxx
+++ b/binfilter/bf_svx/source/items/svx_flditem.cxx
@@ -81,7 +81,7 @@ namespace binfilter {
// -----------------------------------------------------------------------
-/*N*/ int SvxFieldData::operator==( const SvxFieldData& /*rFld*/ ) const
+/*N*/ int SvxFieldData::operator==( const SvxFieldData& rFld ) const
/*N*/ {
/*N*/ DBG_ASSERT( Type() == rFld.Type(), "==: Verschiedene Typen" );
/*N*/ return TRUE; // Basicklasse immer gleich.
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3attr.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3attr.cxx
index 20403b4..0b30947 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3attr.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3attr.cxx
@@ -618,7 +618,7 @@ SvStream& SwFmtNoBalancedColumns::Store(SvStream &rStrm, USHORT ) const
/*M*/ }
-/*M*/ USHORT SwHeaderAndFooterEatSpacingItem::GetVersion( USHORT /*nFFVer*/ ) const
+/*M*/ USHORT SwHeaderAndFooterEatSpacingItem::GetVersion( USHORT nFFVer ) const
/*M*/ {
/*M*/ ASSERT( SOFFICE_FILEFORMAT_31==nFFVer ||
/*M*/ SOFFICE_FILEFORMAT_40==nFFVer ||
@@ -669,7 +669,7 @@ SvStream& SwFmtNoBalancedColumns::Store(SvStream &rStrm, USHORT ) const
/*N*/ }
-/*N*/ USHORT SwCropGrf::GetVersion( USHORT /*nFFVer*/ ) const
+/*N*/ USHORT SwCropGrf::GetVersion( USHORT nFFVer ) const
/*N*/ {
/*N*/ ASSERT( SOFFICE_FILEFORMAT_31==nFFVer ||
/*N*/ SOFFICE_FILEFORMAT_40==nFFVer ||
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
index b2bb614..6c476fe 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
@@ -793,7 +793,7 @@ public:
// Record schliessen
-/*N*/ void Sw3IoImp::CloseRec( sal_uInt8 /*cType*/ )
+/*N*/ void Sw3IoImp::CloseRec( sal_uInt8 cType )
/*N*/ {
/*N*/ sal_uInt16 nLvl = aRecTypes.Count();
/*N*/ ASSERT( nLvl == aRecSizes.Count(), "CloseRec: falscher Level" );
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3npool.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3npool.cxx
index 6692a1c..a2eaca1 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3npool.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3npool.cxx
@@ -1055,7 +1055,7 @@ SfxPoolItem* SwFmtChain::Create(SvStream& rStrm, USHORT nIVer) const
return pChain;
}
-/*N*/ SvStream& SwFmtChain::Store(SvStream &rStrm, USHORT /*nIVer*/) const
+/*N*/ SvStream& SwFmtChain::Store(SvStream &rStrm, USHORT nIVer) const
/*N*/ {
ASSERT( nIVer != USHRT_MAX,
"SwFmtChain: Wer faengt da Version USHRT_MAX nicht ab?" );
@@ -1108,7 +1108,7 @@ SvStream& SwTextGridItem::Store( SvStream & rStrm, USHORT /*nIVer*/ ) const
return rStrm;
}
-/*N*/ USHORT SwTextGridItem::GetVersion( USHORT /*nFFVer*/ ) const
+/*N*/ USHORT SwTextGridItem::GetVersion( USHORT nFFVer ) const
/*N*/ {
/*N*/ ASSERT( SOFFICE_FILEFORMAT_31==nFFVer ||
/*N*/ SOFFICE_FILEFORMAT_40==nFFVer ||
diff --git a/binfilter/inc/bf_sw/hints.hxx b/binfilter/inc/bf_sw/hints.hxx
index ec8ff7f..d2fb82e 100644
--- a/binfilter/inc/bf_sw/hints.hxx
+++ b/binfilter/inc/bf_sw/hints.hxx
@@ -210,13 +210,13 @@ public:
USHORT Count() const { return pChgSet->Count(); }
void ClearItem( USHORT nWhichIn = 0 )
- {
#ifndef DBG_UTIL
+ {
pChgSet->ClearItem( nWhichIn );
+ }
#else
;
#endif
- }
};
class SwCondCollCondChg: public SwMsgPoolItem
More information about the Libreoffice-commits
mailing list