From: Allan Rae <rae@lyx.org>
Date: Tue, 20 Nov 2001 08:54:10 +0000 (+0000)
Subject: Fix inset crashes ; now need to fix insertion of chars via the Inset*::checkInsertChar()
X-Git-Tag: 1.6.10~20320
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=38f2254254b392a64db67859f6879638cc80bd92;p=features.git

Fix inset crashes ; now need to fix insertion of chars via the Inset*::checkInsertChar()


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3045 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 525ba0e7c2..30bf984f45 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,24 +1,21 @@
+src/buffer.C
+src/bufferlist.C
 src/BufferView2.C
+src/bufferview_funcs.C
 src/BufferView_pimpl.C
 src/Chktex.C
 src/ColorHandler.C
-src/CutAndPaste.C
-src/FontLoader.C
-src/LColor.C
-src/LaTeX.C
-src/LyXAction.C
-src/LyXSendto.C
-src/LyXView.C
-src/MenuBackend.C
-src/buffer.C
-src/bufferlist.C
-src/bufferview_funcs.C
 src/converter.C
+src/CutAndPaste.C
 src/debug.C
 src/exporter.C
-src/figureForm.C
+src/ext_l10n.h
 src/figure_form.C
+src/figureForm.C
+src/FontLoader.C
+src/frontends/controllers/biblio.C
 src/frontends/controllers/ButtonController.h
+src/frontends/controllers/character.C
 src/frontends/controllers/ControlAboutlyx.C
 src/frontends/controllers/ControlBibtex.C
 src/frontends/controllers/ControlCharacter.C
@@ -32,8 +29,6 @@ src/frontends/controllers/ControlSpellchecker.C
 src/frontends/controllers/ControlTexinfo.C
 src/frontends/controllers/ControlThesaurus.C
 src/frontends/controllers/ControlVCLog.C
-src/frontends/controllers/biblio.C
-src/frontends/controllers/character.C
 src/frontends/controllers/helper_funcs.C
 src/frontends/gnome/FormCitation.C
 src/frontends/gnome/FormIndex.C
@@ -42,6 +37,7 @@ src/frontends/gnome/FormRef.C
 src/frontends/gnome/FormToc.C
 src/frontends/gnome/Menubar_pimpl.C
 src/frontends/qt2/FileDialog.C
+src/frontends/qt2/lengthcombo.C
 src/frontends/qt2/QAbout.C
 src/frontends/qt2/QBibitem.C
 src/frontends/qt2/QBibtex.C
@@ -50,8 +46,8 @@ src/frontends/qt2/QCharacter.C
 src/frontends/qt2/QCitation.C
 src/frontends/qt2/QCitationDialog.C
 src/frontends/qt2/QDocument.C
-src/frontends/qt2/QERT.C
 src/frontends/qt2/QError.C
+src/frontends/qt2/QERT.C
 src/frontends/qt2/QExternal.C
 src/frontends/qt2/QExternalDialog.C
 src/frontends/qt2/QGraphics.C
@@ -73,87 +69,86 @@ src/frontends/qt2/QThesaurus.C
 src/frontends/qt2/QToc.C
 src/frontends/qt2/QURL.C
 src/frontends/qt2/QVCLog.C
-src/frontends/qt2/lengthcombo.C
+src/frontends/xforms/combox.C
 src/frontends/xforms/FileDialog.C
+src/frontends/xforms/form_aboutlyx.C
 src/frontends/xforms/FormAboutlyx.C
+src/frontends/xforms/form_bibitem.C
 src/frontends/xforms/FormBibitem.C
+src/frontends/xforms/form_bibtex.C
 src/frontends/xforms/FormBibtex.C
+src/frontends/xforms/form_browser.C
+src/frontends/xforms/form_character.C
 src/frontends/xforms/FormCharacter.C
+src/frontends/xforms/form_citation.C
 src/frontends/xforms/FormCitation.C
