r20168 by fschmid - Better fix for #13139, don't mess around with UndoManager, fill internal variables directly instead.

[scribus-commit]

Author: fschmid
Date: Wed Jun 17 19:00:50 2015
New Revision: 20168

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20168
Log:
Better fix for #13139, don't mess around with UndoManager, fill internal variables directly instead.

Modified:
    trunk/Scribus/scribus/pageitem.cpp

Modified: trunk/Scribus/scribus/pageitem.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20168&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp (original)
+++ trunk/Scribus/scribus/pageitem.cpp Wed Jun 17 19:00:50 2015
@@ -2343,15 +2343,12 @@
 		double transS = lineTransparency();
 		bool savedShadow = hasSoftShadow();
 		double rotation_Old = m_rotation;
-		// #13139: Because setHasSoftShadow() and al. create undo actions
-		// if item has a drop shadow setup
-		UndoManager::instance()->setUndoEnabled(false);
-		setHasSoftShadow(false);
+		m_hasSoftShadow = false;
 		m_rotation = 0;
 		isEmbedded = true;
 		invalid = true;
-		setFillTransparency(0.0);
-		setLineTransparency(0.0);
+		fillTransparencyVal = 0.0;
+		lineTransparencyVal = 0.0;
 		p->save();
 		p->translate(m_softShadowXOffset, m_softShadowYOffset);
 		DrawObj(p, QRectF());
@@ -2368,12 +2365,11 @@
 			p->endLayer();
 			p->restore();
 		}
-		setFillTransparency(transF);
-		setLineTransparency(transS);
+		fillTransparencyVal = transF;
+		lineTransparencyVal = transS;
 		isEmbedded = false;
 		m_rotation = rotation_Old;
-		setHasSoftShadow(savedShadow);
-		UndoManager::instance()->setUndoEnabled(true);
+		m_hasSoftShadow = savedShadow;
 	}
 	else
 	{