[Libreoffice-commits] .: binfilter/bf_sw
Caolán McNamara
caolan at kemper.freedesktop.org
Sun Nov 28 07:07:54 PST 2010
binfilter/bf_sw/source/core/sw3io/sw_sw3attr.cxx | 6 +++---
binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx | 16 ++++++++--------
binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx | 8 ++++++--
binfilter/bf_sw/source/core/sw3io/sw_sw3npool.cxx | 12 ++++++------
binfilter/bf_sw/source/core/sw3io/sw_sw3sectn.cxx | 6 +++---
5 files changed, 26 insertions(+), 22 deletions(-)
New commits:
commit f828cc8c1b39664ae4dbdd01ae5b4134716b9ca1
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Sat Nov 27 13:44:30 2010 +0100
trivial warning fixes in binfilters - sw3io
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3attr.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3attr.cxx
index 471a2f7..085997a 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 ||
@@ -829,7 +829,7 @@ SvStream& SwGammaGrf::Store(SvStream & rStrm, USHORT ) const
/*N*/ }
-/*N*/ SfxPoolItem* SwFmtSoftHyph::Create( SvStream& rStrm, USHORT ) const
+/*N*/ SfxPoolItem* SwFmtSoftHyph::Create( SvStream& /*rStrm*/, USHORT ) const
/*N*/ {
/*N*/ return new SwFmtSoftHyph;
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
index 5575660..f283e66 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
@@ -165,8 +165,8 @@ static OldFormats aOldGetSetExpFmt40[] =
NF_NUMBER_1000DEC2, VVF_XX_XX, // 1.234,56
NF_NUMBER_1000DEC2, VVF_XX_X, // 1.234,5
NF_NUMBER_1000DEC2, VVF_XX_XXX, // 1.234,567
- NF_CURRENCY_1000DEC2, VVF_SYS_CUR, // W„hrungsformat aus der
- // Systemeinstellung
+ NF_CURRENCY_1000DEC2, VVF_SYS_CUR, // currency format from the
+ // system setup
// (1.234,00 DM)
NF_CURRENCY_1000INT, VVF_X_CUR, // 1234 DM
NF_CURRENCY_1000DEC2, VVF_XX_XX_CUR, // 1234,56 DM 1234,00 DM
@@ -194,8 +194,8 @@ static OldFormats aOldGetSetExpFmt30[] =
NF_NUMBER_DEC2, 0x0100, // 1245,56
NF_NUMBER_1000DEC2, 0x0100, // 1.234,5
NF_NUMBER_1000DEC2, 0x0100, // 1.234,567
- NF_CURRENCY_1000DEC2, 0x0200, // W„hrungsformat aus der
- // Systemeinstellung
+ NF_CURRENCY_1000DEC2, 0x0200, // currency format from
+ // system setup
// (1.234,00 DM)
NF_CURRENCY_1000INT, 0x1000, // 1234 DM
NF_CURRENCY_1000DEC2, 0x1000, // 1234,56 DM 1234,00 DM
@@ -1055,7 +1055,7 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
/*N*/ }
/*N*/ }
-/*N*/ SwField* lcl_sw3io_InDateField40( Sw3IoImp& rIo, SwFieldType* pType,
+/*N*/ SwField* lcl_sw3io_InDateField40( Sw3IoImp& /*rIo*/, SwFieldType* pType,
/*N*/ USHORT nSubType, UINT32& )
/*N*/ { //SW40.SDW
/*N*/ SwDateTimeField* pFld =
@@ -1065,7 +1065,7 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
/*N*/ return pFld;
/*N*/ }
-/*N*/ SwField* lcl_sw3io_InTimeField40( Sw3IoImp& rIo, SwFieldType* pType,
+/*N*/ SwField* lcl_sw3io_InTimeField40( Sw3IoImp& /*rIo*/, SwFieldType* pType,
/*N*/ USHORT nSubType, UINT32& )
/*N*/ {
SwDateTimeField* pFld =
@@ -1538,7 +1538,7 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
/*N*/ return new SwDocStatField( (SwDocStatFieldType*)pType, nSubType, rFmt );
/*N*/ }
/*N*/
-/*N*/ SwField* lcl_sw3io_InDocStatField( Sw3IoImp& rIo, SwFieldType* pType,
+/*N*/ SwField* lcl_sw3io_InDocStatField( Sw3IoImp& /*rIo*/, SwFieldType* pType,
/*N*/ USHORT nSubType, UINT32& rFmt )
/*N*/ {
/*N*/ return new SwDocStatField( (SwDocStatFieldType*)pType, nSubType, rFmt );
@@ -2001,7 +2001,7 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
/*N*/ *rIo.pStrm << ((SwDocInfoField*)pFld)->GetValue();
/*N*/ }
-/*N*/ SwField* lcl_sw3io_InTemplNameField( Sw3IoImp& rIo, SwFieldType* pType,
+/*N*/ SwField* lcl_sw3io_InTemplNameField( Sw3IoImp& /*rIo*/, SwFieldType* pType,
/*N*/ USHORT, UINT32& rFmt )
/*N*/ {
/*N*/ return new SwTemplNameField( (SwTemplNameFieldType*)pType, rFmt );
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
index f221035..0bed171 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" );
@@ -1326,7 +1326,9 @@ ULONG Sw3IoImp::OutRecSizes()
/*?*/ if( pObj )
/*?*/ pPage->InsertObject( pObj );
/*?*/ else
+ {
/*?*/ ASSERT( !this, "wo ist das DrawObject?" );
+ }
/*?*/ }
/*?*/ }
/*?*/ delete pInsModel;
@@ -1708,7 +1710,7 @@ const int RES_POOLCOLL_HTML_DT_40 = 0x3007;
// Sammeln der Strings am Doc. Es werden alle Strings aus benannten
// Formaten, Collections und PageDescs gesammelt. Weiter wird allen
-// Auto-Frameformaten eine Extension im Namen verpaát, weil die Namen
+// Auto-Frameformaten eine Extension im Namen verpasst, weil die Namen
// nicht eindeutig sind.
/*N*/ void Sw3StringPool::Setup( SwDoc& rDoc, long nFFVersion,
@@ -1945,6 +1947,8 @@ const int RES_POOLCOLL_HTML_DT_40 = 0x3007;
/*?*/ case TOX_TABLES:
/*?*/ nPoolId = RES_POOLCOLL_LABEL_TABLE;
/*?*/ break;
+ default:
+ break;
/*N*/ }
/*N*/ if( USHRT_MAX != nPoolId )
/*N*/ {
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3npool.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3npool.cxx
index 6afd73c..c4efba3 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3npool.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3npool.cxx
@@ -946,7 +946,7 @@ bool SwFmtFlyCnt::Sw3ioExportAllowed() const
/*N*/ SOFFICE_FILEFORMAT_40==nFFVer ) ? 0 : IVER_TOXMARK_NEWTOX;
/*N*/ }
-SfxPoolItem* SwFmtRuby::Create(SvStream & rStrm, USHORT nVer) const
+SfxPoolItem* SwFmtRuby::Create(SvStream & rStrm, USHORT /*nVer*/) const
{
String sRubyTxt;
SwFmtRuby* pRet = new SwFmtRuby( sRubyTxt );
@@ -957,7 +957,7 @@ SfxPoolItem* SwFmtRuby::Create(SvStream & rStrm, USHORT nVer) const
return pRet;
}
-SvStream& SwFmtRuby::Store( SvStream & rStrm, USHORT nIVer ) const
+SvStream& SwFmtRuby::Store( SvStream & rStrm, USHORT /*nIVer*/ ) const
{
BOOL bVal = 0;
rStrm << bVal;
@@ -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?" );
@@ -1091,7 +1091,7 @@ SfxPoolItem* SwFmtChain::Create(SvStream& rStrm, USHORT nIVer) const
/*N*/ return SOFFICE_FILEFORMAT_40 < nFFVer ? 1 : USHRT_MAX;
/*N*/ }
-SfxPoolItem* SwTextGridItem::Create(SvStream& rStrm, USHORT nIVer) const
+SfxPoolItem* SwTextGridItem::Create(SvStream& rStrm, USHORT /*nIVer*/) const
{
SwTextGridItem* pRet = new SwTextGridItem;
BOOL bVal;
@@ -1100,7 +1100,7 @@ SfxPoolItem* SwTextGridItem::Create(SvStream& rStrm, USHORT nIVer) const
return pRet;
}
-SvStream& SwTextGridItem::Store( SvStream & rStrm, USHORT nIVer ) const
+SvStream& SwTextGridItem::Store( SvStream & rStrm, USHORT /*nIVer*/ ) const
{
BOOL bVal = 0;
rStrm << bVal;
@@ -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/bf_sw/source/core/sw3io/sw_sw3sectn.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3sectn.cxx
index 7694afa..330119a 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3sectn.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3sectn.cxx
@@ -76,9 +76,9 @@ namespace binfilter {
/*N*/
/*N*/ // Der aktuelle NumRange eines 3.1/40-Files muss gerettet werden, falls
/*N*/ // eine Section innerhalb einer Section gelesen wird (z.B. Flys)
-/*N*/ SwNumRule* pOld40Rule;
-/*N*/ SwPaM* pOld40Range;
-/*N*/ BOOL bOldConvertNoNum;
+/*N*/ SwNumRule* pOld40Rule = NULL;
+/*N*/ SwPaM* pOld40Range =NULL;
+/*N*/ BOOL bOldConvertNoNum = 0;
/*N*/ if( !IsVersion(SWG_LONGIDX) )
/*N*/ {
/*N*/ pOld40Rule = pCurNumRule;
More information about the Libreoffice-commits
mailing list