GuiTabular.cpp: fix bug #8084

diff --git a/src/frontends/qt4/GuiTabular.cpp b/src/frontends/qt4/GuiTabular.cpp
index 8fe7961474b90d7094fefa61e54d0f95e1de124b..be775c41488185ea875f497a0f2357dde07d24f4 100644 (file)
--- a/src/frontends/qt4/GuiTabular.cpp
+++ b/src/frontends/qt4/GuiTabular.cpp
@@ -428,7 +428,11 @@ docstring GuiTabular::dialogToParams() const
                setParam(param_str, Tabular::SET_PWIDTH, width);
 
        // apply the column alignment
-       setHAlign(param_str);
+       // 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);
 
        // SET_DECIMAL_POINT must come after setHAlign() (ALIGN_DECIMAL)
        string decimal_point = fromqstr(decimalPointED->text());

diff --git a/status.20x b/status.20x
index cecc963e3d1867bd02c2bf02fce9012298dbb0a5..e6a94492be0037022bc6c30458ee33a766b1a714 100644 (file)
--- a/status.20x
+++ b/status.20x
@@ -87,10 +87,13 @@ What's new
 - Fixed stray warning when inserting inserting plaintext file (bug 7916).
 
 - 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).
 
+- Setting a multirow offset no longer also changes table column
+  alignments (bug 8084).
+
 - Fix undo warning when inserting plain text file (bug 7916).