r19732 by fschmid - Fixed Bug #12868: PDF open : white zone is imported with black background

[scribus-commit]

Author: fschmid
Date: Sun Jan  4 21:34:53 2015
New Revision: 19732

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19732
Log:
Fixed Bug #12868: PDF open : white zone is imported with black background
Additional fix: certain text shapes also had wrong color

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=19732&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 Jan  4 21:34:53 2015
@@ -3589,6 +3589,7 @@
 			FPoint wh = textPath.WidthHeight();
 			if ((textPath.size() > 3) && ((wh.x() != 0.0) || (wh.y() != 0.0)))
 			{
+				CurrColorFill = getColor(state->getFillColorSpace(), state->getFillColor(), &CurrFillShade);
 				int z = m_doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, xCoor, yCoor, 10, 10, 0, CurrColorFill, CommonStrings::None, true);
 				PageItem* ite = m_doc->Items->at(z);
 				QTransform mm;
@@ -3712,6 +3713,7 @@
 				ite = m_doc->groupObjectsSelection(tmpSel);
 			else
 				ite = gElements.Items.first();
+			ite->setGroupClipping(false);
 			ite->setFillTransparency(1.0 - state->getFillOpacity());
 			ite->setFillBlendmode(getBlendMode(state));
 			for (int as = 0; as < tmpSel->count(); ++as)