r18021 by fschmid - Save correct order of patterns

[scribus-commit]

Author: fschmid
Date: Mon Dec 31 15:47:41 2012
New Revision: 18021

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18021
Log:
Save correct order of patterns

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

Modified: trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18021&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 Mon Dec 31 15:47:41 2012
@@ -2178,7 +2178,7 @@
 
 	gfx->display(str);
 	gElements = m_groupStack.pop();
-	tmpSel->clear();
+	m_doc->m_Selection->clear();
 	double pwidth = 0;
 	double pheight = 0;
 	if (gElements.Items.count() > 0)
@@ -2189,7 +2189,11 @@
 			m_Elements->removeAll(gElements.Items.at(dre));
 		}
 		m_doc->itemSelection_FlipV();
-		ite = m_doc->groupObjectsSelection();
+		PageItem *ite;
+		if (m_doc->m_Selection->count() > 1)
+			ite = m_doc->groupObjectsSelection();
+		else
+			ite = m_doc->m_Selection->itemAt(0);
 		ite->setFillTransparency(1.0 - state->getFillOpacity());
 		ite->setFillBlendmode(getBlendMode(state));
 		m_doc->m_Selection->clear();
@@ -2211,7 +2215,6 @@
 		m_doc->Items->removeAll(ite);
 		id = QString("Pattern_from_PDF_%1").arg(m_doc->docPatterns.count() + 1);
 		m_doc->addPattern(id, pat);
-		tmpSel->clear();
 	}
 	double xCoor = m_doc->currentPage()->xOffset();
 	double yCoor = m_doc->currentPage()->yOffset();
@@ -3410,7 +3413,7 @@
 	double *ctm;
 	ctm = state->getCTM();
 	groupEntry gElements = m_groupStack.pop();
-	tmpSel->clear();
+	m_doc->m_Selection->clear();
 	if (gElements.Items.count() > 0)
 	{
 		for (int dre = 0; dre < gElements.Items.count(); ++dre)
@@ -3419,7 +3422,11 @@
 			m_Elements->removeAll(gElements.Items.at(dre));
 		}
 		m_doc->itemSelection_FlipV();
-		PageItem *ite = m_doc->groupObjectsSelection();
+		PageItem *ite;
+		if (m_doc->m_Selection->count() > 1)
+			ite = m_doc->groupObjectsSelection();
+		else
+			ite = m_doc->m_Selection->itemAt(0);
 		ite->setFillTransparency(1.0 - state->getFillOpacity());
 		ite->setFillBlendmode(getBlendMode(state));
 		m_doc->m_Selection->clear();

Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18021&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp (original)
+++ trunk/Scribus/scribus/scribusdoc.cpp Mon Dec 31 15:47:41 2012
@@ -4049,7 +4049,7 @@
 		for (int c = 0; c < pp.count(); c++)
 		{
 			if (!results.contains(pp[c]))
-				results.prepend(pp[c]);
+				results.append(pp[c]);
 		}
 		if (patternStack.count() == 0)
 			break;