r14780 by jghali - #8859 : bad master page margins in double page layout

[scribus-commit]

Revision: 14780
Author: jghali
Date: 2010-02-20T17:02:53.701104Z
Commit message: #8859 : bad master page margins in double page layout 

Changeset: 
M  /branches/Version135/Scribus/scribus/page.cpp

Diffs:
Index: scribus/page.cpp
===================================================================
--- scribus/page.cpp	(revision 14779)
+++ scribus/page.cpp	(revision 14780)
@@ -360,12 +360,14 @@
 	m_initialWidth = sourcePage->m_initialWidth;
 	m_initialHeight = sourcePage->m_initialHeight;
 
-	Margins.Top = pageMargins.Top;
+	Margins.Top    = pageMargins.Top;
 	Margins.Bottom = pageMargins.Bottom;
-	Margins.Left = pageMargins.Left;//todo fix for layouts
-	Margins.Right = pageMargins.Right;
-	initialMargins.Top = pageMargins.Top;
-	initialMargins.Bottom = pageMargins.Bottom;
-	initialMargins.Left = pageMargins.Left;
-	initialMargins.Right = pageMargins.Right;
+	Margins.Left   = pageMargins.Left;//todo fix for layouts
+	Margins.Right  = pageMargins.Right;
+	// #8859 do not get initialMargins from pageMargins otherwise
+	// margins may be inverted when applying master pages
+	initialMargins.Top    = sourcePage->initialMargins.Top;
+	initialMargins.Bottom = sourcePage->initialMargins.Bottom;
+	initialMargins.Left   = sourcePage->initialMargins.Left;
+	initialMargins.Right  = sourcePage->initialMargins.Right;
 }