r21794 by jghali - #14638: fix also "path connect"

[scribus-commit]

Author: jghali
Date: Wed Feb 22 19:00:53 2017
New Revision: 21794

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21794
Log:
#14638: fix also "path connect"


Modified:
    trunk/Scribus/scribus/pageitem.cpp
    trunk/Scribus/scribus/plugins/tools/pathconnect/pathconnect.cpp
    trunk/Scribus/scribus/scribusdoc.cpp

Modified: trunk/Scribus/scribus/pageitem.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21794&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp	(original)
+++ trunk/Scribus/scribus/pageitem.cpp	Wed Feb 22 19:00:53 2017
@@ -5114,13 +5114,19 @@
 	if (isUndo)
 	{
 		PoLine = is->getItem().first;
-		doc()->adjustItemSize(this);
+		int oldRotMode = m_Doc->rotationMode();
+		m_Doc->setRotationMode(0);
+		m_Doc->adjustItemSize(this);
+		m_Doc->setRotationMode(oldRotMode);
 		moveBy(is->getDouble("OLDX") - xPos(),is->getDouble("OLDY") - yPos());
 	}
 	else
 	{
 		PoLine = is->getItem().second;
-		doc()->adjustItemSize(this);
+		int oldRotMode = m_Doc->rotationMode();
+		m_Doc->setRotationMode(0);
+		m_Doc->adjustItemSize(this);
+		m_Doc->setRotationMode(oldRotMode);
 		moveBy(is->getDouble("NEWX") - xPos(),is->getDouble("NEWY") - yPos());
 	}
 	OldB2 = width();

Modified: trunk/Scribus/scribus/plugins/tools/pathconnect/pathconnect.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21794&path=/trunk/Scribus/scribus/plugins/tools/pathconnect/pathconnect.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/pathconnect/pathconnect.cpp	(original)
+++ trunk/Scribus/scribus/plugins/tools/pathconnect/pathconnect.cpp	Wed Feb 22 19:00:53 2017
@@ -145,7 +145,10 @@
 			m_item1->PoLine = computePath(pointOne, pointTwo, mode, originalPath1, originalPath2);
 			m_item1->ClipEdited = true;
 			m_item1->FrameType = 3;
+			int oldRotMode = m_doc->rotationMode();
+			m_doc->setRotationMode(0);
 			m_doc->adjustItemSize(m_item1);
+			m_doc->setRotationMode(oldRotMode);
 			m_item1->OldB2 = m_item1->width();
 			m_item1->OldH2 = m_item1->height();
 			if (UndoManager::undoEnabled())
@@ -173,7 +176,10 @@
 			m_item1->ClipEdited = true;
 			m_item1->FrameType = 3;
 			m_item1->setXYPos(originalXPos, originalYPos);
+			int oldRotMode = m_doc->rotationMode();
+			m_doc->setRotationMode(0);
 			m_doc->adjustItemSize(m_item1);
+			m_doc->setRotationMode(oldRotMode);
 			m_item1->OldB2 = m_item1->width();
 			m_item1->OldH2 = m_item1->height();
 			m_item1->updateClip();
@@ -204,7 +210,10 @@
 		m_item1->ClipEdited = true;
 		m_item1->FrameType = 3;
 	}
+	int oldRotMode = m_doc->rotationMode();
+	m_doc->setRotationMode(0);
 	m_doc->adjustItemSize(m_item1);
+	m_doc->setRotationMode(oldRotMode);
 	m_item1->OldB2 = m_item1->width();
 	m_item1->OldH2 = m_item1->height();
 	m_item1->updateClip();

Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21794&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp	(original)
+++ trunk/Scribus/scribus/scribusdoc.cpp	Wed Feb 22 19:00:53 2017
@@ -15974,6 +15974,8 @@
 
 void ScribusDoc::setRotationMode(const int val)
 {
+	if (m_rotMode == val)
+		return;
 	m_rotMode = val;
 	emit rotationMode(m_rotMode);
 }