From 11adfbf64ddd815d2dd8a16e03a528aee837866e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20St=C3=B6hr?= Date: Thu, 15 Mar 2012 02:37:20 +0100 Subject: [PATCH] GuiTabular.cpp: fix bug #8084 --- src/frontends/qt4/GuiTabular.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/frontends/qt4/GuiTabular.cpp b/src/frontends/qt4/GuiTabular.cpp index 7a197231f9..ef85e10121 100644 --- a/src/frontends/qt4/GuiTabular.cpp +++ b/src/frontends/qt4/GuiTabular.cpp @@ -443,7 +443,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()); -- 2.39.2