anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-08 18:19:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Small fix in lyxrc and fixed #167 and #181.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3394 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Vigna 2002-01-16 16:07:09 +00:00
parent 3cf8597069
commit 9c58df4a88
5 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ChangeLog
View File

@ -1,3 +1,9 @@
2002-01-16 Juergen Vigna <jug@sad.it>
* tabular.C (GetAdditionalHeight): one of error fixed.
* lyxrc.C (output): small fix in writing use_pspell.
2002-01-16 Angus Leeming <a.leeming@ic.ac.uk>
* sp_base.h: #include LString.h

5
src/insets/ChangeLog
View File

@ -1,3 +1,8 @@
2002-01-16 Juergen Vigna <jug@sad.it>
* insettabular.C (forceDefaultParagraphs): fixed bug returning value
of wrong cell.
2002-01-16 Allan Rae <rae@lyx.org>
* insetinclude.C (docbook): someone forgot a ";"

2
src/insets/insettabular.C
View File

@ -2732,7 +2732,7 @@ bool InsetTabular::forceDefaultParagraphs(Inset const * in) const
// maybe some speedup
if ((last < n) && tabular->GetCellInset(last) == in) {
if (tabular->GetPWidth(last+1).zero())
if (tabular->GetPWidth(last).zero())
return true;
return false;
}

2
src/lyxrc.C
View File

@ -1444,7 +1444,7 @@ void LyXRC::output(ostream & os) const
#ifdef USE_PSPELL
case RC_USE_PSPELL:
if (use_pspell != system_lyxrc.use_pspell) {
os << "\\use_pspell \"" << use_pspell << "\"\n";
os << "\\use_pspell " << tostr(use_pspell) << "\n";
}
#endif
case RC_SPELL_COMMAND:

4
src/tabular.C
View File

@ -552,7 +552,7 @@ int LyXTabular::GetAdditionalHeight(int row) const
bool top = true;
bool bottom = true;
for (int column = 0; column < columns_ - 1 && bottom; ++column) {
for (int column = 0; column < columns_ && bottom; ++column) {
switch (cell_info[row - 1][column].multicolumn) {
case LyXTabular::CELL_BEGIN_OF_MULTICOLUMN:
bottom = cell_info[row - 1][column].bottom_line;
@ -561,7 +561,7 @@ int LyXTabular::GetAdditionalHeight(int row) const
bottom = row_info[row - 1].bottom_line;
}
}
for (int column = 0; column < columns_ - 1 && top; ++column) {
for (int column = 0; column < columns_ && top; ++column) {
switch (cell_info[row][column].multicolumn){
case LyXTabular::CELL_BEGIN_OF_MULTICOLUMN:
top = cell_info[row][column].top_line;