From 3752f82762899a9e5d7ef719cf62c9c79ae69b49 Mon Sep 17 00:00:00 2001 From: Martin Vermeer Date: Sun, 2 Oct 2005 16:35:56 +0000 Subject: [PATCH] Fix bug 2038 for all three frontends (gtk untested) git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10506 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/gtk/ChangeLog | 4 ++++ src/frontends/gtk/GToc.C | 5 ++++- src/frontends/qt2/ChangeLog | 4 ++++ src/frontends/qt2/QToc.C | 4 +++- src/frontends/xforms/ChangeLog | 4 ++++ src/frontends/xforms/FormToc.C | 4 +++- 6 files changed, 22 insertions(+), 3 deletions(-) diff --git a/src/frontends/gtk/ChangeLog b/src/frontends/gtk/ChangeLog index 56b3ec72cd..bbcd867474 100644 --- a/src/frontends/gtk/ChangeLog +++ b/src/frontends/gtk/ChangeLog @@ -1,3 +1,7 @@ +2005-10-02 Martin Vermeer + + * GToc.C: fix bug 2038 + 2005-09-08 Angus Leeming * GSpellchecker.C: correct grammar describing invocation of the diff --git a/src/frontends/gtk/GToc.C b/src/frontends/gtk/GToc.C index 19c0876b71..3ff57bbc80 100644 --- a/src/frontends/gtk/GToc.C +++ b/src/frontends/gtk/GToc.C @@ -126,7 +126,10 @@ void GToc::updateContents() Gtk::TreeModel::iterator it = typecombo_->get_active(); vector const & choice = controller().getTypes(); - string const type = choice[(*it)[listColIndex_]]; + // Untested: + string type; + if (!choice.empty()) + type = choice[(*it)[listColIndex_]]; toc::Toc const contents = controller().getContents(type); // Check if all elements are the same. diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index 3045db8242..833aedb6aa 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,7 @@ +2005-10-02 Martin Vermeer + + * QToc.C: fix bug 2038 + 2005-09-15 Jürgen Spitzmüller * QTabular.C: disable newpageCB when !longtabular. diff --git a/src/frontends/qt2/QToc.C b/src/frontends/qt2/QToc.C index c76da192f4..b3c5f79827 100644 --- a/src/frontends/qt2/QToc.C +++ b/src/frontends/qt2/QToc.C @@ -80,7 +80,9 @@ void QToc::update_contents() void QToc::updateToc(int newdepth) { vector const & choice = controller().getTypes(); - string const & type = choice[dialog_->typeCO->currentItem()]; + string type; + if (!choice.empty()) + type = choice[dialog_->typeCO->currentItem()]; toc::Toc const & contents = controller().getContents(type); diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index 344a7a1006..b7dd764eb7 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,7 @@ +2005-10-02 Martin Vermeer + + * FormToc.C: fix bug 2038 + 2005-09-15 Jürgen Spitzmüller * FormCitation.C (findBiblio): correct start iterator when diff --git a/src/frontends/xforms/FormToc.C b/src/frontends/xforms/FormToc.C index 7feec7f18e..23cbcdabfb 100644 --- a/src/frontends/xforms/FormToc.C +++ b/src/frontends/xforms/FormToc.C @@ -100,7 +100,9 @@ void FormToc::updateType() void FormToc::updateContents() { vector types = controller().getTypes(); - string const type = types[fl_get_choice(dialog_->choice_toc_type) - 1]; + string type; + if (!types.empty()) + type = types[fl_get_choice(dialog_->choice_toc_type) - 1]; if (type.empty()) { fl_clear_browser(dialog_->browser_toc); fl_add_browser_line(dialog_->browser_toc, -- 2.39.2