Commits

Anonymous committed b03f0c8 Merge

new_itemsets:merging minibranches

  • Participants
  • Parent commits efc0eda, 495b134
  • Branches new_itemsets

Comments (0)

Files changed (1)

svtools/source/items1/itemset.cxx

         {
             OSL_ENSURE(lcl_InRange(rWhichRanges, pItemEntry->GetWhich()), "<itemset.cxx:lcl_ValidateItemVector>"
             " - itemset confused: which out of ranges.");
-            OSL_ENSURE(IsInvalidItem(pItemEntry->GetItem() || pItemEntry->GetItem()->Which() || pItemEntry->GetItem()->IsA(TYPE(SfxVoidItem))),
+            OSL_ENSURE(IsInvalidItem(pItemEntry->GetItem()) || pItemEntry->GetItem()->Which() || pItemEntry->GetItem()->IsA(TYPE(SfxVoidItem)),
                 "<itemset.cxx:lcl_ValidateItemVector> - itemset confused: item has to be invalid, have a WhichId or be a SfxVoidItem.");
         }
         return true;
 bool SfxItemSet::operator==(const SfxItemSet &rCmp) const
 {
     // fast checks
-    if(m_pParent != rCmp.m_pParent || m_pPool != rCmp.m_pPool || m_vWhichRanges.size() != rCmp.m_vWhichRanges.size())
+    if(m_pParent != rCmp.m_pParent || m_pPool != rCmp.m_pPool || m_vWhichRanges.size() != rCmp.m_vWhichRanges.size() || m_pItems->size() != rCmp.m_pItems->size())
         return false;
     for(size_t nCount = 0; nCount < m_pItems->size(); ++nCount)
     {