[Libreoffice-commits] .: binfilter/bf_svtools binfilter/bf_svx binfilter/bf_sw binfilter/inc binfilter/legacysmgr
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Mon Nov 1 17:39:35 PDT 2010
binfilter/bf_svtools/source/items1/svt_itemset.cxx | 2
binfilter/bf_svtools/source/items1/svt_poolitem.cxx | 14
binfilter/bf_svx/source/items/svx_frmitems.cxx | 132 ++--
binfilter/bf_svx/source/items/svx_writingmodeitem.cxx | 2
binfilter/bf_sw/source/filter/w4w/sw_w4wpar1.cxx | 273 ++++------
binfilter/inc/bf_so3/so2dll.hxx | 2
binfilter/inc/bf_svtools/poolitem.hxx | 38 -
binfilter/inc/bf_sw/doc.hxx | 40 -
binfilter/legacysmgr/source/legacy/legacy_binfilters_smgr.cxx | 32 -
9 files changed, 274 insertions(+), 261 deletions(-)
New commits:
commit af5964b48d16089c7921ab9d81774fb3630723ab
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Mon Nov 1 19:34:30 2010 -0500
binfilters: 6926 warnings down, 29191 to go....
diff --git a/binfilter/bf_svtools/source/items1/svt_itemset.cxx b/binfilter/bf_svtools/source/items1/svt_itemset.cxx
index d0b9ad5..706309b 100644
--- a/binfilter/bf_svtools/source/items1/svt_itemset.cxx
+++ b/binfilter/bf_svtools/source/items1/svt_itemset.cxx
@@ -496,7 +496,7 @@ USHORT SfxItemSet::ClearItem( USHORT nWhich )
// #i32448#
// Take care of disabled items, too.
- if(!pItemToClear->nWhich)
+ if(!pItemToClear->m_nWhich)
{
// item is disabled, delete it
delete pItemToClear;
diff --git a/binfilter/bf_svtools/source/items1/svt_poolitem.cxx b/binfilter/bf_svtools/source/items1/svt_poolitem.cxx
index 788d770..634e5a8 100644
--- a/binfilter/bf_svtools/source/items1/svt_poolitem.cxx
+++ b/binfilter/bf_svtools/source/items1/svt_poolitem.cxx
@@ -87,9 +87,9 @@ IMPL_PTRHINT(SfxPoolItemHint,SfxPoolItem)
// SfxPoolItem -----------------------------------------------------------
SfxPoolItem::SfxPoolItem( USHORT nW )
- : nRefCount( 0 ),
- nWhich( nW )
- , nKind( 0 )
+ : m_nRefCount( 0 ),
+ m_nWhich( nW )
+ , m_nKind( 0 )
{
DBG_CTOR(SfxPoolItem, 0);
DBG_ASSERT(nW <= SHRT_MAX, "Which Bereich ueberschritten");
@@ -125,9 +125,9 @@ SfxPoolItem::SfxPoolItem( USHORT nW )
// -----------------------------------------------------------------------
SfxPoolItem::SfxPoolItem( const SfxPoolItem& rCpy )
- : nRefCount( 0 ), // wird ja ein neues Object!
- nWhich( rCpy.Which() ) // Funktion rufen wg. ChkThis()
- , nKind( 0 )
+ : m_nRefCount( 0 ), // wird ja ein neues Object!
+ m_nWhich( rCpy.Which() ) // Funktion rufen wg. ChkThis()
+ , m_nKind( 0 )
{
DBG_CTOR(SfxPoolItem, 0);
#if OSL_DEBUG_LEVEL > 1
@@ -164,7 +164,7 @@ SfxPoolItem::SfxPoolItem( const SfxPoolItem& rCpy )
SfxPoolItem::~SfxPoolItem()
{
DBG_DTOR(SfxPoolItem, 0);
- DBG_ASSERT(nRefCount == 0 || nRefCount > SFX_ITEMS_MAXREF, "destroying item in use" );
+ DBG_ASSERT(m_nRefCount == 0 || m_nRefCount > SFX_ITEMS_MAXREF, "destroying item in use" );
#if OSL_DEBUG_LEVEL > 1
--nItemCount;
#endif
diff --git a/binfilter/bf_svx/source/items/svx_frmitems.cxx b/binfilter/bf_svx/source/items/svx_frmitems.cxx
index 4403c1b..672be28 100644
--- a/binfilter/bf_svx/source/items/svx_frmitems.cxx
+++ b/binfilter/bf_svx/source/items/svx_frmitems.cxx
@@ -129,6 +129,7 @@ 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))
// STATIC DATA -----------------------------------------------------------
@@ -180,7 +181,7 @@ using namespace ::com::sun::star;
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxPaperBinItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const
+/*N*/ SvStream& SvxPaperBinItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
/*N*/ {
/*N*/ rStrm << GetValue();
/*N*/ return rStrm;
@@ -307,7 +308,7 @@ using namespace ::com::sun::star;
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxSizeItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const
+/*N*/ SvStream& SvxSizeItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
/*N*/ {
/*N*/ rStrm << aSize.Width();
/*N*/ rStrm << aSize.Height();
@@ -334,12 +335,15 @@ using namespace ::com::sun::star;
/*N*/
/*N*/ SfxPoolItem( nId ),
/*N*/
-/*N*/ nFirstLineOfst ( 0 ), nPropFirstLineOfst( 100 ),
+ nFirstLineOfst ( 0 ),
/*N*/ nTxtLeft ( 0 ),
-/*N*/ nLeftMargin ( 0 ), nPropLeftMargin( 100 ),
-/*N*/ nRightMargin ( 0 ), nPropRightMargin( 100 ),
-/*N*/ bBulletFI ( 0 ),
-/*N*/ bAutoFirst ( 0 )
+/*N*/ nLeftMargin ( 0 ),
+/*N*/ nRightMargin ( 0 ),
+/*N*/ nPropFirstLineOfst( 100 ),
+ nPropLeftMargin( 100 ),
+ nPropRightMargin( 100 ),
+/*N*/ bAutoFirst ( 0 ),
+/*N*/ bBulletFI ( 0 )
/*N*/ {
/*N*/ }
@@ -351,12 +355,15 @@ using namespace ::com::sun::star;
/*N*/
/*N*/ SfxPoolItem( nId ),
/*N*/
-/*N*/ nFirstLineOfst ( nOfset ), nPropFirstLineOfst( 100 ),
+/*N*/ nFirstLineOfst ( nOfset ),
/*N*/ nTxtLeft ( nTLeft ),
-/*N*/ nLeftMargin ( nLeft ), nPropLeftMargin( 100 ),
-/*N*/ nRightMargin ( nRight ), nPropRightMargin( 100 ),
-/*N*/ bBulletFI ( 0 ),
-/*N*/ bAutoFirst ( 0 )
+/*N*/ nLeftMargin ( nLeft ),
+/*N*/ nRightMargin ( nRight ),
+ nPropFirstLineOfst( 100 ),
+ nPropLeftMargin( 100 ),
+ nPropRightMargin( 100 ),
+/*N*/ bAutoFirst ( 0 ),
+/*N*/ bBulletFI ( 0 )
/*N*/ {
/*N*/ }
@@ -410,8 +417,8 @@ using namespace ::com::sun::star;
/*N*/ {
/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
/*N*/ nMemberId &= ~CONVERT_TWIPS;
-/*N*/ sal_Int32 nMaxVal = bConvert ? TWIP_TO_MM100(USHRT_MAX) : USHRT_MAX;
-/*N*/ sal_Int32 nVal;
+
+/*N*/ sal_Int32 nVal = 0;
/*N*/ if( nMemberId != MID_FIRST_AUTO &&
/*N*/ nMemberId != MID_L_REL_MARGIN && nMemberId != MID_R_REL_MARGIN)
/*N*/ if(!(rVal >>= nVal))
@@ -644,8 +651,10 @@ using namespace ::com::sun::star;
/*N*/
/*N*/ SfxPoolItem( nId ),
/*N*/
-/*N*/ nUpper( 0 ), nPropUpper( 100 ),
-/*N*/ nLower( 0 ), nPropLower( 100 )
+/*N*/ nUpper( 0 ),
+/*N*/ nLower( 0 ),
+ nPropUpper( 100 ),
+ nPropLower( 100 )
/*N*/ {
/*N*/ }
@@ -656,8 +665,10 @@ using namespace ::com::sun::star;
/*N*/
/*N*/ SfxPoolItem( nId ),
/*N*/
-/*N*/ nUpper( nUp ), nPropUpper( 100 ),
-/*N*/ nLower( nLow ), nPropLower( 100 )
+/*N*/ nUpper( nUp ),
+/*N*/ nLower( nLow ),
+ nPropUpper( 100 ),
+ nPropLower( 100 )
/*N*/ {
/*N*/ }
@@ -669,8 +680,8 @@ using namespace ::com::sun::star;
/*N*/ switch( nMemberId )
/*N*/ {
/*N*/ // jetzt alles signed
-/*N*/ case MID_UP_MARGIN: rVal <<= (sal_Int32)(bConvert ? TWIP_TO_MM100(nUpper) : nUpper); break;
-/*N*/ case MID_LO_MARGIN: rVal <<= (sal_Int32)(bConvert ? TWIP_TO_MM100(nLower) : nLower); break;
+/*N*/ case MID_UP_MARGIN: rVal <<= (sal_Int32)(bConvert ? UTWIP_TO_MM100(nUpper) : nUpper); break;
+/*N*/ case MID_LO_MARGIN: rVal <<= (sal_Int32)(bConvert ? UTWIP_TO_MM100(nLower) : nLower); break;
/*N*/ case MID_UP_REL_MARGIN: rVal <<= (sal_Int16) nPropUpper; break;
/*N*/ case MID_LO_REL_MARGIN: rVal <<= (sal_Int16) nPropLower; break;
/*N*/ }
@@ -740,7 +751,7 @@ using namespace ::com::sun::star;
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxULSpaceItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const
+/*N*/ SvStream& SvxULSpaceItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
/*N*/ {
/*N*/ rStrm << GetUpper()
/*N*/ << GetPropUpper()
@@ -775,7 +786,7 @@ using namespace ::com::sun::star;
// -----------------------------------------------------------------------
-/*N*/ sal_uInt16 SvxULSpaceItem::GetVersion( sal_uInt16 nFileVersion ) const
+/*N*/ sal_uInt16 SvxULSpaceItem::GetVersion( sal_uInt16 /*nFileVersion*/ ) const
/*N*/ {
/*N*/ return ULSPACE_16_VERSION;
/*N*/ }
@@ -791,7 +802,7 @@ using namespace ::com::sun::star;
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxPrintItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const
+/*N*/ SvStream& SvxPrintItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
/*N*/ {
/*N*/ rStrm << (sal_Int8)GetValue();
/*N*/ return rStrm;
@@ -818,7 +829,7 @@ using namespace ::com::sun::star;
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxOpaqueItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const
+/*N*/ SvStream& SvxOpaqueItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
/*N*/ {
/*N*/ rStrm << (sal_Int8)GetValue();
/*N*/ return rStrm;
@@ -851,7 +862,7 @@ using namespace ::com::sun::star;
--------------------------------------------------*/
/*N*/ bool SvxProtectItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
/*N*/ {
-/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
+
/*N*/ nMemberId &= ~CONVERT_TWIPS;
/*N*/ sal_Bool bValue;
/*N*/ switch(nMemberId)
@@ -872,7 +883,7 @@ using namespace ::com::sun::star;
--------------------------------------------------*/
/*N*/ bool SvxProtectItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
/*N*/ {
-/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
+
/*N*/ nMemberId &= ~CONVERT_TWIPS;
/*N*/ sal_Bool bVal( Any2Bool(rVal) );
/*N*/ switch(nMemberId)
@@ -896,7 +907,7 @@ using namespace ::com::sun::star;
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxProtectItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const
+/*N*/ SvStream& SvxProtectItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
/*N*/ {
/*N*/ sal_Int8 cProt = 0;
/*N*/ if( IsPosProtected() ) cProt |= 0x01;
@@ -947,9 +958,10 @@ using namespace ::com::sun::star;
/*N*/ case SVX_SHADOW_TOPRIGHT : eSet = table::ShadowLocation_TOP_RIGHT ; break;
/*N*/ case SVX_SHADOW_BOTTOMLEFT : eSet = table::ShadowLocation_BOTTOM_LEFT ; break;
/*N*/ case SVX_SHADOW_BOTTOMRIGHT: eSet = table::ShadowLocation_BOTTOM_RIGHT; break;
+ default: break;
/*N*/ }
/*N*/ aShadow.Location = eSet;
-/*N*/ aShadow.ShadowWidth = bConvert ? TWIP_TO_MM100(nWidth) : nWidth;
+/*N*/ aShadow.ShadowWidth = bConvert ? UTWIP_TO_MM100(nWidth) : nWidth;
/*N*/ aShadow.IsTransparent = aShadowColor.GetTransparency() > 0;
/*N*/ aShadow.Color = aShadowColor.GetRGBColor();
/*N*/
@@ -981,7 +993,7 @@ using namespace ::com::sun::star;
/*?*/ bRet = (rVal >>= aShadow.Location);
/*?*/ if ( !bRet )
/*?*/ {
-/*?*/ sal_Int16 nVal;
+/*?*/ sal_Int16 nVal = 0;
/*?*/ bRet = (rVal >>= nVal);
/*?*/ aShadow.Location = (table::ShadowLocation) nVal;
/*?*/ }
@@ -998,16 +1010,16 @@ using namespace ::com::sun::star;
/*N*/
/*N*/ if ( bRet )
/*N*/ {
-/*N*/ SvxShadowLocation eSet = SVX_SHADOW_NONE;
/*N*/ switch( aShadow.Location )
/*N*/ {
/*N*/ case table::ShadowLocation_TOP_LEFT : eLocation = SVX_SHADOW_TOPLEFT; break;
/*N*/ case table::ShadowLocation_TOP_RIGHT : eLocation = SVX_SHADOW_TOPRIGHT; break;
/*N*/ case table::ShadowLocation_BOTTOM_LEFT : eLocation = SVX_SHADOW_BOTTOMLEFT ; break;
/*N*/ case table::ShadowLocation_BOTTOM_RIGHT: eLocation = SVX_SHADOW_BOTTOMRIGHT; break;
+ default: break;
/*N*/ }
/*N*/
-/*N*/ nWidth = bConvert ? MM100_TO_TWIP(aShadow.ShadowWidth) : aShadow.ShadowWidth;
+/*N*/ nWidth = bConvert ? MM100_TO_TWIP(aShadow.ShadowWidth) : aShadow.ShadowWidth;
/*N*/ Color aSet(aShadow.Color);
/*N*/ aSet.SetTransparency(aShadow.IsTransparent ? 0xff : 0);
/*N*/ aShadowColor = aSet;
@@ -1074,7 +1086,7 @@ using namespace ::com::sun::star;
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxShadowItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const
+/*N*/ SvStream& SvxShadowItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
/*N*/ {
/*N*/ rStrm << (sal_Int8) GetLocation()
/*N*/ << (sal_uInt16) GetWidth()
@@ -1117,9 +1129,9 @@ using namespace ::com::sun::star;
// -----------------------------------------------------------------------
-/*?*/ void SvxShadowItem::SetEnumValue( sal_uInt16 nVal )
+/*?*/ void SvxShadowItem::SetEnumValue( sal_uInt16 /*nVal*/ )
/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SetLocation( (const SvxShadowLocation)nVal );
+/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*?*/ }
// class SvxBorderLine --------------------------------------------------
@@ -1194,8 +1206,8 @@ using namespace ::com::sun::star;
// -----------------------------------------------------------------------
-/*N*/ SvxBoxItem& SvxBoxItem::operator=( const SvxBoxItem& rBox )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return *this;//STRIP001
+/*N*/ SvxBoxItem& SvxBoxItem::operator=( const SvxBoxItem& /*rBox*/ )
+/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return *this;
/*N*/ }
// -----------------------------------------------------------------------
@@ -1237,9 +1249,9 @@ using namespace ::com::sun::star;
/*N*/ if(pLine)
/*N*/ {
/*N*/ aLine.Color = pLine->GetColor().GetColor() ;
-/*N*/ aLine.InnerLineWidth = bConvert ? TWIP_TO_MM100(pLine->GetInWidth() ): pLine->GetInWidth() ;
-/*N*/ aLine.OuterLineWidth = bConvert ? TWIP_TO_MM100(pLine->GetOutWidth()): pLine->GetOutWidth() ;
-/*N*/ aLine.LineDistance = bConvert ? TWIP_TO_MM100(pLine->GetDistance()): pLine->GetDistance() ;
+/*N*/ aLine.InnerLineWidth = bConvert ? UTWIP_TO_MM100(pLine->GetInWidth() ): pLine->GetInWidth() ;
+/*N*/ aLine.OuterLineWidth = bConvert ? UTWIP_TO_MM100(pLine->GetOutWidth()): pLine->GetOutWidth() ;
+/*N*/ aLine.LineDistance = bConvert ? UTWIP_TO_MM100(pLine->GetDistance()): pLine->GetDistance() ;
/*N*/ }
/*N*/ else
/*N*/ aLine.Color = aLine.InnerLineWidth = aLine.OuterLineWidth = aLine.LineDistance = 0;
@@ -1299,7 +1311,7 @@ using namespace ::com::sun::star;
/*N*/ }
/*N*/
/*N*/ if( bDistMember )
-/*N*/ rVal <<= (sal_Int32)(bConvert ? TWIP_TO_MM100(nDist) : nDist);
+/*N*/ rVal <<= (sal_Int32)(bConvert ? UTWIP_TO_MM100(nDist) : nDist);
/*N*/ else
/*N*/ {
/*
@@ -1513,10 +1525,10 @@ using namespace ::com::sun::star;
/*N*/
/*N*/ if( cLine > 3 )
/*N*/ break;
-/*N*/ sal_uInt16 nOutline, nInline, nDistance;
+/*N*/ sal_uInt16 nOutline, nInline, nDist;
/*N*/ Color aColor;
-/*N*/ rStrm >> aColor >> nOutline >> nInline >> nDistance;
-/*N*/ SvxBorderLine aBorder( &aColor, nOutline, nInline, nDistance );
+/*N*/ rStrm >> aColor >> nOutline >> nInline >> nDist;
+/*N*/ SvxBorderLine aBorder( &aColor, nOutline, nInline, nDist );
/*N*/
/*N*/ pAttr->SetLine( &aBorder, aLineMap[cLine] );
/*N*/ }
@@ -1764,7 +1776,7 @@ using namespace ::com::sun::star;
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxBoxInfoItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const
+/*N*/ SvStream& SvxBoxInfoItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
/*N*/ {
/*N*/ sal_Int8 cFlags = 0;
/*N*/
@@ -1856,7 +1868,7 @@ using namespace ::com::sun::star;
// -----------------------------------------------------------------------
-/*N*/ bool SvxFmtBreakItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+/*N*/ bool SvxFmtBreakItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
/*N*/ {
/*N*/ style::BreakType eBreak = style::BreakType_NONE;
/*N*/ switch ( (SvxBreak)GetValue() )
@@ -1867,12 +1879,13 @@ using namespace ::com::sun::star;
/*N*/ case SVX_BREAK_PAGE_BEFORE: eBreak = style::BreakType_PAGE_BEFORE ; break;
/*N*/ case SVX_BREAK_PAGE_AFTER: eBreak = style::BreakType_PAGE_AFTER ; break;
/*N*/ case SVX_BREAK_PAGE_BOTH: eBreak = style::BreakType_PAGE_BOTH ; break;
+ default: break;
/*N*/ }
/*N*/ rVal <<= eBreak;
/*N*/ return sal_True;
/*N*/ }
// -----------------------------------------------------------------------
-/*N*/ bool SvxFmtBreakItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+/*N*/ bool SvxFmtBreakItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
/*N*/ {
/*N*/ style::BreakType nBreak;
/*N*/
@@ -1894,6 +1907,7 @@ using namespace ::com::sun::star;
/*N*/ case style::BreakType_PAGE_BEFORE: eBreak = SVX_BREAK_PAGE_BEFORE; break;
/*?*/ case style::BreakType_PAGE_AFTER: eBreak = SVX_BREAK_PAGE_AFTER; break;
/*?*/ case style::BreakType_PAGE_BOTH: eBreak = SVX_BREAK_PAGE_BOTH; break;
+ default: break;
/*N*/ }
/*N*/ SetValue((sal_uInt16) eBreak);
/*N*/
@@ -1956,7 +1970,7 @@ using namespace ::com::sun::star;
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxFmtKeepItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const
+/*N*/ SvStream& SvxFmtKeepItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
/*N*/ {
/*N*/ rStrm << (sal_Int8)GetValue();
/*N*/ return rStrm;
@@ -1986,9 +2000,9 @@ using namespace ::com::sun::star;
// -----------------------------------------------------------------------
-/*?*/ int SvxLineItem::operator==( const SfxPoolItem& rAttr ) const
+/*?*/ int SvxLineItem::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;
/*?*/
/*?*/ }
@@ -1996,7 +2010,7 @@ using namespace ::com::sun::star;
/*?*/ SfxPoolItem* SvxLineItem::Clone( SfxItemPool* ) const
/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 return new SvxLineItem( *this );
+/*?*/ DBG_BF_ASSERT(0, "STRIP"); return NULL;
/*?*/ }
@@ -2039,9 +2053,9 @@ class SvxBrushItemLink_Impl : public SfxBrushItemLink
// -----------------------------------------------------------------------
-/*?*/ Graphic SvxBrushItemLink_Impl::GetGraphic( const String& rLink, const String& rFilter)
+/*?*/ Graphic SvxBrushItemLink_Impl::GetGraphic( const String& /*rLink*/, const String& /*rFilter*/)
/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); Graphic aResult; return aResult;//STRIP001 Graphic aResult;
+/*?*/ DBG_BF_ASSERT(0, "STRIP"); Graphic aResult; return aResult;
/*?*/ }
// -----------------------------------------------------------------------
@@ -2298,7 +2312,7 @@ class SvxBrushItemLink_Impl : public SfxBrushItemLink
// -----------------------------------------------------------------------
-/*N*/ sal_uInt16 SvxBrushItem::GetVersion( sal_uInt16 nFileVersion ) const
+/*N*/ sal_uInt16 SvxBrushItem::GetVersion( sal_uInt16 /*nFileVersion*/ ) const
/*N*/ {
/*N*/ return BRUSH_GRAPHIC_VERSION;
/*N*/ }
@@ -2316,8 +2330,8 @@ class SvxBrushItemLink_Impl : public SfxBrushItemLink
/*N*/ bool SvxBrushItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
/*N*/ {
-/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
-/*N*/ nMemberId &= ~CONVERT_TWIPS;
+
+/*N*/ nMemberId &= ~CONVERT_TWIPS;
/*N*/ switch( nMemberId)
/*N*/ {
/*N*/ case MID_BACK_COLOR:
@@ -2378,7 +2392,7 @@ class SvxBrushItemLink_Impl : public SfxBrushItemLink
/*N*/ bool SvxBrushItem::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*/ {
@@ -2475,7 +2489,7 @@ class SvxBrushItemLink_Impl : public SfxBrushItemLink
/*N*/ break;
/*N*/ case MID_GRAPHIC_TRANSPARENCY :
/*N*/ {
-/*N*/ sal_Int32 nTmp;
+/*N*/ sal_Int32 nTmp = 0;
/*N*/ rVal >>= nTmp;
/*N*/ if(nTmp >= 0 && nTmp <= 100)
/*N*/ {
@@ -2573,7 +2587,7 @@ class SvxBrushItemLink_Impl : public SfxBrushItemLink
// -----------------------------------------------------------------------
-/*N*/ SvStream& SvxBrushItem::Store( SvStream& rStream , sal_uInt16 nItemVersion ) const
+/*N*/ SvStream& SvxBrushItem::Store( SvStream& rStream , sal_uInt16 /*nItemVersion*/ ) const
/*N*/ {
/*N*/ rStream << (sal_Bool)sal_False;
/*N*/ rStream << aColor;
@@ -2793,7 +2807,7 @@ SfxPoolItem* SvxFrameDirectionItem::Create( SvStream & rStrm, USHORT /*nVer*/ )
return new SvxFrameDirectionItem( (SvxFrameDirection)nValue, Which() );
}
-/*N*/ SvStream& SvxFrameDirectionItem::Store( SvStream & rStrm, USHORT nIVer ) const
+/*N*/ SvStream& SvxFrameDirectionItem::Store( SvStream & rStrm, USHORT /*nIVer*/ ) const
/*N*/ {
/*N*/ sal_uInt16 nValue = GetValue();
/*N*/ rStrm << nValue;
diff --git a/binfilter/bf_svx/source/items/svx_writingmodeitem.cxx b/binfilter/bf_svx/source/items/svx_writingmodeitem.cxx
index c42f9db..b8ee8b8 100644
--- a/binfilter/bf_svx/source/items/svx_writingmodeitem.cxx
+++ b/binfilter/bf_svx/source/items/svx_writingmodeitem.cxx
@@ -67,7 +67,7 @@ using namespace ::com::sun::star::text;
-/*N*/ USHORT SvxWritingModeItem::GetVersion( USHORT nFVer ) const
+/*N*/ USHORT SvxWritingModeItem::GetVersion( USHORT /*nFVer*/ ) const
/*N*/ {
/*N*/ return USHRT_MAX;
/*N*/ }
diff --git a/binfilter/bf_sw/source/filter/w4w/sw_w4wpar1.cxx b/binfilter/bf_sw/source/filter/w4w/sw_w4wpar1.cxx
index 9c6ccf7..f035b48 100644
--- a/binfilter/bf_sw/source/filter/w4w/sw_w4wpar1.cxx
+++ b/binfilter/bf_sw/source/filter/w4w/sw_w4wpar1.cxx
@@ -170,145 +170,144 @@ extern "C" {
static BOOL bSortRecordTab = FALSE;
static W4WRecord aRecordTab[] = {
- 'A', 'F', 'R', &SwW4WParser::Read_BeginFlushRight,
- 'A', 'P', 'F', &SwW4WParser::Read_EndAbsPosObj,
- 'A', 'P', 'O', &SwW4WParser::Read_BeginAbsPosObj,
- 'B', 'B', 'T', &SwW4WParser::Read_BeginBold,
- 'B', 'C', 'L', &SwW4WParser::Read_BeginColoredText,
- 'B', 'C', 'M', &SwW4WParser::Read_BeginColumnMode,
- 'B', 'C', 'O', &SwW4WParser::Read_BeginTabCell,
- 'B', 'C', 'S', &SwW4WParser::Read_BeginSmallCaps,
- 'B', 'C', 'U', &SwW4WParser::Read_BeginUpperCaps,
- 'B', 'D', 'U', &SwW4WParser::Read_BeginDoubleUnderline,
- 'B', 'H', 'P', &SwW4WParser::Read_BeginHyphen,
- 'B', 'H', 'T', &SwW4WParser::Read_BeginHiddenText,
- 'B', 'M', 'T', &SwW4WParser::Read_BeginMarkedText,
- 'B', 'R', 'J', &SwW4WParser::Read_BeginRightJustify,
- 'B', 'R', 'O', &SwW4WParser::Read_BeginTabRow,
- 'B', 'S', 'O', &SwW4WParser::Read_BeginStrikeOut,
- 'B', 'S', 'P', &SwW4WParser::Read_BeginShadow,
-
- 'B', 'T', 'F', &SwW4WParser::Read_BeginTextFlow, // FrameMaker
-
- 'B', 'U', 'L', &SwW4WParser::Read_BeginUnderline,
- 'C', 'D', 'S', &SwW4WParser::Read_ColumnsDefinition,
- 'C', 'M', 'T', &SwW4WParser::Read_CommentLine,
- 'C', 'T', 'X', &SwW4WParser::Read_BeginCenterText,
- 'D', 'I', 'D', &SwW4WParser::Read_DefineDocumentType,
- 'D', 'T', 'B', &SwW4WParser::Read_Tab,
- 'D', 'T', 'F', &SwW4WParser::Read_DateTime,
- 'E', 'A', 'T', &SwW4WParser::Read_EndFlushRight,
- 'E', 'B', 'S', &SwW4WParser::Read_EndSubScript,
- 'E', 'B', 'T', &SwW4WParser::Read_EndBold,
- 'E', 'C', 'L', &SwW4WParser::Read_EndColoredText,
- 'E', 'C', 'M', &SwW4WParser::Read_EndColumnMode,
- 'E', 'C', 'S', &SwW4WParser::Read_EndSmallCaps,
- 'E', 'C', 'T', &SwW4WParser::Read_EndCenterText,
- 'E', 'C', 'U', &SwW4WParser::Read_EndUpperCaps,
- 'E', 'D', 'U', &SwW4WParser::Read_EndDoubleUnderline,
- 'E', 'F', 'N', &SwW4WParser::Read_FootNoteEnd,
- 'E', 'F', 'T', &SwW4WParser::Read_FootNoteEnd,
- 'E', 'H', 'P', &SwW4WParser::Read_EndHyphen,
- 'E', 'H', 'T', &SwW4WParser::Read_EndHiddenText,
- 'E', 'K', 'R', &SwW4WParser::Read_EndKerning,
- 'E', 'M', 'T', &SwW4WParser::Read_EndMarkedText,
- 'E', 'P', 'N', &SwW4WParser::Read_EndOfParaNum,
- 'E', 'P', 'S', &SwW4WParser::Read_EndSuperScript,
- 'E', 'R', 'J', &SwW4WParser::Read_EndRightJustify,
- 'E', 'S', 'O', &SwW4WParser::Read_EndStrikeOut,
- 'E', 'S', 'P', &SwW4WParser::Read_EndShadow,
-
- 'E', 'T', 'F', &SwW4WParser::Read_EndTextFlow, // FrameMaker
-
- 'E', 'U', 'L', &SwW4WParser::Read_EndUnderline,
- 'F', 'B', 'M', &SwW4WParser::Read_FooterBottomMargin,
-// 'F', 'D', 'T', &SwW4WParser::Read_FontDefTable, // ueberfluessig
-
- 'F', 'L', 'O', &SwW4WParser::Read_Flow, // FrameMaker
-
- 'F', 'M', ' ', &SwW4WParser::Read_FooterMargin,
- 'F', 'N', 'I', &SwW4WParser::Read_FootNoteInfo,
- 'F', 'N', 'T', &SwW4WParser::Read_FootNoteStart1,
- 'F', 'T', 'N', &SwW4WParser::Read_FootNoteStart2,
- 'H', 'C', 'B', &SwW4WParser::Read_ColumnBreak,
- 'H', 'E', 'X', &SwW4WParser::Read_Hex,
- 'H', 'H', 'C', &SwW4WParser::Read_HardHyphen,
- 'H', 'H', 'L', &SwW4WParser::Read_HardHyphen,
- 'H', 'H', 'P', &SwW4WParser::Read_HardHyphen,
- 'H', 'F', '1', &SwW4WParser::Read_FooterStart,
- 'H', 'F', '2', &SwW4WParser::Read_HeaderStart,
- 'H', 'F', 'X', &SwW4WParser::Read_HeadFootEnd,
-
- 'H', 'M', ' ', &SwW4WParser::Read_HeadingMargin,
- 'H', 'T', 'M', &SwW4WParser::Read_HeaderTopMargin,
- 'H', 'N', 'L', &SwW4WParser::Read_HardNewLine,
- 'H', 'N', 'P', &SwW4WParser::Read_HardNewPage,
- 'H', 'S', 'P', &SwW4WParser::Read_HardSpace,
-
- 'I', 'G', 'R', &SwW4WParser::Read_IncludeGraphic,
- 'I', 'P', 'S', &SwW4WParser::Read_IndentPara,
- 'I', 'T', 'F', &SwW4WParser::Read_EndItalic,
- 'I', 'T', 'O', &SwW4WParser::Read_BeginItalic,
- 'K', 'E', 'P', &SwW4WParser::Read_Split,
- 'K', 'E', 'R', &SwW4WParser::Read_BeginKerning,
- 'L', 'M', 'R', &SwW4WParser::Read_SetLeftMarginRelease,
- 'N', 'B', 'R', &SwW4WParser::Read_NonBreakSpace,
- 'N', 'L', 'N', &SwW4WParser::Read_NewLineInPara,
- 'N', 'T', 'B', &SwW4WParser::Read_NewTabTable,
- 'P', 'B', 'C', &SwW4WParser::Read_ParaBorder,
- 'P', 'C', 'T', &SwW4WParser::Read_Picture,
- 'P', 'D', 'S', &SwW4WParser::Read_PictureDef,
-
- 'P', 'D', 'T', &SwW4WParser::Read_PageDefinitionTable, // FrameMaker
-
- 'P', 'G', 'N', &SwW4WParser::Read_ParagraphNumber,
- 'P', 'G', 'W', &SwW4WParser::Read_PageWidth,
- 'P', 'L', 'N', &SwW4WParser::Read_PrintLastPageNo,
- 'P', 'N', 'D', &SwW4WParser::Read_ParaNumberDef,
- 'P', 'O', 'R', &SwW4WParser::Read_PageOrient,
- 'P', 'P', 'N', &SwW4WParser::Read_PrintPageNo,
-
- 'R', 'D', 'T', &SwW4WParser::Read_RectangleDefinitionTable,// FrameMaker
-
- 'R', 'M', 'I', &SwW4WParser::Read_SetRightMarginIndent,
- 'R', 'S', 'M', &SwW4WParser::Read_ReSetLeftRightMargin,
- 'R', 'S', 'P', &SwW4WParser::Read_ReSetLineSpacing,
- 'R', 'U', 'L', &SwW4WParser::Read_Ruler,
- 'S', 'A', 'F', &SwW4WParser::Read_SetSpaceAfter,
- 'S', 'B', 'O', &SwW4WParser::Read_StyleBasedOn,
- 'S', 'B', 'F', &SwW4WParser::Read_SetSpaceBefore,
- 'S', 'B', 'P', &SwW4WParser::Read_SetBottomMarginOfPage,
- 'S', 'B', 'S', &SwW4WParser::Read_BeginSubScript,
- 'S', 'C', 'B', &SwW4WParser::Read_ColumnBreak,
- 'S', 'E', 'P', &SwW4WParser::Read_Separator,
- 'S', 'F', 'B', &SwW4WParser::Read_SetTray, //!!! konnte noch nicht getestet
+ {{'A', 'F', 'R'}, &SwW4WParser::Read_BeginFlushRight},
+ {{'A', 'P', 'F'}, &SwW4WParser::Read_EndAbsPosObj},
+ {{'A', 'P', 'O'}, &SwW4WParser::Read_BeginAbsPosObj},
+ {{'B', 'B', 'T'}, &SwW4WParser::Read_BeginBold},
+ {{'B', 'C', 'L'}, &SwW4WParser::Read_BeginColoredText},
+ {{'B', 'C', 'M'}, &SwW4WParser::Read_BeginColumnMode},
+ {{'B', 'C', 'O'}, &SwW4WParser::Read_BeginTabCell},
+ {{'B', 'C', 'S'}, &SwW4WParser::Read_BeginSmallCaps},
+ {{'B', 'C', 'U'}, &SwW4WParser::Read_BeginUpperCaps},
+ {{'B', 'D', 'U'}, &SwW4WParser::Read_BeginDoubleUnderline},
+ {{'B', 'H', 'P'}, &SwW4WParser::Read_BeginHyphen},
+ {{'B', 'H', 'T'}, &SwW4WParser::Read_BeginHiddenText},
+ {{'B', 'M', 'T'}, &SwW4WParser::Read_BeginMarkedText},
+ {{'B', 'R', 'J'}, &SwW4WParser::Read_BeginRightJustify},
+ {{'B', 'R', 'O'}, &SwW4WParser::Read_BeginTabRow},
+ {{'B', 'S', 'O'}, &SwW4WParser::Read_BeginStrikeOut},
+ {{'B', 'S', 'P'}, &SwW4WParser::Read_BeginShadow},
+
+ {{'B', 'T', 'F'}, &SwW4WParser::Read_BeginTextFlow}, // FrameMaker
+
+ {{'B', 'U', 'L'}, &SwW4WParser::Read_BeginUnderline},
+ {{'C', 'D', 'S'}, &SwW4WParser::Read_ColumnsDefinition},
+ {{'C', 'M', 'T'}, &SwW4WParser::Read_CommentLine},
+ {{'C', 'T', 'X'}, &SwW4WParser::Read_BeginCenterText},
+ {{'D', 'I', 'D'}, &SwW4WParser::Read_DefineDocumentType},
+ {{'D', 'T', 'B'}, &SwW4WParser::Read_Tab},
+ {{'D', 'T', 'F'}, &SwW4WParser::Read_DateTime},
+ {{'E', 'A', 'T'}, &SwW4WParser::Read_EndFlushRight},
+ {{'E', 'B', 'S'}, &SwW4WParser::Read_EndSubScript},
+ {{'E', 'B', 'T'}, &SwW4WParser::Read_EndBold},
+ {{'E', 'C', 'L'}, &SwW4WParser::Read_EndColoredText},
+ {{'E', 'C', 'M'}, &SwW4WParser::Read_EndColumnMode},
+ {{'E', 'C', 'S'}, &SwW4WParser::Read_EndSmallCaps},
+ {{'E', 'C', 'T'}, &SwW4WParser::Read_EndCenterText},
+ {{'E', 'C', 'U'}, &SwW4WParser::Read_EndUpperCaps},
+ {{'E', 'D', 'U'}, &SwW4WParser::Read_EndDoubleUnderline},
+ {{'E', 'F', 'N'}, &SwW4WParser::Read_FootNoteEnd},
+ {{'E', 'F', 'T'}, &SwW4WParser::Read_FootNoteEnd},
+ {{'E', 'H', 'P'}, &SwW4WParser::Read_EndHyphen},
+ {{'E', 'H', 'T'}, &SwW4WParser::Read_EndHiddenText},
+ {{'E', 'K', 'R'}, &SwW4WParser::Read_EndKerning},
+ {{'E', 'M', 'T'}, &SwW4WParser::Read_EndMarkedText},
+ {{'E', 'P', 'N'}, &SwW4WParser::Read_EndOfParaNum},
+ {{'E', 'P', 'S'}, &SwW4WParser::Read_EndSuperScript},
+ {{'E', 'R', 'J'}, &SwW4WParser::Read_EndRightJustify},
+ {{'E', 'S', 'O'}, &SwW4WParser::Read_EndStrikeOut},
+ {{'E', 'S', 'P'}, &SwW4WParser::Read_EndShadow},
+
+ {{'E', 'T', 'F'}, &SwW4WParser::Read_EndTextFlow}, // FrameMaker
+
+ {{'E', 'U', 'L'}, &SwW4WParser::Read_EndUnderline},
+ {{'F', 'B', 'M'}, &SwW4WParser::Read_FooterBottomMargin},
+
+ {{'F', 'L', 'O'}, &SwW4WParser::Read_Flow}, // FrameMaker
+
+ {{'F', 'M', ' '}, &SwW4WParser::Read_FooterMargin},
+ {{'F', 'N', 'I'}, &SwW4WParser::Read_FootNoteInfo},
+ {{'F', 'N', 'T'}, &SwW4WParser::Read_FootNoteStart1},
+ {{'F', 'T', 'N'}, &SwW4WParser::Read_FootNoteStart2},
+ {{'H', 'C', 'B'}, &SwW4WParser::Read_ColumnBreak},
+ {{'H', 'E', 'X'}, &SwW4WParser::Read_Hex},
+ {{'H', 'H', 'C'}, &SwW4WParser::Read_HardHyphen},
+ {{'H', 'H', 'L'}, &SwW4WParser::Read_HardHyphen},
+ {{'H', 'H', 'P'}, &SwW4WParser::Read_HardHyphen},
+ {{'H', 'F', '1'}, &SwW4WParser::Read_FooterStart},
+ {{'H', 'F', '2'}, &SwW4WParser::Read_HeaderStart},
+ {{'H', 'F', 'X'}, &SwW4WParser::Read_HeadFootEnd},
+
+ {{'H', 'M', ' '}, &SwW4WParser::Read_HeadingMargin},
+ {{'H', 'T', 'M'}, &SwW4WParser::Read_HeaderTopMargin},
+ {{'H', 'N', 'L'}, &SwW4WParser::Read_HardNewLine},
+ {{'H', 'N', 'P'}, &SwW4WParser::Read_HardNewPage},
+ {{'H', 'S', 'P'}, &SwW4WParser::Read_HardSpace},
+
+ {{'I', 'G', 'R'}, &SwW4WParser::Read_IncludeGraphic},
+ {{'I', 'P', 'S'}, &SwW4WParser::Read_IndentPara},
+ {{'I', 'T', 'F'}, &SwW4WParser::Read_EndItalic},
+ {{'I', 'T', 'O'}, &SwW4WParser::Read_BeginItalic},
+ {{'K', 'E', 'P'}, &SwW4WParser::Read_Split},
+ {{'K', 'E', 'R'}, &SwW4WParser::Read_BeginKerning},
+ {{'L', 'M', 'R'}, &SwW4WParser::Read_SetLeftMarginRelease},
+ {{'N', 'B', 'R'}, &SwW4WParser::Read_NonBreakSpace},
+ {{'N', 'L', 'N'}, &SwW4WParser::Read_NewLineInPara},
+ {{'N', 'T', 'B'}, &SwW4WParser::Read_NewTabTable},
+ {{'P', 'B', 'C'}, &SwW4WParser::Read_ParaBorder},
+ {{'P', 'C', 'T'}, &SwW4WParser::Read_Picture},
+ {{'P', 'D', 'S'}, &SwW4WParser::Read_PictureDef},
+
+ {{'P', 'D', 'T'}, &SwW4WParser::Read_PageDefinitionTable}, // FrameMaker
+
+ {{'P', 'G', 'N'}, &SwW4WParser::Read_ParagraphNumber},
+ {{'P', 'G', 'W'}, &SwW4WParser::Read_PageWidth},
+ {{'P', 'L', 'N'}, &SwW4WParser::Read_PrintLastPageNo},
+ {{'P', 'N', 'D'}, &SwW4WParser::Read_ParaNumberDef},
+ {{'P', 'O', 'R'}, &SwW4WParser::Read_PageOrient},
+ {{'P', 'P', 'N'}, &SwW4WParser::Read_PrintPageNo},
+
+ {{'R', 'D', 'T'}, &SwW4WParser::Read_RectangleDefinitionTable},// FrameMaker
+
+ {{'R', 'M', 'I'}, &SwW4WParser::Read_SetRightMarginIndent},
+ {{'R', 'S', 'M'}, &SwW4WParser::Read_ReSetLeftRightMargin},
+ {{'R', 'S', 'P'}, &SwW4WParser::Read_ReSetLineSpacing},
+ {{'R', 'U', 'L'}, &SwW4WParser::Read_Ruler},
+ {{'S', 'A', 'F'}, &SwW4WParser::Read_SetSpaceAfter},
+ {{'S', 'B', 'O'}, &SwW4WParser::Read_StyleBasedOn},
+ {{'S', 'B', 'F'}, &SwW4WParser::Read_SetSpaceBefore},
+ {{'S', 'B', 'P'}, &SwW4WParser::Read_SetBottomMarginOfPage},
+ {{'S', 'B', 'S'}, &SwW4WParser::Read_BeginSubScript},
+ {{'S', 'C', 'B'}, &SwW4WParser::Read_ColumnBreak},
+ {{'S', 'E', 'P'}, &SwW4WParser::Read_Separator},
+ {{'S', 'F', 'B'}, &SwW4WParser::Read_SetTray}, //!!! konnte noch nicht getestet
// werden, da W4W den Befehl anscheinend
// vergisst.
- 'S', 'F', 'L', &SwW4WParser::Read_SetFormLenght,
- 'S', 'H', 'C', &SwW4WParser::Read_SoftHyphen,
- 'S', 'H', 'L', &SwW4WParser::Read_SoftHyphen,
- 'S', 'H', 'P', &SwW4WParser::Read_SoftHyphen,
- 'S', 'L', 'G', &SwW4WParser::Read_LangGroup,
- 'S', 'N', 'L', &SwW4WParser::Read_SoftNewLine,
- 'S', 'N', 'P', &SwW4WParser::Read_SoftNewPage,
- 'S', 'P', 'F', &SwW4WParser::Read_SetPitchAndOrFont,
- 'S', 'P', 'N', &SwW4WParser::Read_SetPageNumber,
- 'S', 'P', 'S', &SwW4WParser::Read_BeginSuperScript,
- 'S', 'T', 'E', &SwW4WParser::Read_StyleEnd,
- 'S', 'T', 'F', &SwW4WParser::Read_StyleOff,
- 'S', 'T', 'M', &SwW4WParser::Read_SetTempLeftRightMargin,
- 'S', 'T', 'P', &SwW4WParser::Read_SetTopMarginOfPage,
- 'S', 'U', 'M', &SwW4WParser::Read_SetUnderlineMode,
- 'S', 'T', 'Y', &SwW4WParser::Read_StyleOn,
- 'S', 'Y', 'T', &SwW4WParser::Read_StyleTable,
- 'T', 'A', 'B', &SwW4WParser::Read_Tab,
-
- 'T', 'R', 'I', &SwW4WParser::Read_TextRectangelId, // FrameMaker
-
- 'U', 'C', 'S', &SwW4WParser::Read_UpperCharSet,
- 'W', 'O', 'N', &SwW4WParser::Read_WidowOrphOn,
- 'W', 'O', 'Y', &SwW4WParser::Read_WidowOrphOff,
- 'X', 'C', 'S', &SwW4WParser::Read_ExtendCharSet
+ {{'S', 'F', 'L'}, &SwW4WParser::Read_SetFormLenght},
+ {{'S', 'H', 'C'}, &SwW4WParser::Read_SoftHyphen},
+ {{'S', 'H', 'L'}, &SwW4WParser::Read_SoftHyphen},
+ {{'S', 'H', 'P'}, &SwW4WParser::Read_SoftHyphen},
+ {{'S', 'L', 'G'}, &SwW4WParser::Read_LangGroup},
+ {{'S', 'N', 'L'}, &SwW4WParser::Read_SoftNewLine},
+ {{'S', 'N', 'P'}, &SwW4WParser::Read_SoftNewPage},
+ {{'S', 'P', 'F'}, &SwW4WParser::Read_SetPitchAndOrFont},
+ {{'S', 'P', 'N'}, &SwW4WParser::Read_SetPageNumber},
+ {{'S', 'P', 'S'}, &SwW4WParser::Read_BeginSuperScript},
+ {{'S', 'T', 'E'}, &SwW4WParser::Read_StyleEnd},
+ {{'S', 'T', 'F'}, &SwW4WParser::Read_StyleOff},
+ {{'S', 'T', 'M'}, &SwW4WParser::Read_SetTempLeftRightMargin},
+ {{'S', 'T', 'P'}, &SwW4WParser::Read_SetTopMarginOfPage},
+ {{'S', 'U', 'M'}, &SwW4WParser::Read_SetUnderlineMode},
+ {{'S', 'T', 'Y'}, &SwW4WParser::Read_StyleOn},
+ {{'S', 'Y', 'T'}, &SwW4WParser::Read_StyleTable},
+ {{'T', 'A', 'B'}, &SwW4WParser::Read_Tab},
+
+ {{'T', 'R', 'I'}, &SwW4WParser::Read_TextRectangelId}, // FrameMaker
+
+ {{'U', 'C', 'S'}, &SwW4WParser::Read_UpperCharSet},
+ {{'W', 'O', 'N'}, &SwW4WParser::Read_WidowOrphOn},
+ {{'W', 'O', 'Y'}, &SwW4WParser::Read_WidowOrphOff},
+ {{'X', 'C', 'S'}, &SwW4WParser::Read_ExtendCharSet}
};
diff --git a/binfilter/inc/bf_so3/so2dll.hxx b/binfilter/inc/bf_so3/so2dll.hxx
index 91a1f72..c931087 100644
--- a/binfilter/inc/bf_so3/so2dll.hxx
+++ b/binfilter/inc/bf_so3/so2dll.hxx
@@ -63,7 +63,7 @@ class SvObjectList;
class ImpFactory;
//=========================================================================
-struct SO3_DLLPRIVATE ConvertTo_Impl
+struct SO3_DLLPUBLIC ConvertTo_Impl
/* [Beschreibung]
In dieser Struktur werden Informationen "uber den Vorg"anger und den
diff --git a/binfilter/inc/bf_svtools/poolitem.hxx b/binfilter/inc/bf_svtools/poolitem.hxx
index 93e903d..9c46244 100644
--- a/binfilter/inc/bf_svtools/poolitem.hxx
+++ b/binfilter/inc/bf_svtools/poolitem.hxx
@@ -175,9 +175,9 @@ friend class SfxItemPoolCache;
friend class SfxItemSet;
friend class SfxVoidItem;
- ULONG nRefCount; // Referenzzaehler
- USHORT nWhich;
- USHORT nKind;
+ ULONG m_nRefCount; // Referenzzaehler
+ USHORT m_nWhich;
+ USHORT m_nKind;
private:
inline void SetRefCount( ULONG n );
@@ -198,10 +198,10 @@ public:
void SetWhich( USHORT nId ) {
DBG_CHKTHIS(SfxPoolItem, 0);
- nWhich = nId; }
+ m_nWhich = nId; }
USHORT Which() const {
DBG_CHKTHIS(SfxPoolItem, 0);
- return nWhich; }
+ return m_nWhich; }
virtual int operator==( const SfxPoolItem& ) const = 0;
int operator!=( const SfxPoolItem& rItem ) const
{ return !(*this == rItem); }
@@ -225,8 +225,8 @@ public:
virtual SvStream& Store( SvStream &, USHORT nItemVersion ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const = 0;
- ULONG GetRefCount() const { return nRefCount; }
- inline USHORT GetKind() const { return nKind; }
+ ULONG GetRefCount() const { return m_nRefCount; }
+ inline USHORT GetKind() const { return m_nKind; }
/** Read in a Unicode string from a streamed byte string representation.
@@ -284,32 +284,32 @@ private:
inline void SfxPoolItem::SetRefCount( ULONG n )
{
DBG_CHKTHIS( SfxPoolItem, 0 );
- nRefCount = n;
- nKind = 0;
+ m_nRefCount = n;
+ m_nKind = 0;
}
inline void SfxPoolItem::SetKind( USHORT n )
{
DBG_CHKTHIS( SfxPoolItem, 0 );
- nRefCount = SFX_ITEMS_SPECIAL;
- nKind = n;
+ m_nRefCount = SFX_ITEMS_SPECIAL;
+ m_nKind = n;
}
inline ULONG SfxPoolItem::AddRef( ULONG n ) const
{
DBG_CHKTHIS( SfxPoolItem, 0 );
- DBG_ASSERT( nRefCount <= SFX_ITEMS_MAXREF, "AddRef mit nicht-Pool-Item" );
- DBG_ASSERT( ULONG_MAX - nRefCount > n, "AddRef: Referenzzaehler ueberschlaegt sich" );
- return ( ((SfxPoolItem *)this)->nRefCount += n );
+ DBG_ASSERT( m_nRefCount <= SFX_ITEMS_MAXREF, "AddRef mit nicht-Pool-Item" );
+ DBG_ASSERT( ULONG_MAX - m_nRefCount > n, "AddRef: Referenzzaehler ueberschlaegt sich" );
+ return ( ((SfxPoolItem *)this)->m_nRefCount += n );
}
inline ULONG SfxPoolItem::ReleaseRef( ULONG n ) const
{
DBG_CHKTHIS( SfxPoolItem, 0 );
- DBG_ASSERT( nRefCount <= SFX_ITEMS_MAXREF, "AddRef mit nicht-Pool-Item" );
- DBG_ASSERT( nRefCount >= n, "ReleaseRef: Referenzzaehler ueberschlaegt sich" );
- ((SfxPoolItem *)this)->nRefCount -= n;
- return nRefCount;
+ DBG_ASSERT( m_nRefCount <= SFX_ITEMS_MAXREF, "AddRef mit nicht-Pool-Item" );
+ DBG_ASSERT( m_nRefCount >= n, "ReleaseRef: Referenzzaehler ueberschlaegt sich" );
+ ((SfxPoolItem *)this)->m_nRefCount -= n;
+ return m_nRefCount;
}
// -----------------------------------------------------------------------
@@ -361,7 +361,7 @@ public:
// von sich selbst eine Kopie erzeugen
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- void SetWhich(USHORT nWh) { nWhich = nWh; }
+ void SetWhich(USHORT nWh) { m_nWhich = nWh; }
};
// -----------------------------------------------------------------------
diff --git a/binfilter/inc/bf_sw/doc.hxx b/binfilter/inc/bf_sw/doc.hxx
index 85dd1e3..e40fce7 100644
--- a/binfilter/inc/bf_sw/doc.hxx
+++ b/binfilter/inc/bf_sw/doc.hxx
@@ -1127,12 +1127,12 @@ public:
// kopiere die Kopzeile (mit dem Inhalt!) aus dem SrcFmt
// ins DestFmt ( auch ueber Doc grenzen hinaus!)
- void CopyHeader( const SwFrmFmt& rSrcFmt, SwFrmFmt& rDestFmt )
- { DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 _CopyPageDescHeaderFooter( sal_True, rSrcFmt, rDestFmt ); }
+ void CopyHeader( const SwFrmFmt& /*rSrcFmt*/, SwFrmFmt& /*rDestFmt*/ )
+ { DBG_BF_ASSERT(0, "STRIP"); }
// kopiere die Fusszeile (mit dem Inhalt!) aus dem SrcFmt
// ins DestFmt ( auch ueber Doc grenzen hinaus!)
- void CopyFooter( const SwFrmFmt& rSrcFmt, SwFrmFmt& rDestFmt )
- { DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 _CopyPageDescHeaderFooter( sal_False, rSrcFmt, rDestFmt ); }
+ void CopyFooter( const SwFrmFmt& /*rSrcFmt*/, SwFrmFmt& /*rDestFmt*/ )
+ { DBG_BF_ASSERT(0, "STRIP"); }
//fuer Reader
SwPageDesc& _GetPageDesc( sal_uInt16 i ) const { return *aPageDescs[i]; }
@@ -1278,30 +1278,30 @@ public:
// erzeuge aus dem makierten Bereich eine ausgeglichene Tabelle
// erzeuge aus der Tabelle wieder normalen Text
// einfuegen von Spalten/Zeilen in der Tabelle
- sal_Bool InsertCol( const SwCursor& rCursor,
- sal_uInt16 nCnt = 1, sal_Bool bBehind = sal_True ){DBG_BF_ASSERT(0, "STRIP"); return FALSE;} //STRIP001 sal_uInt16 nCnt = 1, sal_Bool bBehind = sal_True );
- sal_Bool InsertRow( const SwCursor& rCursor,
- sal_uInt16 nCnt = 1, sal_Bool bBehind = sal_True ){DBG_BF_ASSERT(0, "STRIP"); return FALSE;} //STRIP001 sal_uInt16 nCnt = 1, sal_Bool bBehind = sal_True );
+ sal_Bool InsertCol( const SwCursor& /*rCursor*/,
+ sal_uInt16 nCnt = 1, sal_Bool bBehind = sal_True ){DBG_BF_ASSERT(0, "STRIP"); return FALSE;}
+ sal_Bool InsertRow( const SwCursor& /*rCursor*/,
+ sal_uInt16 nCnt = 1, sal_Bool bBehind = sal_True ){DBG_BF_ASSERT(0, "STRIP"); return FALSE;}
// loeschen von Spalten/Zeilen in der Tabelle
- sal_Bool DeleteRowCol( const SwSelBoxes& rBoxes ){DBG_BF_ASSERT(0, "STRIP"); return NULL;} //STRIP001 sal_Bool DeleteRowCol( const SwSelBoxes& rBoxes );
- sal_Bool DeleteRow( const SwCursor& rCursor ){DBG_BF_ASSERT(0, "STRIP"); return FALSE;} //STRIP001 sal_Bool DeleteRow( const SwCursor& rCursor );
- sal_Bool DeleteCol( const SwCursor& rCursor ){DBG_BF_ASSERT(0, "STRIP"); return FALSE;} //STRIP001 sal_Bool DeleteCol( const SwCursor& rCursor );
+ sal_Bool DeleteRowCol( const SwSelBoxes& /*rBoxes*/ ){DBG_BF_ASSERT(0, "STRIP"); return NULL;}
+ sal_Bool DeleteRow( const SwCursor& /*rCursor*/ ){DBG_BF_ASSERT(0, "STRIP"); return FALSE;}
+ sal_Bool DeleteCol( const SwCursor& /*rCursor*/ ){DBG_BF_ASSERT(0, "STRIP"); return FALSE;}
// teilen / zusammenfassen von Boxen in der Tabelle
sal_Bool SplitTbl( const SwSelBoxes& rBoxes, sal_Bool bVert = sal_True,
sal_uInt16 nCnt = 1, sal_Bool bSameHeight = sal_False );
// returnt den enum TableMergeErr
- sal_uInt16 MergeTbl( SwPaM& rPam ){DBG_BF_ASSERT(0, "STRIP"); return 0;} //STRIP001 sal_uInt16 MergeTbl( SwPaM& rPam );
+ sal_uInt16 MergeTbl( SwPaM& /*rPam*/ ){DBG_BF_ASSERT(0, "STRIP"); return 0;}
String GetUniqueTblName() const;
// aus der FEShell wg.. Undo und bModified
// Direktzugriff fuer Uno
- void SetTabCols(SwTable& rTab, const SwTabCols &rNew, SwTabCols &rOld,
- const SwTableBox *pStart, sal_Bool bCurRowOnly){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 const SwTableBox *pStart, sal_Bool bCurRowOnly);
+ void SetTabCols(SwTable& rTab, const SwTabCols& /*rNew*/, SwTabCols& /*rOld*/,
+ const SwTableBox* /*pStart*/, sal_Bool /*bCurRowOnly*/){DBG_BF_ASSERT(0, "STRIP");}
- void SetHeadlineRepeat( SwTable &rTable, sal_Bool bSet ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 void SetHeadlineRepeat( SwTable &rTable, sal_Bool bSet );
+ void SetHeadlineRepeat( SwTable& /*rTable*/, sal_Bool /*bSet*/ ){DBG_BF_ASSERT(0, "STRIP");}
// AutoFormat fuer die Tabelle/TabellenSelection
- sal_Bool SetTableAutoFmt( const SwSelBoxes& rBoxes, const SwTableAutoFmt& rNew ){DBG_BF_ASSERT(0, "STRIP"); return FALSE;} //STRIP001 sal_Bool SetTableAutoFmt( const SwSelBoxes& rBoxes, const SwTableAutoFmt& rNew );
+ sal_Bool SetTableAutoFmt( const SwSelBoxes& /*rBoxes*/, const SwTableAutoFmt& /*rNew*/ ){DBG_BF_ASSERT(0, "STRIP"); return FALSE;}
// Erfrage wie attributiert ist
// setze das TabelleAttribut Undo auf:
// setze das InsertDB als Tabelle Undo auf:
@@ -1310,7 +1310,7 @@ public:
SwTableLineFmt* MakeTableLineFmt();
// teste ob die Box ein numerischen Wert darstellt und aender dann ggfs.
// das Format der Box
- void SetTblBoxFormulaAttrs( SwTableBox& rBox, const SfxItemSet& rSet ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 void SetTblBoxFormulaAttrs( SwTableBox& rBox, const SfxItemSet& rSet );
+ void SetTblBoxFormulaAttrs( SwTableBox& /*rBox*/, const SfxItemSet& /*rSet*/ ){DBG_BF_ASSERT(0, "STRIP");}
void ClearBoxNumAttrs( const SwNodeIndex& rNode );
@@ -1502,10 +1502,10 @@ public:
sal_Bool ChgAnchor( const SdrMarkList &rMrkList, int eAnchorId,
sal_Bool bSameOnly, sal_Bool bPosCorr );
- void SetTabBorders( const SwCursor& rCursor, const SfxItemSet& rSet ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 void SetTabBorders( const SwCursor& rCursor, const SfxItemSet& rSet );
+ void SetTabBorders( const SwCursor& /*rCursor*/, const SfxItemSet& /*rSet*/ ){DBG_BF_ASSERT(0, "STRIP");}
void GetTabBorders( const SwCursor& rCursor, SfxItemSet& rSet ) const;
- void SetBoxAttr( const SwCursor& rCursor, const SfxPoolItem &rNew ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 void SetBoxAttr( const SwCursor& rCursor, const SfxPoolItem &rNew );
- sal_Bool GetBoxBackground( const SwCursor& rCursor, SvxBrushItem &rToFill ) const{DBG_BF_ASSERT(0, "STRIP"); return FALSE;} //STRIP001 sal_Bool GetBoxBackground( const SwCursor& rCursor, SvxBrushItem &rToFill ) const;
+ void SetBoxAttr( const SwCursor& /*rCursor*/, const SfxPoolItem& /*rNew*/ ){DBG_BF_ASSERT(0, "STRIP");}
+ sal_Bool GetBoxBackground( const SwCursor& /*rCursor*/, SvxBrushItem& /*rToFill*/ ) const{DBG_BF_ASSERT(0, "STRIP"); return FALSE;}
int Chain( SwFrmFmt &rSource, const SwFrmFmt &rDest );
void Unchain( SwFrmFmt &rFmt );
diff --git a/binfilter/legacysmgr/source/legacy/legacy_binfilters_smgr.cxx b/binfilter/legacysmgr/source/legacy/legacy_binfilters_smgr.cxx
index 0c78eb9..7c69323 100644
--- a/binfilter/legacysmgr/source/legacy/legacy_binfilters_smgr.cxx
+++ b/binfilter/legacysmgr/source/legacy/legacy_binfilters_smgr.cxx
@@ -896,8 +896,8 @@ Any OServiceManager::getPropertyValue(const OUString& PropertyName)
}
void OServiceManager::addPropertyChangeListener(
- const OUString& PropertyName,
- const Reference<XPropertyChangeListener >& aListener)
+ const OUString& /*PropertyName*/,
+ const Reference<XPropertyChangeListener >& /*aListener*/)
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
{
check_undisposed();
@@ -905,8 +905,8 @@ void OServiceManager::addPropertyChangeListener(
}
void OServiceManager::removePropertyChangeListener(
- const OUString& PropertyName,
- const Reference<XPropertyChangeListener >& aListener)
+ const OUString& /*PropertyName*/,
+ const Reference<XPropertyChangeListener >& /*aListener*/)
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
{
check_undisposed();
@@ -914,8 +914,8 @@ void OServiceManager::removePropertyChangeListener(
}
void OServiceManager::addVetoableChangeListener(
- const OUString& PropertyName,
- const Reference<XVetoableChangeListener >& aListener)
+ const OUString& /*PropertyName*/,
+ const Reference<XVetoableChangeListener >& /*aListener*/)
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
{
check_undisposed();
@@ -923,8 +923,8 @@ void OServiceManager::addVetoableChangeListener(
}
void OServiceManager::removeVetoableChangeListener(
- const OUString& PropertyName,
- const Reference<XVetoableChangeListener >& aListener)
+ const OUString& /*PropertyName*/,
+ const Reference<XVetoableChangeListener >& /*aListener*/)
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
{
check_undisposed();
@@ -992,14 +992,14 @@ Reference< XInterface > OServiceManager::createInstanceWithContext(
}
else
{
- Reference< XSingleServiceFactory > xFac( xFactory, UNO_QUERY );
- if (xFac.is())
+ Reference< XSingleServiceFactory > xFac2( xFactory, UNO_QUERY );
+ if (xFac2.is())
{
#ifdef DEBUG
OString aStr( OUStringToOString( rServiceSpecifier, RTL_TEXTENCODING_ASCII_US ) );
OSL_TRACE( "### ignoring given context raising service %s !!!\n", aStr.getStr() );
#endif
- return xFac->createInstance();
+ return xFac2->createInstance();
}
}
}
@@ -1041,14 +1041,14 @@ Reference< XInterface > OServiceManager::createInstanceWithArgumentsAndContext(
}
else
{
- Reference< XSingleServiceFactory > xFac( xFactory, UNO_QUERY );
- if (xFac.is())
+ Reference< XSingleServiceFactory > xFac2( xFactory, UNO_QUERY );
+ if (xFac2.is())
{
#ifdef DEBUG
OString aStr( OUStringToOString( rServiceSpecifier, RTL_TEXTENCODING_ASCII_US ) );
OSL_TRACE( "### ignoring given context raising service %s !!!\n", aStr.getStr() );
#endif
- return xFac->createInstanceWithArguments( rArguments );
+ return xFac2->createInstanceWithArguments( rArguments );
}
}
}
@@ -1133,7 +1133,7 @@ Sequence< OUString > OServiceManager::getSupportedServiceNames()
Sequence< Reference< XInterface > > OServiceManager::queryServiceFactories(
- const OUString& aServiceName, Reference< XComponentContext > const & xContext )
+ const OUString& aServiceName, Reference< XComponentContext > const & /*xContext*/ )
{
Sequence< Reference< XInterface > > ret;
@@ -1946,7 +1946,7 @@ public:
throw (RuntimeException);
};
//__________________________________________________________________________________________________
-void DisposingForwarder::disposing( lang::EventObject const & rSource )
+void DisposingForwarder::disposing( lang::EventObject const & /*rSource*/ )
throw (RuntimeException)
{
m_xTarget->dispose();
More information about the Libreoffice-commits
mailing list