r18079 by fschmid - PDF-Importer: fixed crash when importing files from Bug #9159

[scribus-commit]

Author: fschmid
Date: Wed Jan  9 12:04:25 2013
New Revision: 18079

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18079
Log:
PDF-Importer: fixed crash when importing files from Bug #9159

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

Modified: trunk/Scribus/scribus/pageitem.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18079&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp (original)
+++ trunk/Scribus/scribus/pageitem.cpp Wed Jan  9 12:04:25 2013
@@ -1973,6 +1973,7 @@
 void PageItem::DrawObj_Decoration(ScPainter *p)
 {
 	p->save();
+	p->setAntialiasing(false);
 	if (!isEmbedded)
 		p->translate(m_xPos, m_yPos);
 	p->rotate(m_rotation);
@@ -2078,6 +2079,7 @@
 		//	drawLockedMarker(p);
 	}
 	FrameOnly = false;
+	p->setAntialiasing(true);
 	p->restore();
 }
 

Modified: trunk/Scribus/scribus/pageitem_textframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18079&path=/trunk/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_textframe.cpp (original)
+++ trunk/Scribus/scribus/pageitem_textframe.cpp Wed Jan  9 12:04:25 2013
@@ -3917,6 +3917,7 @@
 	if (isAnnotation() && ((annotation().Type() > 1) && (annotation().Type() < 7)) && (annotation().Bwid() > 0))
 		return;
 	p->save();
+	p->setAntialiasing(false);
 	if (!isEmbedded)
 		p->translate(m_xPos, m_yPos);
 	p->rotate(m_rotation);
@@ -3988,6 +3989,7 @@
 		//	drawLockedMarker(p);
 	}
 	FrameOnly = false;
+	p->setAntialiasing(true);
 	p->restore();
 }
 

Modified: trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18079&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 Wed Jan  9 12:04:25 2013
@@ -1285,7 +1285,10 @@
 						m_Elements->replace(m_Elements->indexOf(ite), sing);
 						m_doc->Items->removeAll(sing);
 						m_doc->Items->replace(m_doc->Items->indexOf(ite), sing);
-						m_groupStack.top().Items.replace(m_groupStack.top().Items.indexOf(ite), sing);
+						if (m_groupStack.top().Items.indexOf(ite) > -1)
+							m_groupStack.top().Items.replace(m_groupStack.top().Items.indexOf(ite), sing);
+						else
+							m_groupStack.top().Items.append(sing);
 						sing->setFillTransparency(1.0 - (state->getFillOpacity() * (1.0 - ite->fillTransparency())));
 						sing->setFillBlendmode(getBlendMode(state));
 						if (!ite->patternMask().isEmpty())