Subversion Repositories Scribus

Compare Revisions

Regard whitespace Rev 19373 → Rev 19374

/trunk/Scribus/scribus/scpage.cpp
372,6 → 372,9
{
//CB #3373 reinsert at old position and renumber items
PageItem* ite = itemList.at(id2);
if (ite->Parent && ite->Parent->isGroup())
ite->Parent->asGroupFrame()->groupItemList.insert(id, ite);
else
m_Doc->Items->insert(id, ite);
for (int i = 0; i < itemList.count(); ++i)
{
/trunk/Scribus/scribus/scribusdoc.cpp
11761,17 → 11761,7
offs++;
continue;
}
else
{
itemList = GroupOfItem(Items, currItem);
if (itemList == NULL)
{
itemList = Items;
offs++;
continue;
}
}
}
//CB FIXME remove this and include of storyeditor.h too
if ((currItem->asTextFrame() || currItem->asPathText()) && currItem==m_ScMW->storyEditor->currentItem() && this==m_ScMW->storyEditor->currentDocument())
{
11807,7 → 11797,6
itemSelection->delaySignalsOff();
return;
}
selectedItemCount = delItems.count();
 
UndoTransaction* activeTransaction = NULL;
if (UndoManager::undoEnabled()) //always create transaction or check if item is reference for any mark or contains any mark or is welded etc
11814,9 → 11803,13
activeTransaction = new UndoTransaction(undoManager->beginTransaction(Um::Group + "/" + Um::Selection, Um::IGroup,
Um::Delete, tooltip, Um::IDelete));
 
selectedItemCount = delItems.count();
for (uint de = 0; de < selectedItemCount; ++de)
{
currItem = delItems.at(selectedItemCount - (de + 1));
itemList = GroupOfItem(Items, currItem);
if (itemList == NULL)
continue;
if ((currItem->asImageFrame()) && ((ScCore->fileWatcher->files().contains(currItem->Pfile) != 0) && (currItem->PictureIsAvailable)))
ScCore->fileWatcher->removeFile(currItem->Pfile);
//delete marks pointed to that item