r22131 by jghali -

scribus-commit scribus-commit at lists.scribus.net
Wed Aug 9 23:28:11 UTC 2017


Author: jghali
Date: Wed Aug  9 23:28:11 2017
New Revision: 22131

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22131
Log:
minor change to ease debugging (and avoid a few unnecessary function calls)

Modified:
    trunk/Scribus/scribus/scribusdoc.cpp

Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22131&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp	(original)
+++ trunk/Scribus/scribus/scribusdoc.cpp	Wed Aug  9 23:28:11 2017
@@ -5946,13 +5946,14 @@
 
 	if (masterPageMode())
 	{
-		double x1 = currentPage()->xOffset() - m_docPrefsData.docSetupPrefs.bleeds.left();
-		double y1 = currentPage()->yOffset() - m_docPrefsData.docSetupPrefs.bleeds.top();
-		double w1 = currentPage()->width() + m_docPrefsData.docSetupPrefs.bleeds.left() + m_docPrefsData.docSetupPrefs.bleeds.right();
-		double h1 = currentPage()->height() + m_docPrefsData.docSetupPrefs.bleeds.bottom() + m_docPrefsData.docSetupPrefs.bleeds.top();
+		ScPage* currPage = currentPage();
+		double x1 = currPage->xOffset() - m_docPrefsData.docSetupPrefs.bleeds.left();
+		double y1 = currPage->yOffset() - m_docPrefsData.docSetupPrefs.bleeds.top();
+		double w1 = currPage->width() + m_docPrefsData.docSetupPrefs.bleeds.left() + m_docPrefsData.docSetupPrefs.bleeds.right();
+		double h1 = currPage->height() + m_docPrefsData.docSetupPrefs.bleeds.bottom() + m_docPrefsData.docSetupPrefs.bleeds.top();
 		QRectF pageRect(x1, y1, w1, h1);
 		if (itemRect.intersects(pageRect))
-			retw = currentPage()->pageNr();
+			retw = currPage->pageNr();
 	}
 	else
 	{




More information about the scribus-commit mailing list