From 94aa0bdda451a4607abc41b19af64e9126435c38 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Fri, 3 Dec 2004 16:39:59 +0000 Subject: [PATCH] remove all trace if idxUpDown2 git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9335 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/ChangeLog | 12 ++++++++---- src/cursor.C | 8 ++------ src/insets/ChangeLog | 4 ++++ src/insets/insetbase.C | 6 ------ src/insets/insetbase.h | 2 -- 5 files changed, 14 insertions(+), 18 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 9b0ab7b437..b66864d9b0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2004-12-03 Lars Gullik Bjonnes + + * cursor.C (goUpDown): remove call to idxUpDown2 + 2004-12-02 Georg Baum * tabular.[Ch]: use size_t-like types for cell, row and column @@ -20,7 +24,7 @@ 2004-11-29 Jean-Marc Lasgouttes * broken_headers.h: remove - + * Makefile.am (lyx_SOURCES): remove broken_headers.h 2004-11-24 Alfredo Braunstein @@ -36,7 +40,7 @@ (workAreaDispatch): adapt to new coord scheme (redoCurrentBuffer): remove - * FontIterator.[Ch]: Use Paragraph & instead of pit_type + * FontIterator.[Ch]: Use Paragraph & instead of pit_type * bufferview_funcs.[Ch]: introduce coordOffset, getPos, status, CurStatus enum. @@ -70,8 +74,8 @@ in insets and LyXText, draw two off-screen paragraphs using NullPainter, and adapt to new coord scheme - * text.C: - * text2.C: + * text.C: + * text2.C: * text3.C: adapt lfun handlers to the new coord scheme, which means: there's only guaranteed coord information for onscreen pars plus one above and one below. This implies that one can do search diff --git a/src/cursor.C b/src/cursor.C index 06954bc173..83d42e8d0e 100644 --- a/src/cursor.C +++ b/src/cursor.C @@ -124,7 +124,7 @@ namespace { CursorSlice bottom = cursor[0]; LyXText * text = bottom.text(); BOOST_ASSERT(text); - + DocIterator it = doc_iterator_begin(bottom.inset()); DocIterator const et = doc_iterator_end(bottom.inset()); @@ -165,7 +165,7 @@ namespace { } // namespace anon -// be careful: this is called from the bv's constructor, too, so +// be careful: this is called from the bv's constructor, too, so // bv functions are not yet available! LCursor::LCursor(BufferView & bv) : DocIterator(), bv_(&bv), anchor_(), x_target_(-1), @@ -980,10 +980,6 @@ bool LCursor::goUpDown(bool up) } } - // try current cell for e.g. text insets - if (inset().idxUpDown2(*this, up)) - return true; - //xarray().boundingBox(xlow, xhigh, ylow, yhigh); //if (up) // yhigh = yo - 4; diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog index 7c43580d22..6ca0d23f8b 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,3 +1,7 @@ +2004-12-03 Lars Gullik Bjonnes + + * insetbase.[Ch] (idxUpDown2): remove function + 2004-12-02 Georg Baum * insettabular.[Ch]: use size_t-like types for cell, row and column diff --git a/src/insets/insetbase.C b/src/insets/insetbase.C index 31ff383215..fbfafa0e77 100644 --- a/src/insets/insetbase.C +++ b/src/insets/insetbase.C @@ -176,12 +176,6 @@ bool InsetBase::idxUpDown(LCursor &, bool) const } -bool InsetBase::idxUpDown2(LCursor &, bool) const -{ - return false; -} - - int InsetBase::plaintext(Buffer const &, std::ostream &, OutputParams const &) const { diff --git a/src/insets/insetbase.h b/src/insets/insetbase.h index dd79ee93e5..6c71b5326f 100644 --- a/src/insets/insetbase.h +++ b/src/insets/insetbase.h @@ -125,8 +125,6 @@ public: virtual bool isActive() const { return nargs() > 0; } /// Where should we go when we press the up or down cursor key? virtual bool idxUpDown(LCursor & cur, bool up) const; - /// Where should we go when we press the up or down cursor key? - virtual bool idxUpDown2(LCursor & cur, bool up) const; /// Move one cell to the left virtual bool idxLeft(LCursor &) const { return false; } /// Move one cell to the right -- 2.39.2