Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 3628 → Rev 3627

/branches/Version13x/Scribus/scribus/scribusview.cpp
8332,7 → 8332,11
}
currItem->clearContents();
}
Doc->updateFrameItems();
uint frameItemCount=Doc->FrameItems.count();
for (uint i = 0; i < frameItemCount; ++i)
{
Doc->FrameItems.at(i)->ItemNr = i;
}
updateContents();
emit DocChanged();
/*
8508,7 → 8512,10
if (Doc->Items.at(a)->isBookmark)
emit NewBMNr(Doc->Items.at(a)->BMnr, a);
}
Doc->updateFrameItems();
for (uint a = 0; a < Doc->FrameItems.count(); ++a)
{
Doc->FrameItems.at(a)->ItemNr = a;
}
if (anz > 1)
undoManager->commit();
updateContents();
/branches/Version13x/Scribus/scribus/scribus.cpp
1044,7 → 1044,10
else
currItem->CPos = 0;
currItem->HasSel = false;
doc->updateFrameItems();
for (uint a = 0; a < doc->FrameItems.count(); ++a)
{
doc->FrameItems.at(a)->ItemNr = a;
}
DisableTxEdit();
}
 
/branches/Version13x/Scribus/scribus/scribusdoc.cpp
2321,10 → 2321,3
}
return false;
}
 
void ScribusDoc::updateFrameItems()
{
uint frameItemsCount=FrameItems.count();
for (uint a = 0; a < frameItemsCount; ++a)
FrameItems.at(a)->ItemNr = a;
}
/branches/Version13x/Scribus/scribus/scribusdoc.h
334,11 → 334,6
//itemDelete
//itemBlah...
/**
* @brief Run this common frame item update code
*/
void updateFrameItems();
 
protected:
void addSymbols();
/branches/Version13x/Scribus/scribus/story.cpp
3071,7 → 3071,10
Editor->FrameItems.remove(FrameItemsDel.at(a));
}
FrameItemsDel.clear();
currDoc->updateFrameItems();
for (uint a = 0; a < currDoc->FrameItems.count(); ++a)
{
currDoc->FrameItems.at(a)->ItemNr = a;
}
bool rep = currDoc->RePos;
currDoc->RePos = true;
QPixmap pgPix(1, 1);
/branches/Version13x/Scribus/scribus/gtaction.cpp
90,7 → 90,10
}
textFrame->itemText.clear();
textFrame->CPos = 0;
ScApp->doc->updateFrameItems();
for (uint a = 0; a < ScApp->doc->FrameItems.count(); ++a)
{
ScApp->doc->FrameItems.at(a)->ItemNr = a;
}
}
 
void gtAction::write(const QString& text, gtStyle *style)
127,7 → 130,10
}
it->itemText.clear();
it->CPos = 0;
ScApp->doc->updateFrameItems();
for (uint a = 0; a < ScApp->doc->FrameItems.count(); ++a)
{
ScApp->doc->FrameItems.at(a)->ItemNr = a;
}
}
}
int paragraphStyle = -1;
/branches/Version13x/Scribus/scribus/serializer.cpp
81,7 → 81,10
nextItem->CPos = 0;
nextItem = nextItem->NextBox;
}
doku->updateFrameItems();
for (uint a = 0; a < doku->FrameItems.count(); ++a)
{
doku->FrameItems.at(a)->ItemNr = a;
}
}
for (a=0; a<Objekt.length(); ++a)
{