r17261 by fschmid - Fixed Bug 10556: "PDF Import pages size"

[scribus-commit]

Author: fschmid
Date: Mon Jan 30 20:58:45 2012
New Revision: 17261

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17261
Log:
Fixed Bug 10556: "PDF Import pages size"

Modified:
    trunk/Scribus/scribus/plugins/import/pdf/importpdf.cpp
    trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp

Modified: trunk/Scribus/scribus/plugins/import/pdf/importpdf.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17261&path=/trunk/Scribus/scribus/plugins/import/pdf/importpdf.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pdf/importpdf.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/pdf/importpdf.cpp Mon Jan 30 20:58:45 2012
@@ -334,6 +334,8 @@
 						m_Doc->currentPage()->setHeight(pdfDoc->getPageMediaHeight(firstPage));
 						m_Doc->currentPage()->setWidth(pdfDoc->getPageMediaWidth(firstPage));
 						m_Doc->currentPage()->MPageNam = CommonStrings::trMasterPageNormal;
+						m_Doc->currentPage()->m_pageSize = "Custom";
+						m_Doc->setPageSize("Custom");
 						m_Doc->reformPages(true);
 						Object info;
 						pdfDoc->getDocInfo(&info);

Modified: trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17261&path=/trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp Mon Jan 30 20:58:45 2012
@@ -74,7 +74,12 @@
 		if (importerFlags & LoadSavePlugin::lfCreateDoc)
 		{
 			m_doc->addPage(pagecount);
+			m_doc->currentPage()->setInitialHeight(state->getPageHeight());
+			m_doc->currentPage()->setInitialWidth(state->getPageWidth());
+			m_doc->currentPage()->setHeight(state->getPageHeight());
+			m_doc->currentPage()->setWidth(state->getPageWidth());
 			m_doc->currentPage()->MPageNam = CommonStrings::trMasterPageNormal;
+			m_doc->currentPage()->m_pageSize = "Custom";
 			m_doc->view()->addPage(pagecount, true);
 			pagecount++;
 		}