Subversion Repositories Scribus

Compare Revisions

Regard whitespace Rev 5684 → Rev 5685

/branches/Version13x/Scribus/scribus/checkDocument.cpp
309,12 → 309,12
hasError = false;
bool pageGraveError = false;
QListViewItem * page = new QListViewItem( item, pagep );
masterPageMap.insert(page, doc->MasterPages.at(a)->PageNam);
masterPageMap.insert(page, doc->MasterPages.at(a)->pageName());
pagep = page;
QMap<int, errorCodes>::Iterator it2;
for (it2 = doc->masterItemErrors.begin(); it2 != doc->masterItemErrors.end(); ++it2)
{
if ((doc->MasterItems.at(it2.key())->OwnPage == a) || (doc->MasterItems.at(it2.key())->OnMasterPage == doc->MasterPages.at(a)->PageNam))
if ((doc->MasterItems.at(it2.key())->OwnPage == a) || (doc->MasterItems.at(it2.key())->OnMasterPage == doc->MasterPages.at(a)->pageName()))
{
hasError = true;
bool itemError = false;
458,7 → 458,7
}
else
page->setPixmap( 0, noErrors );
page->setText(0, doc->MasterPages.at(a)->PageNam);
page->setText(0, doc->MasterPages.at(a)->pageName());
}
for (int a = 0; a < static_cast<int>(doc->DocPages.count()); ++a)
{
/branches/Version13x/Scribus/scribus/page.h
66,8 → 66,9
MarginStruct initialMargins;
/** Nummer der Seite */
int LeftPg;
//! Name of the master page that this page uses
QString MPageNam;
QString PageNam;
 
QString PageSize;
int PageOri;
// PV - guides refactoring
90,6 → 91,8
void removeYGuide(int index);
void moveXGuide(int fromIndex, double to);
void moveYGuide(int fromIndex, double to);*/
//! Return the page's name
const QString& pageName() const {return m_PageName;};
void setPageName(const QString& newName);
void restore(UndoState* state, bool isUndo);
 
115,6 → 118,8
double m_initialWidth;
double m_initialHeight;
uint m_pageNr;
//! Name of this page, currently only allowed to be used by a master page
QString m_PageName;
ScribusDoc* m_Doc;
QString m_pageSectionNumber;
};
/branches/Version13x/Scribus/scribus/muster.h
35,7 → 35,7
void reject();
 
private:
QListBox* masterPageData;
QListBox* masterPageListBox;
QToolButton* importButton;
QToolButton* newButton;
QToolButton* duplicateButton;
53,6 → 53,7
void duplicateMasterPage();
void deleteMasterPage();
void newMasterPage();
void renameMasterPage(QListBoxItem * item);
void appendPage();
void selectMasterPage(QListBoxItem *item);
 
