r18915 by fschmid - Fixed Bug #12146: Clipping paths in Scribus-created PDFs are being ignored during PDF import

[scribus-commit]

Author: fschmid
Date: Sun Mar 16 09:30:38 2014
New Revision: 18915

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18915
Log:
Fixed Bug #12146: Clipping paths in Scribus-created PDFs are being ignored during PDF import

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

Modified: trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18915&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 Sun Mar 16 09:30:38 2014
@@ -1328,13 +1328,15 @@
 							sing->setWidthHeight(ite->width(), ite->height(), true);
 							sing->groupWidth = ite->width();
 							sing->groupHeight = ite->height();
-							if (sing->isImageFrame())
+						/*	if (sing->isImageFrame())
 							{
 								QTransform ft;
 								ft.translate(-result.boundingRect().x(), -result.boundingRect().y());
 								ft.scale(ite->width() / result.boundingRect().width(), ite->height() / result.boundingRect().height());
 								result = ft.map(result);
-							}
+							}*/
+							sing->ClipEdited = true;
+							sing->FrameType = 3;
 							sing->PoLine.fromQPainterPath(result);
 							m_doc->AdjustItemSize(sing);
 							if (sing->isGroup())
@@ -2536,7 +2538,7 @@
 	}
 	else
 	{
-		mm.reset();
+//		mm.reset();
 		if (sx < 0)
 			mm.scale(-1, 1);
 		if (sy < 0)
@@ -2671,7 +2673,7 @@
 	}
 	else
 	{
-		mm.reset();
+//		mm.reset();
 		if (sx < 0)
 			mm.scale(-1, 1);
 		if (sy < 0)
@@ -2815,7 +2817,7 @@
 	}
 	else
 	{
-		mm.reset();
+//		mm.reset();
 		if (sx < 0)
 			mm.scale(-1, 1);
 		if (sy < 0)