Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 19333 → Rev 19334

/branches/Version14x/Scribus/scribus/inspage.cpp
97,6 → 97,8
{
if ((it.key() == CommonStrings::masterPageNormal) && (!conNam))
pageData->addItem(CommonStrings::trMasterPageNormal);
else if ((it.key() == CommonStrings::trMasterPageNormal) && (!conNam))
pageData->addItem(CommonStrings::trMasterPageNormal);
else
{
if (currentDoc->MasterPages.at(it.value())->LeftPg == 1)
115,6 → 117,8
{
if ((it.key() == CommonStrings::masterPageNormal) && (!conNam))
pageData->addItem(CommonStrings::trMasterPageNormal);
else if ((it.key() == CommonStrings::trMasterPageNormal) && (!conNam))
pageData->addItem(CommonStrings::trMasterPageNormal);
else
{
if ((currentDoc->MasterPages.at(it.value())->LeftPg != 0) && (currentDoc->MasterPages.at(it.value())->LeftPg != 1))
131,6 → 135,8
{
if ((it.key() == CommonStrings::masterPageNormal) && (!conNam))
pageData->addItem(CommonStrings::trMasterPageNormal);
else if ((it.key() == CommonStrings::trMasterPageNormal) && (!conNam))
pageData->addItem(CommonStrings::trMasterPageNormal);
else
{
if (currentDoc->MasterPages.at(it.value())->LeftPg == 0)
150,6 → 156,8
{
if ((it.key() == CommonStrings::masterPageNormal) && (!conNam))
pageData->addItem(CommonStrings::trMasterPageNormal);
else if ((it.key() == CommonStrings::trMasterPageNormal) && (!conNam))
pageData->addItem(CommonStrings::trMasterPageNormal);
else
{
if ((currentDoc->MasterPages.at(it.value())->LeftPg != 0) && (currentDoc->MasterPages.at(it.value())->LeftPg != 1))
166,6 → 174,8
{
if ((it.key() == CommonStrings::masterPageNormal) && (!conNam))
pageData->addItem(CommonStrings::trMasterPageNormal);
else if ((it.key() == CommonStrings::trMasterPageNormal) && (!conNam))
pageData->addItem(CommonStrings::trMasterPageNormal);
else
{
if (currentDoc->MasterPages.at(it.value())->LeftPg == 0)
183,6 → 193,8
{
if ((it.key() == CommonStrings::masterPageNormal) && (!conNam))
pageData->addItem(CommonStrings::trMasterPageNormal);
else if ((it.key() == CommonStrings::trMasterPageNormal) && (!conNam))
pageData->addItem(CommonStrings::trMasterPageNormal);
else
{
if (currentDoc->MasterPages.at(it.value())->LeftPg == 0)