r17913 by fschmid - Fixed Bug #11213: Wrong page numbers in PDF export when copied textframe

[scribus-commit]

Author: fschmid
Date: Wed Nov 28 19:58:02 2012
New Revision: 17913

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17913
Log:
Fixed Bug #11213: Wrong page numbers in PDF export when copied textframe

Modified:
    trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
    trunk/Scribus/scribus/scribusview.cpp

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17913&path=/trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp (original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp Wed Nov 28 19:58:02 2012
@@ -3502,6 +3502,8 @@
 	{
 		newItem->LayerID = LayerToPaste;
 		newItem->OwnPage = doc->OnPage(newItem);
+		if (!attrs.value("OnMasterPage").isEmpty())
+			newItem->OnMasterPage = doc->currentPage()->pageName();
 	}
 	QString tmpf = attrs.valueAsString("IFONT", doc->itemToolPrefs().textFont);
 	m_AvailableFonts->findFont(tmpf, doc);

Modified: trunk/Scribus/scribus/scribusview.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17913&path=/trunk/Scribus/scribus/scribusview.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusview.cpp (original)
+++ trunk/Scribus/scribus/scribusview.cpp Wed Nov 28 19:58:02 2012
@@ -305,7 +305,7 @@
 	storedShowControls = Doc->guidesPrefs().showControls;
 	setRulersShown(Doc->guidesPrefs().rulersShown);
 	m_canvas->m_viewMode.viewAsPreview = false;
-	m_canvas->setPreviewVisual(0);
+	m_canvas->setPreviewVisual(-1);
 //	shiftSelItems = false;
 //	inItemCreation = false;
 	m_previousMode = -1;