Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 7690 → Rev 7691

/branches/Version13x/Scribus/scribus/scribus.cpp
3397,15 → 3397,15
for (uint i = oldItemsCount; i < docItemsCount; ++i)
{
PageItem *ite = doc->Items->at(i);
if ((docItemsCount - oldItemsCount) > 1)
ite->Groups.push(doc->GroupCounter);
// if ((docItemsCount - oldItemsCount) > 1)
// ite->Groups.push(doc->GroupCounter);
if (ite->locked())
ite->setLocked(false);
if ((ite->asTextFrame()) && (ite->isBookmark))
bookmarkPalette->BView->AddPageItem(ite);
}
if ((docItemsCount - oldItemsCount) > 1)
doc->GroupCounter++;
// if ((docItemsCount - oldItemsCount) > 1)
// doc->GroupCounter++;
propertiesPalette->updateColorList();
propertiesPalette->Spal->setFormats(doc);
propertiesPalette->SetLineFormats(doc);
/branches/Version13x/Scribus/scribus/plugins/fileloader/oodraw/oodrawimp.cpp
386,9 → 386,9
if ((interactive) && (PageCounter == 1))
break;
}
// m_Doc->m_Selection->clear();
tmpSel->clear();
if ((Elements.count() > 1) && (interactive))
// if ((Elements.count() > 1) && (interactive))
if (Elements.count() > 1)
{
bool isGroup = true;
int firstElem = -1;
462,11 → 462,6
}
Elements.prepend(neu);
m_Doc->GroupCounter++;
/* for (uint a = 0; a < Elements.count(); ++a)
{
Elements.at(a)->Groups.push(m_Doc->GroupCounter);
}
m_Doc->GroupCounter++; */
}
}
m_Doc->DoDrawing = true;
/branches/Version13x/Scribus/scribus/plugins/psimport/importps.cpp
213,7 → 213,8
// m_Doc->m_Selection->clear();
tmpSel->clear();
QDir::setCurrent(CurDirP);
if ((Elements.count() > 1) && (interactive))
// if ((Elements.count() > 1) && (interactive))
if (Elements.count() > 1)
{
bool isGroup = true;
int firstElem = -1;