INTEGRATION: CWS impressc03u3 (1.22.40); FILE MERGED

2006/04/27 12:33:10 cl 1.22.40.1: #i64360# fixed operator==

1 files changed, 12 insertions, 8 deletions

diff --git a/svx/source/editeng/editobj.cxx b/svx/source/editeng/editobj.cxx
index 7fb52e6c115d..541962ef42a7 100644
--- a/svx/source/editeng/editobj.cxx
+++ b/svx/source/editeng/editobj.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: editobj.cxx,v $
  *
- *  $Revision: 1.22 $
+ *  $Revision: 1.23 $
  *
- *  last change: $Author: vg $ $Date: 2006-04-07 08:17:12 $
+ *  last change: $Author: rt $ $Date: 2006-05-04 09:11:26 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -264,14 +264,18 @@ bool ContentInfo::operator==( const ContentInfo& rCompare ) const
             (eFamily == rCompare.eFamily ) &&
             (aParaAttribs == rCompare.aParaAttribs ) )
     {
-        USHORT n;
-        for( n = 0; n < aAttribs.Count(); n++ )
+        const USHORT nCount = aAttribs.Count();
+        if( nCount == rCompare.aAttribs.Count() )
         {
-            if( !(*aAttribs.GetObject(n) == *rCompare.aAttribs.GetObject(n)) )
-                return false;
-        }
+            USHORT n;
+            for( n = 0; n < nCount; n++ )
+            {
+                if( !(*aAttribs.GetObject(n) == *rCompare.aAttribs.GetObject(n)) )
+                    return false;
+            }
 
-        return true;
+            return true;
+        }
     }
 
     return false;