Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 17510 → Rev 17512

/trunk/Scribus/scribus/ui/picstatus.cpp
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);