Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 17509 → Rev 17511

/branches/Version14x/Scribus/scribus/picstatus.cpp
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)