Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 25281 → Rev 25282

/branches/Version15x/Scribus/scribus/scribusdoc.cpp
7097,16 → 7097,15
}
tempSelection.delaySignalsOff();
 
 
for (int copyNumber=1; copyNumber<=copyCount; ++copyNumber)
for (int copyNumber = 1; copyNumber <= copyCount; ++copyNumber)
{
//For multiple insertions we can insert in the same place
int destLocation=existingPage;
if (whereToInsert==0)
int destLocation = existingPage;
if (whereToInsert == 0)
--destLocation;
else if (whereToInsert==2)
destLocation=DocPages.count();
ScPage* destination = new ScPage(m_docPrefsData.displayPrefs.scratch.left(), DocPages.count()*(m_docPrefsData.docSetupPrefs.pageHeight+m_docPrefsData.displayPrefs.scratch.bottom()+m_docPrefsData.displayPrefs.scratch.top())+m_docPrefsData.displayPrefs.scratch.top(), m_docPrefsData.docSetupPrefs.pageWidth, m_docPrefsData.docSetupPrefs.pageHeight);
else if (whereToInsert == 2)
destLocation = DocPages.count();
ScPage* destination = new ScPage(m_docPrefsData.displayPrefs.scratch.left(), DocPages.count() * (m_docPrefsData.docSetupPrefs.pageHeight + m_docPrefsData.displayPrefs.scratch.bottom() + m_docPrefsData.displayPrefs.scratch.top()) + m_docPrefsData.displayPrefs.scratch.top(), m_docPrefsData.docSetupPrefs.pageWidth, m_docPrefsData.docSetupPrefs.pageHeight);
destination->setDocument(this);
destination->setPageNr(destLocation);
lastDest = destination;
7155,7 → 7154,7
{
int lcount = 0;
ScLayers::iterator it;
if (Layers.count()!= 0)
if (Layers.count() != 0)
{
int currActiveLayer = activeLayer();
bool savedAlignGrid = this->SnapGrid;
7183,7 → 7182,16
from->guides.copy(&destination->guides);
}
setUsesAutomaticTextFrames(autoText);
 
int annotLinksInsert = existingPage;
if (whereToInsert == 0)
--annotLinksInsert;
else if (whereToInsert == 2)
annotLinksInsert = DocPages.count();
annotLinksInsert += copyCount;
addPageToAnnotLinks(annotLinksInsert, whereToInsert, copyCount);
addPageToSection(existingPage, whereToInsert, copyCount);
 
if (lastDest != nullptr)
setCurrentPage(lastDest);
else
7194,7 → 7202,6
copyTransaction.commit();
}
 
 
void ScribusDoc::setLocationBasedPageLRMargins(uint pageIndex)
{
int setcol=pageSets()[m_docPrefsData.docSetupPrefs.pagePositioning].Columns;
7225,7 → 7232,6
}
}
 
 
PageLocation ScribusDoc::locationOfPage(int pageIndex) const
{
int myCol=columnOfPage(pageIndex);