+src/frontends/xforms/form_document.C
 src/frontends/xforms/FormDocument.C
-src/frontends/xforms/FormERT.C
+src/frontends/xforms/form_error.C
 src/frontends/xforms/FormError.C
+src/frontends/xforms/form_ert.C
+src/frontends/xforms/FormERT.C
+src/frontends/xforms/form_external.C
 src/frontends/xforms/FormExternal.C
+src/frontends/xforms/form_filedialog.C
 src/frontends/xforms/FormFiledialog.C
+src/frontends/xforms/form_float.C
 src/frontends/xforms/FormFloat.C
+src/frontends/xforms/form_graphics.C
 src/frontends/xforms/FormGraphics.C
+src/frontends/xforms/form_include.C
 src/frontends/xforms/FormInclude.C
+src/frontends/xforms/form_index.C
 src/frontends/xforms/FormIndex.C
 src/frontends/xforms/FormLog.C
 src/frontends/xforms/FormMathsBitmap.C
+src/frontends/xforms/form_maths_deco.C
 src/frontends/xforms/FormMathsDeco.C
+src/frontends/xforms/form_maths_delim.C
 src/frontends/xforms/FormMathsDelim.C
+src/frontends/xforms/form_maths_matrix.C
 src/frontends/xforms/FormMathsMatrix.C
+src/frontends/xforms/form_maths_panel.C
 src/frontends/xforms/FormMathsPanel.C
+src/frontends/xforms/form_maths_space.C
 src/frontends/xforms/FormMathsSpace.C
+src/frontends/xforms/form_minipage.C
 src/frontends/xforms/FormMinipage.C
+src/frontends/xforms/form_paragraph.C
 src/frontends/xforms/FormParagraph.C
+src/frontends/xforms/form_preamble.C
 src/frontends/xforms/FormPreamble.C
+src/frontends/xforms/form_preferences.C
 src/frontends/xforms/FormPreferences.C
+src/frontends/xforms/form_print.C
 src/frontends/xforms/FormPrint.C
+src/frontends/xforms/form_ref.C
 src/frontends/xforms/FormRef.C
+src/frontends/xforms/form_search.C
 src/frontends/xforms/FormSearch.C
+src/frontends/xforms/form_spellchecker.C
 src/frontends/xforms/FormSpellchecker.C
+src/frontends/xforms/form_tabular.C
 src/frontends/xforms/FormTabular.C
+src/frontends/xforms/form_tabular_create.C
 src/frontends/xforms/FormTabularCreate.C
+src/frontends/xforms/form_texinfo.C
 src/frontends/xforms/FormTexinfo.C
+src/frontends/xforms/form_thesaurus.C
 src/frontends/xforms/FormThesaurus.C
+src/frontends/xforms/form_toc.C
 src/frontends/xforms/FormToc.C
+src/frontends/xforms/form_url.C
 src/frontends/xforms/FormUrl.C
 src/frontends/xforms/FormVCLog.C
-src/frontends/xforms/Menubar_pimpl.C
-src/frontends/xforms/combox.C
-src/frontends/xforms/form_aboutlyx.C
-src/frontends/xforms/form_bibitem.C
-src/frontends/xforms/form_bibtex.C
-src/frontends/xforms/form_browser.C
-src/frontends/xforms/form_character.C
-src/frontends/xforms/form_citation.C
-src/frontends/xforms/form_document.C
-src/frontends/xforms/form_error.C
-src/frontends/xforms/form_ert.C
-src/frontends/xforms/form_external.C
-src/frontends/xforms/form_filedialog.C
-src/frontends/xforms/form_float.C
-src/frontends/xforms/form_graphics.C
-src/frontends/xforms/form_include.C
-src/frontends/xforms/form_index.C
-src/frontends/xforms/form_maths_deco.C
-src/frontends/xforms/form_maths_delim.C
-src/frontends/xforms/form_maths_matrix.C
-src/frontends/xforms/form_maths_panel.C
-src/frontends/xforms/form_maths_space.C
-src/frontends/xforms/form_minipage.C
-src/frontends/xforms/form_paragraph.C
-src/frontends/xforms/form_preamble.C
-src/frontends/xforms/form_preferences.C
-src/frontends/xforms/form_print.C
-src/frontends/xforms/form_ref.C
-src/frontends/xforms/form_search.C
-src/frontends/xforms/form_spellchecker.C
-src/frontends/xforms/form_tabular.C
-src/frontends/xforms/form_tabular_create.C
-src/frontends/xforms/form_texinfo.C
-src/frontends/xforms/form_thesaurus.C
-src/frontends/xforms/form_toc.C
-src/frontends/xforms/form_url.C
 src/frontends/xforms/input_validators.C
