r16616 by jghali - #9985 : Styles using tabs duplicate when copying object

[scribus-commit]

Author: jghali
Date: Wed May 11 21:08:41 2011
New Revision: 16616

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=16616
Log:
#9985 : Styles using tabs duplicate when copying object

Modified:
    trunk/Scribus/scribus/styles/paragraphstyle.cpp
    trunk/Scribus/scribus/styles/paragraphstyle.h

Modified: trunk/Scribus/scribus/styles/paragraphstyle.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16616&path=/trunk/Scribus/scribus/styles/paragraphstyle.cpp
==============================================================================
--- trunk/Scribus/scribus/styles/paragraphstyle.cpp (original)
+++ trunk/Scribus/scribus/styles/paragraphstyle.cpp Wed May 11 21:08:41 2011
@@ -21,6 +21,11 @@
 #include "desaxe/simple_actions.h"
 #include "util_math.h"
 
+bool ParagraphStyle::TabRecord::operator==(const TabRecord& other) const
+{
+	return isequiv(tabPosition, other.tabPosition) && tabType==other.tabType && tabFillChar == other.tabFillChar;
+}
+
 ParagraphStyle::ParagraphStyle() : Style(), cstyleContext(NULL), cstyleContextIsInh(true), cstyle()
 {
 	setParent("");

Modified: trunk/Scribus/scribus/styles/paragraphstyle.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16616&path=/trunk/Scribus/scribus/styles/paragraphstyle.h
==============================================================================
--- trunk/Scribus/scribus/styles/paragraphstyle.h (original)
+++ trunk/Scribus/scribus/styles/paragraphstyle.h Wed May 11 21:08:41 2011
@@ -57,9 +57,7 @@
 		qreal tabPosition;
 		int tabType;
 		QChar tabFillChar;
-		bool operator==(const TabRecord& other) const {
-			return tabPosition==other.tabPosition && tabType==other.tabType && tabFillChar == other.tabFillChar;
-		}
+		bool operator==(const TabRecord& other) const;
 		bool operator<(const TabRecord& other)  const { return tabPosition < other.tabPosition; }
 		bool operator<=(const TabRecord& other) const { return tabPosition <= other.tabPosition; }
 		bool operator>(const TabRecord& other)  const { return tabPosition > other.tabPosition; }