r21145 by jghali -

[scribus-commit]

Author: jghali
Date: Fri Apr  1 03:22:36 2016
New Revision: 21145

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21145
Log:
fix boxes regression: disappearing blocks of text when exporting pdf/ps

Modified:
    trunk/Scribus/scribus/pdflib_core.cpp
    trunk/Scribus/scribus/pslib.cpp

Modified: trunk/Scribus/scribus/pdflib_core.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21145&path=/trunk/Scribus/scribus/pdflib_core.cpp
==============================================================================
--- trunk/Scribus/scribus/pdflib_core.cpp	(original)
+++ trunk/Scribus/scribus/pdflib_core.cpp	Fri Apr  1 03:22:36 2016
@@ -5747,6 +5747,11 @@
 // Return a PDF substring representing a PageItem's text
 QByteArray PDFLibCore::setTextSt(PageItem *ite, uint PNr, const ScPage* pag)
 {
+	int savedOwnPage = ite->OwnPage;
+	ite->OwnPage = PNr;
+	ite->layout();
+	ite->OwnPage = savedOwnPage;
+	
 	PdfPainter p(ite, this, PNr, pag);
 	ite->textLayout.renderBackground(&p);
 	ite->textLayout.render(&p);

Modified: trunk/Scribus/scribus/pslib.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21145&path=/trunk/Scribus/scribus/pslib.cpp
==============================================================================
--- trunk/Scribus/scribus/pslib.cpp	(original)
+++ trunk/Scribus/scribus/pslib.cpp	Fri Apr  1 03:22:36 2016
@@ -4405,6 +4405,11 @@
  */
 void PSLib::setTextSt(ScribusDoc* Doc, PageItem* ite, uint argh, ScPage* pg, bool sep, bool farb, bool master)
 {
+	int savedOwnPage = ite->OwnPage;
+	ite->OwnPage = argh;
+	ite->layout();
+	ite->OwnPage = savedOwnPage;
+
 	PSPainter p(Doc, argh, pg, sep, farb, master, this);
 	ite->textLayout.renderBackground(&p);
 	ite->textLayout.render(&p);