cui/source/options/cfgchart.cxx | 2 +- editeng/source/items/flditem.cxx | 2 +- editeng/source/items/frmitems.cxx | 24 ++++++++++++------------ editeng/source/items/optitems.cxx | 4 ++-- editeng/source/items/paraitem.cxx | 12 ++++++------ editeng/source/items/textitem.cxx | 18 +++++++++--------- editeng/source/items/writingmodeitem.cxx | 2 +- include/sax/tools/converter.hxx | 20 ++++++++++---------- sd/source/ui/app/optsitem.cxx | 25 ++++++++++--------------- sfx2/source/config/evntconf.cxx | 2 +- sfx2/source/doc/zoomitem.cxx | 2 +- svl/source/items/cntwall.cxx | 2 +- svl/source/items/flagitem.cxx | 2 +- svl/source/items/intitem.cxx | 2 +- svl/source/items/macitem.cxx | 2 +- svl/source/items/ptitem.cxx | 2 +- svl/source/items/rectitem.cxx | 2 +- svl/source/items/rngitem.cxx | 2 +- svl/source/items/sitem.cxx | 2 +- svl/source/items/slstitm.cxx | 2 +- svl/source/items/srchitem.cxx | 2 +- svl/source/items/szitem.cxx | 2 +- svl/source/items/visitem.cxx | 2 +- svx/source/dialog/optgrid.cxx | 2 +- svx/source/form/fmitems.cxx | 2 +- svx/source/items/SmartTagItem.cxx | 2 +- svx/source/items/algitem.cxx | 2 +- svx/source/items/drawitem.cxx | 14 +++++++------- svx/source/items/e3ditem.cxx | 2 +- svx/source/items/galleryitem.cxx | 2 +- svx/source/items/grfitem.cxx | 3 ++- svx/source/items/hlnkitem.cxx | 2 +- svx/source/items/numinf.cxx | 2 +- svx/source/items/pageitem.cxx | 2 +- svx/source/items/viewlayoutitem.cxx | 2 +- svx/source/items/zoomslideritem.cxx | 2 +- 36 files changed, 86 insertions(+), 90 deletions(-)
New commits: commit 2345e4657001d6239b6408e14ee49518a2036b13 Author: Michael Stahl <mst...@redhat.com> Date: Fri Nov 18 22:00:11 2016 +0100 sd: assert SfxPoolItem::operator== Remove the defensive programming here. Change-Id: I27e89fe6e28ee3c0c2821083d825859d10f79bb0 diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx index f360981..b13b7ec 100644 --- a/sd/source/ui/app/optsitem.cxx +++ b/sd/source/ui/app/optsitem.cxx @@ -304,9 +304,8 @@ SfxPoolItem* SdOptionsLayoutItem::Clone( SfxItemPool* ) const bool SdOptionsLayoutItem::operator==( const SfxPoolItem& rAttr ) const { - const bool bSameType = SfxPoolItem::operator==( rAttr ); - DBG_ASSERT( bSameType, "SdOptionsLayoutItem::operator==(), different pool item type!" ); - return bSameType && ( maOptionsLayout == static_cast< const SdOptionsLayoutItem& >( rAttr ).maOptionsLayout ); + assert(SfxPoolItem::operator==(rAttr)); + return maOptionsLayout == static_cast<const SdOptionsLayoutItem&>(rAttr).maOptionsLayout; } void SdOptionsLayoutItem::SetOptions( SdOptions* pOpts ) const @@ -393,9 +392,8 @@ SfxPoolItem* SdOptionsContentsItem::Clone( SfxItemPool* ) const bool SdOptionsContentsItem::operator==( const SfxPoolItem& rAttr ) const { - const bool bSameType = SfxPoolItem::operator==(rAttr); - DBG_ASSERT( bSameType, "SdOptionsContentsItem::operator==(), different pool item type!" ); - return bSameType && ( maOptionsContents == static_cast<const SdOptionsContentsItem&>( rAttr ).maOptionsContents ); + assert(SfxPoolItem::operator==(rAttr)); + return maOptionsContents == static_cast<const SdOptionsContentsItem&>(rAttr).maOptionsContents; } /************************************************************************* @@ -703,9 +701,8 @@ SfxPoolItem* SdOptionsMiscItem::Clone( SfxItemPool* ) const bool SdOptionsMiscItem::operator==( const SfxPoolItem& rAttr ) const { - const bool bSameType = SfxPoolItem::operator==(rAttr); - DBG_ASSERT( bSameType, "SdOptionsMiscItem::operator==(), different pool item type!" ); - return bSameType && ( maOptionsMisc == static_cast< const SdOptionsMiscItem& >(rAttr).maOptionsMisc ); + assert(SfxPoolItem::operator==(rAttr)); + return maOptionsMisc == static_cast<const SdOptionsMiscItem&>(rAttr).maOptionsMisc; } void SdOptionsMiscItem::SetOptions( SdOptions* pOpts ) const @@ -889,9 +886,8 @@ SfxPoolItem* SdOptionsSnapItem::Clone( SfxItemPool* ) const bool SdOptionsSnapItem::operator==( const SfxPoolItem& rAttr ) const { - const bool bSameType = SfxPoolItem::operator==(rAttr); - DBG_ASSERT( bSameType, "SdOptionsSnapItem::operator==(), different pool item type!" ); - return bSameType && ( maOptionsSnap == static_cast< const SdOptionsSnapItem& >(rAttr).maOptionsSnap ); + assert(SfxPoolItem::operator==(rAttr)); + return maOptionsSnap == static_cast<const SdOptionsSnapItem&>(rAttr).maOptionsSnap; } void SdOptionsSnapItem::SetOptions( SdOptions* pOpts ) const @@ -1343,9 +1339,8 @@ SfxPoolItem* SdOptionsPrintItem::Clone( SfxItemPool* ) const bool SdOptionsPrintItem::operator==( const SfxPoolItem& rAttr ) const { - const bool bSameType = SfxPoolItem::operator==(rAttr); - DBG_ASSERT( bSameType, "SdOptionsPrintItem::operator==(), different pool item type!" ); - return bSameType && ( maOptionsPrint == static_cast< const SdOptionsPrintItem& >( rAttr ).maOptionsPrint ); + assert(SfxPoolItem::operator==(rAttr)); + return maOptionsPrint == static_cast<const SdOptionsPrintItem&>(rAttr).maOptionsPrint; } void SdOptionsPrintItem::SetOptions( SdOptions* pOpts ) const commit 3662061633f5651ad7f01543a3ce8807cdd966fe Author: Michael Stahl <mst...@redhat.com> Date: Fri Nov 18 21:57:42 2016 +0100 editeng: assert SfxPoolItem::operator== Change-Id: Ia6c6f4f5af1e3a803b464ab410558984c3861a65 diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx index 11309d4..30e742b 100644 --- a/editeng/source/items/flditem.cxx +++ b/editeng/source/items/flditem.cxx @@ -340,7 +340,7 @@ SvStream& SvxFieldItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) co bool SvxFieldItem::operator==( const SfxPoolItem& rItem ) const { - DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal which or type" ); + assert(SfxPoolItem::operator==(rItem)); const SvxFieldData* pOtherFld = static_cast<const SvxFieldItem&>(rItem).GetField(); if( pField == pOtherFld ) diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index dc659e9..501dd71 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -307,7 +307,7 @@ SvxSizeItem::SvxSizeItem( const sal_uInt16 nId ) : bool SvxSizeItem::operator==( const SfxPoolItem& rAttr ) const { - DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); + assert(SfxPoolItem::operator==(rAttr)); return ( aSize == static_cast<const SvxSizeItem&>( rAttr ).GetSize() ); } @@ -569,7 +569,7 @@ void SvxLRSpaceItem::AdjustLeft() bool SvxLRSpaceItem::operator==( const SfxPoolItem& rAttr ) const { - DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); + assert(SfxPoolItem::operator==(rAttr)); const SvxLRSpaceItem& rOther = static_cast<const SvxLRSpaceItem&>(rAttr); @@ -953,7 +953,7 @@ bool SvxULSpaceItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) bool SvxULSpaceItem::operator==( const SfxPoolItem& rAttr ) const { - DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); + assert(SfxPoolItem::operator==(rAttr)); const SvxULSpaceItem& rSpaceItem = static_cast<const SvxULSpaceItem&>( rAttr ); return ( nUpper == rSpaceItem.nUpper && @@ -1177,7 +1177,7 @@ bool SvxOpaqueItem::GetPresentation bool SvxProtectItem::operator==( const SfxPoolItem& rAttr ) const { - DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); + assert(SfxPoolItem::operator==(rAttr)); const SvxProtectItem& rItem = static_cast<const SvxProtectItem&>(rAttr); return ( bCntnt == rItem.bCntnt && @@ -1402,7 +1402,7 @@ bool SvxShadowItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) bool SvxShadowItem::operator==( const SfxPoolItem& rAttr ) const { - DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); + assert(SfxPoolItem::operator==(rAttr)); const SvxShadowItem& rItem = static_cast<const SvxShadowItem&>(rAttr); return ( ( aShadowColor == rItem.aShadowColor ) && @@ -1650,7 +1650,7 @@ inline bool CmpBrdLn( const SvxBorderLine* pBrd1, const SvxBorderLine* pBrd2 ) bool SvxBoxItem::operator==( const SfxPoolItem& rAttr ) const { - DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); + assert(SfxPoolItem::operator==(rAttr)); const SvxBoxItem& rBoxItem = static_cast<const SvxBoxItem&>(rAttr); return ( @@ -2545,9 +2545,9 @@ SvxBoxInfoItem &SvxBoxInfoItem::operator=( const SvxBoxInfoItem& rCpy ) bool SvxBoxInfoItem::operator==( const SfxPoolItem& rAttr ) const { - const SvxBoxInfoItem& rBoxInfo = static_cast<const SvxBoxInfoItem&>(rAttr); + assert(SfxPoolItem::operator==(rAttr)); - DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); + const SvxBoxInfoItem& rBoxInfo = static_cast<const SvxBoxInfoItem&>(rAttr); return ( mbEnableHor == rBoxInfo.mbEnableHor && mbEnableVer == rBoxInfo.mbEnableVer @@ -2919,7 +2919,7 @@ bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) bool SvxFormatBreakItem::operator==( const SfxPoolItem& rAttr ) const { - DBG_ASSERT( SfxPoolItem::operator==( rAttr ), "unequal types" ); + assert(SfxPoolItem::operator==(rAttr)); return GetValue() == static_cast<const SvxFormatBreakItem&>( rAttr ).GetValue(); } @@ -3105,7 +3105,7 @@ SvxLineItem& SvxLineItem::operator=( const SvxLineItem& rLine ) bool SvxLineItem::operator==( const SfxPoolItem& rAttr ) const { - DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); + assert(SfxPoolItem::operator==(rAttr)); return CmpBrdLn( pLine, static_cast<const SvxLineItem&>(rAttr).GetLine() ); } @@ -3716,7 +3716,7 @@ SvxBrushItem& SvxBrushItem::operator=(SvxBrushItem&& rItem) bool SvxBrushItem::operator==( const SfxPoolItem& rAttr ) const { - DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); + assert(SfxPoolItem::operator==(rAttr)); const SvxBrushItem& rCmp = static_cast<const SvxBrushItem&>(rAttr); bool bEqual = ( aColor == rCmp.aColor && eGraphicPos == rCmp.eGraphicPos && @@ -4059,7 +4059,7 @@ SvxFrameDirectionItem::~SvxFrameDirectionItem() bool SvxFrameDirectionItem::operator==( const SfxPoolItem& rCmp ) const { - DBG_ASSERT( SfxPoolItem::operator==(rCmp), "unequal types" ); + assert(SfxPoolItem::operator==(rCmp)); return GetValue() == static_cast<const SvxFrameDirectionItem&>(rCmp).GetValue(); } diff --git a/editeng/source/items/optitems.cxx b/editeng/source/items/optitems.cxx index 8d89d23..f4ab203 100644 --- a/editeng/source/items/optitems.cxx +++ b/editeng/source/items/optitems.cxx @@ -71,7 +71,7 @@ SfxPoolItem* SfxSpellCheckItem::Clone( SfxItemPool* ) const bool SfxSpellCheckItem::operator==( const SfxPoolItem& rItem ) const { - DBG_ASSERT( SfxPoolItem::operator==(rItem), "unequal types" ); + assert(SfxPoolItem::operator==(rItem)); return ( xSpellCheck == static_cast<const SfxSpellCheckItem&>( rItem ).GetXSpellChecker() ); } @@ -97,7 +97,7 @@ SfxHyphenRegionItem::SfxHyphenRegionItem( const SfxHyphenRegionItem& rItem ) : bool SfxHyphenRegionItem::operator==( const SfxPoolItem& rAttr ) const { - DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); + assert(SfxPoolItem::operator==(rAttr)); return ( ( static_cast<const SfxHyphenRegionItem&>( rAttr ).nMinLead == nMinLead ) && ( static_cast<const SfxHyphenRegionItem&>( rAttr ).nMinTrail == nMinTrail ) ); diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx index 26bb5d0..130dfaa 100644 --- a/editeng/source/items/paraitem.cxx +++ b/editeng/source/items/paraitem.cxx @@ -91,7 +91,7 @@ SvxLineSpacingItem::SvxLineSpacingItem( sal_uInt16 nHeight, const sal_uInt16 nId bool SvxLineSpacingItem::operator==( const SfxPoolItem& rAttr ) const { - DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); + assert(SfxPoolItem::operator==(rAttr)); const SvxLineSpacingItem& rLineSpace = static_cast<const SvxLineSpacingItem&>(rAttr); return @@ -344,7 +344,7 @@ SvxAdjustItem::SvxAdjustItem(const SvxAdjust eAdjst, const sal_uInt16 nId ) bool SvxAdjustItem::operator==( const SfxPoolItem& rAttr ) const { - DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); + assert(SfxPoolItem::operator==(rAttr)); const SvxAdjustItem& rItem = static_cast<const SvxAdjustItem&>(rAttr); return GetAdjust() == rItem.GetAdjust() && @@ -683,7 +683,7 @@ bool SvxHyphenZoneItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) bool SvxHyphenZoneItem::operator==( const SfxPoolItem& rAttr ) const { - DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); + assert(SfxPoolItem::operator==(rAttr)); const SvxHyphenZoneItem& rItem = static_cast<const SvxHyphenZoneItem&>(rAttr); return ( rItem.bHyphen == bHyphen @@ -1005,7 +1005,7 @@ bool SvxTabStopItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) bool SvxTabStopItem::operator==( const SfxPoolItem& rAttr ) const { - DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); + assert(SfxPoolItem::operator==(rAttr)); const SvxTabStopItem& rTSI = static_cast<const SvxTabStopItem&>(rAttr); @@ -1237,7 +1237,7 @@ bool SvxPageModelItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId bool SvxPageModelItem::operator==( const SfxPoolItem& rAttr ) const { - DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); + assert(SfxPoolItem::operator==(rAttr)); return SfxStringItem::operator==(rAttr) && bAuto == static_cast<const SvxPageModelItem&>( rAttr ).bAuto; @@ -1464,7 +1464,7 @@ bool SvxParaVertAlignItem::PutValue( const css::uno::Any& rVal, bool SvxParaVertAlignItem::operator==( const SfxPoolItem& rItem ) const { - DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); + assert(SfxPoolItem::operator==(rItem)); return SfxUInt16Item::operator==( rItem ); } diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index ffe4848..1e01793 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -171,7 +171,7 @@ SfxPoolItem* SvxFontListItem::Clone( SfxItemPool* ) const bool SvxFontListItem::operator==( const SfxPoolItem& rAttr ) const { - DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); + assert(SfxPoolItem::operator==(rAttr)); return( pFontList == static_cast<const SvxFontListItem&>(rAttr).pFontList ); } @@ -326,7 +326,7 @@ bool SvxFontItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId) bool SvxFontItem::operator==( const SfxPoolItem& rAttr ) const { - DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); + assert(SfxPoolItem::operator==(rAttr)); const SvxFontItem& rItem = static_cast<const SvxFontItem&>(rAttr); @@ -773,7 +773,7 @@ SfxPoolItem* SvxFontHeightItem::Create( SvStream& rStrm, bool SvxFontHeightItem::operator==( const SfxPoolItem& rItem ) const { - DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); + assert(SfxPoolItem::operator==(rItem)); return GetHeight() == static_cast<const SvxFontHeightItem&>(rItem).GetHeight() && GetProp() == static_cast<const SvxFontHeightItem&>(rItem).GetProp() && GetPropUnit() == static_cast<const SvxFontHeightItem&>(rItem).GetPropUnit(); @@ -1146,7 +1146,7 @@ SfxPoolItem* SvxFontWidthItem::Create( SvStream& rStrm, bool SvxFontWidthItem::operator==( const SfxPoolItem& rItem ) const { - DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); + assert(SfxPoolItem::operator==(rItem)); return GetWidth() == static_cast<const SvxFontWidthItem&>(rItem).GetWidth() && GetProp() == static_cast<const SvxFontWidthItem&>(rItem).GetProp(); } @@ -1347,7 +1347,7 @@ bool SvxTextLineItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) bool SvxTextLineItem::operator==( const SfxPoolItem& rItem ) const { - DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); + assert(SfxPoolItem::operator==(rItem)); return SfxEnumItem::operator==( rItem ) && GetColor() == static_cast<const SvxTextLineItem&>(rItem).GetColor(); } @@ -1871,7 +1871,7 @@ sal_uInt16 SvxColorItem::GetVersion( sal_uInt16 nFFVer ) const bool SvxColorItem::operator==( const SfxPoolItem& rAttr ) const { - DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); + assert(SfxPoolItem::operator==(rAttr)); return mColor == static_cast<const SvxColorItem&>( rAttr ).mColor; } @@ -2203,7 +2203,7 @@ SvxEscapementItem::SvxEscapementItem( const short _nEsc, bool SvxEscapementItem::operator==( const SfxPoolItem& rAttr ) const { - DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); + assert(SfxPoolItem::operator==(rAttr)); return( nEsc == static_cast<const SvxEscapementItem&>(rAttr).nEsc && nProp == static_cast<const SvxEscapementItem&>(rAttr).nProp ); @@ -2760,7 +2760,7 @@ SvxTwoLinesItem::~SvxTwoLinesItem() bool SvxTwoLinesItem::operator==( const SfxPoolItem& rAttr ) const { - DBG_ASSERT( SfxPoolItem::operator==( rAttr ), "not equal attribute types" ); + assert(SfxPoolItem::operator==(rAttr)); return bOn == static_cast<const SvxTwoLinesItem&>(rAttr).bOn && cStartBracket == static_cast<const SvxTwoLinesItem&>(rAttr).cStartBracket && cEndBracket == static_cast<const SvxTwoLinesItem&>(rAttr).cEndBracket; @@ -2979,7 +2979,7 @@ bool SvxCharRotateItem::PutValue( const css::uno::Any& rVal, bool SvxCharRotateItem::operator==( const SfxPoolItem& rItem ) const { - DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); + assert(SfxPoolItem::operator==(rItem)); return SfxUInt16Item::operator==( rItem ) && IsFitToLine() == static_cast<const SvxCharRotateItem&>(rItem).IsFitToLine(); } diff --git a/editeng/source/items/writingmodeitem.cxx b/editeng/source/items/writingmodeitem.cxx index 50e4b35..85387f9 100644 --- a/editeng/source/items/writingmodeitem.cxx +++ b/editeng/source/items/writingmodeitem.cxx @@ -38,7 +38,7 @@ SvxWritingModeItem::~SvxWritingModeItem() bool SvxWritingModeItem::operator==( const SfxPoolItem& rCmp ) const { - DBG_ASSERT( SfxPoolItem::operator==(rCmp), "unequal types" ); + assert(SfxPoolItem::operator==(rCmp)); return GetValue() == static_cast<const SvxWritingModeItem&>(rCmp).GetValue(); } diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx index e7bea26..3b45707 100644 --- a/sfx2/source/config/evntconf.cxx +++ b/sfx2/source/config/evntconf.cxx @@ -71,7 +71,7 @@ void SfxEventNamesList::DelDtor() bool SfxEventNamesItem::operator==( const SfxPoolItem& rAttr ) const { - DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); + assert(SfxPoolItem::operator==(rAttr)); const SfxEventNamesList& rOwn = aEventsList; const SfxEventNamesList& rOther = static_cast<const SfxEventNamesItem&>( rAttr ).aEventsList; diff --git a/sfx2/source/doc/zoomitem.cxx b/sfx2/source/doc/zoomitem.cxx index da35e86..c714055 100644 --- a/sfx2/source/doc/zoomitem.cxx +++ b/sfx2/source/doc/zoomitem.cxx @@ -90,7 +90,7 @@ SvStream& SvxZoomItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) con bool SvxZoomItem::operator==( const SfxPoolItem& rAttr ) const { - DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); + assert(SfxPoolItem::operator==(rAttr)); const SvxZoomItem& rItem = static_cast<const SvxZoomItem&>(rAttr); commit 5781a709a94895003ded8dd30722cd22faf04e63 Author: Michael Stahl <mst...@redhat.com> Date: Fri Nov 18 21:35:52 2016 +0100 svl: assert SfxPoolItem::operator== Change-Id: Ia293c498682dd2ac86b15a74f06fd1ab389f9ba6 diff --git a/svl/source/items/cntwall.cxx b/svl/source/items/cntwall.cxx index b4e80bd..5fa769f 100644 --- a/svl/source/items/cntwall.cxx +++ b/svl/source/items/cntwall.cxx @@ -91,7 +91,7 @@ CntWallpaperItem::~CntWallpaperItem() bool CntWallpaperItem::operator==( const SfxPoolItem& rItem ) const { - DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); + assert(SfxPoolItem::operator==(rItem)); const CntWallpaperItem& rWallItem = static_cast<const CntWallpaperItem&>(rItem); diff --git a/svl/source/items/flagitem.cxx b/svl/source/items/flagitem.cxx index e22c288..ee5ad34 100644 --- a/svl/source/items/flagitem.cxx +++ b/svl/source/items/flagitem.cxx @@ -76,7 +76,7 @@ SfxPoolItem* SfxFlagItem::Create(SvStream &, sal_uInt16) const bool SfxFlagItem::operator==( const SfxPoolItem& rItem ) const { - DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); + assert(SfxPoolItem::operator==(rItem)); return static_cast<const SfxFlagItem&>(rItem).nVal == nVal; } diff --git a/svl/source/items/intitem.cxx b/svl/source/items/intitem.cxx index 99ef393..09d31f8 100644 --- a/svl/source/items/intitem.cxx +++ b/svl/source/items/intitem.cxx @@ -59,7 +59,7 @@ SfxInt16Item::SfxInt16Item(sal_uInt16 which, SvStream & rStream): // virtual bool SfxInt16Item::operator ==(const SfxPoolItem & rItem) const { - DBG_ASSERT(SfxPoolItem::operator ==(rItem), "unequal type"); + assert(SfxPoolItem::operator==(rItem)); return m_nValue == (static_cast< const SfxInt16Item * >(&rItem))-> m_nValue; } diff --git a/svl/source/items/macitem.cxx b/svl/source/items/macitem.cxx index 9580aab..d6bbd79 100644 --- a/svl/source/items/macitem.cxx +++ b/svl/source/items/macitem.cxx @@ -205,7 +205,7 @@ void SvxMacroTableDtor::Erase(sal_uInt16 nEvent) bool SvxMacroItem::operator==( const SfxPoolItem& rAttr ) const { - DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); + assert(SfxPoolItem::operator==(rAttr)); const SvxMacroTableDtor& rOwn = aMacroTable; const SvxMacroTableDtor& rOther = static_cast<const SvxMacroItem&>(rAttr).aMacroTable; diff --git a/svl/source/items/ptitem.cxx b/svl/source/items/ptitem.cxx index cdfcb44..7da6c21 100644 --- a/svl/source/items/ptitem.cxx +++ b/svl/source/items/ptitem.cxx @@ -69,7 +69,7 @@ bool SfxPointItem::GetPresentation bool SfxPointItem::operator==( const SfxPoolItem& rItem ) const { - DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); + assert(SfxPoolItem::operator==(rItem)); return static_cast<const SfxPointItem&>(rItem).aVal == aVal; } diff --git a/svl/source/items/rectitem.cxx b/svl/source/items/rectitem.cxx index b1f14e4..9f50f06 100644 --- a/svl/source/items/rectitem.cxx +++ b/svl/source/items/rectitem.cxx @@ -69,7 +69,7 @@ bool SfxRectangleItem::GetPresentation bool SfxRectangleItem::operator==( const SfxPoolItem& rItem ) const { - DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); + assert(SfxPoolItem::operator==(rItem)); return static_cast<const SfxRectangleItem&>(rItem).aVal == aVal; } diff --git a/svl/source/items/rngitem.cxx b/svl/source/items/rngitem.cxx index 467439a..f6f8c14 100644 --- a/svl/source/items/rngitem.cxx +++ b/svl/source/items/rngitem.cxx @@ -63,7 +63,7 @@ bool SfxRangeItem::GetPresentation bool SfxRangeItem::operator==( const SfxPoolItem& rItem ) const { - DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); + assert(SfxPoolItem::operator==(rItem)); const SfxRangeItem& rT = static_cast<const SfxRangeItem&>(rItem); return nFrom==rT.nFrom && nTo==rT.nTo; } diff --git a/svl/source/items/sitem.cxx b/svl/source/items/sitem.cxx index f82d509..1947f7e 100644 --- a/svl/source/items/sitem.cxx +++ b/svl/source/items/sitem.cxx @@ -52,7 +52,7 @@ SfxSetItem::~SfxSetItem() bool SfxSetItem::operator==( const SfxPoolItem& rCmp) const { - DBG_ASSERT( SfxPoolItem::operator==( rCmp ), "unequal type" ); + assert(SfxPoolItem::operator==(rCmp)); return *pSet == *static_cast<const SfxSetItem &>(rCmp).pSet; } diff --git a/svl/source/items/slstitm.cxx b/svl/source/items/slstitm.cxx index 5d4ccae..ea8ee3f 100644 --- a/svl/source/items/slstitm.cxx +++ b/svl/source/items/slstitm.cxx @@ -106,7 +106,7 @@ const std::vector<OUString>& SfxStringListItem::GetList () const bool SfxStringListItem::operator==( const SfxPoolItem& rItem ) const { - DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); + assert(SfxPoolItem::operator==(rItem)); const SfxStringListItem& rSSLItem = static_cast<const SfxStringListItem&>(rItem); diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx index 7cdcea9..fe37c3f 100644 --- a/svl/source/items/srchitem.cxx +++ b/svl/source/items/srchitem.cxx @@ -262,7 +262,7 @@ static bool equalsWithoutLocale( const SearchOptions2& rItem1, const SearchOptio bool SvxSearchItem::operator==( const SfxPoolItem& rItem ) const { - DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal which or type" ); + assert(SfxPoolItem::operator==(rItem)); const SvxSearchItem &rSItem = static_cast<const SvxSearchItem &>(rItem); return ( m_nCommand == rSItem.m_nCommand ) && ( m_bBackward == rSItem.m_bBackward ) && diff --git a/svl/source/items/szitem.cxx b/svl/source/items/szitem.cxx index 8a8db4f..65d14c7 100644 --- a/svl/source/items/szitem.cxx +++ b/svl/source/items/szitem.cxx @@ -58,7 +58,7 @@ bool SfxSizeItem::GetPresentation bool SfxSizeItem::operator==( const SfxPoolItem& rItem ) const { - DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); + assert(SfxPoolItem::operator==(rItem)); return static_cast<const SfxSizeItem&>(rItem).aVal == aVal; } diff --git a/svl/source/items/visitem.cxx b/svl/source/items/visitem.cxx index 32d7568..d295209 100644 --- a/svl/source/items/visitem.cxx +++ b/svl/source/items/visitem.cxx @@ -34,7 +34,7 @@ SfxVisibilityItem::SfxVisibilityItem(sal_uInt16 which, SvStream & rStream): // virtual bool SfxVisibilityItem::operator ==(const SfxPoolItem & rItem) const { - DBG_ASSERT(SfxPoolItem::operator ==(rItem), "unequal type"); + assert(SfxPoolItem::operator==(rItem)); return m_nValue.bVisible == (static_cast< const SfxVisibilityItem * >(&rItem))-> m_nValue.bVisible; } commit 70840f46755063a32af3bdb02ed6dba1f4873d01 Author: Michael Stahl <mst...@redhat.com> Date: Fri Nov 18 21:30:35 2016 +0100 svx: assert SfxPoolItem::operator== Change-Id: I7a5898f0dffb4d25b6e1bb916b3c6b36374f9912 diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx index 91c9295..474a740 100644 --- a/cui/source/options/cfgchart.cxx +++ b/cui/source/options/cfgchart.cxx @@ -293,7 +293,7 @@ SfxPoolItem* SvxChartColorTableItem::Clone( SfxItemPool * ) const bool SvxChartColorTableItem::operator==( const SfxPoolItem& rAttr ) const { - DBG_ASSERT( SfxPoolItem::operator==( rAttr ), "SvxChartColorTableItem::operator== : types differ" ); + assert(SfxPoolItem::operator==(rAttr)); const SvxChartColorTableItem * rCTItem( dynamic_cast<const SvxChartColorTableItem * >( & rAttr )); if( rCTItem ) diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx index 4dca17d..f759d7c 100644 --- a/svx/source/dialog/optgrid.cxx +++ b/svx/source/dialog/optgrid.cxx @@ -86,7 +86,7 @@ SfxPoolItem* SvxGridItem::Clone( SfxItemPool* ) const bool SvxGridItem::operator==( const SfxPoolItem& rAttr ) const { - DBG_ASSERT( SfxPoolItem::operator==(rAttr), "different types "); + assert(SfxPoolItem::operator==(rAttr)); const SvxGridItem& rItem = static_cast<const SvxGridItem&>(rAttr); diff --git a/svx/source/form/fmitems.cxx b/svx/source/form/fmitems.cxx index 7e50a3d..f7adc07 100644 --- a/svx/source/form/fmitems.cxx +++ b/svx/source/form/fmitems.cxx @@ -28,7 +28,7 @@ bool FmInterfaceItem::operator==( const SfxPoolItem& rAttr ) const { - DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); + assert(SfxPoolItem::operator==(rAttr)); return xInterface == static_cast<const FmInterfaceItem&>(rAttr).xInterface; } diff --git a/svx/source/items/SmartTagItem.cxx b/svx/source/items/SmartTagItem.cxx index 4bc8856..325d4f3 100644 --- a/svx/source/items/SmartTagItem.cxx +++ b/svx/source/items/SmartTagItem.cxx @@ -73,7 +73,7 @@ bool SvxSmartTagItem::PutValue( const uno::Any& /*rVal*/, sal_uInt8 /* nMemberId bool SvxSmartTagItem::operator==( const SfxPoolItem& rAttr ) const { - DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); + assert(SfxPoolItem::operator==(rAttr)); const SvxSmartTagItem& rItem = static_cast<const SvxSmartTagItem&>(rAttr); diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx index 998cc9b..f7df00a 100644 --- a/svx/source/items/algitem.cxx +++ b/svx/source/items/algitem.cxx @@ -248,7 +248,7 @@ bool SvxMarginItem::GetPresentation bool SvxMarginItem::operator==( const SfxPoolItem& rItem ) const { - DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); + assert(SfxPoolItem::operator==(rItem)); return ( ( nLeftMargin == static_cast<const SvxMarginItem&>(rItem).nLeftMargin ) && ( nTopMargin == static_cast<const SvxMarginItem&>(rItem).nTopMargin ) && diff --git a/svx/source/items/drawitem.cxx b/svx/source/items/drawitem.cxx index c2760fe..d14ab56 100644 --- a/svx/source/items/drawitem.cxx +++ b/svx/source/items/drawitem.cxx @@ -64,7 +64,7 @@ bool SvxColorListItem::GetPresentation bool SvxColorListItem::operator==( const SfxPoolItem& rItem ) const { - DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); + assert(SfxPoolItem::operator==(rItem)); return static_cast<const SvxColorListItem&>(rItem).pColorList == pColorList; } @@ -127,7 +127,7 @@ bool SvxGradientListItem::GetPresentation bool SvxGradientListItem::operator==( const SfxPoolItem& rItem ) const { - DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); + assert(SfxPoolItem::operator==(rItem)); return static_cast<const SvxGradientListItem&>(rItem).pGradientList == pGradientList; } @@ -174,7 +174,7 @@ bool SvxHatchListItem::GetPresentation bool SvxHatchListItem::operator==( const SfxPoolItem& rItem ) const { - DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); + assert(SfxPoolItem::operator==(rItem)); return static_cast<const SvxHatchListItem&>(rItem).pHatchList == pHatchList; } @@ -216,7 +216,7 @@ bool SvxBitmapListItem::GetPresentation bool SvxBitmapListItem::operator==( const SfxPoolItem& rItem ) const { - DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); + assert(SfxPoolItem::operator==(rItem)); return static_cast<const SvxBitmapListItem&>(rItem).pBitmapList == pBitmapList; } @@ -257,7 +257,7 @@ bool SvxPatternListItem::GetPresentation bool SvxPatternListItem::operator==( const SfxPoolItem& rItem ) const { - DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); + assert(SfxPoolItem::operator==(rItem)); return static_cast<const SvxPatternListItem&>(rItem).pPatternList == pPatternList; } @@ -299,7 +299,7 @@ bool SvxDashListItem::GetPresentation bool SvxDashListItem::operator==( const SfxPoolItem& rItem ) const { - DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); + assert(SfxPoolItem::operator==(rItem)); return static_cast<const SvxDashListItem&>(rItem).pDashList == pDashList; } @@ -340,7 +340,7 @@ bool SvxLineEndListItem::GetPresentation bool SvxLineEndListItem::operator==( const SfxPoolItem& rItem ) const { - DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); + assert(SfxPoolItem::operator==(rItem)); return static_cast<const SvxLineEndListItem&>(rItem).pLineEndList == pLineEndList; } diff --git a/svx/source/items/e3ditem.cxx b/svx/source/items/e3ditem.cxx index 7053bb9..2c1568c 100644 --- a/svx/source/items/e3ditem.cxx +++ b/svx/source/items/e3ditem.cxx @@ -47,7 +47,7 @@ SvxB3DVectorItem::SvxB3DVectorItem( const SvxB3DVectorItem& rItem ) : bool SvxB3DVectorItem::operator==( const SfxPoolItem &rItem ) const { - DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); + assert(SfxPoolItem::operator==(rItem)); return static_cast<const SvxB3DVectorItem&>(rItem).aVal == aVal; } diff --git a/svx/source/items/galleryitem.cxx b/svx/source/items/galleryitem.cxx index 212cded..cd82898 100644 --- a/svx/source/items/galleryitem.cxx +++ b/svx/source/items/galleryitem.cxx @@ -123,7 +123,7 @@ bool SvxGalleryItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /* nMemberId bool SvxGalleryItem::operator==( const SfxPoolItem& rAttr ) const { - DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); + assert(SfxPoolItem::operator==(rAttr)); const SvxGalleryItem& rItem = static_cast<const SvxGalleryItem&>(rAttr); diff --git a/svx/source/items/grfitem.cxx b/svx/source/items/grfitem.cxx index f338b75..21360b8 100644 --- a/svx/source/items/grfitem.cxx +++ b/svx/source/items/grfitem.cxx @@ -42,7 +42,8 @@ SvxGrfCrop::~SvxGrfCrop() bool SvxGrfCrop::operator==( const SfxPoolItem& rAttr ) const { - DBG_ASSERT( SfxPoolItem::operator==( rAttr ), "not equal attributes" ); + assert(SfxPoolItem::operator==(rAttr)); + const SvxGrfCrop& rCrop = static_cast<const SvxGrfCrop&>(rAttr); return nLeft == rCrop.GetLeft() && nRight == rCrop.GetRight() && diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx index f9165f6..04cf184 100644 --- a/svx/source/items/hlnkitem.cxx +++ b/svx/source/items/hlnkitem.cxx @@ -230,7 +230,7 @@ SfxPoolItem* SvxHyperlinkItem::Clone( SfxItemPool* ) const bool SvxHyperlinkItem::operator==( const SfxPoolItem& rAttr ) const { - DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unterschiedliche Typen" ); + assert(SfxPoolItem::operator==(rAttr)); const SvxHyperlinkItem& rItem = static_cast<const SvxHyperlinkItem&>(rAttr); diff --git a/svx/source/items/numinf.cxx b/svx/source/items/numinf.cxx index 680493b..f403ecf 100644 --- a/svx/source/items/numinf.cxx +++ b/svx/source/items/numinf.cxx @@ -120,7 +120,7 @@ bool SvxNumberInfoItem::GetPresentation bool SvxNumberInfoItem::operator==( const SfxPoolItem& rItem ) const { - DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal which or type" ); + assert(SfxPoolItem::operator==(rItem)); const SvxNumberInfoItem& rOther = static_cast<const SvxNumberInfoItem&>(rItem); diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx index 53c01c1..40892bc 100644 --- a/svx/source/items/pageitem.cxx +++ b/svx/source/items/pageitem.cxx @@ -63,7 +63,7 @@ SfxPoolItem* SvxPageItem::Clone( SfxItemPool * ) const // Test for equality bool SvxPageItem::operator==( const SfxPoolItem& rAttr ) const { - DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); + assert(SfxPoolItem::operator==(rAttr)); const SvxPageItem& rItem = static_cast<const SvxPageItem&>(rAttr); return ( eNumType == rItem.eNumType && bLandscape == rItem.bLandscape && diff --git a/svx/source/items/viewlayoutitem.cxx b/svx/source/items/viewlayoutitem.cxx index 9863484..1a1abc0 100644 --- a/svx/source/items/viewlayoutitem.cxx +++ b/svx/source/items/viewlayoutitem.cxx @@ -77,7 +77,7 @@ SvStream& SvxViewLayoutItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ bool SvxViewLayoutItem::operator==( const SfxPoolItem& rAttr ) const { - DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); + assert(SfxPoolItem::operator==(rAttr)); const SvxViewLayoutItem& rItem = static_cast<const SvxViewLayoutItem&>(rAttr); diff --git a/svx/source/items/zoomslideritem.cxx b/svx/source/items/zoomslideritem.cxx index a4db8d2..53d8a04 100644 --- a/svx/source/items/zoomslideritem.cxx +++ b/svx/source/items/zoomslideritem.cxx @@ -74,7 +74,7 @@ SvStream& SvxZoomSliderItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ bool SvxZoomSliderItem::operator==( const SfxPoolItem& rAttr ) const { - DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); + assert(SfxPoolItem::operator==(rAttr)); const SvxZoomSliderItem& rItem = static_cast<const SvxZoomSliderItem&>(rAttr); commit e5992129905aacf34fad391ec19feeeec83a6714 Author: Michael Stahl <mst...@redhat.com> Date: Fri Nov 18 21:07:42 2016 +0100 sax: these are for XMLSchema-2 duration/date/dateTime, not "ISO" ISO 8601 is a little more lenient in its lexical representation. Change-Id: I92834a2a1d3c0c37203c13d17e8ae42a1cfe9e1c diff --git a/include/sax/tools/converter.hxx b/include/sax/tools/converter.hxx index d30e8b6..072c3b4 100644 --- a/include/sax/tools/converter.hxx +++ b/include/sax/tools/converter.hxx @@ -145,49 +145,49 @@ public: /** convert SVG angle to number, 10th of degrees with range [0..3600] */ static bool convertAngle(sal_Int16& rAngle, OUString const& rString); - /** convert double to ISO "duration" string; negative durations allowed */ + /** convert double to XMLSchema-2 "duration" string; negative durations allowed */ static void convertDuration(OUStringBuffer& rBuffer, const double fTime); - /** convert util::Duration to ISO "duration" string */ + /** convert util::Duration to XMLSchema-2 "duration" string */ static void convertDuration(OUStringBuffer& rBuffer, const css::util::Duration& rDuration); - /** convert ISO "duration" string to double; negative durations allowed */ + /** convert XMLSchema-2 "duration" string to double; negative durations allowed */ static bool convertDuration(double & rfTime, const OUString& rString); - /** convert ISO "duration" string to util::Duration */ + /** convert XMLSchema-2 "duration" string to util::Duration */ static bool convertDuration(css::util::Duration& rDuration, const OUString& rString); - /** convert util::Date to ISO "date" string */ + /** convert util::Date to XMLSchema-2 "date" string */ static void convertDate( OUStringBuffer& rBuffer, const css::util::Date& rDate, sal_Int16 const* pTimeZoneOffset); - /** convert util::DateTime to ISO "date" or "dateTime" string */ + /** convert util::DateTime to XMLSchema-2 "date" or "dateTime" string */ static void convertDateTime( OUStringBuffer& rBuffer, const css::util::DateTime& rDateTime, sal_Int16 const* pTimeZoneOffset, bool bAddTimeIf0AM = false ); - /** convert util::DateTime to ISO "time" or "dateTime" string */ + /** convert util::DateTime to XMLSchema-2 "time" or "dateTime" string */ static void convertTimeOrDateTime(OUStringBuffer& rBuffer, const css::util::DateTime& rDateTime, sal_Int16 const* pTimeZoneOffset); - /** convert ISO "date" or "dateTime" string to util::DateTime */ + /** convert XMLSchema-2 "date" or "dateTime" string to util::DateTime */ static bool parseDateTime( css::util::DateTime& rDateTime, boost::optional<sal_Int16> * pTimeZoneOffset, const OUString& rString ); - /** convert ISO "time" or "dateTime" string to util::DateTime */ + /** convert XMLSchema-2 "time" or "dateTime" string to util::DateTime */ static bool parseTimeOrDateTime(css::util::DateTime& rDateTime, boost::optional<sal_Int16> * pTimeZoneOffset, const OUString& rString); - /** convert ISO "date" or "dateTime" string to util::DateTime or + /** convert XMLSchema-2 "date" or "dateTime" string to util::DateTime or util::Date */ static bool parseDateOrDateTime( css::util::Date * pDate, _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits