r21791 by jghali - #14638: combine polygons results in unexpected displacement

[scribus-commit]

Author: jghali
Date: Wed Feb 22 18:23:55 2017
New Revision: 21791

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21791
Log:
#14638: combine polygons results in unexpected displacement

Modified:
    branches/Version14x/Scribus/scribus/scribusdoc.cpp

Modified: branches/Version14x/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21791&path=/branches/Version14x/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/scribusdoc.cpp	(original)
+++ branches/Version14x/Scribus/scribus/scribusdoc.cpp	Wed Feb 22 18:23:55 2017
@@ -10822,7 +10822,10 @@
 			currItem->PoLine.putPoints(currItem->PoLine.size(), bb->PoLine.size(), bb->PoLine);
 		}
 //		currItem->Clip = FlattenPath(currItem->PoLine, currItem->Segments);
+		int oldRotMode = this->RotMode;
+		this->RotMode = 0;
 		AdjustItemSize(currItem);
+		this->RotMode = oldRotMode;
 		currItem->ContourLine = currItem->PoLine.copy();
 		//FIXME: stop using m_View
 		m_View->Deselect(true);
@@ -10838,6 +10841,8 @@
 {
 	PageItem *bb;
 	m_Selection->delaySignalsOn();
+	int oldRotMode = this->RotMode;
+	this->RotMode = 0;
 	for (int i = 0; i < m_Selection->count(); ++i)
 	{
 		PageItem *currItem = m_Selection->itemAt(i);
@@ -10871,6 +10876,7 @@
 		currItem->ContourLine = currItem->PoLine.copy();
 		currItem->ClipEdited = true;
 	}
+	this->RotMode = oldRotMode;
 	m_Selection->delaySignalsOff();
 	//FIXME: stop using m_View
 	m_View->Deselect(true);