summaryrefslogtreecommitdiff
path: root/svx/source/items
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2016-11-18 21:30:35 +0100
committerMichael Stahl <mstahl@redhat.com>2016-11-18 22:21:55 +0100
commit70840f46755063a32af3bdb02ed6dba1f4873d01 (patch)
tree4b9c4147a10651cfb9c59ed63a6c83b50d0ef213 /svx/source/items
parente5992129905aacf34fad391ec19feeeec83a6714 (diff)
svx: assert SfxPoolItem::operator==
Change-Id: I7a5898f0dffb4d25b6e1bb916b3c6b36374f9912
Diffstat (limited to 'svx/source/items')
-rw-r--r--svx/source/items/SmartTagItem.cxx2
-rw-r--r--svx/source/items/algitem.cxx2
-rw-r--r--svx/source/items/drawitem.cxx14
-rw-r--r--svx/source/items/e3ditem.cxx2
-rw-r--r--svx/source/items/galleryitem.cxx2
-rw-r--r--svx/source/items/grfitem.cxx3
-rw-r--r--svx/source/items/hlnkitem.cxx2
-rw-r--r--svx/source/items/numinf.cxx2
-rw-r--r--svx/source/items/pageitem.cxx2
-rw-r--r--svx/source/items/viewlayoutitem.cxx2
-rw-r--r--svx/source/items/zoomslideritem.cxx2
11 files changed, 18 insertions, 17 deletions
diff --git a/svx/source/items/SmartTagItem.cxx b/svx/source/items/SmartTagItem.cxx
index 4bc885692773..325d4f3a8c8b 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 998cc9ba8784..f7df00afd16e 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 c2760fe9b89c..d14ab5672e53 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 7053bb99c664..2c1568ccdc5d 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 212cded5d461..cd82898dfe04 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 f338b7553d1a..21360b8adfd5 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 f9165f6cdbb0..04cf184759d4 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 680493be871d..f403ecf9a8fb 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 53c01c10d595..40892bc7d5b0 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 986348466f47..1a1abc073b14 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 a4db8d27b872..53d8a0444c40 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);