r20508 by fschmid -

scribus-commit scribus-commit at lists.scribus.net
Sun Nov 1 09:20:25 UTC 2015


Author: fschmid
Date: Sun Nov  1 09:20:25 2015
New Revision: 20508

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20508
Log:
Fix crash with noteframes and the outline palette previews.

Modified:
    trunk/Scribus/scribus/ui/outlinepalette.cpp

Modified: trunk/Scribus/scribus/ui/outlinepalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20508&path=/trunk/Scribus/scribus/ui/outlinepalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/outlinepalette.cpp	(original)
+++ trunk/Scribus/scribus/ui/outlinepalette.cpp	Sun Nov  1 09:20:25 2015
@@ -396,14 +396,14 @@
 					}
 					tipText +="<br>" + tr("X-Pos:") + " ";
 					if (pgItem->OwnPage != -1)
-						tipText += value2String(pgItem->xPos() - item->PageObject->xOffset(), item->DocObject->unitIndex(), true, true);
+						tipText += value2String(pgItem->xPos() - item->PageObject->xOffset(), pgItem->doc()->unitIndex(), true, true);
 					else
-						tipText += value2String(pgItem->xPos(), item->DocObject->unitIndex(), true, true);
+						tipText += value2String(pgItem->xPos(), pgItem->doc()->unitIndex(), true, true);
 					tipText +="<br>" + tr("Y-Pos:") + " ";
 					if (pgItem->OwnPage != -1)
-						tipText += value2String(pgItem->yPos() - item->PageObject->yOffset(), item->DocObject->unitIndex(), true, true);
+						tipText += value2String(pgItem->yPos() - item->PageObject->yOffset(), pgItem->doc()->unitIndex(), true, true);
 					else
-						tipText += value2String(pgItem->yPos(), item->DocObject->unitIndex(), true, true);
+						tipText += value2String(pgItem->yPos(), pgItem->doc()->unitIndex(), true, true);
 					tipText += "</p>";
 				}
 				QToolTip::showText(helpEvent->globalPos(), tipText, this);




More information about the scribus-commit mailing list