r17916 by fschmid - Better fix for Bug #11213: Wrong page numbers in PDF export when copied textframe

[scribus-commit]

Author: fschmid
Date: Thu Nov 29 20:02:41 2012
New Revision: 17916

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

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

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17916&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 Thu Nov 29 20:02:41 2012
@@ -3502,8 +3502,7 @@
 	{
 		newItem->LayerID = LayerToPaste;
 		newItem->OwnPage = doc->OnPage(newItem);
-		if (!attrs.value("OnMasterPage").isEmpty())
-			newItem->OnMasterPage = doc->currentPage()->pageName();
+		newItem->OnMasterPage = doc->currentPage()->pageName();
 	}
 	QString tmpf = attrs.valueAsString("IFONT", doc->itemToolPrefs().textFont);
 	m_AvailableFonts->findFont(tmpf, doc);