Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 3144 → Rev 3145

/branches/Version13x/Scribus/scribus/fileloader.cpp
947,7 → 947,7
doc->pageCount = Pgc;
doc->Pages = doc->DocPages;
doc->PageAT = AtFl;
doc->MasterP = false;
doc->masterPageMode = false;
}
else
{
954,7 → 954,7
doc->pageCount = 0;
doc->PageAT = false;
doc->Pages = doc->MasterPages;
doc->MasterP = true;
doc->masterPageMode = true;
}
app->slotNewPage(a);
Apage = doc->Pages.at(a);
974,7 → 974,7
Apage->LeftPg=QStoInt(pg.attribute("LEFT","0"));
QString Mus = "";
Mus = pg.attribute("MNAM","Normal");
if (!doc->MasterP)
if (!doc->masterPageMode)
Apage->MPageNam = Mus;
else
Apage->MPageNam = "";
997,7 → 997,7
Apage->initialMargins.Right = QStodouble(pg.attribute("BORDERRIGHT"));
Apage->Margins.Top = Apage->initialMargins.Top;
Apage->Margins.Bottom = Apage->initialMargins.Bottom;
doc->MasterP = false;
doc->masterPageMode = false;
if ((pg.hasAttribute("NumVGuides")) && (QStoInt(pg.attribute("NumVGuides","0")) != 0))
{
tmp = pg.attribute("VerticalGuides");
1035,13 → 1035,13
{
doc->Items = doc->DocItems;
doc->Pages = doc->DocPages;
doc->MasterP = false;
doc->masterPageMode = false;
}
else
{
doc->Items = doc->MasterItems;
doc->Pages = doc->MasterPages;
doc->MasterP = true;
doc->masterPageMode = true;
}
if ((!pg.attribute("OnMasterPage").isEmpty()) && (pg.tagName()=="MASTEROBJECT"))
doc->currentPage = doc->MasterPages.at(doc->MasterNames[pg.attribute("OnMasterPage")]);
1161,7 → 1161,7
doc->MasterItems = doc->Items;
doc->MasterPages = doc->Pages;
}
doc->MasterP = false;
doc->masterPageMode = false;
counter++;
}
PAGE=PAGE.nextSibling();
1194,7 → 1194,7
doc->Pages = doc->DocPages;
doc->pageCount = doc->Pages.count();
doc->Items = doc->DocItems;
doc->MasterP = false;
doc->masterPageMode = false;
view->reformPages();
if (doc->Layers.count() == 0)
{
/branches/Version13x/Scribus/scribus/about.cpp
46,7 → 46,7
tabLayout1->addWidget( pixmapLabel1 );
buildID = new QLabel( tab, "BB" );
buildID->setAlignment(Qt::AlignCenter);
QString bu = tr("%1 %2 %3 ").arg("31").arg("August").arg("2005 ");
QString bu = tr("%1 %2 %3 ").arg("1").arg("September").arg("2005 ");
#ifdef HAVE_CMS
bu += "C";
#else
/branches/Version13x/Scribus/scribus/page.cpp
277,7 → 277,7
else
{
ScApp->doc->Items.append(ite);
if (ScApp->doc->MasterP)
if (ScApp->doc->masterPageMode)
ScApp->doc->MasterItems = ScApp->doc->Items;
else
ScApp->doc->DocItems = ScApp->doc->Items;
293,7 → 293,7
if (isUndo)
{
ScApp->doc->Items.append(ite);
if (ScApp->doc->MasterP)
if (ScApp->doc->masterPageMode)
ScApp->doc->MasterItems = ScApp->doc->Items;
else
ScApp->doc->DocItems = ScApp->doc->Items;
/branches/Version13x/Scribus/scribus/scribusdoc.cpp
61,7 → 61,7
{
ApplicationPrefs* prefsData=&(PrefsManager::instance()->appPrefs);
modified = false;
MasterP = false;
masterPageMode = false;
NrItems = 0;
First = 1;
Last = 0;
941,6 → 941,10
addedPage->PageSize = PageSize;
addedPage->PageOri = PageOri;
Pages.insert(pageNumber, addedPage);
if (masterPageMode)
MasterPages = Pages;
else
DocPages = Pages;
currentPage = addedPage;
pageCount++;
return addedPage;
/branches/Version13x/Scribus/scribus/scribusXml.cpp
1568,7 → 1568,7
doc->pageCount = Pgc;
doc->Pages = doc->DocPages;
doc->PageAT = AtFl;
doc->MasterP = false;
doc->masterPageMode = false;
doc->Items = doc->DocItems;
}
else
1576,7 → 1576,7
doc->pageCount = 0;
doc->PageAT = false;
doc->Pages = doc->MasterPages;
doc->MasterP = true;
doc->masterPageMode = true;
doc->Items = doc->MasterItems;
}
emit NewPage(a);
1583,7 → 1583,7
doc->Pages.at(a)->LeftPg=QStoInt(pg.attribute("LEFT","0"));
QString Mus = "";
Mus = pg.attribute("MNAM","Normal");
if (!doc->MasterP)
if (!doc->masterPageMode)
doc->Pages.at(a)->MPageNam = Mus;
else
doc->Pages.at(a)->MPageNam = "";
1762,7 → 1762,7
doc->MasterPages = doc->Pages;
doc->MasterItems = doc->Items;
}
doc->MasterP = false;
doc->masterPageMode = false;
doc->pageCount = Pgc+1;
doc->PageAT = AtFl;
}
1865,7 → 1865,7
doc->Pages = doc->DocPages;
doc->pageCount = doc->Pages.count();
doc->Items = doc->DocItems;
doc->MasterP = false;
doc->masterPageMode = false;
view->reformPages();
if (doc->layerCount() == 0)
{
/branches/Version13x/Scribus/scribus/pageitem.cpp
3050,7 → 3050,7
uint zae = 0;
uint za2 = base;
QString chx = "#";
if ((!Doc->MasterP) && (OwnPage != -1))
if ((!Doc->masterPageMode) && (OwnPage != -1))
{
do
{
/branches/Version13x/Scribus/scribus/scribusdoc.h
401,7 → 401,6
QValueList<uint> DragElements;
QValueList<ParagraphStyle> docParagraphStyles;
QValueList<Layer> Layers;
bool MasterP;
bool marginColored;
int GroupCounter;
CMSData CMSSettings;
/branches/Version13x/Scribus/scribus/scribusview.cpp
235,7 → 235,7
// painter->translate(0.5, 0.5);
painter->setZoomFactor(1.0);
/* Draw Page Outlines */
if (!Doc->MasterP)
if (!Doc->masterPageMode)
{
for (uint a = 0; a < Doc->Pages.count(); ++a)
{
643,9 → 643,9
continue;
if ((previewMode) && (!currItem->printable()))
continue;
if ((Doc->MasterP) && ((currItem->OwnPage != -1) && (currItem->OwnPage != static_cast<int>(Doc->currentPage->PageNr))))
if ((Doc->masterPageMode) && ((currItem->OwnPage != -1) && (currItem->OwnPage != static_cast<int>(Doc->currentPage->PageNr))))
continue;
if ((!Doc->MasterP) && (!currItem->OnMasterPage.isEmpty()))
if ((!Doc->masterPageMode) && (!currItem->OnMasterPage.isEmpty()))
{
if (currItem->OnMasterPage != Doc->currentPage->PageNam)
continue;
2629,7 → 2629,7
QRegion apr = QRegion(p.xForm(docItem->Clip));
QRect apr2 = getRedrawBounding(docItem);
p.end();
if ((Doc->MasterP) && (docItem->OnMasterPage != Doc->currentPage->PageNam))
if ((Doc->masterPageMode) && (docItem->OnMasterPage != Doc->currentPage->PageNam))
continue;
if (((Sele.contains(apr.boundingRect())) || (Sele.contains(apr2))) && (docItem->LayerNr == Doc->activeLayer()))
SelectItemNr(a, false);
7089,7 → 7089,7
int ScribusView::OnPage(double x2, double y2)
{
int retw = -1;
if (Doc->MasterP)
if (Doc->masterPageMode)
{
int x = static_cast<int>(Doc->currentPage->Xoffset);
int y = static_cast<int>(Doc->currentPage->Yoffset);
7119,7 → 7119,7
int ScribusView::OnPage(PageItem *currItem)
{
int retw = -1;
if (Doc->MasterP)
if (Doc->masterPageMode)
{
int x = static_cast<int>(Doc->currentPage->Xoffset);
int y = static_cast<int>(Doc->currentPage->Yoffset);
7299,7 → 7299,7
mpo.moveBy(qRound(Doc->minCanvasCoordinate.x() * Scale), qRound(Doc->minCanvasCoordinate.y() * Scale));
ClRe = -1;
Deselect(false);
if (!Doc->MasterP)
if (!Doc->masterPageMode)
{
for (uint a = 0; a < Doc->Pages.count(); ++a)
{
7340,7 → 7340,7
currItem = SelItem.at(0);
else
currItem = Doc->Items.last();
if (!Doc->MasterP)
if (!Doc->masterPageMode)
{
for (a = 0; a < Doc->Pages.count(); ++a)
{
7364,7 → 7364,7
if (m->state() == (ControlButton | AltButton))
Deselect(false);
 
if ((m->state() == (ShiftButton | AltButton)) && (!Doc->MasterP) && (Doc->currentPage->FromMaster.count() != 0))
if ((m->state() == (ShiftButton | AltButton)) && (!Doc->masterPageMode) && (Doc->currentPage->FromMaster.count() != 0))
{
Page* Mp = Doc->MasterPages.at(Doc->MasterNames[Doc->currentPage->MPageNam]);
currItem = Doc->currentPage->FromMaster.last();
7511,7 → 7511,7
SelItem.clear();
return false;
}
if ((Doc->MasterP) && (!((currItem->OwnPage == -1) || (currItem->OwnPage == static_cast<int>(Doc->currentPage->PageNr)))))
if ((Doc->masterPageMode) && (!((currItem->OwnPage == -1) || (currItem->OwnPage == static_cast<int>(Doc->currentPage->PageNr)))))
{
currItem = Doc->Items.prev();
continue;
8624,7 → 8624,7
Doc->RePos = savre;
}
}
if ((!ScApp->ScriptRunning) && (!Doc->isLoading()) && (!Doc->MasterP))
if ((!ScApp->ScriptRunning) && (!Doc->isLoading()) && (!Doc->masterPageMode))
PGS->GotoPg(nr);
Mpressed = false;
Doc->DragP = false;
8681,7 → 8681,7
oldPg.newPg = a;
pageTable.insert(Seite->PageNr, oldPg);
Seite->setPageNr(a);
if (Doc->MasterP)
if (Doc->masterPageMode)
{
Seite->Xoffset = Doc->ScratchLeft;
Seite->Yoffset = Doc->ScratchTop;
8819,7 → 8819,7
return;
disconnect(PGS, SIGNAL(GotoPage(int)), this, SLOT(GotoPa(int)));
PGS->setMaxValue(Doc->pageCount);
if ((!Doc->isLoading()) && (!Doc->MasterP))
if ((!Doc->isLoading()) && (!Doc->masterPageMode))
PGS->GotoPg(Seite);
connect(PGS, SIGNAL(GotoPage(int)), this, SLOT(GotoPa(int)));
}
8989,7 → 8989,7
return;
SetCPo(qRound(Doc->currentPage->Xoffset-10), qRound(Doc->currentPage->Yoffset-10));
PGS->setMaxValue(Doc->pageCount);
if ((!Doc->isLoading()) && (!Doc->MasterP))
if ((!Doc->isLoading()) && (!Doc->masterPageMode))
PGS->GotoPg(Seite);
}
 
8997,7 → 8997,7
{
Deselect(false);
OldScale = Scale;
if (!Doc->MasterP)
if (!Doc->masterPageMode)
{
Doc->DocPages = Doc->Pages;
Doc->Pages = Doc->MasterPages;
9005,7 → 9005,7
Doc->Items = Doc->MasterItems;
}
Doc->pageCount = 1;
Doc->MasterP = true;
Doc->masterPageMode = true;
Doc->currentPage = Doc->Pages.at(nr);
PGS->setEnabled(false);
updateOn = false;
9026,7 → 9026,7
Doc->MasterPages = Doc->Pages;
Doc->pageCount = Doc->DocPages.count();
Doc->Pages = Doc->DocPages;
Doc->MasterP = false;
Doc->masterPageMode = false;
Doc->currentPage = Doc->Pages.at(0);
PGS->setEnabled(true);
setScale(OldScale);
9088,7 → 9088,7
{
double sca = Scale;
bool frs = Doc->guidesSettings.framesShown;
bool mas = Doc->MasterP;
bool mas = Doc->masterPageMode;
Page* act = Doc->currentPage;
Doc->currentPage = Doc->MasterPages.at(Nr);
if (!mas)
9115,7 → 9115,7
Doc->MasterItems = Doc->Items;
Doc->Items = Doc->DocItems;
}
Doc->MasterP = mas;
Doc->masterPageMode = mas;
painter->end();
double sx = im.width() / static_cast<double>(maxGr);
double sy = im.height() / static_cast<double>(maxGr);
9459,7 → 9459,7
}
PageItem* ite = new PageItem(Doc, PageItem::Polygon, x, y, b, h, w, fill, outline);
Doc->Items.append(ite);
if (Doc->MasterP)
if (Doc->masterPageMode)
Doc->MasterItems = Doc->Items;
else
Doc->DocItems = Doc->Items;
9510,7 → 9510,7
}
PageItem* ite = new PageItem(Doc, PageItem::ImageFrame, x, y, b, h, 1, Doc->toolSettings.dBrushPict, "None");
Doc->Items.append(ite);
if (Doc->MasterP)
if (Doc->masterPageMode)
Doc->MasterItems = Doc->Items;
else
Doc->DocItems = Doc->Items;
9563,7 → 9563,7
}
PageItem* ite = new PageItem(Doc, PageItem::Polygon, x, y, b, h, w, fill, outline);
Doc->Items.append(ite);
if (Doc->MasterP)
if (Doc->masterPageMode)
Doc->MasterItems = Doc->Items;
else
Doc->DocItems = Doc->Items;
9612,7 → 9612,7
}
PageItem* ite = new PageItem(Doc, PageItem::Polygon, x, y, b, h, w, fill, outline);
Doc->Items.append(ite);
if (Doc->MasterP)
if (Doc->masterPageMode)
Doc->MasterItems = Doc->Items;
else
Doc->DocItems = Doc->Items;
9661,7 → 9661,7
}
PageItem* ite = new PageItem(Doc, PageItem::PolyLine, x, y, b, h, w, fill, outline);
Doc->Items.append(ite);
if (Doc->MasterP)
if (Doc->masterPageMode)
Doc->MasterItems = Doc->Items;
else
Doc->DocItems = Doc->Items;
9709,7 → 9709,7
}
PageItem* ite = new PageItem(Doc, PageItem::TextFrame, x, y, b, h, w, "None", outline);
Doc->Items.append(ite);
if (Doc->MasterP)
if (Doc->masterPageMode)
Doc->MasterItems = Doc->Items;
else
Doc->DocItems = Doc->Items;
9763,7 → 9763,7
}
PageItem* ite = new PageItem(Doc, PageItem::Line, x, y, b, h, w, "None", outline);
Doc->Items.append(ite);
if (Doc->MasterP)
if (Doc->masterPageMode)
Doc->MasterItems = Doc->Items;
else
Doc->DocItems = Doc->Items;
/branches/Version13x/Scribus/scribus/scribus.cpp
2516,7 → 2516,7
doc->pageCount = doc->MasterPages.count();
bool atfb = doc->PageAT;
doc->PageAT = false;
doc->MasterP = true;
doc->masterPageMode = true;
slotNewPage(0);
doc->PageAT = atfb;
doc->MasterNames["Normal"] = 0;
2524,7 → 2524,7
doc->MasterPages = doc->Pages;
doc->pageCount = doc->DocPages.count();
doc->Pages = doc->DocPages;
doc->MasterP = false;
doc->masterPageMode = false;
doc->Pages.at(0)->MPageNam = "Normal";
doc->setModified(false);
doc->setLoading(false);
3122,7 → 3122,7
scrActions["toolsEditContents"]->setEnabled(true);
if (currItem->NextBox == 0)
scrActions["toolsLinkTextFrame"]->setEnabled(true);
if (doc->MasterP)
if (doc->masterPageMode)
scrActions["toolsLinkTextFrame"]->setEnabled(false);
if (doc->appMode == modeEdit)
{
4044,7 → 4044,7
}
else
doc->setName(FName);
doc->MasterP = false;
doc->masterPageMode = false;
doc->Language = GetLang(doc->Language);
HaveNewDoc();
propertiesPalette->updateCList();
4063,7 → 4063,7
doc->MasterPages = doc->Pages;
doc->pageCount = doc->DocPages.count();
doc->Pages = doc->DocPages;
doc->MasterP = false;
doc->masterPageMode = false;
}
doc->setLoading(false);
doc->DocItems = doc->Items;
4072,7 → 4072,7
QRect rd = QRect(0,0,9,9);
ScPainter *painter = new ScPainter(&pgPix, pgPix.width(), pgPix.height());
doc->Pages = doc->MasterPages;
doc->MasterP = true;
doc->masterPageMode = true;
doc->Items = doc->MasterItems;
for (uint azz=0; azz<doc->MasterItems.count(); ++azz)
{
4110,7 → 4110,7
}
// RestoreBookMarks();
doc->Pages = doc->DocPages;
doc->MasterP = false;
doc->masterPageMode = false;
doc->Items = doc->DocItems;
for (uint azz=0; azz<doc->Items.count(); ++azz)
{
6455,7 → 6455,6
Ziel->initialMargins.Bottom = from->Margins.Bottom;
Ziel->initialMargins.Left = from->Margins.Left;
Ziel->initialMargins.Right = from->Margins.Right;
view->reformPages();
QMap<int,int> TableID;
QPtrList<PageItem> TableItems;
TableID.clear();
6470,6 → 6469,7
Buffer.Ypos = Buffer.Ypos - from->Yoffset + Ziel->Yoffset;
view->PasteItem(&Buffer, true, true);
PageItem* Neu = doc->Items.at(doc->Items.count()-1);
Neu->OnMasterPage = "";
if (doc->Items.at(ite)->isBookmark)
AddBookMark(Neu);
if (Neu->isTableItem)
6523,6 → 6523,7
}
view->Deselect(true);
doc->setLoading(false);
view->reformPages();
view->DrawNew();
slotDocCh();
pagePalette->RebuildPage();
/branches/Version13x/Scribus/scribus/pslib.cpp
2185,7 → 2185,7
chx = " ";
if (hl->ch == QChar(30))
{
if (Doc->MasterP)
if (Doc->masterPageMode)
chx = "#";
else
{
/branches/Version13x/Scribus/scribus/aligndistribute.cpp
441,7 → 441,7
break;
case Page:
newX = currDoc->ScratchLeft;
if ((currDoc->currentPageLayout == doublePage) && !currDoc->MasterP)
if ((currDoc->currentPageLayout == doublePage) && !currDoc->masterPageMode)
{
if ((currDoc->currentPage->PageNr % 2 == 1) && (currDoc->pageSets[currDoc->currentPageLayout].FirstPage))
newX += currDoc->currentPage->Width;
451,7 → 451,7
break;
case Margins:
newX = currDoc->ScratchLeft;
if ((currDoc->currentPageLayout == doublePage) && !currDoc->MasterP)
if ((currDoc->currentPageLayout == doublePage) && !currDoc->masterPageMode)
{
if ((currDoc->currentPage->PageNr % 2 == 1) && (currDoc->pageSets[currDoc->currentPageLayout].FirstPage))
newX += currDoc->currentPage->Width;
498,7 → 498,7
break;
case Page:
newX = currDoc->ScratchLeft;
if ((currDoc->currentPageLayout == doublePage) && !currDoc->MasterP)
if ((currDoc->currentPageLayout == doublePage) && !currDoc->masterPageMode)
{
if ((currDoc->currentPage->PageNr % 2 == 1) && (currDoc->pageSets[currDoc->currentPageLayout].FirstPage))
newX += currDoc->currentPage->Width;
508,7 → 508,7
break;
case Margins:
newX = currDoc->ScratchLeft;
if ((currDoc->currentPageLayout == doublePage ) && !currDoc->MasterP)
if ((currDoc->currentPageLayout == doublePage ) && !currDoc->masterPageMode)
{
if ((currDoc->currentPage->PageNr % 2 == 1) && (currDoc->pageSets[currDoc->currentPageLayout].FirstPage))
newX += currDoc->currentPage->Width;
558,7 → 558,7
break;
case Page:
newX = currDoc->ScratchLeft;
if ((currDoc->currentPageLayout == doublePage) && !currDoc->MasterP)
if ((currDoc->currentPageLayout == doublePage) && !currDoc->masterPageMode)
{
if ((currDoc->currentPage->PageNr % 2 == 1) && (currDoc->pageSets[currDoc->currentPageLayout].FirstPage))
newX += currDoc->currentPage->Width;
569,7 → 569,7
break;
case Margins:
newX = currDoc->ScratchLeft;
if ((currDoc->currentPageLayout == doublePage ) && !currDoc->MasterP)
if ((currDoc->currentPageLayout == doublePage ) && !currDoc->masterPageMode)
{
if ((currDoc->currentPage->PageNr % 2 == 1) && (currDoc->pageSets[currDoc->currentPageLayout].FirstPage))
newX += currDoc->currentPage->Width;
622,7 → 622,7
break;
case Page:
newX = currDoc->ScratchLeft;
if ((currDoc->currentPageLayout == doublePage ) && !currDoc->MasterP)
if ((currDoc->currentPageLayout == doublePage ) && !currDoc->masterPageMode)
{
if ((currDoc->currentPage->PageNr % 2 == 1) && (currDoc->pageSets[currDoc->currentPageLayout].FirstPage))
newX += currDoc->currentPage->Width;
633,7 → 633,7
break;
case Margins:
newX = currDoc->ScratchLeft;
if ((currDoc->currentPageLayout == doublePage ) && !currDoc->MasterP)
if ((currDoc->currentPageLayout == doublePage ) && !currDoc->masterPageMode)
{
if ((currDoc->currentPage->PageNr % 2 == 1) && (currDoc->pageSets[currDoc->currentPageLayout].FirstPage))
newX += currDoc->currentPage->Width;
681,7 → 681,7
break;
case Page:
newX = currDoc->ScratchLeft;
if ((currDoc->currentPageLayout == doublePage ) && !currDoc->MasterP)
if ((currDoc->currentPageLayout == doublePage ) && !currDoc->masterPageMode)
{
if ((currDoc->currentPage->PageNr % 2 == 1) && (currDoc->pageSets[currDoc->currentPageLayout].FirstPage))
newX += currDoc->currentPage->Width;
692,7 → 692,7
break;
case Margins:
newX = currDoc->ScratchLeft;
if ((currDoc->currentPageLayout == doublePage ) && !currDoc->MasterP)
if ((currDoc->currentPageLayout == doublePage ) && !currDoc->masterPageMode)
{
if ((currDoc->currentPage->PageNr % 2 == 1) && (currDoc->pageSets[currDoc->currentPageLayout].FirstPage))
newX += currDoc->currentPage->Width;
740,7 → 740,7
break;
case Page:
newY = currDoc->ScratchTop;
if (!currDoc->MasterP)
if (!currDoc->masterPageMode)
{
if (!(currDoc->currentPageLayout == doublePage ))
multiplier=currDoc->currentPage->PageNr;
755,7 → 755,7
break;
case Margins:
newY = currDoc->ScratchTop;
if (!currDoc->MasterP)
if (!currDoc->masterPageMode)
{
if (!(currDoc->currentPageLayout == doublePage ))
multiplier=currDoc->currentPage->PageNr;
807,7 → 807,7
break;
case Page:
newY = currDoc->ScratchTop;
if (!currDoc->MasterP)
if (!currDoc->masterPageMode)
{
if (!(currDoc->currentPageLayout == doublePage ))
multiplier=currDoc->currentPage->PageNr;
822,7 → 822,7
break;
case Margins:
newY = currDoc->ScratchTop;
if (!currDoc->MasterP)
if (!currDoc->masterPageMode)
{
if (!(currDoc->currentPageLayout == doublePage ))
multiplier=currDoc->currentPage->PageNr;
878,7 → 878,7
break;
case Page:
newY = currDoc->ScratchTop;
if (!currDoc->MasterP)
if (!currDoc->masterPageMode)
{
if (!(currDoc->currentPageLayout == doublePage ))
multiplier=currDoc->currentPage->PageNr;
894,7 → 894,7
break;
case Margins:
newY = currDoc->ScratchTop;
if (!currDoc->MasterP)
if (!currDoc->masterPageMode)
{
if (!(currDoc->currentPageLayout == doublePage ))
multiplier=currDoc->currentPage->PageNr;
953,7 → 953,7
break;
case Page:
newY = currDoc->ScratchTop;
if (!currDoc->MasterP)
if (!currDoc->masterPageMode)
{
if (!(currDoc->currentPageLayout == doublePage ))
multiplier=currDoc->currentPage->PageNr;
969,7 → 969,7
break;
case Margins:
newY = currDoc->ScratchTop;
if (!currDoc->MasterP)
if (!currDoc->masterPageMode)
{
if (!(currDoc->currentPageLayout == doublePage ))
multiplier=currDoc->currentPage->PageNr;
1022,7 → 1022,7
break;
case Page:
newY = currDoc->ScratchTop;
if (!currDoc->MasterP)
if (!currDoc->masterPageMode)
{
if (!(currDoc->currentPageLayout == doublePage ))
multiplier=currDoc->currentPage->PageNr;
1038,7 → 1038,7
break;
case Margins:
newY = currDoc->ScratchTop;
if (!currDoc->MasterP)
if (!currDoc->masterPageMode)
{
if (!(currDoc->currentPageLayout == doublePage ))
multiplier=currDoc->currentPage->PageNr;