r23263 by jghali - #15853: convert text to outline does not work correctly if the basepoint is not top left

[scribus-commit]

Author: jghali
Date: Thu Oct 17 19:54:02 2019
New Revision: 23263

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23263
Log:
#15853: convert text to outline does not work correctly if the basepoint is not top left

Modified:
    trunk/Scribus/scribus/scribusview.cpp

Modified: trunk/Scribus/scribus/scribusview.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23263&path=/trunk/Scribus/scribus/scribusview.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusview.cpp	(original)
+++ trunk/Scribus/scribus/scribusview.cpp	Thu Oct 17 19:54:02 2019
@@ -51,9 +51,9 @@
 #include <QPolygon>
 #include <QStack>
 #include <QStringList>
+#include <QStyleOptionRubberBand>
 #include <QWheelEvent>
 #include <QWidgetAction>
-#include <QStyleOptionRubberBand>
 
 #include <cstdio>
 #include <cstdlib>
@@ -3147,6 +3147,10 @@
 
 	UndoTransaction trans(undoManager->beginTransaction(currItem->getUName(), currItem->getUPixmap(), Um::ToOutlines, "", nullptr));
 	int offset = 0;
+
+	int oldRotMode = Doc->rotationMode();
+	Doc->setRotationMode(0);
+
 	for (int i = 0; i < selectedItemCount; ++i)
 	{
 		PageItem *currItem = tmpSelection.itemAt(offset);
@@ -3207,6 +3211,7 @@
 		}
 		delItems.append(tmpSelection.takeItem(offset));
 	}
+
 	tmpSelection.clear();
 	int ind = -1;
 	if (currItem->isGroupChild())
@@ -3251,6 +3256,7 @@
 		else
 			Doc->Items->insert(ind+1, newGroupedItems.at(0));
 	}
+
 	int toDeleteItemCount = delItems.count();
 	if (toDeleteItemCount != 0)
 	{
@@ -3259,6 +3265,8 @@
 			tmpSelection.addItem(delItems.takeAt(0)); //yes, 0, remove the first
 		Doc->itemSelection_DeleteItem(&tmpSelection);
 	}
+
+	Doc->setRotationMode(oldRotMode);
 	m_ScMW->HaveNewSel();
 	Deselect(true);
 	trans.commit();