summaryrefslogtreecommitdiff
path: root/svx/source/editeng/editobj2.hxx
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2006-05-04 08:11:41 +0000
committerRüdiger Timm <rt@openoffice.org>2006-05-04 08:11:41 +0000
commit71158788efb32ffc3bac5154c38ca5d79525155c (patch)
tree53641634da47ac609e077618f0d1a4611bbc3576 /svx/source/editeng/editobj2.hxx
parentc1f39dcf392cd98f1183aa305da78cfac25cb85f (diff)
INTEGRATION: CWS impressc03u3 (1.8.40); FILE MERGED
2006/04/27 12:33:10 cl 1.8.40.1: #i64360# fixed operator==
Diffstat (limited to 'svx/source/editeng/editobj2.hxx')
-rw-r--r--svx/source/editeng/editobj2.hxx8
1 files changed, 5 insertions, 3 deletions
diff --git a/svx/source/editeng/editobj2.hxx b/svx/source/editeng/editobj2.hxx
index d8f29059c859..154e6a300615 100644
--- a/svx/source/editeng/editobj2.hxx
+++ b/svx/source/editeng/editobj2.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: editobj2.hxx,v $
*
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
*
- * last change: $Author: vg $ $Date: 2006-04-07 08:17:30 $
+ * last change: $Author: rt $ $Date: 2006-05-04 09:11:41 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -82,7 +82,9 @@ inline bool XEditAttribute::operator==( const XEditAttribute& rCompare )
{
return (nStart == rCompare.nStart) &&
(nEnd == rCompare.nEnd) &&
- ( (pItem == rCompare.pItem) || (*pItem == *rCompare.pItem));
+ ( (pItem == rCompare.pItem) ||
+ ( pItem->Which() != rCompare.pItem->Which()) ||
+ (*pItem == *rCompare.pItem));
}
inline BOOL XEditAttribute::IsFeature()