r15445 by craig - #9332: fix out of order pages in PDF

[scribus-commit]

Author: craig
Date: Thu Aug 26 23:08:19 2010
New Revision: 15445

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=15445
Log:
#9332: fix out of order pages in PDF

Modified:
    branches/Version135/Scribus/scribus/pdflib_core.cpp
    branches/Version135/Scribus/scribus/pdflib_core.h

Modified: branches/Version135/Scribus/scribus/pdflib_core.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15445&path=/branches/Version135/Scribus/scribus/pdflib_core.cpp
==============================================================================
--- branches/Version135/Scribus/scribus/pdflib_core.cpp (original)
+++ branches/Version135/Scribus/scribus/pdflib_core.cpp Thu Aug 26 23:08:19 2010
@@ -224,7 +224,7 @@
 			qApp->processEvents();
 			if (abortExport) break;
 
-			PDF_End_Page();
+			PDF_End_Page(a);
 			pc_exportpages++;
 			if (usingGUI)
 			{
@@ -2275,7 +2275,7 @@
 	}
 }
 
-void PDFLibCore::PDF_End_Page()
+void PDFLibCore::PDF_End_Page(int physPage)
 {
 	uint PgNr =  ActPageP->pageNr();
 	double markOffs = 0.0;
@@ -2661,7 +2661,7 @@
 	}
 	PutDoc(">>\nendobj\n");
 	PageTree.Count++;
-	PageTree.Kids[PgNr] = pageObject;
+	PageTree.Kids[physPage] = pageObject;
 }
 
 

Modified: branches/Version135/Scribus/scribus/pdflib_core.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15445&path=/branches/Version135/Scribus/scribus/pdflib_core.h
==============================================================================
--- branches/Version135/Scribus/scribus/pdflib_core.h (original)
+++ branches/Version135/Scribus/scribus/pdflib_core.h Thu Aug 26 23:08:19 2010
@@ -81,7 +81,7 @@
 	
 	bool PDF_Begin_Doc(const QString& fn, SCFonts &AllFonts, QMap<QString, QMap<uint, FPointArray> > DocFonts, BookMView* vi);
 	void PDF_Begin_Page(const Page* pag, QPixmap pm = 0);
-	void PDF_End_Page();
+	void PDF_End_Page(int physPage);
 	bool PDF_TemplatePage(const Page* pag, bool clip = false);
 	bool PDF_ProcessPage(const Page* pag, uint PNr, bool clip = false);
 	bool PDF_End_Doc(const QString& PrintPr = "", const QString& Name = "", int Components = 0);