r20544 by craig -

[scribus-commit]

Author: craig
Date: Mon Nov  9 20:58:09 2015
New Revision: 20544

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20544
Log:
#13381: Remove hopefully unnecessary code for 1.5.x

Modified:
    trunk/Scribus/scribus/canvasmode_framelinks.cpp

Modified: trunk/Scribus/scribus/canvasmode_framelinks.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20544&path=/trunk/Scribus/scribus/canvasmode_framelinks.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_framelinks.cpp	(original)
+++ trunk/Scribus/scribus/canvasmode_framelinks.cpp	Mon Nov  9 20:58:09 2015
@@ -143,7 +143,6 @@
 
 	double Rxp = 0;
 	double Ryp = 0;
-	PageItem *currItem, *bb;
 	m_canvas->PaintSizeRect(QRect());
 	m_canvas->m_viewMode.m_MouseButtonPressed = true;
 	m_canvas->m_viewMode.operItemMoving = false;
@@ -168,6 +167,7 @@
 			m_view->DrawNew();
 		return;
 	}
+	PageItem *currItem=NULL, *bb=NULL;
 	switch (m_doc->appMode)
 	{
 		case modeLinkFrames:
@@ -226,6 +226,11 @@
 					if (bb->prevInChain())
 						bb->prevInChain()->unlink();
 					currItem->link(bb);
+
+					/*
+					// #133881: Remove item renumbering on link as 1.5.x has better drawing methods
+					// than 1.3.3.x did at the time (#3488). Leaving in in case we find we need it back
+					//
 					int cid = m_doc->Items->indexOf(currItem);
 					int bid = m_doc->Items->indexOf(bb);
 					// CB We need to do this because we draw in the order of the item list
@@ -235,6 +240,8 @@
 						m_doc->Items->insert(cid+1, bb);
 						bb = m_doc->Items->takeAt(bid);
 					}
+					*/
+
 					// m_view->updateContents();
 					// link calls PageItem::update	
 					//ECE no, link() not force update