/branches/Version13x/Scribus/scribus/page.cpp
37,7 → 37,6
initialMargins(40,40,40,40),
LeftPg(0),
MPageNam(""),
PageNam(""),
//XGuides(),
//YGuides(),
FromMaster(),
48,6 → 47,7
m_height(h),
m_initialWidth(b),
m_initialHeight(h),
m_PageName(""),
m_Doc(NULL)
{
guides.setPage(this);
75,10 → 75,10
void Page::setPageNr(int pageNr)
{
m_pageNr = pageNr;
if (PageNam.isEmpty())
setUName(QString(QObject::tr("Page") + " %1").arg(ScMW->doc->FirstPnum + m_pageNr));
if (m_PageName.isEmpty())
setUName(QString(QObject::tr("Page") + " %1").arg(m_Doc->FirstPnum + m_pageNr));
else
setUName(PageNam);
setUName(m_PageName);
}
 
/* PV
205,7 → 205,7
 
void Page::setPageName(const QString& newName)
{
PageNam = newName;
m_PageName = newName;
if (!newName.isEmpty())
setUName(QObject::tr("Master Page ") + newName);
}
/branches/Version13x/Scribus/scribus/pdflib.cpp
1148,7 → 1148,7
continue;
if (ite->ChangedMasterItem)
continue;
if ((!pag->PageNam.isEmpty()) && (ite->OwnPage != static_cast<int>(pag->pageNr())) && (ite->OwnPage != -1))
if ((!pag->pageName().isEmpty()) && (ite->OwnPage != static_cast<int>(pag->pageNr())) && (ite->OwnPage != -1))
continue;
PutPage("q\n");
if ((ite->doOverprint) && (!Options.doOverprint) && (!Options.UseRGB))
1170,7 → 1170,7
/* Bookmarks on Master Pages do not make any sense */
// if ((ite->isBookmark) && (Options.Bookmarks))
// PDF_Bookmark(ite, pag->height() - (ite->yPos() - pag->yOffset()));
if (!ite->printEnabled() || ((ite->itemType() == PageItem::TextFrame) && (!pag->PageNam.isEmpty())))
if (!ite->printEnabled() || ((ite->itemType() == PageItem::TextFrame) && (!pag->pageName().isEmpty())))
{
PutPage("Q\n");
continue;
1608,7 → 1608,7
if ((Options.Compress) && (CompAvail))
PutDoc("\n/Filter /FlateDecode");
PutDoc(" >>\nstream\n"+EncStream(Inhalt, ObjCounter-1)+"\nendstream\nendobj\n");
QString name = pag->PageNam.simplifyWhiteSpace().replace( QRegExp("[\\s\\/\\{\\[\\]\\}\\<\\>\\(\\)\\%]"), "_" ) + QString::number(ite->ItemNr);
QString name = pag->pageName().simplifyWhiteSpace().replace( QRegExp("[\\s\\/\\{\\[\\]\\}\\<\\>\\(\\)\\%]"), "_" ) + QString::number(ite->ItemNr);
Seite.XObjects[name] = ObjCounter-1;
}
if ((Options.Version == 15) && (Options.useLayers))
1821,7 → 1821,7
ite = pag->FromMaster.at(am);
if ((ite->LayerNr != ll.LNr) || (!ite->printEnabled()))
continue;
if ((!pag->PageNam.isEmpty()) && (ite->OwnPage != static_cast<int>(pag->pageNr())) && (ite->OwnPage != -1))
if ((!pag->pageName().isEmpty()) && (ite->OwnPage != static_cast<int>(pag->pageNr())) && (ite->OwnPage != -1))
continue;
QString name = "/"+pag->MPageNam.simplifyWhiteSpace().replace( QRegExp("[\\s\\/\\{\\[\\]\\}\\<\\>\\(\\)\\%]"), "_" ) + QString::number(ite->ItemNr);
if (! ite->asTextFrame())
1836,7 → 1836,7
continue;
if (ite->ChangedMasterItem)
continue;
if ((!pag->PageNam.isEmpty()) && (ite->OwnPage != static_cast<int>(pag->pageNr())) && (ite->OwnPage != -1))
if ((!pag->pageName().isEmpty()) && (ite->OwnPage != static_cast<int>(pag->pageNr())) && (ite->OwnPage != -1))
continue;
if (!ite->isTableItem)
continue;
1852,13 → 1852,13
ll.LNr = 0;
Lnr = 0;
//CB *2 because the Pitems count loop runs twice.. y.. dunno.
if (usingGUI && pag->PageNam.isEmpty())
if (usingGUI && pag->pageName().isEmpty())
progressDialog->setProgress("ECPI", 0, doc.DocItems.count()*2);
int pc_exportpagesitems=0;
for (uint la = 0; la < doc.Layers.count() && !abortExport; ++la)
{
Level2Layer(&doc, &ll, Lnr);
if (!pag->PageNam.isEmpty())
if (!pag->pageName().isEmpty())
PItems = doc.MasterItems;
else
PItems = doc.DocItems;
1907,7 → 1907,7
continue;
if (ite->ChangedMasterItem)
continue;
if ((!pag->PageNam.isEmpty()) && (ite->OwnPage != static_cast<int>(pag->pageNr())) && (ite->OwnPage != -1))
if ((!pag->pageName().isEmpty()) && (ite->OwnPage != static_cast<int>(pag->pageNr())) && (ite->OwnPage != -1))
continue;
if (!ite->printEnabled())
continue;
2184,7 → 2184,7
return tmp;
if (ite->ChangedMasterItem)
return tmp;
if ((!pag->PageNam.isEmpty()) && (ite->OwnPage != static_cast<int>(pag->pageNr())) && (ite->OwnPage != -1))
if ((!pag->pageName().isEmpty()) && (ite->OwnPage != static_cast<int>(pag->pageNr())) && (ite->OwnPage != -1))
return tmp;
tmp += "q\n";
if ((ite->doOverprint) && (!Options.doOverprint) && (!Options.UseRGB))
2205,7 → 2205,7
tmp += PDF_Transparenz(ite);
if ((ite->isBookmark) && (Options.Bookmarks))
PDF_Bookmark(ite, pag->height() - (ite->yPos() - pag->yOffset()));
if (!ite->printEnabled() || ((ite->itemType() == PageItem::TextFrame) && (!pag->PageNam.isEmpty())))
if (!ite->printEnabled() || ((ite->itemType() == PageItem::TextFrame) && (!pag->pageName().isEmpty())))
{
tmp += "Q\n";
return tmp;
/branches/Version13x/Scribus/scribus/scribusdoc.cpp
1054,11 → 1054,34
return addedPage;
}
 
bool ScribusDoc::renameMasterPage(const QString& oldPageName, const QString& newPageName)
{
Q_ASSERT(oldPageName!="Normal" && oldPageName!=tr("Normal"));
if (MasterNames.contains(oldPageName) && !MasterNames.contains(newPageName))
{
//Rename our master page lists
int number=MasterNames[oldPageName];
MasterNames.insert(newPageName, number);
MasterNames.remove(oldPageName);
Q_ASSERT(MasterPages.at(number)->pageName()==oldPageName);
MasterPages.at(number)->setPageName(newPageName);
//Update any pages that were linking to our old name
for (Page* docPage = DocPages.first(); docPage; docPage = DocPages.next() )
{
if (docPage->MPageNam == oldPageName)
docPage->MPageNam = newPageName;
}
changed();
return true;
}
return false;
}
 
void ScribusDoc::deleteMasterPage(const int pageNumber)
{
Q_ASSERT( Pages->count() > 1 && Pages->count() > static_cast<uint>(pageNumber) );
Page* page = Pages->at(pageNumber);
QString oldPageName=page->PageNam;
QString oldPageName(page->pageName());
Pages->remove(pageNumber);
delete page;
// remove the master page from the master page name list
/branches/Version13x/Scribus/scribus/seiten.cpp
567,7 → 567,7
}
Seite->Margins.Top = currView->Doc->pageMargins.Top;
Seite->Margins.Bottom = currView->Doc->pageMargins.Bottom;
currView->Doc->MasterNames[Seite->PageNam] = aa;
currView->Doc->MasterNames[Seite->pageName()] = aa;
}
for (uint b=0; b<currView->Doc->DocPages.count(); ++b)
{
/branches/Version13x/Scribus/scribus/pageitem.cpp
416,7 → 416,7
invalid = true;
ChangedMasterItem = false;
isEmbedded = false;
OnMasterPage = m_Doc->currentPage()->PageNam;
OnMasterPage = m_Doc->currentPage()->pageName();
m_startArrowIndex = m_Doc->toolSettings.dStartArrow;
m_endArrowIndex = m_Doc->toolSettings.dEndArrow;
effectsInUse.clear();
/branches/Version13x/Scribus/scribus/scribusdoc.h
100,6 → 100,8
* @brief Add a master page with this function, do not use addPage
*/
Page* addMasterPage(const int, const QString&);
//! @brief Rename a master page
bool renameMasterPage(const QString& oldPageName, const QString& newPageName);
 
/**
* @brief Add the automatic text frame to the page
/branches/Version13x/Scribus/scribus/scribusview.cpp
779,7 → 779,7
continue;
if (!Doc->masterPageMode() && !currItem->OnMasterPage.isEmpty())
{
if (currItem->OnMasterPage != Doc->currentPage()->PageNam)
if (currItem->OnMasterPage != Doc->currentPage()->pageName())
continue;
}
QRect oldR(currItem->getRedrawBounding(Scale));
2059,7 → 2059,7
ScMW->scrActions["itemAttributes"]->addTo(pmen);
if (currItem->itemType() == PageItem::TextFrame)
{
if (Doc->currentPage()->PageNam.isEmpty())
if (Doc->currentPage()->pageName().isEmpty())
{
ScMW->scrActions["itemPDFIsAnnotation"]->addTo(pmenPDF);
ScMW->scrActions["itemPDFIsBookmark"]->addTo(pmenPDF);
3137,7 → 3137,7
QRegion apr = QRegion(p.xForm(docItem->Clip));
QRect apr2(docItem->getRedrawBounding(Scale));
p.end();
if ((Doc->masterPageMode()) && (docItem->OnMasterPage != Doc->currentPage()->PageNam))
if ((Doc->masterPageMode()) && (docItem->OnMasterPage != Doc->currentPage()->pageName()))
continue;
//CB Finally Items are selected here
if (((Sele.contains(apr.boundingRect())) || (Sele.contains(apr2))) && (docItem->LayerNr == Doc->activeLayer()) && (!Doc->layerLocked(docItem->LayerNr)))
/branches/Version13x/Scribus/scribus/muster.cpp
8,8 → 8,10
#include "muster.moc"
#include "newtemp.h"
#include "mergedoc.h"
#include <qinputdialog.h>
#include <qlayout.h>
#include <qlistbox.h>
#include <qmessagebox.h>
#include <qpushbutton.h>
#include <qcursor.h>
#include <qstring.h>
50,9 → 52,9
QSpacerItem* spacer = new QSpacerItem( 16, 16, QSizePolicy::Expanding, QSizePolicy::Minimum );
buttonLayout->addItem( spacer );
masterPagesLayout->addLayout( buttonLayout );
masterPageData = new QListBox( this, "masterPageData" );
masterPageData->setMinimumSize( QSize( 100, 240 ) );
masterPagesLayout->addWidget( masterPageData );
masterPageListBox = new QListBox( this, "masterPageListBox" );
masterPageListBox->setMinimumSize( QSize( 100, 240 ) );
masterPagesLayout->addWidget( masterPageListBox );
 
 
if (masterPageName.isEmpty())
79,7 → 81,8
connect(deleteButton, SIGNAL(clicked()), this, SLOT(deleteMasterPage()));
connect(newButton, SIGNAL(clicked()), this, SLOT(newMasterPage()));
connect(importButton, SIGNAL(clicked()), this, SLOT(appendPage()));
connect(masterPageData, SIGNAL(highlighted(QListBoxItem*)), this, SLOT(selectMasterPage(QListBoxItem*)));
connect(masterPageListBox, SIGNAL(highlighted(QListBoxItem*)), this, SLOT(selectMasterPage(QListBoxItem*)));
connect(masterPageListBox, SIGNAL(doubleClicked(QListBoxItem*)), this, SLOT(renameMasterPage( QListBoxItem*)));
}
 
void MasterPagesPalette::reject()
111,7 → 114,7
//This must happen after the pages have been reformed (view/doc)
currentDoc->MasterNames.clear();
for (uint a = 0; a < currentDoc->Pages->count(); ++a)
currentDoc->MasterNames[currentDoc->Pages->at(a)->PageNam] = currentDoc->Pages->at(a)->pageNr();
currentDoc->MasterNames[currentDoc->Pages->at(a)->pageName()] = currentDoc->Pages->at(a)->pageNr();
// and fix up any pages that refer to the deleted master page
for (Page* docPage = currentDoc->DocPages.first(); docPage; docPage = currentDoc->DocPages.next() )
{
271,12 → 274,6
MasterPageName = dia->Answer->text();
}
currentDoc->setCurrentPage(currentDoc->addMasterPage(nr, MasterPageName));
//currentDoc->MasterNames.insert(MasterPageName, nr);
//currentDoc->pageCount = 0;
//atf = currentDoc->usesAutomaticTextFrames();
//currentDoc->setUsesAutomaticTextFrames(false);
//emit createNew(nr);
if (currentDoc->currentPageLayout != singlePage)
{
int lp = dia->Links->currentItem();
288,13 → 285,9
lp++;
currentDoc->Pages->at(nr)->LeftPg = lp;
}
//currentDoc->Pages->at(nr)->setPageName(MasterPageName);
//currentDoc->Pages->at(nr)->MPageNam = "";
updateMasterPageList(MasterPageName);
//currentDoc->setUsesAutomaticTextFrames(atf);
currentView->showMasterPage(currentDoc->MasterNames[MasterPageName]);
currentView->reformPages();
//currentDoc->MasterPages = currentDoc->Pages;
}
delete dia;
}
377,9 → 370,9
 
void MasterPagesPalette::updateMasterPageList(QString MasterPageName)
{
masterPageData->clear();
masterPageListBox->clear();
for (QMap<QString,int>::Iterator it = currentDoc->MasterNames.begin(); it != currentDoc->MasterNames.end(); ++it)
masterPageData->insertItem(it.key() == "Normal" ? tr("Normal") : it.key());
masterPageListBox->insertItem(it.key() == "Normal" ? tr("Normal") : it.key());
deleteButton->setEnabled(currentDoc->MasterNames.count() == 1 ? false : true);
if (MasterPageName == "Normal")
{
386,6 → 379,22
MasterPageName = tr("Normal");
deleteButton->setEnabled(false);
}
masterPageData->setSelected(masterPageData->index(masterPageData->findItem(MasterPageName)), true);
masterPageListBox->setSelected(masterPageListBox->index(masterPageListBox->findItem(MasterPageName)), true);
}
 
void MasterPagesPalette::renameMasterPage(QListBoxItem * item)
{
QString oldName(item->text());
if (oldName=="Normal" || oldName==tr("Normal"))
{
QMessageBox::information( this, tr("Unable to Rename Master Page"), tr("The Normal page is not allowed to be renamed."), QMessageBox::Ok );
return;
}
bool ok;
QString newName = QInputDialog::getText(
tr("Rename Master Page"), tr("New Name:"), QLineEdit::Normal,
oldName, &ok, this );
if (ok && !newName.isEmpty())
if (currentDoc->renameMasterPage( oldName, newName))
updateMasterPageList(newName);
}
/branches/Version13x/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.h
31,6 → 31,7
virtual const AboutData* getAboutData() const;
virtual void deleteAboutData(const AboutData* about) const;
virtual void languageChange();
//Not the same as readSLA. This one only reads max 4k of the file for speed.
virtual bool fileSupported(QIODevice* file, const QString & fileName=QString::null) const;
 
virtual bool loadFile(const QString & fileName, const FileFormat & fmt, int flags, int index = 0);
/branches/Version13x/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
3184,7 → 3184,7
pg.setAttribute("BORDERTOP",page->initialMargins.Top);
pg.setAttribute("BORDERBOTTOM",page->initialMargins.Bottom);
pg.setAttribute("NUM",page->pageNr());
pg.setAttribute("NAM",page->PageNam);
pg.setAttribute("NAM",page->pageName());
pg.setAttribute("MNAM",page->MPageNam);
pg.setAttribute("Size", page->PageSize);
pg.setAttribute("Orientation", page->PageOri);
/branches/Version13x/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.h
30,6 → 30,7
virtual const AboutData* getAboutData() const;
virtual void deleteAboutData(const AboutData* about) const;
virtual void languageChange();
//Not the same as readSLA. This one only reads max 4k of the file for speed.
virtual bool fileSupported(QIODevice* file, const QString & fileName=QString::null) const;
 
virtual bool loadFile(const QString & fileName, const FileFormat & fmt, int flags, int index = 0);
/branches/Version13x/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.h
30,6 → 30,7
virtual const AboutData* getAboutData() const;
virtual void deleteAboutData(const AboutData* about) const;
virtual void languageChange();
//Not the same as readSLA. This one only reads max 4k of the file for speed.
virtual bool fileSupported(QIODevice* file, const QString & fileName=QString::null) const;
 
virtual bool loadFile(const QString & fileName, const FileFormat & fmt, int flags, int index = 0);
/branches/Version13x/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
3184,7 → 3184,7
pg.setAttribute("BORDERTOP",page->initialMargins.Top);
pg.setAttribute("BORDERBOTTOM",page->initialMargins.Bottom);
pg.setAttribute("NUM",page->pageNr());
pg.setAttribute("NAM",page->PageNam);
pg.setAttribute("NAM",page->pageName());
pg.setAttribute("MNAM",page->MPageNam);
pg.setAttribute("Size", page->PageSize);
pg.setAttribute("Orientation", page->PageOri);
/branches/Version13x/Scribus/scribus/plugins/svgexplugin/svgexplugin.cpp
261,7 → 261,7
QPtrList<PageItem> Items;
Page* SavedAct = ScMW->doc->currentPage();
ScMW->doc->setCurrentPage(Seite);
if (Seite->PageNam.isEmpty())
if (Seite->pageName().isEmpty())
Items = ScMW->doc->DocItems;
else
Items = ScMW->doc->MasterItems;
/branches/Version13x/Scribus/scribus/tree.cpp
178,7 → 178,7
if (currDoc->masterPageMode())
{
if (Nr == -1)
retVal = masterPageMapRev[currDoc->MasterPages.at(SNr)->PageNam];
retVal = masterPageMapRev[currDoc->MasterPages.at(SNr)->pageName()];
else
{
if (currDoc->MasterItems.at(Nr)!=0)
582,7 → 582,7
for (int a = 0; a < static_cast<int>(currDoc->MasterPages.count()); ++a)
{
QListViewItem * page = new QListViewItem( item, pagep );
QString pageNam = currDoc->MasterPages.at(a)->PageNam;
QString pageNam = currDoc->MasterPages.at(a)->pageName();
masterPageMap.insert(page, pageNam);
masterPageMapRev.insert(pageNam, page);
pagep = page;
618,7 → 618,7
}
}
}
page->setText(0, currDoc->MasterPages.at(a)->PageNam);
page->setText(0, currDoc->MasterPages.at(a)->pageName());
}
for (uint b = 0; b < currDoc->DocItems.count(); ++b)
{
/branches/Version13x/Scribus/scribus/pslib.cpp
1202,7 → 1202,7
continue;
if ((it->asImageFrame()) && (it->PicAvail) && (!it->Pfile.isEmpty()) && (it->printEnabled()) && (!sep) && (farb))
PS_ImageData(it, it->Pfile, it->itemName(), it->IProfile, it->UseEmbedded, Ic);
PS_TemplateStart(Doc->MasterPages.at(ap)->PageNam + tmps.setNum(it->ItemNr));
PS_TemplateStart(Doc->MasterPages.at(ap)->pageName() + tmps.setNum(it->ItemNr));
ProcessItem(Doc, Doc->MasterPages.at(ap), it, ap+1, sep, farb, Ic, gcr, true);
PS_TemplateEnd();
}
1570,7 → 1570,7
{
SetClipPath(&c->PoLine);
PS_closepath();
if ((c->GrType != 0) && (a->PageNam.isEmpty()))
if ((c->GrType != 0) && (a->pageName().isEmpty()))
HandleGradient(c, c->width(), c->height(), gcr);
else
putColor(c->fillColor(), c->fillShade(), true);
1599,7 → 1599,7
if ((c->PicAvail) && (!c->Pfile.isEmpty()))
{
PS_translate(0, -c->BBoxH*c->imageYScale());
if ((!a->PageNam.isEmpty()) && (!sep) && (farb))
if ((!a->pageName().isEmpty()) && (!sep) && (farb))
PS_image(c, /*-c->BBoxX+*/c->imageXOffset(), -c->imageYOffset(), c->Pfile, c->imageXScale(), c->imageYScale(), c->IProfile, c->UseEmbedded, ic, c->itemName());
else
PS_image(c, /*-c->BBoxX+*/c->imageXOffset(), -c->imageYOffset(), c->Pfile, c->imageXScale(), c->imageYScale(), c->IProfile, c->UseEmbedded, ic);
1665,7 → 1665,7
{
SetClipPath(&c->PoLine);
PS_closepath();
if ((c->GrType != 0) && (a->PageNam.isEmpty()))
if ((c->GrType != 0) && (a->pageName().isEmpty()))
HandleGradient(c, c->width(), c->height(), gcr);
else
putColor(c->fillColor(), c->fillShade(), true);
2052,7 → 2052,7
for (uint la = 0; la < Doc->Layers.count(); ++la)
{
Level2Layer(Doc, &ll, Lnr);
if (!a->PageNam.isEmpty())
if (!a->pageName().isEmpty())
PItems = Doc->MasterItems;
else
PItems = Doc->DocItems;
2063,9 → 2063,9
c = PItems.at(b);
if (c->LayerNr != ll.LNr)
continue;
if ((!a->PageNam.isEmpty()) && (c->asTextFrame()))
if ((!a->pageName().isEmpty()) && (c->asTextFrame()))
continue;
if ((!a->PageNam.isEmpty()) && (c->asImageFrame()) && ((sep) || (!farb)))
if ((!a->pageName().isEmpty()) && (c->asImageFrame()) && ((sep) || (!farb)))
continue;
//if ((!Art) && (view->SelItem.count() != 0) && (!c->Select))
if ((!Art) && (!c->isSelected()) && (Doc->m_Selection->count() != 0))
2083,7 → 2083,7
continue;
if (c->ChangedMasterItem)
continue;
if ((!a->PageNam.isEmpty()) && (c->OwnPage != static_cast<int>(a->pageNr())) && (c->OwnPage != -1))
if ((!a->pageName().isEmpty()) && (c->OwnPage != static_cast<int>(a->pageNr())) && (c->OwnPage != -1))
continue;
ProcessItem(Doc, a, c, PNr, sep, farb, ic, gcr, false);
}
2093,9 → 2093,9
c = PItems.at(b);
if (c->LayerNr != ll.LNr)
continue;
if ((!a->PageNam.isEmpty()) && (c->asTextFrame()))
if ((!a->pageName().isEmpty()) && (c->asTextFrame()))
continue;
if ((!a->PageNam.isEmpty()) && (c->asImageFrame()) && ((sep) || (!farb)))
if ((!a->pageName().isEmpty()) && (c->asImageFrame()) && ((sep) || (!farb)))
continue;
double x = a->xOffset();
double y = a->yOffset();
2112,7 → 2112,7
continue;
if (!c->isTableItem)
continue;
if ((!a->PageNam.isEmpty()) && (c->OwnPage != static_cast<int>(a->pageNr())) && (c->OwnPage != -1))
if ((!a->pageName().isEmpty()) && (c->OwnPage != static_cast<int>(a->pageNr())) && (c->OwnPage != -1))
continue;
if (c->printEnabled())
{