r19562 by craig - Deal with more special modes within restorePageItemCreation

[scribus-commit]

Author: craig
Date: Wed Oct  8 06:06:28 2014
New Revision: 19562

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19562
Log:
Deal with more special modes within restorePageItemCreation

Modified:
    trunk/Scribus/scribus/scpage.cpp

Modified: trunk/Scribus/scribus/scpage.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19562&path=/trunk/Scribus/scribus/scpage.cpp
==============================================================================
--- trunk/Scribus/scribus/scpage.cpp (original)
+++ trunk/Scribus/scribus/scpage.cpp Wed Oct  8 06:06:28 2014
@@ -24,7 +24,7 @@
 #include <QDebug>
 #include <QPixmap>
 
-#include "appmodes.h"
+#include "appmodehelper.h"
 #include "scpage.h"
 #include "scribus.h"
 #include "scribusdoc.h"
@@ -322,8 +322,8 @@
 	PageItem *ite = state->getItem();
 	bool oldMPMode=m_Doc->masterPageMode();
 	m_Doc->setMasterPageMode(!ite->OnMasterPage.isEmpty());
-	if (m_Doc->appMode == modeEditClip) // switch off from edit shape
-		m_Doc->scMW()->nodePalette->EndEdit();
+	if (m_Doc->scMW()->appModeHelper->inAnEditMode(m_Doc))
+		m_Doc->scMW()->slotEndSpecialEdit();
 	m_Doc->m_Selection->delaySignalsOn();
 	if (isUndo)
 	{