[Libreoffice-commits] .: binfilter/bf_sc binfilter/bf_sch binfilter/bf_sfx2 binfilter/bf_starmath binfilter/bf_svx binfilter/bf_sw binfilter/bf_xmloff binfilter/inc
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Tue Nov 2 20:26:57 PDT 2010
binfilter/bf_sc/source/core/tool/sc_addincol.cxx | 6
binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx | 13
binfilter/bf_sch/source/core/sch_chtmod3d.cxx | 2
binfilter/bf_sch/source/core/sch_chtmode2.cxx | 1
binfilter/bf_sch/source/core/sch_chtmode9.cxx | 2
binfilter/bf_sfx2/source/inc/objshimp.hxx | 54 +-
binfilter/bf_starmath/source/starmath_mathml.cxx | 11
binfilter/bf_starmath/source/starmath_node.cxx | 2
binfilter/bf_starmath/source/starmath_parse.cxx | 1
binfilter/bf_svx/source/dialog/svx_dlgutil.cxx | 2
binfilter/bf_svx/source/items/svx_algitem.cxx | 4
binfilter/bf_svx/source/items/svx_bulitem.cxx | 31 -
binfilter/bf_svx/source/items/svx_chrtitem.cxx | 106 -----
binfilter/bf_svx/source/items/svx_clipfmtitem.cxx | 2
binfilter/bf_svx/source/items/svx_e3ditem.cxx | 10
binfilter/bf_svx/source/items/svx_frmitems.cxx | 12
binfilter/bf_svx/source/items/svx_numitem.cxx | 30 -
binfilter/bf_svx/source/items/svx_paraitem.cxx | 77 ++-
binfilter/bf_svx/source/items/svx_rotmodit.cxx | 7
binfilter/bf_svx/source/items/svx_svxfont.cxx | 20 -
binfilter/bf_svx/source/items/svx_textitem.cxx | 200 +++++-----
binfilter/bf_svx/source/items/svx_xmlcnitm.cxx | 20 -
binfilter/bf_svx/source/items/svx_zoomitem.cxx | 2
binfilter/bf_svx/source/svdraw/svx_svdocirc.cxx | 2
binfilter/bf_svx/source/svdraw/svx_svdopath.cxx | 2
binfilter/bf_sw/source/core/bastyp/sw_calc.cxx | 1
binfilter/bf_sw/source/core/fields/sw_ddefld.cxx | 4
binfilter/bf_sw/source/core/fields/sw_fldbas.cxx | 2
binfilter/bf_sw/source/core/inc/swcache.hxx | 8
binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx | 22 -
binfilter/bf_sw/source/ui/fldui/sw_fldmgr.cxx | 72 +--
binfilter/bf_xmloff/source/core/xmloff_XMLEmbeddedObjectImportContext.cxx | 1
binfilter/bf_xmloff/source/core/xmloff_xmlehelp.cxx | 4
binfilter/bf_xmloff/source/draw/xmloff_XMLImageMapExport.cxx | 2
binfilter/bf_xmloff/source/draw/xmloff_animimp.cxx | 10
binfilter/bf_xmloff/source/draw/xmloff_shapeexport2.cxx | 15
binfilter/bf_xmloff/source/draw/xmloff_shapeexport3.cxx | 4
binfilter/inc/bf_sw/tblsel.hxx | 6
38 files changed, 368 insertions(+), 402 deletions(-)
New commits:
commit 4cfcdb7ed3450218665b59f8de5698b3f441bac3
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Tue Nov 2 22:20:58 2010 -0500
binfilters: kill 8464 warnings. 15756 to go
diff --git a/binfilter/bf_sc/source/core/tool/sc_addincol.cxx b/binfilter/bf_sc/source/core/tool/sc_addincol.cxx
index e1fced7..c5d58cc 100644
--- a/binfilter/bf_sc/source/core/tool/sc_addincol.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_addincol.cxx
@@ -201,11 +201,11 @@ public:
/*N*/ case uno::TypeClass_FLOAT:
/*N*/ case uno::TypeClass_DOUBLE:
/*N*/ rAny >>= rOut;
-/*N*/ bRet = TRUE;
/*N*/ break;
+ default:
+ rOut = 0.0;
+ break;
/*N*/ }
-/*N*/ if (!bRet)
-/*N*/ rOut = 0.0;
/*N*/ return bRet;
/*N*/ }
diff --git a/binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx b/binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx
index 512852a..ed4666b 100644
--- a/binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx
@@ -3275,6 +3275,7 @@ const USHORT ScChangeTrack::nContentSlots =
/*N*/ case SC_CAT_DELETE_TABS :
/*N*/ eInsType = SC_CAT_INSERT_TABS;
/*N*/ break;
+ default: break;
/*N*/ }
/*N*/ for ( ScChangeAction* p = *ppFirstAction; p; p = p->GetNext() )
/*N*/ {
@@ -3429,6 +3430,7 @@ const USHORT ScChangeTrack::nContentSlots =
/*N*/ else
/*N*/ pMove->GetFromRange().aEnd.IncTab( nFrom );
/*N*/ break;
+ default: break;
/*N*/ }
/*N*/ }
/*N*/ if ( nTo )
@@ -3453,6 +3455,7 @@ const USHORT ScChangeTrack::nContentSlots =
/*N*/ else
/*N*/ pMove->GetBigRange().aEnd.IncTab( nTo );
/*N*/ break;
+ default: break;
/*N*/ }
/*N*/ }
/*N*/ if ( nFrom || nTo )
@@ -3463,6 +3466,7 @@ const USHORT ScChangeTrack::nContentSlots =
/*N*/ }
/*N*/ }
/*N*/ break;
+ default: break;
/*N*/ }
/*N*/ }
/*N*/ if ( bUpdate )
@@ -3477,7 +3481,6 @@ const USHORT ScChangeTrack::nContentSlots =
/*N*/ }
/*N*/ else
/*N*/ { // Undo Delete
-/*N*/ ScChangeAction* pNextAction = NULL;
/*N*/ for ( ScChangeAction* p = *ppFirstAction; p; p = p->GetNext() )
/*N*/ {
/*N*/ if ( p == pAct )
@@ -3565,7 +3568,8 @@ const USHORT ScChangeTrack::nContentSlots =
/*N*/ do
/*N*/ { // Abhaengigkeit vom FromRange herstellen
/*N*/ AddDependentWithNotify( pActMove, pHere );
-/*N*/ } while ( pHere = pHere->GetNextContent() );
+ }
+ while ( (pHere = pHere->GetNextContent()) != 0 );
/*N*/ }
/*N*/ else
/*N*/ p->UpdateReference( this, eMode, rFrom, nDx, nDy, nDz );
@@ -3678,7 +3682,6 @@ const USHORT ScChangeTrack::nContentSlots =
/*N*/ {
/*N*/ if ( pAct->HasDependent() && !bRecursion )
/*N*/ {
-/*N*/ const ScBigRange& rRange = pAct->GetBigRange();
/*N*/ DBG_ASSERT( pTable, "ScChangeTrack::Reject: Insert ohne Table" );
/*N*/ for ( ScChangeAction* p = pTable->Last(); p && bOk; p = pTable->Prev() )
/*N*/ {
@@ -3738,6 +3741,8 @@ const USHORT ScChangeTrack::nContentSlots =
/*N*/ case SC_CAT_DELETE_TABS :
/*N*/ aDelRange.aStart.SetTab( aDelRange.aEnd.Tab() );
/*N*/ break;
+ default:
+ break;
/*N*/ }
/*N*/ ScChangeAction* p = pAct;
/*N*/ BOOL bLoop = TRUE;
@@ -3760,6 +3765,7 @@ const USHORT ScChangeTrack::nContentSlots =
/*N*/ case SC_CAT_DELETE_TABS :
/*N*/ aDelRange.aStart.IncTab( -1 );
/*N*/ break;
+ default: break;
/*N*/ }
/*N*/ }
/*N*/ else
@@ -3787,7 +3793,6 @@ const USHORT ScChangeTrack::nContentSlots =
/*N*/ {
/*N*/ if ( pAct->HasDependent() && !bRecursion )
/*N*/ {
-/*N*/ const ScBigRange& rRange = pAct->GetBigRange();
/*N*/ DBG_ASSERT( pTable, "ScChangeTrack::Reject: Move ohne Table" );
/*N*/ for ( ScChangeAction* p = pTable->Last(); p && bOk; p = pTable->Prev() )
/*N*/ {
diff --git a/binfilter/bf_sch/source/core/sch_chtmod3d.cxx b/binfilter/bf_sch/source/core/sch_chtmod3d.cxx
index 37a7d82..7d3e8dc 100644
--- a/binfilter/bf_sch/source/core/sch_chtmod3d.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmod3d.cxx
@@ -1132,6 +1132,7 @@ namespace binfilter {
/*?*/ CHOBJID_AREA, pRowGroup);
/*?*/ }
/*?*/ break;
+ default: break;
/*?*/ }
/*?*/ }
/*N*/
@@ -1754,6 +1755,7 @@ namespace binfilter {
/*?*/ pDescription [nRow].fValue = DBL_MIN;
/*N*/ }
/*N*/ break;
+ default: break;
/*N*/ }
/*N*/ }
/*N*/
diff --git a/binfilter/bf_sch/source/core/sch_chtmode2.cxx b/binfilter/bf_sch/source/core/sch_chtmode2.cxx
index 56058be..5d143df 100644
--- a/binfilter/bf_sch/source/core/sch_chtmode2.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmode2.cxx
@@ -1751,6 +1751,7 @@ enum ChartStyleV0
/*?*/ case CHSTYLE_3D_AREA:
/*?*/ eChartStyle = CHSTYLE_3D_PERCENTAREA;
/*?*/ break;
+ default: break;
/*?*/ }
/*?*/
/*?*/ bNoMore = TRUE;
diff --git a/binfilter/bf_sch/source/core/sch_chtmode9.cxx b/binfilter/bf_sch/source/core/sch_chtmode9.cxx
index 8176a88..a371e3f 100644
--- a/binfilter/bf_sch/source/core/sch_chtmode9.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmode9.cxx
@@ -215,6 +215,7 @@ namespace binfilter {
/*N*/ {
/*N*/ case CHSTYLE_2D_STOCK_3:
/*N*/ case CHSTYLE_2D_STOCK_4:
+ default: break;
/*N*/ return TRUE;
/*N*/ }
/*N*/ if(!CanAxis(CHART_AXIS_SECONDARY_Y))
@@ -890,6 +891,7 @@ namespace binfilter {
/*N*/ }
/*N*/ break;
/*N*/ }
+ default: break;
/*N*/ }
/*N*/ } //for nRow
/*N*/ aBarY1.NextCol();
diff --git a/binfilter/bf_sfx2/source/inc/objshimp.hxx b/binfilter/bf_sfx2/source/inc/objshimp.hxx
index 233e7ef..a9b2ac4 100644
--- a/binfilter/bf_sfx2/source/inc/objshimp.hxx
+++ b/binfilter/bf_sfx2/source/inc/objshimp.hxx
@@ -132,61 +132,63 @@ struct SfxObjectShell_Impl
sal_Bool bDisposing;
SfxObjectShell_Impl() :
- nTime(),
- bIsTmp( sal_False),
- bClosing( sal_False),
- bSetInPlaceObj( sal_False),
- bPasswd( sal_False),
+ pDocInfo ( 0),
+ pCfgMgr( 0),
pInPlaceObj( 0),
pBasicMgr( 0),
pBasicLibContainer( 0 ),
pDialogLibContainer( 0 ),
pProgress( 0),
+ nTime(),
nVisualDocumentNumber( USHRT_MAX),
+
+ bTemplateConfig( sal_False),
+ bInList ( sal_False),
+ bClosing( sal_False),
+ bSetInPlaceObj( sal_False),
bIsSaving( sal_False),
+ bPasswd( sal_False),
+ bIsTmp( sal_False),
bIsNamedVisible( sal_False),
- pCfgMgr( 0),
- bTemplateConfig( sal_False),
bDidWarnFormat( sal_False),
bDidDangerousSave(sal_False),
- bIsBasicDefault( sal_True ),
bIsTemplate(sal_False),
- lErr(ERRCODE_NONE),
- nEventId ( 0),
- pDocInfo ( 0),
bIsAbortingImport ( sal_False),
- bInList ( sal_False),
bImportDone ( sal_False),
+ bInPrepareClose( sal_False ),
+ bPreparedForClose( sal_False ),
+ bWaitingForPicklist( sal_False ),
+ bModuleSearched( sal_False ),
+ bIsBasicDefault( sal_True ),
+ bIsHelpObjSh( sal_False ),
+ bForbidCaching( sal_False ),
+ bForbidReload( sal_False ),
+ bSupportsEventMacros( sal_True ),
+ bLoadingWindows( sal_False ),
+ bBasicInitialized( sal_False ),
+ bHidden( sal_False ),
+
+ lErr(ERRCODE_NONE),
+ nEventId ( 0),
+ bDoNotTouchDocInfo( sal_False ),
pReloadTimer ( 0),
- nLoadedFlags ( SFX_LOADED_MAINDOCUMENT ),
pMarkData( 0 ),
+ nLoadedFlags ( SFX_LOADED_MAINDOCUMENT ),
bInFrame( sal_False ),
bModalMode( sal_False ),
bRunningMacro( sal_False ),
bReloadAvailable( sal_False ),
nAutoLoadLocks( 0 ),
- bInPrepareClose( sal_False ),
- bPreparedForClose( sal_False ),
- bWaitingForPicklist( sal_False ),
pModule( 0 ),
- bModuleSearched( sal_False ),
pFrame( 0 ),
pImageManager( 0 ),
pTbxConfig( 0 ),
pEventConfig(NULL),
- bIsHelpObjSh( sal_False ),
- bForbidCaching( sal_False ),
- bDoNotTouchDocInfo( sal_False ),
- bForbidReload( sal_False ),
- bBasicInitialized( sal_False ),
eFlags( SFXOBJECTSHELL_UNDEFINED ),
pCloser( 0 ),
- bSupportsEventMacros( sal_True ),
bReadOnlyUI( sal_False ),
bHiddenLockedByAPI( sal_False ),
- bInCloseEvent( sal_False ),
- bLoadingWindows( sal_False ),
- bHidden( sal_False )
+ bInCloseEvent( sal_False )
, nStyleFilter( 0 )
, nMacroMode( -1 )
, bDisposing( sal_False )
diff --git a/binfilter/bf_starmath/source/starmath_mathml.cxx b/binfilter/bf_starmath/source/starmath_mathml.cxx
index 135b5b6..82b2f2b 100644
--- a/binfilter/bf_starmath/source/starmath_mathml.cxx
+++ b/binfilter/bf_starmath/source/starmath_mathml.cxx
@@ -3997,7 +3997,8 @@ void SmXMLExport::ExportFont(const SmNode *pNode, int nLevel)
AddAttribute(XML_NAMESPACE_MATH,sXML_fontfamily,
OUString(pNode->GetToken().aText.GetBuffer()));
break;
-
+ default:
+ break;
}
#if 0
if (pNode->GetNumSubNodes() > 1) //or in the future is a node that
@@ -4157,16 +4158,8 @@ void SmXMLExport::ExportNodes(const SmNode *pNode, int nLevel)
case NMATRIX:
ExportMatrix(pNode,nLevel);
break;
-#if 0
default:
- {
- ULONG nSize = pNode->GetNumSubNodes();
- for (ULONG i = 0; i < nSize; i++)
- if (SmNode *pTemp = pNode->GetSubNode(i))
- ExportNodes(pTemp,nLevel+1);
- }
break;
-#endif
}
}
}
diff --git a/binfilter/bf_starmath/source/starmath_node.cxx b/binfilter/bf_starmath/source/starmath_node.cxx
index fcd2919..69fe6f8 100644
--- a/binfilter/bf_starmath/source/starmath_node.cxx
+++ b/binfilter/bf_starmath/source/starmath_node.cxx
@@ -1642,6 +1642,7 @@ void SmAlignNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
case TALIGNL: eHorAlign = RHA_LEFT; break;
case TALIGNC: eHorAlign = RHA_CENTER; break;
case TALIGNR: eHorAlign = RHA_RIGHT; break;
+ default: break;
}
SetRectHorAlign(eHorAlign);
@@ -2425,6 +2426,7 @@ void SmGlyphSpecialNode::Arrange(const OutputDevice &rDev, const SmFormat &rForm
/*N*/ {
/*N*/ case TBLANK: nNum += 4; break;
/*?*/ case TSBLANK: nNum += 1; break;
+ default: break;
/*N*/ }
/*N*/ }
diff --git a/binfilter/bf_starmath/source/starmath_parse.cxx b/binfilter/bf_starmath/source/starmath_parse.cxx
index 6f2bcd4..46463f6 100644
--- a/binfilter/bf_starmath/source/starmath_parse.cxx
+++ b/binfilter/bf_starmath/source/starmath_parse.cxx
@@ -1599,6 +1599,7 @@ const sal_Int32 coNumContFlags =
/*N*/ case TLIM : pLim = "lim"; break;
/*N*/ case TLIMSUP : pLim = "lim sup"; break;
/*N*/ case TLIMINF : pLim = "lim inf"; break;
+ default: break;
/*N*/ }
/*N*/ if( pLim )
/*N*/ CurToken.aText.AssignAscii( pLim );
diff --git a/binfilter/bf_svx/source/dialog/svx_dlgutil.cxx b/binfilter/bf_svx/source/dialog/svx_dlgutil.cxx
index 1e81648..fd8903c 100644
--- a/binfilter/bf_svx/source/dialog/svx_dlgutil.cxx
+++ b/binfilter/bf_svx/source/dialog/svx_dlgutil.cxx
@@ -64,6 +64,7 @@ namespace binfilter {
/*?*/ case SFX_MAPUNIT_10TH_MM: nTmp *= 10; break;
/*?*/ case SFX_MAPUNIT_MM: break;
/*?*/ case SFX_MAPUNIT_CM: nTmp /= 10; break;
+ default: break;
/*N*/ }
/*N*/
/*N*/ nTmp *= 20;
@@ -102,6 +103,7 @@ namespace binfilter {
/*?*/ case SFX_MAPUNIT_10TH_MM: nRet /= 10; break;
/*?*/ case SFX_MAPUNIT_MM: break;
/*?*/ case SFX_MAPUNIT_CM: nRet *= 10; break;
+ default: break;
/*N*/ }
/*N*/
/*N*/ // ggf. aufrunden
diff --git a/binfilter/bf_svx/source/items/svx_algitem.cxx b/binfilter/bf_svx/source/items/svx_algitem.cxx
index cd871e7..1781bc4 100644
--- a/binfilter/bf_svx/source/items/svx_algitem.cxx
+++ b/binfilter/bf_svx/source/items/svx_algitem.cxx
@@ -212,7 +212,7 @@ using namespace ::com::sun::star;
//------------------------------------------------------------------------
-/*N*/ bool SvxVerJustifyItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+/*N*/ bool SvxVerJustifyItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
/*N*/ {
/*N*/ table::CellVertJustify eUno = table::CellVertJustify_STANDARD;
/*N*/ switch ( (SvxCellVerJustify)GetValue() )
@@ -304,7 +304,7 @@ using namespace ::com::sun::star;
/*N*/ return sal_True;
/*N*/ }
-/*N*/ bool SvxOrientationItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+/*N*/ bool SvxOrientationItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
/*N*/ {
/*N*/ table::CellOrientation eOrient;
/*N*/ if(!(rVal >>= eOrient))
diff --git a/binfilter/bf_svx/source/items/svx_bulitem.cxx b/binfilter/bf_svx/source/items/svx_bulitem.cxx
index f830d7a..c20ddfd 100644
--- a/binfilter/bf_svx/source/items/svx_bulitem.cxx
+++ b/binfilter/bf_svx/source/items/svx_bulitem.cxx
@@ -218,14 +218,14 @@ namespace binfilter {
// -----------------------------------------------------------------------
-/*N*/ SfxPoolItem* SvxBulletItem::Clone( SfxItemPool *pPool ) const
+/*N*/ SfxPoolItem* SvxBulletItem::Clone( SfxItemPool* /*pPool*/ ) const
/*N*/ {
/*N*/ return new SvxBulletItem( *this );
/*N*/ }
// -----------------------------------------------------------------------
-/*N*/ SfxPoolItem* SvxBulletItem::Create( SvStream& rStrm, USHORT nVersion ) const
+/*N*/ SfxPoolItem* SvxBulletItem::Create( SvStream& rStrm, USHORT /*nVersion*/ ) const
/*N*/ {
/*N*/ return new SvxBulletItem( rStrm, Which() );
/*N*/ }
@@ -254,7 +254,7 @@ namespace binfilter {
// -----------------------------------------------------------------------
-/*N*/ USHORT SvxBulletItem::GetVersion( USHORT nVersion ) const
+/*N*/ USHORT SvxBulletItem::GetVersion( USHORT /*nVersion*/ ) const
/*N*/ {
/*N*/ return BULITEM_VERSION;
/*N*/ }
@@ -303,7 +303,7 @@ namespace binfilter {
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxBulletItem::Store( SvStream& rStrm, USHORT nItemVersion ) const
+/*N*/ SvStream& SvxBulletItem::Store( SvStream& rStrm, USHORT /*nItemVersion*/ ) const
/*N*/ {
/*N*/ // Korrektur bei leerer Bitmap
/*N*/ if( ( nStyle == BS_BMP ) &&
@@ -324,7 +324,7 @@ namespace binfilter {
/*N*/ StoreFont( rStrm, aFont );
/*N*/ else
/*N*/ {
-/*?*/ ULONG nStart = rStrm.Tell();
+/*?*/ ULONG _nStart = rStrm.Tell();
/*?*/
/*?*/ // Kleine Vorab-Schaetzung der Groesse...
/*?*/ USHORT nFac = ( rStrm.GetCompressMode() != COMPRESSMODE_NONE ) ? 3 : 1;
@@ -344,8 +344,8 @@ namespace binfilter {
/*?*/ // Bitmap > 64K verwendet wird, hat das SvxNumBulletItem beim Laden ein Problem,
/*?*/ // stuerzt aber nicht ab.
/*?*/
-/*?*/ if ( (nEnd-nStart) > 0xFF00 )
-/*?*/ rStrm.Seek( nStart );
+/*?*/ if ( (nEnd-_nStart) > 0xFF00 )
+/*?*/ rStrm.Seek( _nStart );
/*N*/ }
/*N*/ rStrm << nWidth;
/*N*/ rStrm << nStart;
@@ -362,23 +362,6 @@ namespace binfilter {
/*N*/ return rStrm;
/*N*/ }
-//------------------------------------------------------------------------
-
-
-//------------------------------------------------------------------------
-
-
-//------------------------------------------------------------------------
-
-
-//------------------------------------------------------------------------
-
-
-//------------------------------------------------------------------------
-
-
-//------------------------------------------------------------------------
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_svx/source/items/svx_chrtitem.cxx b/binfilter/bf_svx/source/items/svx_chrtitem.cxx
index c2ff778..ee44117 100644
--- a/binfilter/bf_svx/source/items/svx_chrtitem.cxx
+++ b/binfilter/bf_svx/source/items/svx_chrtitem.cxx
@@ -86,7 +86,7 @@ using namespace ::com::sun::star;
// -----------------------------------------------------------------------
-/*N*/ SfxPoolItem* SvxChartStyleItem::Clone(SfxItemPool* pPool) const
+/*N*/ SfxPoolItem* SvxChartStyleItem::Clone(SfxItemPool* /*pPool*/) const
/*N*/ {
/*N*/ return new SvxChartStyleItem(*this);
/*N*/ }
@@ -115,14 +115,14 @@ using namespace ::com::sun::star;
/*N*/ // -----------------------------------------------------------------------
/*N*/
-/*N*/ SfxPoolItem* SvxChartDataDescrItem::Clone(SfxItemPool* pPool) const
+/*N*/ SfxPoolItem* SvxChartDataDescrItem::Clone(SfxItemPool* /*pPool*/) const
/*N*/ {
/*N*/ return new SvxChartDataDescrItem(*this);
/*N*/ }
// -----------------------------------------------------------------------
-/*N*/ SfxPoolItem* SvxChartDataDescrItem::Create(SvStream& rIn, USHORT nVer) const
+/*N*/ SfxPoolItem* SvxChartDataDescrItem::Create(SvStream& rIn, USHORT /*nVer*/) const
/*N*/ {
/*N*/ return new SvxChartDataDescrItem(rIn, Which());
/*N*/ }
@@ -148,14 +148,14 @@ using namespace ::com::sun::star;
// -----------------------------------------------------------------------
-/*N*/ SfxPoolItem* SvxChartLegendPosItem::Clone(SfxItemPool* pPool) const
+/*N*/ SfxPoolItem* SvxChartLegendPosItem::Clone(SfxItemPool* /*pPool*/) const
/*N*/ {
/*N*/ return new SvxChartLegendPosItem(*this);
/*N*/ }
// -----------------------------------------------------------------------
-/*N*/ SfxPoolItem* SvxChartLegendPosItem::Create(SvStream& rIn, USHORT nVer) const
+/*N*/ SfxPoolItem* SvxChartLegendPosItem::Create(SvStream& rIn, USHORT /*nVer*/) const
/*N*/ {
/*N*/ return new SvxChartLegendPosItem(rIn, Which());
/*N*/ }
@@ -181,14 +181,14 @@ using namespace ::com::sun::star;
// -----------------------------------------------------------------------
-/*N*/ SfxPoolItem* SvxChartTextOrderItem::Clone(SfxItemPool* pPool) const
+/*N*/ SfxPoolItem* SvxChartTextOrderItem::Clone(SfxItemPool* /*pPool*/) const
/*N*/ {
/*N*/ return new SvxChartTextOrderItem(*this);
/*N*/ }
// -----------------------------------------------------------------------
-/*N*/ SfxPoolItem* SvxChartTextOrderItem::Create(SvStream& rIn, USHORT nVer) const
+/*N*/ SfxPoolItem* SvxChartTextOrderItem::Create(SvStream& rIn, USHORT /*nVer*/) const
/*N*/ {
/*N*/ return new SvxChartTextOrderItem(rIn, Which());
/*N*/ }
@@ -214,14 +214,14 @@ using namespace ::com::sun::star;
// -----------------------------------------------------------------------
-/*N*/ SfxPoolItem* SvxChartTextOrientItem::Clone(SfxItemPool* pPool) const
+/*N*/ SfxPoolItem* SvxChartTextOrientItem::Clone(SfxItemPool* /*pPool*/) const
/*N*/ {
/*N*/ return new SvxChartTextOrientItem(*this);
/*N*/ }
// -----------------------------------------------------------------------
-/*N*/ SfxPoolItem* SvxChartTextOrientItem::Create(SvStream& rIn, USHORT nVer) const
+/*N*/ SfxPoolItem* SvxChartTextOrientItem::Create(SvStream& rIn, USHORT /*nVer*/) const
/*N*/ {
/*N*/ return new SvxChartTextOrientItem(rIn, Which());
/*N*/ }
@@ -264,113 +264,41 @@ using namespace ::com::sun::star;
// -----------------------------------------------------------------------
-/*N*/ SfxPoolItem* SvxDoubleItem::Clone(SfxItemPool* Pool) const
+/*N*/ SfxPoolItem* SvxDoubleItem::Clone(SfxItemPool* /*Pool*/) const
/*N*/ {
/*N*/ return new SvxDoubleItem(*this);
/*N*/ }
// -----------------------------------------------------------------------
-/*N*/ SfxPoolItem* SvxDoubleItem::Create(SvStream& rIn, USHORT nVersion) const
+/*N*/ SfxPoolItem* SvxDoubleItem::Create(SvStream& rIn, USHORT /*nVersion*/) const
/*N*/ {
-/*N*/ double fVal;
-/*N*/ rIn >> fVal;
-/*N*/ return new SvxDoubleItem(fVal, Which());
+/*N*/ double _fVal;
+/*N*/ rIn >> _fVal;
+/*N*/ return new SvxDoubleItem(_fVal, Which());
/*N*/ }
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxDoubleItem::Store(SvStream& rOut, USHORT nItemVersion) const
+/*N*/ SvStream& SvxDoubleItem::Store(SvStream& rOut, USHORT /*nItemVersion*/) const
/*N*/ {
/*N*/ rOut << fVal;
/*N*/ return rOut;
/*N*/ }
// -----------------------------------------------------------------------
-
-
-// -----------------------------------------------------------------------
-
-
-// -----------------------------------------------------------------------
-
-
-
-
-
-// -----------------------------------------------------------------------
-/*N*/ bool SvxDoubleItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+/*N*/ bool SvxDoubleItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
/*N*/ {
/*N*/ rVal <<= fVal;
/*N*/ return sal_True;
/*N*/ }
// -----------------------------------------------------------------------
-/*N*/ bool SvxDoubleItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+/*N*/ bool SvxDoubleItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
/*N*/ {
/*N*/ return rVal >>= fVal;
/*N*/ }
-
-
-/*************************************************************************
-|*
-|* SvxChartKindErrorItem
-|*
-*************************************************************************/
-
-
-// -----------------------------------------------------------------------
-
-
-// -----------------------------------------------------------------------
-
-
-// -----------------------------------------------------------------------
-
-
-// -----------------------------------------------------------------------
-
-
-/*************************************************************************
-|*
-|* SvxChartIndicateItem
-|*
-*************************************************************************/
-
-
-// -----------------------------------------------------------------------
-
-
-// -----------------------------------------------------------------------
-
-
-// -----------------------------------------------------------------------
-
-
-// -----------------------------------------------------------------------
-
-
-/*************************************************************************
-|*
-|* SvxChartRegressItem
-|*
-*************************************************************************/
-
-
-// -----------------------------------------------------------------------
-
-
-// -----------------------------------------------------------------------
-
-
-// -----------------------------------------------------------------------
-
-
-// -----------------------------------------------------------------------
-
-
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_svx/source/items/svx_clipfmtitem.cxx b/binfilter/bf_svx/source/items/svx_clipfmtitem.cxx
index d77890c..9876141 100644
--- a/binfilter/bf_svx/source/items/svx_clipfmtitem.cxx
+++ b/binfilter/bf_svx/source/items/svx_clipfmtitem.cxx
@@ -100,7 +100,7 @@ String SvxClipboardFmtItem_Impl::sEmptyStr;
/*N*/ return nRet;
/*N*/ }
-/*N*/ SfxPoolItem* SvxClipboardFmtItem::Clone( SfxItemPool *pPool ) const
+/*N*/ SfxPoolItem* SvxClipboardFmtItem::Clone( SfxItemPool* /*pPool*/ ) const
/*N*/ {
/*N*/ return new SvxClipboardFmtItem( *this );
/*N*/ }
diff --git a/binfilter/bf_svx/source/items/svx_e3ditem.cxx b/binfilter/bf_svx/source/items/svx_e3ditem.cxx
index ec2aea3..8136528 100644
--- a/binfilter/bf_svx/source/items/svx_e3ditem.cxx
+++ b/binfilter/bf_svx/source/items/svx_e3ditem.cxx
@@ -85,7 +85,7 @@ using namespace ::com::sun::star;
// -----------------------------------------------------------------------
-/*N*/ SfxPoolItem* SvxVector3DItem::Clone( SfxItemPool *pPool ) const
+/*N*/ SfxPoolItem* SvxVector3DItem::Clone( SfxItemPool* /*pPool*/ ) const
/*N*/ {
/*N*/ DBG_CHKTHIS(SvxVector3DItem, 0);
/*N*/ return new SvxVector3DItem( *this );
@@ -93,7 +93,7 @@ using namespace ::com::sun::star;
// -----------------------------------------------------------------------
-/*N*/ SfxPoolItem* SvxVector3DItem::Create(SvStream &rStream, USHORT nVersion) const
+/*N*/ SfxPoolItem* SvxVector3DItem::Create(SvStream &rStream, USHORT /*nVersion*/) const
/*N*/ {
/*N*/ DBG_CHKTHIS(SvxVector3DItem, 0);
/*N*/ Vector3D aStr;
@@ -103,7 +103,7 @@ using namespace ::com::sun::star;
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxVector3DItem::Store(SvStream &rStream, USHORT nItemVersion) const
+/*N*/ SvStream& SvxVector3DItem::Store(SvStream &rStream, USHORT /*nItemVersion*/) const
/*N*/ {
/*N*/ DBG_CHKTHIS(SvxVector3DItem, 0);
/*N*/
@@ -115,7 +115,7 @@ using namespace ::com::sun::star;
// -----------------------------------------------------------------------
-/*N*/ bool SvxVector3DItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+/*N*/ bool SvxVector3DItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
/*N*/ {
/*N*/ drawing::Direction3D aDirection;
/*N*/
@@ -130,7 +130,7 @@ using namespace ::com::sun::star;
// -----------------------------------------------------------------------
-/*N*/ bool SvxVector3DItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+/*N*/ bool SvxVector3DItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
/*N*/ {
/*N*/ drawing::Direction3D aDirection;
/*N*/ if(!(rVal >>= aDirection))
diff --git a/binfilter/bf_svx/source/items/svx_frmitems.cxx b/binfilter/bf_svx/source/items/svx_frmitems.cxx
index 672be28..e7567e4 100644
--- a/binfilter/bf_svx/source/items/svx_frmitems.cxx
+++ b/binfilter/bf_svx/source/items/svx_frmitems.cxx
@@ -1102,15 +1102,15 @@ using namespace ::com::sun::star;
/*N*/ SfxPoolItem* SvxShadowItem::Create( SvStream& rStrm, sal_uInt16 ) const
/*N*/ {
/*N*/ sal_Int8 cLoc;
-/*N*/ sal_uInt16 nWidth;
+/*N*/ sal_uInt16 _nWidth;
/*N*/ sal_Bool bTrans;
/*N*/ Color aColor;
/*N*/ Color aFillColor;
/*N*/ sal_Int8 nStyle;
-/*N*/ rStrm >> cLoc >> nWidth
+/*N*/ rStrm >> cLoc >> _nWidth
/*N*/ >> bTrans >> aColor >> aFillColor >> nStyle;
/*N*/ aColor.SetTransparency(bTrans ? 0xff : 0);
-/*N*/ return new SvxShadowItem( Which(), &aColor, nWidth, (SvxShadowLocation)cLoc );
+/*N*/ return new SvxShadowItem( Which(), &aColor, _nWidth, (SvxShadowLocation)cLoc );
/*N*/ }
// -----------------------------------------------------------------------
@@ -1813,15 +1813,15 @@ using namespace ::com::sun::star;
/*N*/ SfxPoolItem* SvxBoxInfoItem::Create( SvStream& rStrm, sal_uInt16 ) const
/*N*/ {
/*N*/ sal_Int8 cFlags;
-/*N*/ sal_uInt16 nDefDist;
-/*N*/ rStrm >> cFlags >> nDefDist;
+/*N*/ sal_uInt16 _nDefDist;
+/*N*/ rStrm >> cFlags >> _nDefDist;
/*N*/
/*N*/ SvxBoxInfoItem* pAttr = new SvxBoxInfoItem( Which() );
/*N*/
/*N*/ pAttr->SetTable ( ( cFlags & 0x01 ) != 0 );
/*N*/ pAttr->SetDist ( ( cFlags & 0x02 ) != 0 );
/*N*/ pAttr->SetMinDist( ( cFlags & 0x04 ) != 0 );
-/*N*/ pAttr->SetDefDist( nDefDist );
+/*N*/ pAttr->SetDefDist( _nDefDist );
/*N*/
/*N*/ while( sal_True )
/*N*/ {
diff --git a/binfilter/bf_svx/source/items/svx_numitem.cxx b/binfilter/bf_svx/source/items/svx_numitem.cxx
index 5991828..067f53e 100644
--- a/binfilter/bf_svx/source/items/svx_numitem.cxx
+++ b/binfilter/bf_svx/source/items/svx_numitem.cxx
@@ -405,13 +405,13 @@ sal_Int32 SvxNumberType::nRefCount = 0;
/*N*/ sCharStyleName != rFormat.sCharStyleName
/*N*/ )
/*N*/ return FALSE;
-/*N*/ if(pGraphicBrush && !rFormat.pGraphicBrush ||
-/*N*/ !pGraphicBrush && rFormat.pGraphicBrush ||
-/*N*/ pGraphicBrush && *pGraphicBrush != *rFormat.pGraphicBrush )
+/*N*/ if((pGraphicBrush && !rFormat.pGraphicBrush) ||
+/*N*/ (!pGraphicBrush && rFormat.pGraphicBrush) ||
+/*N*/ (pGraphicBrush && *pGraphicBrush != *rFormat.pGraphicBrush ))
/*N*/ return FALSE;
/*N*/ if(pBulletFont && !rFormat.pBulletFont ||
-/*N*/ !pBulletFont && rFormat.pBulletFont ||
-/*N*/ pBulletFont && *pBulletFont != *rFormat.pBulletFont)
+/*N*/ (!pBulletFont && rFormat.pBulletFont) ||
+/*N*/ (pBulletFont && (*pBulletFont != *rFormat.pBulletFont)))
/*N*/ return FALSE;
/*N*/ return TRUE;
/*N*/ }
@@ -426,7 +426,7 @@ sal_Int32 SvxNumberType::nRefCount = 0;
/*N*/ delete pGraphicBrush;
/*N*/ pGraphicBrush = 0;
/*N*/ }
-/*N*/ else if(!pGraphicBrush || pGraphicBrush && !(*pBrushItem == *pGraphicBrush))
+/*N*/ else if(!pGraphicBrush || (pGraphicBrush && !(*pBrushItem == *pGraphicBrush)))
/*N*/ {
/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ delete pGraphicBrush;
/*N*/ }
@@ -569,9 +569,9 @@ static SvxNumberFormat* pStdNumFmt = 0;
static SvxNumberFormat* pStdOutlineNumFmt = 0;
/*N*/ SvxNumRule::SvxNumRule(ULONG nFeatures, USHORT nLevels, BOOL bCont, SvxNumRuleType eType) :
/*N*/ nLevelCount(nLevels),
-/*N*/ nFeatureFlags(nFeatures),
/*N*/ bContinuousNumbering(bCont),
-/*N*/ eNumberingType(eType)
+/*N*/ eNumberingType(eType),
+/*N*/ nFeatureFlags(nFeatures)
/*N*/ {
/*N*/ ++nRefCount;
/*N*/ LanguageType eLang = Application::GetSettings().GetLanguage();
@@ -726,9 +726,9 @@ static SvxNumberFormat* pStdOutlineNumFmt = 0;
/*N*/ for(USHORT i = 0; i < nLevelCount; i++)
/*N*/ {
/*N*/ if( aFmtsSet[i] != rCopy.aFmtsSet[i] ||
-/*N*/ !aFmts[i] && rCopy.aFmts[i] ||
-/*N*/ aFmts[i] && !rCopy.aFmts[i] ||
-/*N*/ aFmts[i] && *aFmts[i] != *rCopy.aFmts[i] )
+/*N*/ (!aFmts[i] && rCopy.aFmts[i]) ||
+/*N*/ (aFmts[i] && !rCopy.aFmts[i]) ||
+/*N*/ (aFmts[i] && *aFmts[i] != *rCopy.aFmts[i] ))
/*N*/ return FALSE;
/*N*/ }
/*N*/ return TRUE;
@@ -850,7 +850,7 @@ static SvxNumberFormat* pStdOutlineNumFmt = 0;
/* -----------------27.10.98 10:41-------------------
*
* --------------------------------------------------*/
-/*N*/ SfxPoolItem* SvxNumBulletItem::Clone( SfxItemPool *pPool ) const
+/*N*/ SfxPoolItem* SvxNumBulletItem::Clone( SfxItemPool* /*pPool*/ ) const
/*N*/ {
/*N*/ return new SvxNumBulletItem(*this);
/*N*/ }
@@ -865,7 +865,7 @@ static SvxNumberFormat* pStdOutlineNumFmt = 0;
/* -----------------08.12.98 10:43-------------------
*
* --------------------------------------------------*/
-/*N*/ SvStream& SvxNumBulletItem::Store(SvStream &rStream, USHORT nItemVersion )const
+/*N*/ SvStream& SvxNumBulletItem::Store(SvStream &rStream, USHORT /*nItemVersion*/ )const
/*N*/ {
/*N*/ pNumRule->Store(rStream);
/*N*/ return rStream;
@@ -873,7 +873,7 @@ static SvxNumberFormat* pStdOutlineNumFmt = 0;
/* -----------------08.12.98 10:43-------------------
*
* --------------------------------------------------*/
-/*N*/ USHORT SvxNumBulletItem::GetVersion( USHORT nFileVersion ) const
+/*N*/ USHORT SvxNumBulletItem::GetVersion( USHORT /*nFileVersion*/ ) const
/*N*/ {
/*N*/ return NUMITEM_VERSION_03;
/*N*/ }
@@ -883,7 +883,7 @@ static SvxNumberFormat* pStdOutlineNumFmt = 0;
* --------------------------------------------------*/
-/*N*/ bool SvxNumBulletItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+/*N*/ bool SvxNumBulletItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
/*N*/ {
/*N*/ uno::Reference< container::XIndexReplace > xRule;
/*N*/ if( rVal >>= xRule )
diff --git a/binfilter/bf_svx/source/items/svx_paraitem.cxx b/binfilter/bf_svx/source/items/svx_paraitem.cxx
index 3b4e9b0..5e7b9d5 100644
--- a/binfilter/bf_svx/source/items/svx_paraitem.cxx
+++ b/binfilter/bf_svx/source/items/svx_paraitem.cxx
@@ -98,7 +98,9 @@ using namespace ::com::sun::star;
// Konvertierung fuer UNO
#define TWIP_TO_MM100(TWIP) ((TWIP) >= 0 ? (((TWIP)*127L+36L)/72L) : (((TWIP)*127L-36L)/72L))
+#define UTWIP_TO_MM100(TWIP) (((TWIP)*127L+36L)/72L)
#define MM100_TO_TWIP(MM100) ((MM100) >= 0 ? (((MM100)*72L+63L)/127L) : (((MM100)*72L-63L)/127L))
+#define UMM100_TO_TWIP(MM100) (((MM100)*72L+63L)/127L)
// STATIC DATA -----------------------------------------------------------
@@ -196,8 +198,10 @@ using namespace ::com::sun::star;
/*N*/ case SVX_LINE_SPACE_FIX :
/*N*/ case SVX_LINE_SPACE_MIN :
/*N*/ aLSp.Mode = eLineSpace == SVX_LINE_SPACE_FIX ? style::LineSpacingMode::FIX : style::LineSpacingMode::MINIMUM;
-/*N*/ aLSp.Height = ( bConvert ? (short)TWIP_TO_MM100(nLineHeight) : nLineHeight );
+/*N*/ aLSp.Height = ( bConvert ? (short)UTWIP_TO_MM100(nLineHeight) : nLineHeight );
/*N*/ break;
+ default:
+ break;
/*N*/ }
/*N*/
/*N*/ switch ( nMemberId )
@@ -261,7 +265,7 @@ using namespace ::com::sun::star;
/*N*/ eLineSpace = aLSp.Mode == style::LineSpacingMode::FIX ? SVX_LINE_SPACE_FIX : SVX_LINE_SPACE_MIN;
/*N*/ nLineHeight = aLSp.Height;
/*N*/ if(bConvert)
-/*N*/ nLineHeight = (USHORT)MM100_TO_TWIP(nLineHeight);
+/*N*/ nLineHeight = (USHORT)UMM100_TO_TWIP(nLineHeight);
/*N*/ }
/*N*/ break;
/*N*/ }
@@ -305,7 +309,7 @@ using namespace ::com::sun::star;
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxLineSpacingItem::Store( SvStream& rStrm, sal_uInt16 nItemVersion ) const
+/*N*/ SvStream& SvxLineSpacingItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const
/*N*/ {
/*N*/ rStrm << (sal_Int8) GetPropLineSpace()
/*N*/ << (short) GetInterLineSpace()
@@ -324,9 +328,9 @@ using namespace ::com::sun::star;
// -----------------------------------------------------------------------
-/*?*/ XubString SvxLineSpacingItem::GetValueTextByPos( sal_uInt16 nPos ) const
+/*?*/ XubString SvxLineSpacingItem::GetValueTextByPos( sal_uInt16 /*nPos*/ ) const
/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); XubString aText;//STRIP001 //STRIP001 //! Strings demnaechst aus Resource laden
+/*?*/ DBG_BF_ASSERT(0, "STRIP"); XubString aText;
/*?*/ return aText;
/*?*/ }
@@ -334,14 +338,14 @@ using namespace ::com::sun::star;
/*?*/ sal_uInt16 SvxLineSpacingItem::GetEnumValue() const
/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 //STRIP001 sal_uInt16 nVal;
+/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;
/*?*/ }
// -----------------------------------------------------------------------
-/*?*/ void SvxLineSpacingItem::SetEnumValue( sal_uInt16 nVal )
+/*?*/ void SvxLineSpacingItem::SetEnumValue( sal_uInt16 /*nVal*/ )
/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 switch ( nVal )
+/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*?*/ }
// class SvxAdjustItem ---------------------------------------------------
@@ -371,7 +375,7 @@ using namespace ::com::sun::star;
--------------------------------------------------*/
/*N*/ bool SvxAdjustItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
/*N*/ {
-/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
+/*N*/
/*N*/ nMemberId &= ~CONVERT_TWIPS;
/*N*/ switch( nMemberId )
/*N*/ {
@@ -392,7 +396,7 @@ using namespace ::com::sun::star;
/*N*/ bool SvxAdjustItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
/*N*/ {
-/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
+/*N*/
/*N*/ nMemberId &= ~CONVERT_TWIPS;
/*N*/ switch( nMemberId )
/*N*/ {
@@ -455,8 +459,8 @@ using namespace ::com::sun::star;
// -----------------------------------------------------------------------
-/*N*/ void SvxAdjustItem::SetEnumValue( sal_uInt16 nVal )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
+/*N*/ void SvxAdjustItem::SetEnumValue( sal_uInt16 /*nVal*/ )
+/*N*/ {DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
// -----------------------------------------------------------------------
@@ -576,7 +580,7 @@ using namespace ::com::sun::star;
// -----------------------------------------------------------------------
/*N*/ bool SvxHyphenZoneItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
/*N*/ {
-/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
+/*N*/
/*N*/ nMemberId &= ~CONVERT_TWIPS;
/*N*/ switch(nMemberId)
/*N*/ {
@@ -598,7 +602,7 @@ using namespace ::com::sun::star;
// -----------------------------------------------------------------------
/*N*/ bool SvxHyphenZoneItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
/*N*/ {
-/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
+/*N*/
/*N*/ nMemberId &= ~CONVERT_TWIPS;
/*N*/ sal_Int16 nNewVal = 0;
/*N*/
@@ -651,21 +655,21 @@ using namespace ::com::sun::star;
/*N*/ SfxPoolItem* SvxHyphenZoneItem::Create(SvStream& rStrm, sal_uInt16) const
/*N*/ {
-/*N*/ sal_Int8 bHyphen, bHyphenPageEnd;
-/*N*/ sal_Int8 nMinLead, nMinTrail, nMaxHyphens;
-/*N*/ rStrm >> bHyphen >> bHyphenPageEnd >> nMinLead >> nMinTrail >> nMaxHyphens;
+/*N*/ sal_Int8 _bHyphen, bHyphenPageEnd;
+/*N*/ sal_Int8 _nMinLead, _nMinTrail, _nMaxHyphens;
+/*N*/ rStrm >> _bHyphen >> bHyphenPageEnd >> _nMinLead >> _nMinTrail >> _nMaxHyphens;
/*N*/ SvxHyphenZoneItem* pAttr = new SvxHyphenZoneItem( sal_False, Which() );
-/*N*/ pAttr->SetHyphen( sal_Bool( bHyphen != 0 ) );
+/*N*/ pAttr->SetHyphen( sal_Bool( _bHyphen != 0 ) );
/*N*/ pAttr->SetPageEnd( sal_Bool( bHyphenPageEnd != 0 ) );
-/*N*/ pAttr->GetMinLead() = nMinLead;
-/*N*/ pAttr->GetMinTrail() = nMinTrail;
-/*N*/ pAttr->GetMaxHyphens() = nMaxHyphens;
+/*N*/ pAttr->GetMinLead() = _nMinLead;
+/*N*/ pAttr->GetMinTrail() = _nMinTrail;
+/*N*/ pAttr->GetMaxHyphens() = _nMaxHyphens;
/*N*/ return pAttr;
/*N*/ }
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxHyphenZoneItem::Store( SvStream& rStrm, sal_uInt16 nItemVersion ) const
+/*N*/ SvStream& SvxHyphenZoneItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const
/*N*/ {
/*N*/ rStrm << (sal_Int8) IsHyphen()
/*N*/ << (sal_Int8) IsPageEnd()
@@ -886,6 +890,7 @@ typedef sequence ::com::sun::star::style::TabStop> TabSTopSequence;
/*N*/ case style::TabAlign_CENTER : eAdjust = SVX_TAB_ADJUST_CENTER; break;
/*N*/ case style::TabAlign_RIGHT : eAdjust = SVX_TAB_ADJUST_RIGHT; break;
/*N*/ case style::TabAlign_DECIMAL: eAdjust = SVX_TAB_ADJUST_DECIMAL; break;
+ default: break;
/*N*/ }
/*N*/ sal_Unicode cFill = pArr[i].FillChar;
/*N*/ sal_Unicode cDecimal = pArr[i].DecimalChar;
@@ -963,7 +968,7 @@ typedef sequence ::com::sun::star::style::TabStop> TabSTopSequence;
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxTabStopItem::Store( SvStream& rStrm, sal_uInt16 nItemVersion ) const
+/*N*/ SvStream& SvxTabStopItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const
/*N*/ {
/*N*/ //MA 05. Sep. 96: Default-Tabs werden nur noch fuer das default-Attr
/*N*/ //expandiert. Fuer vollstaendige Rueckwaertskompatibilitaet (<=304)
@@ -977,8 +982,8 @@ typedef sequence ::com::sun::star::style::TabStop> TabSTopSequence;
/*N*/ && binfilter::IsDefaultItem( this );
/*N*/
/*N*/ const short nTabs = Count();
-/*N*/ sal_uInt16 nCount = 0, nDefDist;
-/*N*/ long nNew;
+/*N*/ sal_uInt16 nCount = 0, nDefDist = 0;
+/*N*/ long nNew = 0;
/*N*/
/*N*/ if( bStoreDefTabs )
/*N*/ {
@@ -1043,7 +1048,7 @@ typedef sequence ::com::sun::star::style::TabStop> TabSTopSequence;
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxFmtSplitItem::Store( SvStream& rStrm, sal_uInt16 nItemVersion ) const
+/*N*/ SvStream& SvxFmtSplitItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const
/*N*/ {
/*N*/ rStrm << (sal_Int8)GetValue();
/*N*/ return rStrm;
@@ -1076,7 +1081,7 @@ typedef sequence ::com::sun::star::style::TabStop> TabSTopSequence;
/*N*/ {
/*N*/ }
-/*N*/ SfxPoolItem* SvxScriptSpaceItem::Clone( SfxItemPool *pPool ) const
+/*N*/ SfxPoolItem* SvxScriptSpaceItem::Clone( SfxItemPool* /*pPool*/ ) const
/*N*/ {
/*N*/ return new SvxScriptSpaceItem( GetValue(), Which() );
/*N*/ }
@@ -1107,7 +1112,7 @@ typedef sequence ::com::sun::star::style::TabStop> TabSTopSequence;
/*N*/ {
/*N*/ }
-/*N*/ SfxPoolItem* SvxHangingPunctuationItem::Clone( SfxItemPool *pPool ) const
+/*N*/ SfxPoolItem* SvxHangingPunctuationItem::Clone( SfxItemPool* /*pPool*/ ) const
/*N*/ {
/*N*/ return new SvxHangingPunctuationItem( GetValue(), Which() );
/*N*/ }
@@ -1139,7 +1144,7 @@ typedef sequence ::com::sun::star::style::TabStop> TabSTopSequence;
/* -----------------------------29.11.00 11:23--------------------------------
---------------------------------------------------------------------------*/
-/*N*/ SfxPoolItem* SvxForbiddenRuleItem::Clone( SfxItemPool *pPool ) const
+/*N*/ SfxPoolItem* SvxForbiddenRuleItem::Clone( SfxItemPool* /*pPool*/ ) const
/*N*/ {
/*N*/ return new SvxForbiddenRuleItem( GetValue(), Which() );
/*N*/ }
@@ -1196,12 +1201,12 @@ typedef sequence ::com::sun::star::style::TabStop> TabSTopSequence;
/*N*/ {
/*N*/ }
-/*N*/ SfxPoolItem* SvxParaGridItem::Clone( SfxItemPool *pPool ) const
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001
+/*N*/ SfxPoolItem* SvxParaGridItem::Clone( SfxItemPool* /*pPool*/ ) const
+/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return NULL;
/*N*/ }
-/*N*/ SfxPoolItem* SvxParaGridItem::Create(SvStream & rStrm, USHORT) const
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001
+/*N*/ SfxPoolItem* SvxParaGridItem::Create(SvStream & /*rStrm*/, USHORT) const
+/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return NULL;
/*N*/ }
/*N*/ USHORT SvxParaGridItem::GetVersion( USHORT nFFVer ) const
@@ -1216,8 +1221,8 @@ typedef sequence ::com::sun::star::style::TabStop> TabSTopSequence;
/*N*/ SfxItemPresentation SvxParaGridItem::GetPresentation(
/*N*/ SfxItemPresentation ePres,
-/*N*/ SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric,
-/*N*/ String &rText, const ::IntlWrapper* pIntl ) const
+/*N*/ SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/,
+/*N*/ String &rText, const ::IntlWrapper* /*pIntl*/ ) const
/*N*/ {
/*?*/ switch( ePres )
/*?*/ {
@@ -1234,6 +1239,8 @@ typedef sequence ::com::sun::star::style::TabStop> TabSTopSequence;
/*?*/ return ePres;
/*?*/ }
/*?*/ break;
+ default:
+ break;
/*?*/ }
/*?*/ return SFX_ITEM_PRESENTATION_NONE;
/*N*/ }
diff --git a/binfilter/bf_svx/source/items/svx_rotmodit.cxx b/binfilter/bf_svx/source/items/svx_rotmodit.cxx
index 2230446..d0396cd 100644
--- a/binfilter/bf_svx/source/items/svx_rotmodit.cxx
+++ b/binfilter/bf_svx/source/items/svx_rotmodit.cxx
@@ -81,14 +81,14 @@ using namespace ::com::sun::star;
/*N*/ return new SvxRotateModeItem( *this );
/*N*/ }
-/*N*/ USHORT __EXPORT SvxRotateModeItem::GetVersion( USHORT nFileVersion ) const
+/*N*/ USHORT __EXPORT SvxRotateModeItem::GetVersion( USHORT /*nFileVersion*/ ) const
/*N*/ {
/*N*/ return 0;
/*N*/ }
// QueryValue/PutValue: Der ::com::sun::star::table::CellVertJustify enum wird mitbenutzt...
-/*N*/ bool SvxRotateModeItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+/*N*/ bool SvxRotateModeItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
/*N*/ {
/*N*/ table::CellVertJustify eUno = table::CellVertJustify_STANDARD;
/*N*/ switch ( (SvxRotateMode)GetValue() )
@@ -102,7 +102,7 @@ using namespace ::com::sun::star;
/*N*/ return sal_True;
/*N*/ }
-/*N*/ bool SvxRotateModeItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+/*N*/ bool SvxRotateModeItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
/*N*/ {
/*N*/ table::CellVertJustify eUno;
/*N*/ if(!(rVal >>= eUno))
@@ -120,6 +120,7 @@ using namespace ::com::sun::star;
/*?*/ case table::CellVertJustify_TOP: eSvx = SVX_ROTATE_MODE_TOP; break;
/*?*/ case table::CellVertJustify_CENTER: eSvx = SVX_ROTATE_MODE_CENTER; break;
/*N*/ case table::CellVertJustify_BOTTOM: eSvx = SVX_ROTATE_MODE_BOTTOM; break;
+ default: break;
/*N*/ }
/*N*/ SetValue( eSvx );
/*N*/ return sal_True;
diff --git a/binfilter/bf_svx/source/items/svx_svxfont.cxx b/binfilter/bf_svx/source/items/svx_svxfont.cxx
index dd9e479..06603dd 100644
--- a/binfilter/bf_svx/source/items/svx_svxfont.cxx
+++ b/binfilter/bf_svx/source/items/svx_svxfont.cxx
@@ -176,9 +176,9 @@ protected:
const xub_StrLen nLen;
public:
- SvxDoCapitals( OutputDevice *pOut, const XubString &rTxt,
- const xub_StrLen nIdx, const xub_StrLen nLen )
- : pOut(pOut), rTxt(rTxt), nIdx(nIdx), nLen(nLen)
+ SvxDoCapitals( OutputDevice* _pOut, const XubString& _rTxt,
+ const xub_StrLen _nIdx, const xub_StrLen _nLen )
+ : pOut(_pOut), rTxt(_rTxt), nIdx(_nIdx), nLen(_nLen)
{ }
@@ -370,10 +370,10 @@ protected:
Size aTxtSize;
short nKern;
public:
- SvxDoGetCapitalSize( SvxFont *pFnt, const OutputDevice *pOut,
- const XubString &rTxt, const xub_StrLen nIdx,
- const xub_StrLen nLen, const short nKrn )
- : SvxDoCapitals( (OutputDevice*)pOut, rTxt, nIdx, nLen ),
+ SvxDoGetCapitalSize( SvxFont *pFnt, const OutputDevice* _pOut,
+ const XubString& _rTxt, const xub_StrLen _nIdx,
+ const xub_StrLen _nLen, const short nKrn )
+ : SvxDoCapitals( (OutputDevice*)_pOut, _rTxt, _nIdx, _nLen ),
pFont( pFnt ),
nKern( nKrn )
{ }
@@ -402,10 +402,10 @@ protected:
Point aSpacePos;
short nKern;
public:
- SvxDoDrawCapital( SvxFont *pFnt, OutputDevice *pOut, const XubString &rTxt,
- const xub_StrLen nIdx, const xub_StrLen nLen,
+ SvxDoDrawCapital( SvxFont *pFnt, OutputDevice* _pOut, const XubString& _rTxt,
+ const xub_StrLen _nIdx, const xub_StrLen _nLen,
const Point &rPos, const short nKrn )
- : SvxDoCapitals( pOut, rTxt, nIdx, nLen ),
+ : SvxDoCapitals( _pOut, _rTxt, _nIdx, _nLen ),
pFont( pFnt ),
aPos( rPos ),
aSpacePos( rPos ),
diff --git a/binfilter/bf_svx/source/items/svx_textitem.cxx b/binfilter/bf_svx/source/items/svx_textitem.cxx
index 173b147..03b2468 100644
--- a/binfilter/bf_svx/source/items/svx_textitem.cxx
+++ b/binfilter/bf_svx/source/items/svx_textitem.cxx
@@ -126,7 +126,9 @@ using namespace ::com::sun::star::text;
// Konvertierung fuer UNO
#define TWIP_TO_MM100(TWIP) ((TWIP) >= 0 ? (((TWIP)*127L+36L)/72L) : (((TWIP)*127L-36L)/72L))
+#define UTWIP_TO_MM100(TWIP) ((((TWIP)*127L+36L)/72L))
#define MM100_TO_TWIP(MM100) ((MM100) >= 0 ? (((MM100)*72L+63L)/127L) : (((MM100)*72L-63L)/127L))
+#define UMM100_TO_TWIP(MM100) ((((MM100)*72L+63L)/127L))
BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
@@ -192,9 +194,9 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
// -----------------------------------------------------------------------
-/*?*/ int SvxFontListItem::operator==( const SfxPoolItem& rAttr ) const
+/*?*/ int SvxFontListItem::operator==( const SfxPoolItem& /*rAttr*/ ) const
/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" );
+/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;
/*?*/ }
//------------------------------------------------------------------------
@@ -230,7 +232,7 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
/*N*/ bool SvxFontItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
/*N*/ {
-/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
+/*N*/
/*N*/ nMemberId &= ~CONVERT_TWIPS;
/*N*/ switch(nMemberId)
/*N*/ {
@@ -249,7 +251,7 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
// -----------------------------------------------------------------------
/*N*/ bool SvxFontItem::PutValue( const uno::Any& rVal, BYTE nMemberId)
/*N*/ {
-/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
+/*N*/
/*N*/ nMemberId &= ~CONVERT_TWIPS;
/*N*/ switch(nMemberId)
/*N*/ {
@@ -329,7 +331,7 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxFontItem::Store( SvStream& rStrm , USHORT nItemVersion ) const
+/*N*/ SvStream& SvxFontItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
/*N*/ {
/*N*/ BOOL bToBats =
/*N*/ GetFamilyName().EqualsAscii( "StarSymbol", 0, sizeof("StarSymbol")-1 ) ||
@@ -363,9 +365,9 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
/*N*/ SfxPoolItem* SvxFontItem::Create(SvStream& rStrm, USHORT) const
/*N*/ {
-/*N*/ BYTE eFamily, eFontPitch, eFontTextEncoding;
+/*N*/ BYTE _eFamily, eFontPitch, eFontTextEncoding;
/*N*/ String aName, aStyle;
-/*N*/ rStrm >> eFamily;
+/*N*/ rStrm >> _eFamily;
/*N*/ rStrm >> eFontPitch;
/*N*/ rStrm >> eFontTextEncoding;
/*N*/
@@ -398,7 +400,7 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
/*N*/
/*N*/
/*N*/
-/*N*/ return new SvxFontItem( (FontFamily)eFamily, aName, aStyle,
+/*N*/ return new SvxFontItem( (FontFamily)_eFamily, aName, aStyle,
/*N*/ (FontPitch)eFontPitch, (rtl_TextEncoding)eFontTextEncoding, Which() );
/*N*/ }
@@ -428,7 +430,7 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxPostureItem::Store( SvStream& rStrm , USHORT nItemVersion ) const
+/*N*/ SvStream& SvxPostureItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
/*N*/ {
/*N*/ rStrm << (BYTE)GetValue();
/*N*/ return rStrm;
@@ -455,7 +457,7 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
--------------------------------------------------*/
/*N*/ bool SvxPostureItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
/*N*/ {
-/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
+/*N*/
/*N*/ nMemberId &= ~CONVERT_TWIPS;
/*N*/ switch( nMemberId )
/*N*/ {
@@ -473,7 +475,7 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
--------------------------------------------------*/
/*N*/ bool SvxPostureItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
/*N*/ {
-/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
+/*N*/
/*N*/ nMemberId &= ~CONVERT_TWIPS;
/*N*/ switch( nMemberId )
/*N*/ {
@@ -555,7 +557,7 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxWeightItem::Store( SvStream& rStrm , USHORT nItemVersion ) const
+/*N*/ SvStream& SvxWeightItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
/*N*/ {
/*N*/ rStrm << (BYTE)GetValue();
/*N*/ return rStrm;
@@ -581,7 +583,7 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
--------------------------------------------------*/
/*N*/ bool SvxWeightItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
/*N*/ {
-/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
+/*N*/
/*N*/ nMemberId &= ~CONVERT_TWIPS;
/*N*/ switch( nMemberId )
/*N*/ {
@@ -601,7 +603,7 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
--------------------------------------------------*/
/*N*/ bool SvxWeightItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
/*N*/ {
-/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
+/*N*/
/*N*/ nMemberId &= ~CONVERT_TWIPS;
/*N*/ switch( nMemberId )
/*N*/ {
@@ -654,10 +656,10 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
/*N*/ {
/*N*/ // JP 30.06.98: beim Export in alte Versionen geht die relative
/*N*/ // Angabe verloren, wenn es keine Prozentuale ist
-/*N*/ USHORT nProp = GetProp();
+/*N*/ USHORT _nProp = GetProp();
/*N*/ if( SFX_MAPUNIT_RELATIVE != GetPropUnit() )
-/*N*/ nProp = 100;
-/*N*/ rStrm << nProp;
+/*N*/ _nProp = 100;
+/*N*/ rStrm << _nProp;
/*N*/ }
/*N*/ return rStrm;
/*N*/ }
@@ -716,13 +718,13 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
/*N*/ // also umrechnen, wenn CONVERT_TWIPS nicht gesetzt ist
/*N*/ if( bConvert )
/*N*/ {
-/*N*/ long nTwips = bConvert ? nHeight : MM100_TO_TWIP(nHeight);
+/*N*/ long nTwips = bConvert ? nHeight : UMM100_TO_TWIP(nHeight);
/*N*/ rVal <<= (float)( nTwips / 20.0 );
/*N*/ }
/*N*/ else
/*N*/ {
-/*N*/ double fPoints = MM100_TO_TWIP((long)nHeight) / 20.0;
-/*N*/ float fRoundPoints =
+/*N*/ double fPoints = UMM100_TO_TWIP((long)nHeight) / 20.0;
+/*N*/ float fRoundPoints =
/*N*/ static_cast<float>(::rtl::math::round(fPoints, 1));
/*N*/ rVal <<= fRoundPoints;
/*N*/ }
@@ -749,6 +751,9 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
/*?*/ case SFX_MAPUNIT_TWIP:
/*?*/ fRet /= 20.;
/*N*/ break;
+ default:
+ /* not handled */
+ break;
/*N*/ }
/*N*/ rVal <<= fRet;
/*N*/ }
@@ -785,6 +790,9 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
/*?*/ // hier doch sicher TWIP
/*?*/ nDiff = ((short)nProp);
/*N*/ break;
+ default:
+ /* not handled */
+ break;
/*N*/ }
/*N*/ nRet -= nDiff;
/*N*/
@@ -817,7 +825,7 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
/*N*/
/*N*/ nHeight = (long)( fPoint * 20.0 + 0.5 ); // Twips
/*N*/ if (!bConvert)
-/*N*/ nHeight = TWIP_TO_MM100(nHeight); // umrechnen, wenn das Item 1/100mm enthaelt
+/*N*/ nHeight = UTWIP_TO_MM100(nHeight); // umrechnen, wenn das Item 1/100mm enthaelt
/*N*/ }
/*N*/ break;
/*N*/ case MID_FONTHEIGHT_PROP:
@@ -935,7 +943,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxUnderlineItem::Store( SvStream& rStrm , USHORT nItemVersion ) const
+/*N*/ SvStream& SvxUnderlineItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
/*N*/ {
/*N*/ rStrm << (BYTE)GetValue();
/*N*/ return rStrm;
@@ -961,7 +969,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
--------------------------------------------------*/
/*N*/ bool SvxUnderlineItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
/*N*/ {
-/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
+/*N*/
/*N*/ nMemberId &= ~CONVERT_TWIPS;
/*N*/ switch(nMemberId)
/*N*/ {
@@ -986,7 +994,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
--------------------------------------------------*/
/*N*/ bool SvxUnderlineItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
/*N*/ {
-/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
+/*N*/
/*N*/ nMemberId &= ~CONVERT_TWIPS;
/*N*/ sal_Bool bRet = sal_True;
/*N*/ switch(nMemberId)
@@ -1064,7 +1072,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxCrossedOutItem::Store( SvStream& rStrm , USHORT nItemVersion ) const
+/*N*/ SvStream& SvxCrossedOutItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
/*N*/ {
/*N*/ rStrm << (BYTE)GetValue();
/*N*/ return rStrm;
@@ -1090,7 +1098,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
--------------------------------------------------*/
/*N*/ bool SvxCrossedOutItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
/*N*/ {
-/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
+/*N*/
/*N*/ nMemberId &= ~CONVERT_TWIPS;
/*N*/ switch(nMemberId)
/*N*/ {
@@ -1108,7 +1116,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
--------------------------------------------------*/
/*N*/ bool SvxCrossedOutItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
/*N*/ {
-/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
+/*N*/
/*N*/ nMemberId &= ~CONVERT_TWIPS;
/*N*/ switch(nMemberId)
/*N*/ {
@@ -1142,7 +1150,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxShadowedItem::Store( SvStream& rStrm , USHORT nItemVersion ) const
+/*N*/ SvStream& SvxShadowedItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
/*N*/ {
/*N*/ rStrm << (BYTE) GetValue();
/*N*/ return rStrm;
@@ -1176,7 +1184,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxAutoKernItem::Store( SvStream& rStrm , USHORT nItemVersion ) const
+/*N*/ SvStream& SvxAutoKernItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
/*N*/ {
/*N*/ rStrm << (BYTE) GetValue();
/*N*/ return rStrm;
@@ -1211,7 +1219,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxWordLineModeItem::Store( SvStream& rStrm , USHORT nItemVersion ) const
+/*N*/ SvStream& SvxWordLineModeItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
/*N*/ {
/*N*/ rStrm << (sal_Bool) GetValue();
/*N*/ return rStrm;
@@ -1245,7 +1253,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxContourItem::Store( SvStream& rStrm , USHORT nItemVersion ) const
+/*N*/ SvStream& SvxContourItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
/*N*/ {
/*N*/ rStrm << (sal_Bool) GetValue();
/*N*/ return rStrm;
@@ -1353,7 +1361,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
// -----------------------------------------------------------------------
-/*N*/ bool SvxColorItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+/*N*/ bool SvxColorItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
/*N*/ {
/*N*/ rVal <<= (sal_Int32)(mColor.GetColor());
/*N*/ return sal_True;
@@ -1361,7 +1369,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
// -----------------------------------------------------------------------
-/*N*/ bool SvxColorItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+/*N*/ bool SvxColorItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
/*N*/ {
/*N*/ sal_Int32 nColor;
/*N*/ if(!(rVal >>= nColor))
@@ -1392,7 +1400,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
// -----------------------------------------------------------------------
-/*N*/ SfxPoolItem* SvxColorItem::Create(SvStream& rStrm, USHORT nVer ) const
+/*N*/ SfxPoolItem* SvxColorItem::Create(SvStream& rStrm, USHORT /*nVer*/ ) const
/*N*/ {
/*N*/ return new SvxColorItem( rStrm, Which() );
/*N*/ }
@@ -1419,11 +1427,11 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
// -----------------------------------------------------------------------
/*N*/ SvxCharSetColorItem::SvxCharSetColorItem( const Color& rCol,
-/*N*/ const rtl_TextEncoding eFrom,
+/*N*/ const rtl_TextEncoding _eFrom,
/*N*/ const USHORT nId ) :
/*N*/ SvxColorItem( rCol, nId ),
/*N*/
-/*N*/ eFrom( eFrom )
+/*N*/ eFrom( _eFrom )
/*N*/ {
/*N*/ }
@@ -1437,7 +1445,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxCharSetColorItem::Store( SvStream& rStrm , USHORT nItemVersion ) const
+/*N*/ SvStream& SvxCharSetColorItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
/*N*/ {
/*N*/ // #90477# rStrm << (BYTE) GetStoreCharSet( GetCharSet(), (USHORT)rStrm.GetVersion() )
/*N*/ // << GetValue();
@@ -1475,7 +1483,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxKerningItem::Store( SvStream& rStrm , USHORT nItemVersion ) const
+/*N*/ SvStream& SvxKerningItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
/*N*/ {
/*N*/ rStrm << (short) GetValue();
/*N*/ return rStrm;
@@ -1544,7 +1552,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxCaseMapItem::Store( SvStream& rStrm , USHORT nItemVersion ) const
+/*N*/ SvStream& SvxCaseMapItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
/*N*/ {
/*N*/ rStrm << (BYTE) GetValue();
/*N*/ return rStrm;
@@ -1568,7 +1576,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
/*-----------------13.03.98 16:29-------------------
--------------------------------------------------*/
-/*N*/ bool SvxCaseMapItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+/*N*/ bool SvxCaseMapItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
/*N*/ {
/*N*/ sal_Int16 nRet = style::CaseMap::NONE;
/*N*/ switch( GetValue() )
@@ -1585,7 +1593,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
/*-----------------13.03.98 16:29-------------------
--------------------------------------------------*/
-/*N*/ bool SvxCaseMapItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+/*N*/ bool SvxCaseMapItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
/*N*/ {
/*N*/ sal_uInt16 nVal;
/*N*/ if(!(rVal >>= nVal))
@@ -1618,12 +1626,12 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
// -----------------------------------------------------------------------
-/*N*/ SvxEscapementItem::SvxEscapementItem( const short nEsc,
-/*N*/ const BYTE nProp,
+/*N*/ SvxEscapementItem::SvxEscapementItem( const short _nEsc,
+/*N*/ const BYTE _nProp,
/*N*/ const USHORT nId ) :
/*N*/ SfxEnumItemInterface( nId ),
-/*N*/ nEsc ( nEsc ),
-/*N*/ nProp ( nProp )
+/*N*/ nEsc ( _nEsc ),
+/*N*/ nProp ( _nProp )
/*N*/ {
/*N*/ }
@@ -1646,18 +1654,18 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxEscapementItem::Store( SvStream& rStrm , USHORT nItemVersion ) const
+/*N*/ SvStream& SvxEscapementItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
/*N*/ {
-/*N*/ short nEsc = GetEsc();
+/*N*/ short _nEsc = GetEsc();
/*N*/ if( SOFFICE_FILEFORMAT_31 == rStrm.GetVersion() )
/*N*/ {
-/*N*/ if( DFLT_ESC_AUTO_SUPER == nEsc )
-/*N*/ nEsc = DFLT_ESC_SUPER;
-/*N*/ else if( DFLT_ESC_AUTO_SUB == nEsc )
-/*N*/ nEsc = DFLT_ESC_SUB;
+/*N*/ if( DFLT_ESC_AUTO_SUPER == _nEsc )
+/*N*/ _nEsc = DFLT_ESC_SUPER;
+/*N*/ else if( DFLT_ESC_AUTO_SUB == _nEsc )
+/*N*/ _nEsc = DFLT_ESC_SUB;
/*N*/ }
/*N*/ rStrm << (BYTE) GetProp()
-/*N*/ << (short) nEsc;
+/*N*/ << (short) _nEsc;
/*N*/ return rStrm;
/*N*/ }
@@ -1665,10 +1673,10 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
/*N*/ SfxPoolItem* SvxEscapementItem::Create(SvStream& rStrm, USHORT) const
/*N*/ {
-/*N*/ BYTE nProp;
-/*N*/ short nEsc;
-/*N*/ rStrm >> nProp >> nEsc;
-/*N*/ return new SvxEscapementItem( nEsc, nProp, Which() );
+/*N*/ BYTE _nProp;
+/*N*/ short _nEsc;
+/*N*/ rStrm >> _nProp >> _nEsc;
+/*N*/ return new SvxEscapementItem( _nEsc, _nProp, Which() );
/*N*/ }
// -----------------------------------------------------------------------
@@ -1693,9 +1701,9 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
// -----------------------------------------------------------------------
-/*?*/ void SvxEscapementItem::SetEnumValue( USHORT nVal )
+/*?*/ void SvxEscapementItem::SetEnumValue( USHORT /*nVal*/ )
/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SetEscapement( (const SvxEscapement)nVal );
+/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*?*/ }
/*-----------------13.03.98 17:05-------------------
@@ -1703,7 +1711,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
--------------------------------------------------*/
/*N*/ bool SvxEscapementItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
/*N*/ {
-/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
+/*N*/
/*N*/ nMemberId &= ~CONVERT_TWIPS;
/*N*/ switch(nMemberId)
/*N*/ {
@@ -1724,7 +1732,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
--------------------------------------------------*/
/*N*/ bool SvxEscapementItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
/*N*/ {
-/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
+/*N*/
/*N*/ nMemberId &= ~CONVERT_TWIPS;
/*N*/ switch(nMemberId)
/*N*/ {
@@ -1790,7 +1798,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxLanguageItem::Store( SvStream& rStrm , USHORT nItemVersion ) const
+/*N*/ SvStream& SvxLanguageItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
/*N*/ {
/*N*/ rStrm << (USHORT) GetValue();
/*N*/ return rStrm;
@@ -1813,7 +1821,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
--------------------------------------------------*/
/*N*/ bool SvxLanguageItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
/*N*/ {
-/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
+/*N*/
/*N*/ nMemberId &= ~CONVERT_TWIPS;
/*N*/ switch(nMemberId)
/*N*/ {
@@ -1832,7 +1840,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
--------------------------------------------------*/
/*N*/ bool SvxLanguageItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
/*N*/ {
-/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
+/*N*/
/*N*/ nMemberId &= ~CONVERT_TWIPS;
/*N*/ switch(nMemberId)
/*N*/ {
@@ -1940,7 +1948,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxBlinkItem::Store( SvStream& rStrm , USHORT nItemVersion ) const
+/*N*/ SvStream& SvxBlinkItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
/*N*/ {
/*N*/ rStrm << (BYTE) GetValue();
/*N*/ return rStrm;
@@ -1976,7 +1984,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
// -----------------------------------------------------------------------
/*N*/ SvStream& SvxEmphasisMarkItem::Store( SvStream& rStrm,
-/*N*/ USHORT nItemVersion ) const
+/*N*/ USHORT /*nItemVersion*/ ) const
/*N*/ {
/*N*/ rStrm << (sal_uInt16)GetValue();
/*N*/ return rStrm;
@@ -1998,7 +2006,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
/*N*/ bool SvxEmphasisMarkItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
/*N*/ {
-/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
+/*N*/
/*N*/ nMemberId &= ~CONVERT_TWIPS;
/*N*/ switch( nMemberId )
/*N*/ {
@@ -2025,7 +2033,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
/*N*/ bool SvxEmphasisMarkItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
/*N*/ {
-/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
+/*N*/
/*N*/ nMemberId &= ~CONVERT_TWIPS;
/*N*/ sal_Bool bRet = sal_True;
/*N*/ switch( nMemberId )
@@ -2072,14 +2080,14 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
/*N*/ SvxTwoLinesItem::SvxTwoLinesItem( sal_Bool bFlag, sal_Unicode nStartBracket,
/*N*/ sal_Unicode nEndBracket, sal_uInt16 nW )
/*N*/ : SfxPoolItem( nW ),
-/*N*/ bOn( bFlag ), cStartBracket( nStartBracket ), cEndBracket( nEndBracket )
+/*N*/ cStartBracket( nStartBracket ), cEndBracket( nEndBracket ), bOn( bFlag )
/*N*/ {
/*N*/ }
/*NBFF*/ SvxTwoLinesItem::SvxTwoLinesItem( const SvxTwoLinesItem& rAttr )
/*NBFF*/ : SfxPoolItem( rAttr.Which() ),
-/*NBFF*/ bOn( rAttr.bOn ), cStartBracket( rAttr.cStartBracket ),
-/*NBFF*/ cEndBracket( rAttr.cEndBracket )
+/*NBFF*/ cStartBracket( rAttr.cStartBracket ),
+ /*NBFF*/ cEndBracket( rAttr.cEndBracket ), bOn( rAttr.bOn )
/*NBFF*/ {
/*NBFF*/ }
@@ -2103,7 +2111,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
/*NBFF*/ bool SvxTwoLinesItem::QueryValue( ::com::sun::star::uno::Any& rVal,
/*NBFF*/ BYTE nMemberId ) const
/*NBFF*/ {
-/*NBFF*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
+/*NBFF*/
/*NBFF*/ nMemberId &= ~CONVERT_TWIPS;
/*NBFF*/ sal_Bool bRet = sal_True;
/*NBFF*/ switch( nMemberId )
@@ -2137,7 +2145,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
/*NBFF*/ bool SvxTwoLinesItem::PutValue( const ::com::sun::star::uno::Any& rVal,
/*NBFF*/ BYTE nMemberId )
/*NBFF*/ {
-/*NBFF*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
+/*NBFF*/
/*NBFF*/ nMemberId &= ~CONVERT_TWIPS;
/*NBFF*/ sal_Bool bRet = sal_False;
/*NBFF*/ OUString s;
@@ -2166,8 +2174,8 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
/*NBFF*/ }
/*NBFF*/ SfxItemPresentation SvxTwoLinesItem::GetPresentation( SfxItemPresentation ePres,
-/*NBFF*/ SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric,
-/*NBFF*/ String &rText, const ::IntlWrapper* pIntl ) const
+/*NBFF*/ SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/,
+/*NBFF*/ String &rText, const ::IntlWrapper* /*pIntl*/ ) const
/*NBFF*/ {
/*NBFF*/ switch( ePres )
/*NBFF*/ {
@@ -2190,20 +2198,22 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
/*NBFF*/ return ePres;
/*NBFF*/ }
/*NBFF*/ break;
+ default:
+ break;
/*NBFF*/ }
/*NBFF*/ return SFX_ITEM_PRESENTATION_NONE;
/*NBFF*/ }
-/*NBFF*/ SfxPoolItem* SvxTwoLinesItem::Create( SvStream & rStrm, USHORT nVer) const
+/*NBFF*/ SfxPoolItem* SvxTwoLinesItem::Create( SvStream & rStrm, USHORT /*nVer*/) const
/*NBFF*/ {
-/*NBFF*/ sal_Bool bOn;
+/*NBFF*/ sal_Bool _bOn;
/*NBFF*/ sal_Unicode cStart, cEnd;
-/*NBFF*/ rStrm >> bOn >> cStart >> cEnd;
-/*NBFF*/ return new SvxTwoLinesItem( bOn, cStart, cEnd, Which() );
+/*NBFF*/ rStrm >> _bOn >> cStart >> cEnd;
+/*NBFF*/ return new SvxTwoLinesItem( _bOn, cStart, cEnd, Which() );
/*NBFF*/ }
-/*NBFF*/ SvStream& SvxTwoLinesItem::Store(SvStream & rStrm, USHORT nIVer) const
+/*NBFF*/ SvStream& SvxTwoLinesItem::Store(SvStream & rStrm, USHORT /*nIVer*/) const
/*NBFF*/ {
/*NBFF*/ rStrm << GetValue() << GetStartBracket() << GetEndBracket();
/*NBFF*/ return rStrm;
@@ -2258,7 +2268,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
/*NBFF*/ SfxItemPresentation SvxCharRotateItem::GetPresentation(
/*NBFF*/ SfxItemPresentation ePres,
-/*NBFF*/ SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric,
+/*NBFF*/ SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/,
/*NBFF*/ String &rText, const ::IntlWrapper* ) const
/*NBFF*/ {
/*NBFF*/ switch( ePres )
@@ -2282,6 +2292,8 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
/*NBFF*/ return ePres;
/*NBFF*/ }
/*NBFF*/ break;
+ default:
+ break;
/*NBFF*/ }
/*NBFF*/ return SFX_ITEM_PRESENTATION_NONE;
/*NBFF*/ }
@@ -2289,7 +2301,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
/*NBFF*/ bool SvxCharRotateItem::QueryValue( ::com::sun::star::uno::Any& rVal,
/*NBFF*/ BYTE nMemberId ) const
/*NBFF*/ {
-/*NBFF*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
+/*NBFF*/
/*NBFF*/ nMemberId &= ~CONVERT_TWIPS;
/*NBFF*/ sal_Bool bRet = sal_True;
/*NBFF*/ switch( nMemberId )
@@ -2310,10 +2322,10 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
/*NBFF*/ bool SvxCharRotateItem::PutValue( const ::com::sun::star::uno::Any& rVal,
/*NBFF*/ BYTE nMemberId )
/*NBFF*/ {
-/*NBFF*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
+/*NBFF*/
/*NBFF*/ nMemberId &= ~CONVERT_TWIPS;
/*NBFF*/ sal_Bool bRet = sal_True;
-/*NBFF*/ sal_Int16 nVal;
+/*NBFF*/ sal_Int16 nVal = 0;
/*NBFF*/ switch( nMemberId )
/*NBFF*/ {
/*NBFF*/ case MID_ROTATE:
@@ -2401,7 +2413,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
/*N*/ }
-/*N*/ bool SvxCharScaleWidthItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+/*N*/ bool SvxCharScaleWidthItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
/*N*/ {
/*N*/ // SfxUInt16Item::QueryValue returns sal_Int32 in Any now... (srx642w)
/*N*/ // where we still want this to be a sal_Int16
@@ -2416,7 +2428,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
/*N*/ return FALSE;
/*N*/ }
-/*N*/ bool SvxCharScaleWidthItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+/*N*/ bool SvxCharScaleWidthItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
/*N*/ {
/*N*/ // SfxUInt16Item::QueryValue returns sal_Int32 in Any now... (srx642w)
/*N*/ // where we still want this to be a sal_Int16
@@ -2434,7 +2446,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
/*N*/ {
/*N*/ }
-/*N*/ SfxPoolItem* SvxCharReliefItem::Clone( SfxItemPool *pPool ) const
+/*N*/ SfxPoolItem* SvxCharReliefItem::Clone( SfxItemPool* /*pPool*/ ) const
/*N*/ {
/*N*/ return new SvxCharReliefItem( *this );
/*N*/ }
@@ -2446,7 +2458,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
/*N*/ return new SvxCharReliefItem( (FontRelief)nVal, Which() );
/*N*/ }
-/*N*/ SvStream& SvxCharReliefItem::Store(SvStream & rStrm, USHORT nIVer) const
+/*N*/ SvStream& SvxCharReliefItem::Store(SvStream & rStrm, USHORT /*nIVer*/) const
/*N*/ {
/*N*/ sal_uInt16 nVal = GetValue();
/*N*/ rStrm << nVal;
@@ -2473,9 +2485,9 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
/*N*/ SfxItemPresentation SvxCharReliefItem::GetPresentation
/*N*/ (
/*N*/ SfxItemPresentation ePres,
-/*N*/ SfxMapUnit eCoreUnit,
-/*N*/ SfxMapUnit ePresUnit,
-/*N*/ XubString& rText, const ::IntlWrapper *pIntl
+/*N*/ SfxMapUnit /*eCoreUnit*/,
+/*N*/ SfxMapUnit /*ePresUnit*/,
+/*N*/ XubString& rText, const ::IntlWrapper* /*pIntl*/
/*N*/ ) const
/*N*/ {
/*?*/ SfxItemPresentation eRet = ePres;
@@ -2499,7 +2511,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
/*N*/ bool SvxCharReliefItem::PutValue( const ::com::sun::star::uno::Any& rVal,
/*N*/ BYTE nMemberId )
/*N*/ {
-/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
+/*N*/
/*N*/ nMemberId &= ~CONVERT_TWIPS;
/*N*/ sal_Bool bRet = sal_True;
/*N*/ switch( nMemberId )
@@ -2524,7 +2536,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
/*N*/ bool SvxCharReliefItem::QueryValue( ::com::sun::star::uno::Any& rVal,
/*N*/ BYTE nMemberId ) const
/*N*/ {
-/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
+/*N*/
/*N*/ nMemberId &= ~CONVERT_TWIPS;
/*N*/ sal_Bool bRet = sal_True;
/*N*/ switch( nMemberId )
@@ -2548,8 +2560,8 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI
|* class SvxScriptSetItem
*************************************************************************/
-/*N*/ SfxPoolItem* SvxScriptSetItem::Clone( SfxItemPool *pPool ) const
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001
+/*N*/ SfxPoolItem* SvxScriptSetItem::Clone( SfxItemPool* /*pPool*/ ) const
+/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return NULL;
/*N*/ }
/*N*/ SfxPoolItem* SvxScriptSetItem::Create( SvStream &, USHORT ) const
diff --git a/binfilter/bf_svx/source/items/svx_xmlcnitm.cxx b/binfilter/bf_svx/source/items/svx_xmlcnitm.cxx
index 17cdb64..28b466c 100644
--- a/binfilter/bf_svx/source/items/svx_xmlcnitm.cxx
+++ b/binfilter/bf_svx/source/items/svx_xmlcnitm.cxx
@@ -72,13 +72,13 @@ using rtl::OUString;
-/*N*/ USHORT SvXMLAttrContainerItem::GetVersion( USHORT nFileFormatVersion ) const
+/*N*/ USHORT SvXMLAttrContainerItem::GetVersion( USHORT /*nFileFormatVersion*/ ) const
/*N*/ {
/*N*/ // This item should never be stored
/*N*/ return USHRT_MAX;
/*N*/ }
-/*N*/ bool SvXMLAttrContainerItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+/*N*/ bool SvXMLAttrContainerItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
/*N*/ {
/*N*/ Reference<XNameContainer> xContainer =
/*N*/ new SvUnoAttributeContainer( new SvXMLAttrContainerData( *pImpl ) );
@@ -86,7 +86,7 @@ using rtl::OUString;
/*N*/ rVal.setValue( &xContainer, ::getCppuType((Reference<XNameContainer>*)0) );
/*N*/ return true;
/*N*/ }
-/*N*/ bool SvXMLAttrContainerItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+/*N*/ bool SvXMLAttrContainerItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
/*NBFF*/{
/*NBFF*/ Reference<XInterface> xRef;
/*NBFF*/ SvUnoAttributeContainer* pContainer = NULL;
@@ -214,20 +214,20 @@ using rtl::OUString;
/*N*/ USHORT SvXMLAttrContainerItem::GetFirstNamespaceIndex() const
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001
+/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;
/*N*/ }
-/*N*/ USHORT SvXMLAttrContainerItem::GetNextNamespaceIndex( USHORT nIdx ) const
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001
+/*N*/ USHORT SvXMLAttrContainerItem::GetNextNamespaceIndex( USHORT /*nIdx*/ ) const
+/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;
/*N*/ }
-/*N*/ const OUString& SvXMLAttrContainerItem::GetNamespace( USHORT i ) const
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return OUString::createFromAscii (""); //STRIP001
+/*N*/ const OUString& SvXMLAttrContainerItem::GetNamespace( USHORT /*i*/ ) const
+/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return OUString::createFromAscii ("");
/*N*/ }
-/*N*/ const OUString& SvXMLAttrContainerItem::GetPrefix( USHORT i ) const
+/*N*/ const OUString& SvXMLAttrContainerItem::GetPrefix( USHORT /*i*/ ) const
/*N*/ {
-/*N*/ DBG_BF_ASSERT(0, "STRIP"); return ::rtl::OUString::createFromAscii ("");//STRIP001 /*N*/ return pImpl->GetPrefix( i );
+/*N*/ DBG_BF_ASSERT(0, "STRIP"); return ::rtl::OUString::createFromAscii ("");
/*N*/ }
diff --git a/binfilter/bf_svx/source/items/svx_zoomitem.cxx b/binfilter/bf_svx/source/items/svx_zoomitem.cxx
index a1b89b5..fc91862 100644
--- a/binfilter/bf_svx/source/items/svx_zoomitem.cxx
+++ b/binfilter/bf_svx/source/items/svx_zoomitem.cxx
@@ -68,7 +68,7 @@ namespace binfilter {
// -----------------------------------------------------------------------
-/*N*/ SfxPoolItem* SvxZoomItem::Clone( SfxItemPool *pPool ) const
+/*N*/ SfxPoolItem* SvxZoomItem::Clone( SfxItemPool* /*pPool*/ ) const
/*N*/ {
/*N*/ return new SvxZoomItem( *this );
/*N*/ }
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdocirc.cxx b/binfilter/bf_svx/source/svdraw/svx_svdocirc.cxx
index fec4d03..17b2bae 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdocirc.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdocirc.cxx
@@ -340,6 +340,7 @@ namespace binfilter {
/*?*/ case OBJ_SECT: rXOut.DrawPie(aR,aTmpPt1,aTmpPt2); break;
/*?*/ case OBJ_CARC: rXOut.DrawArc(aR,aTmpPt1,aTmpPt2); break;
/*?*/ case OBJ_CCUT: DBG_ERROR("SdrCircObj::Paint(): ein Kreisabschnitt muss immer mit XPoly gepaintet werden"); break;
+ default: break;
/*?*/ }
/*?*/ }
/*?*/ }
@@ -380,6 +381,7 @@ namespace binfilter {
/*?*/ case OBJ_SECT: rXOut.DrawPie(aRect,aPnt1,aPnt2); break;
/*?*/ case OBJ_CARC: rXOut.DrawArc(aRect,aPnt1,aPnt2); break;
/*?*/ case OBJ_CCUT: DBG_ERROR("SdrCircObj::Paint(): ein Kreisabschnitt muss immer mit XPoly gepaintet werden"); break;
+ default: break;
/*N*/ }
/*N*/ }
/*N*/ }
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdopath.cxx b/binfilter/bf_svx/source/svdraw/svx_svdopath.cxx
index dab4ce8..620c50d 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdopath.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdopath.cxx
@@ -179,12 +179,14 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
/*N*/ case OBJ_FREELINE: eKind=OBJ_PLIN; break;
/*N*/ case OBJ_PATHFILL: eKind=OBJ_POLY; break;
/*N*/ case OBJ_FREEFILL: eKind=OBJ_POLY; break;
+ default: break;
/*N*/ }
/*N*/ } else {
/*N*/ switch (eKind) {
/*N*/ case OBJ_LINE: eKind=OBJ_PATHLINE; break;
/*N*/ case OBJ_PLIN: eKind=OBJ_PATHLINE; break;
/*N*/ case OBJ_POLY: eKind=OBJ_PATHFILL; break;
+ default: break;
/*N*/ }
/*N*/ }
/*N*/
diff --git a/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx b/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx
index a4b5e62..7b50afe 100644
--- a/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx
+++ b/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx
@@ -743,6 +743,7 @@ static int
/*M*/ case CALC_MEAN : eCurrListOper = CALC_PLUS; break;
/*M*/ case CALC_MIN : eCurrListOper = CALC_MIN_IN; break;
/*M*/ case CALC_MAX : eCurrListOper = CALC_MAX_IN; break;
+ default: break;
/*M*/ }
/*M*/ nCommandPos = (xub_StrLen)aRes.EndPos;
/*M*/ return eCurrOper;
diff --git a/binfilter/bf_sw/source/core/fields/sw_ddefld.cxx b/binfilter/bf_sw/source/core/fields/sw_ddefld.cxx
index ba4dc6b..8e49449 100644
--- a/binfilter/bf_sw/source/core/fields/sw_ddefld.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_ddefld.cxx
@@ -212,8 +212,8 @@ BOOL SwDDEFieldType::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMId
/* ---------------------------------------------------------------------------
---------------------------------------------------------------------------*/
-/*N*/ SwDDEField::SwDDEField( SwDDEFieldType* pType )
-/*N*/ : SwField(pType)
+/*N*/ SwDDEField::SwDDEField( SwDDEFieldType* _pType )
+/*N*/ : SwField(_pType)
/*N*/ {
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/fields/sw_fldbas.cxx b/binfilter/bf_sw/source/core/fields/sw_fldbas.cxx
index d6fd307..5bc383c 100644
--- a/binfilter/bf_sw/source/core/fields/sw_fldbas.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_fldbas.cxx
@@ -67,6 +67,8 @@ using namespace ::com::sun::star;
/*?*/ case NF_DATETIME_SYSTEM_SHORT_HHMM:
/*?*/ nLng = LANGUAGE_SYSTEM;
/*?*/ break;
+ default:
+ break;
/*N*/ }
/*N*/ return nLng;
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/inc/swcache.hxx b/binfilter/bf_sw/source/core/inc/swcache.hxx
index 29e8586..597d1ee 100644
--- a/binfilter/bf_sw/source/core/inc/swcache.hxx
+++ b/binfilter/bf_sw/source/core/inc/swcache.hxx
@@ -273,8 +273,8 @@ inline SwCacheObj *SwCache::Next( SwCacheObj *pCacheObj)
inline SwCacheAccess::SwCacheAccess( SwCache &rC, const void *pOwn, BOOL bSeek ) :
rCache( rC ),
- pOwner( pOwn ),
- pObj( 0 )
+ pObj( 0 ),
+ pOwner( pOwn )
{
if ( bSeek && pOwner && 0 != (pObj = rCache.Get( pOwner )) )
pObj->Lock();
@@ -283,8 +283,8 @@ inline SwCacheAccess::SwCacheAccess( SwCache &rC, const void *pOwn, BOOL bSeek )
inline SwCacheAccess::SwCacheAccess( SwCache &rC, const void *pOwn,
const USHORT nIndex ) :
rCache( rC ),
- pOwner( pOwn ),
- pObj( 0 )
+ pObj( 0 ),
+ pOwner( pOwn )
{
if ( pOwner && 0 != (pObj = rCache.Get( pOwner, nIndex )) )
pObj->Lock();
diff --git a/binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx b/binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx
index 47d7ed7..423cd08 100644
--- a/binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx
+++ b/binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx
@@ -111,17 +111,17 @@ namespace binfilter {
static const SwLineType __FAR_DATA aLineTypeArr[] =
{
// In Out Dist
- LIN_0, LIN_1, LIN_0, // Einfache Linien
- LIN_0, LIN_2, LIN_0,
- LIN_0, LIN_3, LIN_0,
- LIN_0, LIN_5, LIN_0,
- LIN_1, LIN_1, LIN_2, // Doppelte Linien
- LIN_2, LIN_2, LIN_2, // Doppelte Linien
- LIN_3, LIN_3, LIN_3,
- LIN_3, LIN_2, LIN_2,
- LIN_2, LIN_3, LIN_2,
- LIN_4, LIN_3, LIN_3,
- LIN_3, LIN_4, LIN_3
+ {LIN_0, LIN_1, LIN_0}, // Einfache Linien
+ {LIN_0, LIN_2, LIN_0},
+ {LIN_0, LIN_3, LIN_0},
+ {LIN_0, LIN_5, LIN_0},
+ {LIN_1, LIN_1, LIN_2}, // Doppelte Linien
+ {LIN_2, LIN_2, LIN_2}, // Doppelte Linien
+ {LIN_3, LIN_3, LIN_3},
+ {LIN_3, LIN_2, LIN_2},
+ {LIN_2, LIN_3, LIN_2},
+ {LIN_4, LIN_3, LIN_3},
+ {LIN_3, LIN_4, LIN_3}
};
diff --git a/binfilter/bf_sw/source/ui/fldui/sw_fldmgr.cxx b/binfilter/bf_sw/source/ui/fldui/sw_fldmgr.cxx
index 0c4774b..d8d6840 100644
--- a/binfilter/bf_sw/source/ui/fldui/sw_fldmgr.cxx
+++ b/binfilter/bf_sw/source/ui/fldui/sw_fldmgr.cxx
@@ -153,54 +153,54 @@ struct SwFldPack
static const SwFldPack __FAR_DATA aSwFlds[] =
{
// Dokument
- TYP_EXTUSERFLD, FLD_EU_BEGIN, FLD_EU_END, 0, 0,
- TYP_AUTHORFLD, 0, 0, FMT_AUTHOR_BEGIN, FMT_AUTHOR_END,
- TYP_DATEFLD, FLD_DATE_BEGIN, FLD_DATE_END, 0, 0,
- TYP_TIMEFLD, FLD_TIME_BEGIN, FLD_TIME_END, 0, 0,
- TYP_PAGENUMBERFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END-1,
- TYP_NEXTPAGEFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END,
- TYP_PREVPAGEFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END,
- TYP_FILENAMEFLD, 0, 0, FMT_FF_BEGIN, FMT_FF_END,
- TYP_DOCSTATFLD, FLD_STAT_BEGIN, FLD_STAT_END, FMT_NUM_BEGIN, FMT_NUM_END-1,
+ {TYP_EXTUSERFLD, FLD_EU_BEGIN, FLD_EU_END, 0, 0},
+ {TYP_AUTHORFLD, 0, 0, FMT_AUTHOR_BEGIN, FMT_AUTHOR_END},
+ {TYP_DATEFLD, FLD_DATE_BEGIN, FLD_DATE_END, 0, 0},
+ {TYP_TIMEFLD, FLD_TIME_BEGIN, FLD_TIME_END, 0, 0},
+ {TYP_PAGENUMBERFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END-1},
+ {TYP_NEXTPAGEFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END},
+ {TYP_PREVPAGEFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END},
+ {TYP_FILENAMEFLD, 0, 0, FMT_FF_BEGIN, FMT_FF_END},
+ {TYP_DOCSTATFLD, FLD_STAT_BEGIN, FLD_STAT_END, FMT_NUM_BEGIN, FMT_NUM_END-1},
- TYP_CHAPTERFLD, 0, 0, FMT_CHAPTER_BEGIN, FMT_CHAPTER_END,
- TYP_TEMPLNAMEFLD, 0, 0, FMT_FF_BEGIN, FMT_FF_END,
+ {TYP_CHAPTERFLD, 0, 0, FMT_CHAPTER_BEGIN, FMT_CHAPTER_END},
+ {TYP_TEMPLNAMEFLD, 0, 0, FMT_FF_BEGIN, FMT_FF_END},
// Funktion
- TYP_CONDTXTFLD, 0, 0, 0, 0,
- TYP_DROPDOWN, 0, 0, 0, 0,
- TYP_INPUTFLD, FLD_INPUT_BEGIN, FLD_INPUT_END, 0, 0,
- TYP_MACROFLD, 0, 0, 0, 0,
- TYP_JUMPEDITFLD, 0, 0, FMT_MARK_BEGIN, FMT_MARK_END,
- TYP_COMBINED_CHARS, 0, 0, 0, 0,
- TYP_HIDDENTXTFLD, 0, 0, 0, 0,
- TYP_HIDDENPARAFLD, 0, 0, 0, 0,
+ {TYP_CONDTXTFLD, 0, 0, 0, 0},
+ {TYP_DROPDOWN, 0, 0, 0, 0},
+ {TYP_INPUTFLD, FLD_INPUT_BEGIN, FLD_INPUT_END, 0, 0},
+ {TYP_MACROFLD, 0, 0, 0, 0},
+ {TYP_JUMPEDITFLD, 0, 0, FMT_MARK_BEGIN, FMT_MARK_END},
+ {TYP_COMBINED_CHARS, 0, 0, 0, 0},
+ {TYP_HIDDENTXTFLD, 0, 0, 0, 0},
+ {TYP_HIDDENPARAFLD, 0, 0, 0, 0},
// Referenzen
- TYP_SETREFFLD, 0, 0, 0, 0,
- TYP_GETREFFLD, 0, 0, FMT_REF_BEGIN, FMT_REF_END,
+ {TYP_SETREFFLD, 0, 0, 0, 0},
+ {TYP_GETREFFLD, 0, 0, FMT_REF_BEGIN, FMT_REF_END},
// Ablage
- TYP_DOCINFOFLD, 0, 0, FMT_REG_BEGIN, FMT_REG_END,
+ {TYP_DOCINFOFLD, 0, 0, FMT_REG_BEGIN, FMT_REG_END},
// Datenbank
- TYP_DBFLD, 0, 0, FMT_DBFLD_BEGIN, FMT_DBFLD_END,
- TYP_DBNEXTSETFLD, 0, 0, 0, 0,
- TYP_DBNUMSETFLD, 0, 0, 0, 0,
- TYP_DBSETNUMBERFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END-2,
- TYP_DBNAMEFLD, 0, 0, 0, 0,
+ {TYP_DBFLD, 0, 0, FMT_DBFLD_BEGIN, FMT_DBFLD_END},
+ {TYP_DBNEXTSETFLD, 0, 0, 0, 0},
+ {TYP_DBNUMSETFLD, 0, 0, 0, 0},
+ {TYP_DBSETNUMBERFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END-2},
+ {TYP_DBNAMEFLD, 0, 0, 0, 0},
// Variablen
- TYP_SETFLD, 0, 0, FMT_SETVAR_BEGIN, FMT_SETVAR_END,
+ {TYP_SETFLD, 0, 0, FMT_SETVAR_BEGIN, FMT_SETVAR_END},
- TYP_GETFLD, 0, 0, FMT_GETVAR_BEGIN, FMT_GETVAR_END,
- TYP_DDEFLD, 0, 0, FMT_DDE_BEGIN, FMT_DDE_END,
- TYP_FORMELFLD, 0, 0, FMT_GETVAR_BEGIN, FMT_GETVAR_END,
- TYP_INPUTFLD, FLD_INPUT_BEGIN, FLD_INPUT_END, 0, 0,
- TYP_SEQFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END-2,
- TYP_SETREFPAGEFLD, FLD_PAGEREF_BEGIN, FLD_PAGEREF_END,0, 0,
- TYP_GETREFPAGEFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END-1,
- TYP_USERFLD, 0, 0, FMT_USERVAR_BEGIN, FMT_USERVAR_END
+ {TYP_GETFLD, 0, 0, FMT_GETVAR_BEGIN, FMT_GETVAR_END},
+ {TYP_DDEFLD, 0, 0, FMT_DDE_BEGIN, FMT_DDE_END},
+ {TYP_FORMELFLD, 0, 0, FMT_GETVAR_BEGIN, FMT_GETVAR_END},
+ {TYP_INPUTFLD, FLD_INPUT_BEGIN, FLD_INPUT_END, 0, 0},
+ {TYP_SEQFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END-2},
+ {TYP_SETREFPAGEFLD, FLD_PAGEREF_BEGIN, FLD_PAGEREF_END,0, 0},
+ {TYP_GETREFPAGEFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END-1},
+ {TYP_USERFLD, 0, 0, FMT_USERVAR_BEGIN, FMT_USERVAR_END}
};
String* SwFldMgr::pDate = 0;
diff --git a/binfilter/bf_xmloff/source/core/xmloff_XMLEmbeddedObjectImportContext.cxx b/binfilter/bf_xmloff/source/core/xmloff_XMLEmbeddedObjectImportContext.cxx
index 07153cd..813c4d1 100644
--- a/binfilter/bf_xmloff/source/core/xmloff_XMLEmbeddedObjectImportContext.cxx
+++ b/binfilter/bf_xmloff/source/core/xmloff_XMLEmbeddedObjectImportContext.cxx
@@ -227,6 +227,7 @@ XMLEmbeddedObjectImportContext::XMLEmbeddedObjectImportContext(
case XML_DRAWING: aName = SvGlobalName(SO3_SDRAW_CLASSID); break;
case XML_PRESENTATION: aName = SvGlobalName(SO3_SIMPRESS_CLASSID); break;
case XML_CHART: aName = SvGlobalName(SO3_SCH_CLASSID); break;
+ default: break;
}
break;
diff --git a/binfilter/bf_xmloff/source/core/xmloff_xmlehelp.cxx b/binfilter/bf_xmloff/source/core/xmloff_xmlehelp.cxx
index 5e13ec7..3b69c19 100644
--- a/binfilter/bf_xmloff/source/core/xmloff_xmlehelp.cxx
+++ b/binfilter/bf_xmloff/source/core/xmloff_xmlehelp.cxx
@@ -153,6 +153,7 @@ void SvXMLExportHelper::AddLength( sal_Int32 nValue, MapUnit eValueUnit,
break;
}
break;
+ default: break;
}
@@ -175,7 +176,7 @@ void SvXMLExportHelper::AddLength( sal_Int32 nValue, MapUnit eValueUnit,
}
else
{
- BigInt nBigFac( nFac );
+ nBigFac = nFac;
BigInt nBig10( 10 );
rOut.append( (sal_Int32)(nBigVal / nBigFac) );
if( !(nBigVal % nBigFac).IsZero() )
@@ -421,6 +422,7 @@ double SvXMLExportHelper::GetConversionFactor(::rtl::OUStringBuffer& rUnit,
}
break;
}
+ default: break;
}
if(eUnit != XML_TOKEN_INVALID)
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_XMLImageMapExport.cxx b/binfilter/bf_xmloff/source/draw/xmloff_XMLImageMapExport.cxx
index ce5cb51..67a911c 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_XMLImageMapExport.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_XMLImageMapExport.cxx
@@ -248,6 +248,8 @@ void XMLImageMapExport::ExportMapEntry(
case XML_AREA_POLYGON:
ExportPolygon(rPropertySet);
break;
+ default:
+ break;
}
// write element
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_animimp.cxx b/binfilter/bf_xmloff/source/draw/xmloff_animimp.cxx
index b85cefb..45a4000 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_animimp.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_animimp.cxx
@@ -151,6 +151,7 @@ AnimationEffect ImplSdXMLgetEffect( XMLEffect eKind, XMLEffectDirection eDirecti
case ED_spiral_inward_right:return AnimationEffect_SPIRALIN_RIGHT;
case ED_spiral_outward_left:return AnimationEffect_SPIRALOUT_LEFT;
case ED_spiral_outward_right:return AnimationEffect_SPIRALOUT_RIGHT;
+ default: break;
}
return AnimationEffect_FADE_FROM_LEFT;
case EK_move:
@@ -184,6 +185,7 @@ AnimationEffect ImplSdXMLgetEffect( XMLEffect eKind, XMLEffectDirection eDirecti
case ED_to_upperright: return AnimationEffect_MOVE_TO_UPPERRIGHT;
case ED_to_lowerright: return AnimationEffect_MOVE_TO_LOWERRIGHT;
case ED_to_lowerleft: return AnimationEffect_MOVE_TO_LOWERLEFT;
+ default: break;
}
return AnimationEffect_ZOOM_IN;
}
@@ -201,6 +203,7 @@ AnimationEffect ImplSdXMLgetEffect( XMLEffect eKind, XMLEffectDirection eDirecti
case ED_from_lowerright: return AnimationEffect_ZOOM_OUT_FROM_LOWERRIGHT;
case ED_from_center: return AnimationEffect_ZOOM_OUT_FROM_CENTER;
case ED_spiral_inward_left: return AnimationEffect_ZOOM_OUT_SPIRAL;
+ default: break;
}
return AnimationEffect_ZOOM_OUT;
}
@@ -224,6 +227,7 @@ AnimationEffect ImplSdXMLgetEffect( XMLEffect eKind, XMLEffectDirection eDirecti
case ED_to_upperright: return AnimationEffect_MOVE_TO_UPPERRIGHT;
case ED_to_lowerright: return AnimationEffect_MOVE_TO_LOWERRIGHT;
case ED_to_lowerleft: return AnimationEffect_MOVE_TO_LOWERLEFT;
+ default: break;
}
}
return AnimationEffect_MOVE_FROM_LEFT;
@@ -251,6 +255,7 @@ AnimationEffect ImplSdXMLgetEffect( XMLEffect eKind, XMLEffectDirection eDirecti
case ED_from_top: return AnimationEffect_WAVYLINE_FROM_TOP;
case ED_from_right: return AnimationEffect_WAVYLINE_FROM_RIGHT;
case ED_from_bottom: return AnimationEffect_WAVYLINE_FROM_BOTTOM;
+ default: break;
}
return AnimationEffect_WAVYLINE_FROM_LEFT;
case EK_random:
@@ -271,6 +276,7 @@ AnimationEffect ImplSdXMLgetEffect( XMLEffect eKind, XMLEffectDirection eDirecti
case ED_from_upperright: return AnimationEffect_LASER_FROM_UPPERRIGHT;
case ED_from_lowerleft: return AnimationEffect_LASER_FROM_LOWERLEFT;
case ED_from_lowerright: return AnimationEffect_LASER_FROM_LOWERRIGHT;
+ default: break;
}
return AnimationEffect_LASER_FROM_LEFT;
case EK_appear:
@@ -296,6 +302,7 @@ AnimationEffect ImplSdXMLgetEffect( XMLEffect eKind, XMLEffectDirection eDirecti
case ED_to_lowerright: return AnimationEffect_MOVE_SHORT_TO_LOWERRIGHT;
case ED_to_bottom: return AnimationEffect_MOVE_SHORT_TO_BOTTOM;
case ED_to_lowerleft: return AnimationEffect_MOVE_SHORT_TO_LOWERLEFT;
+ default: break;
}
return AnimationEffect_MOVE_SHORT_FROM_LEFT;
case EK_checkerboard:
@@ -321,8 +328,11 @@ AnimationEffect ImplSdXMLgetEffect( XMLEffect eKind, XMLEffectDirection eDirecti
case ED_from_lowerright: return AnimationEffect_STRETCH_FROM_LOWERRIGHT;
case ED_vertical: return AnimationEffect_VERTICAL_STRETCH;
case ED_horizontal: return AnimationEffect_HORIZONTAL_STRETCH;
+ default: break;
}
return AnimationEffect_STRETCH_FROM_LEFT;
+ default:
+ break;
}
return AnimationEffect_NONE;
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_shapeexport2.cxx b/binfilter/bf_xmloff/source/draw/xmloff_shapeexport2.cxx
index 8d38b19..da015b3 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_shapeexport2.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_shapeexport2.cxx
@@ -536,6 +536,7 @@ void XMLShapeExport::ImpExportTextBoxShape(
bIsPresShape = TRUE;
break;
}
+ default: break;
}
// Transformation
@@ -1030,7 +1031,7 @@ void XMLShapeExport::ImpExportSpreadsheetShape(
void XMLShapeExport::ImpExportControlShape(
const uno::Reference< drawing::XShape >& xShape,
- XmlShapeType eShapeType, sal_Int32 nFeatures, awt::Point* pRefPoint)
+ XmlShapeType /*eShapeType*/, sal_Int32 nFeatures, awt::Point* pRefPoint)
{
const uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY);
if(xPropSet.is())
@@ -1059,7 +1060,7 @@ void XMLShapeExport::ImpExportControlShape(
void XMLShapeExport::ImpExportConnectorShape(
const uno::Reference< drawing::XShape >& xShape,
- XmlShapeType eShapeType, sal_Int32 nFeatures /* = SEF_DEFAULT */, awt::Point* pRefPoint /* = NULL */)
+ XmlShapeType /*eShapeType*/, sal_Int32 nFeatures /* = SEF_DEFAULT */, awt::Point* pRefPoint /* = NULL */)
{
uno::Reference< beans::XPropertySet > xProps( xShape, uno::UNO_QUERY );
@@ -1208,7 +1209,7 @@ void XMLShapeExport::ImpExportConnectorShape(
void XMLShapeExport::ImpExportMeasureShape(
const uno::Reference< drawing::XShape >& xShape,
- XmlShapeType eShapeType, sal_Int32 nFeatures /* = SEF_DEFAULT */, awt::Point* pRefPoint /* = NULL */)
+ XmlShapeType /*eShapeType*/, sal_Int32 nFeatures /* = SEF_DEFAULT */, awt::Point* pRefPoint /* = NULL */)
{
uno::Reference< beans::XPropertySet > xProps( xShape, uno::UNO_QUERY );
@@ -1417,7 +1418,7 @@ void XMLShapeExport::ImpExportPageShape(
void XMLShapeExport::ImpExportCaptionShape(
const uno::Reference< drawing::XShape >& xShape,
- XmlShapeType eShapeType, sal_Int32 nFeatures /* = SEF_DEFAULT */, awt::Point* pRefPoint /* = NULL */)
+ XmlShapeType /*eShapeType*/, sal_Int32 nFeatures /* = SEF_DEFAULT */, awt::Point* pRefPoint /* = NULL */)
{
const uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY);
if(xPropSet.is())
@@ -1457,7 +1458,7 @@ void XMLShapeExport::ImpExportCaptionShape(
void XMLShapeExport::ImpExportFrameShape(
const uno::Reference< drawing::XShape >& xShape,
- XmlShapeType eShapeType, sal_Int32 nFeatures, ::com::sun::star::awt::Point* pRefPoint)
+ XmlShapeType /*eShapeType*/, sal_Int32 nFeatures, ::com::sun::star::awt::Point* pRefPoint)
{
const uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY);
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list