sc: assert SfxPoolItem::operator==

Change-Id: I69b7d2b9e580b08ebd59866f1244e0e61c4b1dcb

7 files changed, 19 insertions, 19 deletions

diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx
index 1b37853c7d1d..6adef02ddcbb 100644
--- a/sc/source/core/data/attrib.cxx
+++ b/sc/source/core/data/attrib.cxx
@@ -393,7 +393,7 @@ bool ScProtectionAttr::SetHidePrint( bool bHPrint)
  */
 bool ScRangeItem::operator==( const SfxPoolItem& rAttr ) const
 {
-    OSL_ENSURE( SfxPoolItem::operator==(rAttr), "unequal types" );
+    assert(SfxPoolItem::operator==(rAttr));
 
     return aRange == static_cast<const ScRangeItem&>(rAttr).aRange;
 }
@@ -479,7 +479,7 @@ ScTableListItem& ScTableListItem::operator=( const ScTableListItem& rCpy )
 
 bool ScTableListItem::operator==( const SfxPoolItem& rAttr ) const
 {
-    OSL_ENSURE( SfxPoolItem::operator==(rAttr), "unequal types" );
+    assert(SfxPoolItem::operator==(rAttr));
 
     const ScTableListItem& rCmp   = static_cast<const ScTableListItem&>(rAttr);
     bool                   bEqual = (nCount == rCmp.nCount);
@@ -639,7 +639,7 @@ OUString ScPageHFItem::GetValueText() const
 
 bool ScPageHFItem::operator==( const SfxPoolItem& rItem ) const
 {
-    OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" );
+    assert(SfxPoolItem::operator==(rItem));
 
     const ScPageHFItem& r = static_cast<const ScPageHFItem&>(rItem);
 
@@ -948,7 +948,7 @@ OUString ScDoubleItem::GetValueText() const
 
 bool ScDoubleItem::operator==( const SfxPoolItem& rItem ) const
 {
-    OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" );
+    assert(SfxPoolItem::operator==(rItem));
     const ScDoubleItem& _rItem = static_cast<const ScDoubleItem&>(rItem);
     return nValue == _rItem.nValue;
 }
@@ -997,7 +997,7 @@ ScPageScaleToItem* ScPageScaleToItem::Clone( SfxItemPool* ) const
 
 bool ScPageScaleToItem::operator==( const SfxPoolItem& rCmp ) const
 {
-    OSL_ENSURE( SfxPoolItem::operator==( rCmp ), "ScPageScaleToItem::operator== - unequal wid or type" );
+    assert(SfxPoolItem::operator==(rCmp));
     const ScPageScaleToItem& rPageCmp = static_cast< const ScPageScaleToItem& >( rCmp );
     return ((mnWidth == rPageCmp.mnWidth) && (mnHeight == rPageCmp.mnHeight)) ? 1 : 0;
 }
diff --git a/sc/source/core/tool/defaultsoptions.cxx b/sc/source/core/tool/defaultsoptions.cxx
index 7c66d60adf54..0226832febc1 100644
--- a/sc/source/core/tool/defaultsoptions.cxx
+++ b/sc/source/core/tool/defaultsoptions.cxx
@@ -83,7 +83,7 @@ OUString ScTpDefaultsItem::GetValueText() const
 
 bool ScTpDefaultsItem::operator==( const SfxPoolItem& rItem ) const
 {
-    OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" );
+    assert(SfxPoolItem::operator==(rItem));
 
     const ScTpDefaultsItem& rPItem = static_cast<const ScTpDefaultsItem&>(rItem);
     return ( theOptions == rPItem.theOptions );
diff --git a/sc/source/core/tool/docoptio.cxx b/sc/source/core/tool/docoptio.cxx
index d0708656d921..dc61de005ce9 100644
--- a/sc/source/core/tool/docoptio.cxx
+++ b/sc/source/core/tool/docoptio.cxx
@@ -123,7 +123,7 @@ OUString ScTpCalcItem::GetValueText() const
 
 bool ScTpCalcItem::operator==( const SfxPoolItem& rItem ) const
 {
-    OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" );
+    assert(SfxPoolItem::operator==(rItem));
 
     const ScTpCalcItem& rPItem = static_cast<const ScTpCalcItem&>(rItem);
 
diff --git a/sc/source/core/tool/formulaopt.cxx b/sc/source/core/tool/formulaopt.cxx
index 1abeaa349f87..346525db0466 100644
--- a/sc/source/core/tool/formulaopt.cxx
+++ b/sc/source/core/tool/formulaopt.cxx
@@ -174,7 +174,7 @@ OUString ScTpFormulaItem::GetValueText() const
 
 bool ScTpFormulaItem::operator==( const SfxPoolItem& rItem ) const
 {
-    OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" );
+    assert(SfxPoolItem::operator==(rItem));
 
     const ScTpFormulaItem& rPItem = static_cast<const ScTpFormulaItem&>(rItem);
     return ( theOptions == rPItem.theOptions );
diff --git a/sc/source/core/tool/printopt.cxx b/sc/source/core/tool/printopt.cxx
index 70926e1947bb..00daafe9b7d6 100644
--- a/sc/source/core/tool/printopt.cxx
+++ b/sc/source/core/tool/printopt.cxx
@@ -94,7 +94,7 @@ OUString ScTpPrintItem::GetValueText() const
 
 bool ScTpPrintItem::operator==( const SfxPoolItem& rItem ) const
 {
-    OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" );
+    assert(SfxPoolItem::operator==(rItem));
 
     const ScTpPrintItem& rPItem = static_cast<const ScTpPrintItem&>(rItem);
     return ( theOptions == rPItem.theOptions );
diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx
index 4cc649c84f4a..ed047b32de63 100644
--- a/sc/source/core/tool/viewopti.cxx
+++ b/sc/source/core/tool/viewopti.cxx
@@ -217,7 +217,7 @@ OUString ScTpViewItem::GetValueText() const
 
 bool ScTpViewItem::operator==( const SfxPoolItem& rItem ) const
 {
-    OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" );
+    assert(SfxPoolItem::operator==(rItem));
 
     const ScTpViewItem& rPItem = static_cast<const ScTpViewItem&>(rItem);
 
diff --git a/sc/source/ui/app/uiitems.cxx b/sc/source/ui/app/uiitems.cxx
index f8618a080ec4..0ab024faf045 100644
--- a/sc/source/ui/app/uiitems.cxx
+++ b/sc/source/ui/app/uiitems.cxx
@@ -77,7 +77,7 @@ OUString ScInputStatusItem::GetValueText() const
 
 bool ScInputStatusItem::operator==( const SfxPoolItem& rItem ) const
 {
-    OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" );
+    assert(SfxPoolItem::operator==(rItem));
 
     return (aStartPos  == static_cast<const ScInputStatusItem&>(rItem).aStartPos)
              && (aEndPos    == static_cast<const ScInputStatusItem&>(rItem).aEndPos)
@@ -173,7 +173,7 @@ OUString ScSortItem::GetValueText() const
 
 bool ScSortItem::operator==( const SfxPoolItem& rItem ) const
 {
-    OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" );
+    assert(SfxPoolItem::operator==(rItem));
 
     const ScSortItem& rOther = static_cast<const ScSortItem&>(rItem);
 
@@ -265,7 +265,7 @@ OUString ScQueryItem::GetValueText() const
 
 bool ScQueryItem::operator==( const SfxPoolItem& rItem ) const
 {
-    OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" );
+    assert(SfxPoolItem::operator==(rItem));
 
     const ScQueryItem& rQueryItem = static_cast<const ScQueryItem&>(rItem);
 
@@ -318,7 +318,7 @@ OUString ScSubTotalItem::GetValueText() const
 
 bool ScSubTotalItem::operator==( const SfxPoolItem& rItem ) const
 {
-    OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" );
+    assert(SfxPoolItem::operator==(rItem));
 
     const ScSubTotalItem& rSTItem = static_cast<const ScSubTotalItem&>(rItem);
 
@@ -368,7 +368,7 @@ OUString ScUserListItem::GetValueText() const
 
 bool ScUserListItem::operator==( const SfxPoolItem& rItem ) const
 {
-    OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" );
+    assert(SfxPoolItem::operator==(rItem));
 
     const ScUserListItem& r = static_cast<const ScUserListItem&>(rItem);
     bool bEqual = false;
@@ -420,7 +420,7 @@ OUString ScConsolidateItem::GetValueText() const
 
 bool ScConsolidateItem::operator==( const SfxPoolItem& rItem ) const
 {
-    OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" );
+    assert(SfxPoolItem::operator==(rItem));
 
     const ScConsolidateItem& rCItem = static_cast<const ScConsolidateItem&>(rItem);
 
@@ -469,7 +469,7 @@ OUString ScPivotItem::GetValueText() const
 
 bool ScPivotItem::operator==( const SfxPoolItem& rItem ) const
 {
-    OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" );
+    assert(SfxPoolItem::operator==(rItem));
 
     const ScPivotItem& rPItem = static_cast<const ScPivotItem&>(rItem);
     OSL_ENSURE( pSaveData && rPItem.pSaveData, "pSaveData" );
@@ -510,7 +510,7 @@ OUString ScSolveItem::GetValueText() const
 
 bool ScSolveItem::operator==( const SfxPoolItem& rItem ) const
 {
-    OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" );
+    assert(SfxPoolItem::operator==(rItem));
 
     const ScSolveItem& rPItem = static_cast<const ScSolveItem&>(rItem);
 
@@ -549,7 +549,7 @@ OUString ScTabOpItem::GetValueText() const
 
 bool ScTabOpItem::operator==( const SfxPoolItem& rItem ) const
 {
-    OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" );
+    assert(SfxPoolItem::operator==(rItem));
 
     const ScTabOpItem& rPItem = static_cast<const ScTabOpItem&>(rItem);