r17512 by jghali - small change related to previous fix
scribus-commit
scribus-commit at lists.scribus.net
Thu May 17 22:21:43 UTC 2012
Author: jghali
Date: Thu May 17 22:21:43 2012
New Revision: 17512
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17512
Log:
small change related to previous fix
Modified:
trunk/Scribus/scribus/ui/picstatus.cpp
Modified: trunk/Scribus/scribus/ui/picstatus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17512&path=/trunk/Scribus/scribus/ui/picstatus.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/picstatus.cpp (original)
+++ trunk/Scribus/scribus/ui/picstatus.cpp Thu May 17 22:21:43 2012
@@ -396,7 +396,7 @@
{
if (currItem != NULL)
{
- if (currItem->OnMasterPage.isEmpty() && currItem->doc()->masterPageMode())
+ if (currItem->OnMasterPage.isEmpty() && m_Doc->masterPageMode())
ScCore->primaryMainWindow()->closeActiveWindowMasterPageEditor();
if (!currItem->OnMasterPage.isEmpty())
emit selectMasterPage(currItem->OnMasterPage);
@@ -410,9 +410,9 @@
if (currItem == NULL)
return;
- if (currItem->OnMasterPage.isEmpty() && currItem->doc()->masterPageMode())
+ if (currItem->OnMasterPage.isEmpty() && m_Doc->masterPageMode())
ScCore->primaryMainWindow()->closeActiveWindowMasterPageEditor();
- else if (!currItem->OnMasterPage.isEmpty() && !currItem->doc()->masterPageMode())
+ else if (!currItem->OnMasterPage.isEmpty() && !m_Doc->masterPageMode())
emit selectMasterPage(currItem->OnMasterPage);
emit selectElementByItem(currItem, true);
More information about the scribus-commit
mailing list