diff --git a/src/ChangeLog b/src/ChangeLog index cad56d91e5..49c7f4f9f5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -5,7 +5,8 @@ with rebreak of full par * lyxtext.h: - * text.C (breakAgainOneRow, redoHeightOfParagraph): removed + * text.C (breakAgainOneRow, redoHeightOfParagraph, + checkParagraph, updateInset): removed 2003-08-07 André Pönitz diff --git a/src/insets/insettext.C b/src/insets/insettext.C index d2b4e257ef..7cafe5917b 100644 --- a/src/insets/insettext.C +++ b/src/insets/insettext.C @@ -532,7 +532,6 @@ bool InsetText::unlockInsetInInset(BufferView * bv, UpdatableInset * inset, return false; if (the_locking_inset == inset) { the_locking_inset->insetUnlock(bv); - getLyXText(bv)->updateInset(inset); the_locking_inset = 0; if (lr) moveRightIntern(bv, true, false); diff --git a/src/lyxtext.h b/src/lyxtext.h index 3c343182be..dcca304461 100644 --- a/src/lyxtext.h +++ b/src/lyxtext.h @@ -364,14 +364,7 @@ public: bool same_content); /// void gotoInset(InsetOld::Code code, bool same_content); - /// - /* for the greater insets */ - - /// returns false if inset wasn't found - bool updateInset(InsetOld *); - /// - void checkParagraph(ParagraphList::iterator pit, lyx::pos_type pos); /// int workWidth() const; diff --git a/src/text.C b/src/text.C index d1c429e720..ea9d391948 100644 --- a/src/text.C +++ b/src/text.C @@ -1389,7 +1389,7 @@ void LyXText::breakAgain(RowList::iterator rit) bool not_ready = true; - do { + do { pos_type z = rowBreakPoint(*rit); RowList::iterator tmprit = rit; RowList::iterator end = rows().end(); @@ -2103,8 +2103,6 @@ void LyXText::changeCase(LyXText::TextCase action) } #warning changes pit->setChar(pos, c); - checkParagraph(pit, pos); - ++pos; } } diff --git a/src/text2.C b/src/text2.C index b62db49bcc..d6089a19ec 100644 --- a/src/text2.C +++ b/src/text2.C @@ -1428,38 +1428,6 @@ void LyXText::insertStringAsParagraphs(string const & str) } -void LyXText::checkParagraph(ParagraphList::iterator pit, pos_type pos) -{ - breakAgain(getRow(pit, pos)); - setCursorIntern(cursor.par(), cursor.pos(), false, cursor.boundary()); -} - - -// returns false if inset wasn't found -bool LyXText::updateInset(InsetOld * inset) -{ - // first check the current paragraph - int pos = cursor.par()->getPositionOfInset(inset); - if (pos != -1) { - checkParagraph(cursor.par(), pos); - return true; - } - - // check every paragraph - ParagraphList::iterator par = ownerParagraphs().begin(); - ParagraphList::iterator end = ownerParagraphs().end(); - for (; par != end; ++par) { - pos = par->getPositionOfInset(inset); - if (pos != -1) { - checkParagraph(par, pos); - return true; - } - } - - return false; -} - - bool LyXText::setCursor(ParagraphList::iterator pit, pos_type pos, bool setfont, bool boundary) diff --git a/src/text3.C b/src/text3.C index b834dea124..e1c0710f45 100644 --- a/src/text3.C +++ b/src/text3.C @@ -984,10 +984,9 @@ InsetOld::RESULT LyXText::dispatch(FuncRequest const & cmd) case LFUN_TRANSPOSE_CHARS: recordUndo(bv, Undo::ATOMIC, cursor.par()); - if (transposeChars(cursor)) - checkParagraph(cursor.par(), cursor.pos()); if (inset_owner) bv->updateInset(); + redoParagraph(); update(); break;