r16503 by craig - Fix pageitem compilation issue

scribus-commit scribus-commit at lists.scribus.net
Fri Mar 25 01:26:13 CET 2011


Author: craig
Date: Fri Mar 25 00:26:13 2011
New Revision: 16503

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=16503
Log:
Fix pageitem compilation issue

Modified:
    trunk/Scribus/scribus/pageitem.cpp

Modified: trunk/Scribus/scribus/pageitem.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16503&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp (original)
+++ trunk/Scribus/scribus/pageitem.cpp Fri Mar 25 00:26:13 2011
@@ -22,6 +22,7 @@
  ***************************************************************************/
 
 #include "pageitem.h"
+
 #include <QPainter>
 #include <QPen>
 #include <QFont>
@@ -42,6 +43,7 @@
 #include "ui/cpalette.h"
 #include "ui/guidemanager.h"
 #include "page.h"
+#include "pageitem_textframe.h"
 #include "pageitem_latexframe.h"
 #include "prefsmanager.h"
 #include "ui/propertiespalette.h"
@@ -6418,22 +6420,6 @@
 	}
 }
 
-void PageItem::restoreLinkTextFrame(UndoState *state, bool isUndo)
-{
-	if (!isTextFrame())
-		return;
-	if (isUndo)
-	{
-		unlink();
-	}
-	else
-	{
-		ItemState<std::pair<PageItem*, PageItem*> > *is = dynamic_cast<ItemState<std::pair<PageItem*, PageItem*> >*>(state);
-		asTextFrame()->link(is->getItem().second->asTextFrame());
-	}
-}
-
-
 void PageItem::convertClip()
 {
 	if (Clip.count() != 0)




More information about the scribus-commit mailing list