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