r17511 by jghali - small change related to previous fix

scribus-commit scribus-commit at lists.scribus.net
Thu May 17 22:21:05 UTC 2012


Author: jghali
Date: Thu May 17 22:21:05 2012
New Revision: 17511

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17511
Log:
small change related to previous fix

Modified:
    branches/Version14x/Scribus/scribus/picstatus.cpp

Modified: branches/Version14x/Scribus/scribus/picstatus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17511&path=/branches/Version14x/Scribus/scribus/picstatus.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/picstatus.cpp (original)
+++ branches/Version14x/Scribus/scribus/picstatus.cpp Thu May 17 22:21:05 2012
@@ -377,7 +377,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);
@@ -391,9 +391,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);
 
 	if (currItem->Groups.count() == 0)




More information about the scribus-commit mailing list