r14998 by jghali - fix some compiler error

[scribus-commit]

Revision: 14998
Author: jghali
Date: 2010-04-22T07:14:19.119543Z
Commit message: fix some compiler error

Changeset: 
M  /trunk/Scribus/scribus/scprintengine_gdi.cpp
M  /trunk/Scribus/scribus/plugins/scriptplugin/cmddoc.cpp
M  /trunk/Scribus/scribus/plugins/scriptplugin/cmdpage.cpp

Diffs:
Index: scribus/scprintengine_gdi.cpp
===================================================================
--- scribus/scprintengine_gdi.cpp	(revision 14997)
+++ scribus/scprintengine_gdi.cpp	(revision 14998)
@@ -450,8 +450,8 @@
 		QString tmp;
 		QStringList opts;
 		QString tempFilePath2 = PrefsManager::instance()->preferencesLocation() + "/tmp2.ps";
-		opts.append( QString("-dDEVICEWIDTHPOINTS=%1").arg(tmp.setNum(doc->pageWidth)) );
-		opts.append( QString("-dDEVICEHEIGHTPOINTS=%1").arg(tmp.setNum(doc->pageHeight)) );
+		opts.append( QString("-dDEVICEWIDTHPOINTS=%1").arg(tmp.setNum(doc->pageWidth())) );
+		opts.append( QString("-dDEVICEHEIGHTPOINTS=%1").arg(tmp.setNum(doc->pageHeight())) );
 		if ( QFile::exists( tempFilePath2 ) )
 			QFile::remove( tempFilePath2 );
 		ret = convertPS2PS(tempFilePath, tempFilePath2, opts, options.prnEngine);
Index: scribus/plugins/scriptplugin/cmdpage.cpp
===================================================================
--- scribus/plugins/scriptplugin/cmdpage.cpp	(revision 14997)
+++ scribus/plugins/scriptplugin/cmdpage.cpp	(revision 14998)
@@ -359,10 +359,10 @@
 	PyObject *margins = NULL;
 	if(!checkHaveDocument())
 		return NULL;
-	margins = Py_BuildValue("ffff", PointToValue(ScCore->primaryMainWindow()->doc->pageMargins.Top),
-									PointToValue(ScCore->primaryMainWindow()->doc->pageMargins.Left),
-									PointToValue(ScCore->primaryMainWindow()->doc->pageMargins.Right),
-									PointToValue(ScCore->primaryMainWindow()->doc->pageMargins.Bottom));
+	margins = Py_BuildValue("ffff", PointToValue(ScCore->primaryMainWindow()->doc->margins()->Top),
+									PointToValue(ScCore->primaryMainWindow()->doc->margins()->Left),
+									PointToValue(ScCore->primaryMainWindow()->doc->margins()->Right),
+									PointToValue(ScCore->primaryMainWindow()->doc->margins()->Bottom));
 	return margins;
 }
 
Index: scribus/plugins/scriptplugin/cmddoc.cpp
===================================================================
--- scribus/plugins/scriptplugin/cmddoc.cpp	(revision 14997)
+++ scribus/plugins/scriptplugin/cmddoc.cpp	(revision 14998)
@@ -116,7 +116,7 @@
 	if(!checkHaveDocument())
 		return NULL;
 	MarginStruct margins(ValueToPoint(tpr), ValueToPoint(lr), ValueToPoint(btr), ValueToPoint(rr));
-	ScCore->primaryMainWindow()->doc->resetPage(margins, ScCore->primaryMainWindow()->doc->currentPageLayout);
+	ScCore->primaryMainWindow()->doc->resetPage(ScCore->primaryMainWindow()->doc->currentPageLayout, &margins);
 	ScCore->primaryMainWindow()->view->reformPages();
 	ScCore->primaryMainWindow()->doc->setModified(true);
 	ScCore->primaryMainWindow()->view->GotoPage(ScCore->primaryMainWindow()->doc->currentPageNumber());