From: Jean-Marc Lasgouttes Date: Thu, 22 Nov 2001 10:33:11 +0000 (+0000) Subject: remove bogus calls to LyXText::getRow X-Git-Tag: 1.6.10~20303 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=96f078b748bc7007add4113f5b9499dd43e0263e;p=features.git remove bogus calls to LyXText::getRow git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3062 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/po/POTFILES.in b/po/POTFILES.in index 30bf984f45..525ba0e7c2 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,21 +1,24 @@ -src/buffer.C -src/bufferlist.C src/BufferView2.C -src/bufferview_funcs.C src/BufferView_pimpl.C src/Chktex.C src/ColorHandler.C -src/converter.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/debug.C src/exporter.C -src/ext_l10n.h -src/figure_form.C src/figureForm.C -src/FontLoader.C -src/frontends/controllers/biblio.C +src/figure_form.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 @@ -29,6 +32,8 @@ 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 @@ -37,7 +42,6 @@ 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 @@ -46,8 +50,8 @@ src/frontends/qt2/QCharacter.C src/frontends/qt2/QCitation.C src/frontends/qt2/QCitationDialog.C src/frontends/qt2/QDocument.C -src/frontends/qt2/QError.C src/frontends/qt2/QERT.C +src/frontends/qt2/QError.C src/frontends/qt2/QExternal.C src/frontends/qt2/QExternalDialog.C src/frontends/qt2/QGraphics.C @@ -69,86 +73,87 @@ src/frontends/qt2/QThesaurus.C src/frontends/qt2/QToc.C src/frontends/qt2/QURL.C src/frontends/qt2/QVCLog.C -src/frontends/xforms/combox.C +src/frontends/qt2/lengthcombo.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/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/FormError.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/input_validators.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/xforms_helpers.C src/gettext.h src/importer.C src/insets/figinset.C -src/insets/insetbib.C src/insets/inset.C +src/insets/insetbib.C src/insets/insetcaption.C src/insets/inseterror.C src/insets/insetert.C @@ -173,25 +178,19 @@ 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/LyXView.C -src/mathed/formulabase.C src/mathed/formula.C +src/mathed/formulabase.C src/mathed/formulamacro.C src/mathed/math_cursor.C -src/MenuBackend.C src/minibuffer.C src/paragraph.C src/print_form.C @@ -200,6 +199,6 @@ src/support/getUserName.C src/support/path.C src/support/path.h src/tabular.C -src/text2.C src/text.C +src/text2.C src/ext_l10n.h diff --git a/src/ChangeLog b/src/ChangeLog index a8dd40197e..5145638acf 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2001-11-22 Jean-Marc Lasgouttes + + * text2.C (removeRow): + * text.C (setHeightOfRow): remove useless (and costly) call to + getRow. + 2001-11-20 Allan Rae * paragraph.C (insertFromMinibuffer): Fix for inset related crashes. diff --git a/src/text.C b/src/text.C index 5dca76aefb..0a965a0d32 100644 --- a/src/text.C +++ b/src/text.C @@ -1212,11 +1212,6 @@ void LyXText::setHeightOfRow(BufferView * bview, Row * row_ptr) const LyXFont tmpfont; Inset * tmpinset = 0; - /* this must not happen before the currentrow for clear reasons. - so the trick is just to set the current row onto this row */ - int unused_y; - getRow(row_ptr->par(), row_ptr->pos(), unused_y); - /* ok , let us initialize the maxasc and maxdesc value. * This depends in LaTeX of the font of the last character * in the paragraph. The hack below is necessary because diff --git a/src/text2.C b/src/text2.C index ecfbae47fa..8e3a76773e 100644 --- a/src/text2.C +++ b/src/text2.C @@ -385,12 +385,6 @@ void LyXText::insertRow(Row * row, Paragraph * par, // removes the row and reset the touched counters void LyXText::removeRow(Row * row) const { - /* this must not happen before the currentrow for clear reasons. - so the trick is just to set the current row onto the previous - row of this row */ - int unused_y; - getRow(row->par(), row->pos(), unused_y); - if (row->next()) row->next()->previous(row->previous()); if (!row->previous()) {