From 7d200f302d4dd06fe7b595ea19b4154bd9a8e530 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20St=C3=B6hr?= Date: Thu, 15 Mar 2012 02:29:47 +0100 Subject: [PATCH] GuiTabular.cpp: fix bug #8084 --- src/frontends/qt4/GuiTabular.cpp | 6 +++++- status.20x | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/frontends/qt4/GuiTabular.cpp b/src/frontends/qt4/GuiTabular.cpp index 8fe7961474..be775c4148 100644 --- 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 cecc963e3d..e6a94492be 100644 --- 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). -- 2.39.5