anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-29 21:05:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GuiTabular.cpp: fix bug #8084

Browse Source
This commit is contained in:
Uwe Stöhr 2012-03-15 02:29:47 +01:00
parent 0e271180f9
commit 7d200f302d
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/frontends/qt4/GuiTabular.cpp
View File

@ -428,6 +428,10 @@ docstring GuiTabular::dialogToParams() const
setParam(param_str, Tabular::SET_PWIDTH, width); setParam(param_str, Tabular::SET_PWIDTH, width);
// apply the column alignment // apply the column alignment
// multirows inherit the alignment from the column; if a column width
// is set, multicolumns are always left-aligned so that in this case
// its alignment must not be applied (see bug #8084)
if (!(multirowCB->isChecked() && width != "0pt"))
setHAlign(param_str); setHAlign(param_str);
// SET_DECIMAL_POINT must come after setHAlign() (ALIGN_DECIMAL) // SET_DECIMAL_POINT must come after setHAlign() (ALIGN_DECIMAL)

5
status.20x
View File

@ -87,10 +87,13 @@ What's new
- Fixed stray warning when inserting inserting plaintext file (bug 7916). - Fixed stray warning when inserting inserting plaintext file (bug 7916).
- Don't reset the selected format each time we click into a new paragraph - Don't reset the selected format each time we click into a new paragraph
in View>Source (bug 7997). in View->Source (bug 7997).
- Stop screen from jumping around so much on undo and redo (bug 6367). - Stop screen from jumping around so much on undo and redo (bug 6367).
- Setting a multirow offset no longer also changes table column
alignments (bug 8084).
- Fix undo warning when inserting plain text file (bug 7916). - Fix undo warning when inserting plain text file (bug 7916).