From 9f7498dbdf16f61cd5c9ee82e0cb6576d2bf620f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Wed, 4 Apr 2001 23:00:42 +0000 Subject: [PATCH] implement getLabelList git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1897 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/insets/ChangeLog | 4 ++++ src/insets/insetcollapsable.C | 6 ++++++ src/insets/insetcollapsable.h | 3 ++- src/insets/insetlabel.C | 2 +- src/insets/insettext.C | 18 ++++++++++++++++++ src/insets/insettext.h | 2 ++ 6 files changed, 33 insertions(+), 2 deletions(-) diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog index 8acdd4128a..1ed65d8262 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,5 +1,9 @@ 2001-04-05 Lars Gullik Bjønnes + * insetcollapsable.[Ch] (getLabelList): implement + + * insettext.[Ch] (getLabelList): implement + * insettext.h: reindent * insettabular.h: make tabular a scoped_ptr diff --git a/src/insets/insetcollapsable.C b/src/insets/insetcollapsable.C index c435af5e5f..e64bac5f26 100644 --- a/src/insets/insetcollapsable.C +++ b/src/insets/insetcollapsable.C @@ -466,3 +466,9 @@ void InsetCollapsable::resizeLyXText(BufferView * bv) const LyXFont font(LyXFont::ALL_SANE); oldWidth = width(bv, font); } + + +vector const InsetCollapsable::getLabelList() const +{ + return inset.getLabelList(); +} diff --git a/src/insets/insetcollapsable.h b/src/insets/insetcollapsable.h index d89bf92481..35bd5562ca 100644 --- a/src/insets/insetcollapsable.h +++ b/src/insets/insetcollapsable.h @@ -129,7 +129,8 @@ public: void deleteLyXText(BufferView *, bool recursive=true) const; /// void resizeLyXText(BufferView *) const; - + /// + vector const getLabelList() const; protected: /// int ascent_collapsed(Painter &, LyXFont const &) const; diff --git a/src/insets/insetlabel.C b/src/insets/insetlabel.C index cf48ce3d4a..0c36ab4613 100644 --- a/src/insets/insetlabel.C +++ b/src/insets/insetlabel.C @@ -35,7 +35,7 @@ InsetLabel::InsetLabel(InsetCommandParams const & p) vector const InsetLabel::getLabelList() const { - return vector(1,getContents()); + return vector(1, getContents()); } diff --git a/src/insets/insettext.C b/src/insets/insettext.C index 733876889e..49c932b1cd 100644 --- a/src/insets/insettext.C +++ b/src/insets/insettext.C @@ -1447,6 +1447,24 @@ bool InsetText::ShowInsetDialog(BufferView * bv) const } +vector const InsetText::getLabelList() const +{ + vector label_list; + + LyXParagraph * tpar = par; + while (tpar) { + LyXParagraph::inset_iterator beg = tpar->inset_iterator_begin(); + LyXParagraph::inset_iterator end = tpar->inset_iterator_end(); + for (; beg != end; ++beg) { + vector const l = (*beg)->getLabelList(); + label_list.insert(label_list.end(), l.begin(), l.end()); + } + tpar = tpar->next(); + } + return label_list; +} + + void InsetText::SetFont(BufferView * bv, LyXFont const & font, bool toggleall) { if (TEXT(bv)->selection) { diff --git a/src/insets/insettext.h b/src/insets/insettext.h index 8a2366e9e0..ce80a94b35 100644 --- a/src/insets/insettext.h +++ b/src/insets/insettext.h @@ -178,6 +178,8 @@ public: /// bool ShowInsetDialog(BufferView *) const; /// + vector const getLabelList() const; + /// LyXParagraph * par; /// mutable int need_update; -- 2.39.5