From 4cd3bf1c0785694096379b6b9e5bebbcb6f113a8 Mon Sep 17 00:00:00 2001 From: Alfredo Braunstein Date: Tue, 15 Jul 2003 08:26:17 +0000 Subject: [PATCH] remove reinit argument from LyXText::init (act as if always true) git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7274 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/ChangeLog | 5 +++++ src/insets/ChangeLog | 3 +++ src/insets/insettext.C | 6 +++--- src/lyxtext.h | 2 +- src/text2.C | 19 ++++++++----------- 5 files changed, 20 insertions(+), 15 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 00cb2d34cc..aa79a7f2d4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2003-07-15 Alfredo Braunstein + + * lyxtext.h (init): remove reinit argument (act as if always true) + * text2.C: adjust to that + 2003-07-14 Juergen Spitzmueller * bufferview_funcs.[Ch]: introduce function replaceSelection() diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog index d8f1c33ad1..02241c7eb0 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,4 +1,7 @@ +2003-07-15 Alfredo Braunstein + * insettext.C: adjust call to LyXText::init + 2003-07-14 Juergen Spitzmueller * insettext.C: use bufferview_funcs->replaceSelection() diff --git a/src/insets/insettext.C b/src/insets/insettext.C index 4e2d22fa9b..d4b3e0e14b 100644 --- a/src/insets/insettext.C +++ b/src/insets/insettext.C @@ -2005,7 +2005,7 @@ void InsetText::resizeLyXText(BufferView * bv, bool force) const // no data, resize not neccessary! // we have to do this as a fixed width may have changed! saveLyXTextState(); - text_.init(bv, true); + text_.init(bv); restoreLyXTextState(); return; } @@ -2026,7 +2026,7 @@ void InsetText::resizeLyXText(BufferView * bv, bool force) const const_cast(paragraphs).end(), boost::bind(&Paragraph::resizeInsetsLyXText, _1, bv)); - text_.init(bv, true); + text_.init(bv); restoreLyXTextState(); if (the_locking_inset) { @@ -2058,7 +2058,7 @@ void InsetText::reinitLyXText() const const_cast(paragraphs).end(), boost::bind(&Paragraph::resizeInsetsLyXText, _1, bv)); - text_.init(bv, true); + text_.init(bv); restoreLyXTextState(); if (the_locking_inset) { inset_x = cix(bv) - top_x + drawTextXOffset; diff --git a/src/lyxtext.h b/src/lyxtext.h index 1163ff2748..438b41e99c 100644 --- a/src/lyxtext.h +++ b/src/lyxtext.h @@ -59,7 +59,7 @@ public: /// sets inset as owner LyXText(BufferView *, InsetText *); - void init(BufferView *, bool reinit = false); + void init(BufferView *); /// int height; /// diff --git a/src/text2.C b/src/text2.C index 08cf07eea0..16de638e2a 100644 --- a/src/text2.C +++ b/src/text2.C @@ -81,16 +81,14 @@ LyXText::LyXText(BufferView * bv, InsetText * inset) } -void LyXText::init(BufferView * bview, bool reinit) +void LyXText::init(BufferView * bview) { bv_owner = bview; - if (reinit) { - rowlist_.clear(); - need_break_row = rows().end(); - width = height = 0; - clearPaint(); - } else if (!rowlist_.empty()) - return; + + rowlist_.clear(); + need_break_row = rows().end(); + width = height = 0; + clearPaint(); anchor_row_ = rows().end(); anchor_row_offset_ = 0; @@ -100,9 +98,9 @@ void LyXText::init(BufferView * bview, bool reinit) current_font = getFont(bview->buffer(), pit, 0); - for (; pit != end; ++pit) { + for (; pit != end; ++pit) insertParagraph(pit, rowlist_.end()); - } + setCursorIntern(rowlist_.begin()->par(), 0); selection.cursor = cursor; @@ -728,7 +726,6 @@ void LyXText::redoParagraphs(LyXCursor const & cur, void LyXText::fullRebreak() { - rows().clear(); init(bv()); setCursorIntern(cursor.par(), cursor.pos()); } -- 2.39.2