+src/frontends/xforms/Menubar_pimpl.C
 src/frontends/xforms/xforms_helpers.C
 src/gettext.h
 src/importer.C
 src/insets/figinset.C
-src/insets/inset.C
 src/insets/insetbib.C
+src/insets/inset.C
 src/insets/insetcaption.C
 src/insets/inseterror.C
 src/insets/insetert.C
@@ -178,19 +173,25 @@ src/insets/insettoc.C
 src/insets/inseturl.C
 src/kbsequence.C
 src/language.C
+src/LaTeX.C
 src/layout.C
+src/LColor.C
+src/LyXAction.C
 src/lyx_cb.C
-src/lyx_gui_misc.C
-src/lyx_main.C
 src/lyxfind.C
 src/lyxfont.C
 src/lyxfunc.C
+src/lyx_gui_misc.C
+src/lyx_main.C
 src/lyxrc.C
+src/LyXSendto.C
 src/lyxvc.C
-src/mathed/formula.C
+src/LyXView.C
 src/mathed/formulabase.C
+src/mathed/formula.C
 src/mathed/formulamacro.C
 src/mathed/math_cursor.C
+src/MenuBackend.C
 src/minibuffer.C
 src/paragraph.C
 src/print_form.C
@@ -199,6 +200,6 @@ src/support/getUserName.C
 src/support/path.C
 src/support/path.h
 src/tabular.C
-src/text.C
 src/text2.C
+src/text.C
 src/ext_l10n.h
diff --git a/src/ChangeLog b/src/ChangeLog
index 3592af2406..a8dd40197e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2001-11-20  Allan Rae  <rae@lyx.org>
+
+	* paragraph.C (insertFromMinibuffer): Fix for inset related crashes.
+	Now need Inset*::checkInsertChar() to return true for appropriate
+	cases so that the characters in the minibuffer will actually be
+	inserted.
+
 2001-11-15  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
 	* text.C: change the order of the includes.
diff --git a/src/paragraph.C b/src/paragraph.C
index b9c8086dfd..d52d464f8d 100644
--- a/src/paragraph.C
+++ b/src/paragraph.C
@@ -452,15 +452,17 @@ void Paragraph::cutIntoMinibuffer(BufferParams const & bparams,
 
 bool Paragraph::insertFromMinibuffer(Paragraph::size_type pos)
 {
-	if ((minibuffer_char == Paragraph::META_INSET) &&
-	    !insetAllowed(minibuffer_inset->lyxCode()))
-		return false;
-	if (minibuffer_char == Paragraph::META_INSET)
+	if (minibuffer_char == Paragraph::META_INSET) {
+		if (!insetAllowed(minibuffer_inset->lyxCode())) {
+			return false;
+		}
 		insertInset(pos, minibuffer_inset, minibuffer_font);
-	else {
+	} else {
 		LyXFont f = minibuffer_font;
-		if (checkInsertChar(f))
-			insertChar(pos, minibuffer_char, f);
+		if (!checkInsertChar(f)) {
+			return false;
+		}
+		insertChar(pos, minibuffer_char, f);
 	}
 	return true;
 }