r15049 by jghali - #9083, svg export : incorrect export of master page elements

[scribus-commit]

Revision: 15049
Author: jghali
Date: 2010-05-06T21:10:54.180693Z
Commit message: #9083, svg export : incorrect export of master page elements

Changeset: 
M  /trunk/Scribus/scribus/plugins/svgexplugin/svgexplugin.cpp

Diffs:
Index: scribus/plugins/svgexplugin/svgexplugin.cpp
===================================================================
--- scribus/plugins/svgexplugin/svgexplugin.cpp	(revision 15048)
+++ scribus/plugins/svgexplugin/svgexplugin.cpp	(revision 15049)
@@ -315,6 +315,8 @@
 		double h2 = Item->BoundingH;
 		if (!( qMax( x, x2 ) <= qMin( x+w, x2+w2 ) && qMax( y, y2 ) <= qMin( y+h, y2+h2 )))
 			continue;
+		if ((!page->pageName().isEmpty()) && (Item->OwnPage != static_cast<int>(page->pageNr())) && (Item->OwnPage != -1))
+			continue;
 		if (Item->isGroupControl)
 		{
 			groupStack.push(Item->groupsLastItem);
@@ -373,6 +375,8 @@
 		double h2 = Item->BoundingH;
 		if (!( qMax( x, x2 ) <= qMin( x+w, x2+w2 ) && qMax( y, y2 ) <= qMin( y+h, y2+h2 )))
 			continue;
+		if ((!page->pageName().isEmpty()) && (Item->OwnPage != static_cast<int>(page->pageNr())) && (Item->OwnPage != -1))
+			continue;
 		if (!Item->isTableItem)
 			continue;
 		if ((Item->lineColor() == CommonStrings::None) || (Item->lineWidth() == 0.0))