From e40120ce1c2ae507a03e1c642080d7d69a3b9eca Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Tue, 3 Jul 2001 14:15:39 +0000 Subject: [PATCH] remove one more forms.h ; fix cache miss in TabularInset::GetMaxWidth git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2173 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/ChangeLog | 4 ++++ src/FontLoader.h | 3 +-- src/tabular.C | 6 ++++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index ed6cb049be..f7694dc788 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,7 +1,11 @@ 2001-07-03 Jean-Marc Lasgouttes + * tabular.C (GetCellInset): update cur_cell also in the row/col + version of this function. + * lyxfunc.C: no need to include figure_form.h here. + * FontLoader.h: * lyxfunc.h: * lyxscreen.h: * text2.C: diff --git a/src/FontLoader.h b/src/FontLoader.h index fce75a74b1..0b5b2b09b3 100644 --- a/src/FontLoader.h +++ b/src/FontLoader.h @@ -16,8 +16,7 @@ #pragma interface #endif - -#include FORMS_H_LOCATION +#include #include "lyxfont.h" #include "LString.h" diff --git a/src/tabular.C b/src/tabular.C index f681ee2533..99e7816168 100644 --- a/src/tabular.C +++ b/src/tabular.C @@ -2530,6 +2530,12 @@ InsetText * LyXTabular::GetCellInset(int cell) const InsetText * LyXTabular::GetCellInset(int row, int column) const { +#ifdef WITH_WARNINGS +#warning Juergen, should we check whether the row/column values are correct? +// If we do not need to do that, the tests in GetCellNumber should be +// changed to asserts. +#endif + cur_cell = GetCellNumber(row, column); return & cell_info[row][column].inset; } -- 2.39.5