r18777 by fschmid - Use the new Drop Shadow features in the MS Publisher importer.

[scribus-commit]

Author: fschmid
Date: Mon Jan 27 19:45:51 2014
New Revision: 18777

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18777
Log:
Use the new Drop Shadow features in the MS Publisher importer.

Modified:
    trunk/Scribus/scribus/plugins/import/pub/importpub.cpp

Modified: trunk/Scribus/scribus/plugins/import/pub/importpub.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18777&path=/trunk/Scribus/scribus/plugins/import/pub/importpub.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pub/importpub.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/pub/importpub.cpp Mon Jan 27 19:45:51 2014
@@ -152,12 +152,16 @@
 		tmpSel->clear();
 		if (gElements.count() > 0)
 		{
+			bool groupClip = true;
 			for (int dre = 0; dre < gElements.count(); ++dre)
 			{
 				tmpSel->addItem(gElements.at(dre), true);
 				Elements->removeAll(gElements.at(dre));
+				if (gElements.at(dre)->hasSoftShadow())
+					groupClip = false;
 			}
 			ite = m_Doc->groupObjectsSelection(tmpSel);
+			ite->setGroupClipping(groupClip);
 			ite->setTextFlowMode(PageItem::TextFlowUsesBoundingBox);
 			if (!gr.clip.isEmpty())
 			{
@@ -1411,7 +1415,7 @@
 		return;
 	if(m_style["draw:shadow"] && m_style["draw:shadow"]->getStr() == "visible")
 	{
-		double xp = ite->xPos();
+/*		double xp = ite->xPos();
 		double yp = ite->yPos();
 		double xof = 0.0;
 		double yof = 0.0;
@@ -1448,7 +1452,7 @@
 			groupStack.top().Items.append(nite);
 			groupStack.top().Items.append(ite);
 		}
-/*
+*/
 		double xof = 0.0;
 		double yof = 0.0;
 		if (m_style["draw:shadow-offset-x"])
@@ -1471,7 +1475,7 @@
 		ite->setSoftShadowShade(100);
 		ite->setSoftShadowOpacity(shadowTrans);
 		ite->setSoftShadowBlendMode(0);
-*/
+
 	}
 }