Don't allow newline characters in preference (#5840).

[lyx.git] / src / frontends / qt4 / GuiTabular.cpp

diff --git a/src/frontends/qt4/GuiTabular.cpp b/src/frontends/qt4/GuiTabular.cpp
index 87f351b6117010c013340e87372761377dc51c21..bb01c3bd2407d05835e385ab23a53a42fb730714 100644 (file)
--- a/src/frontends/qt4/GuiTabular.cpp
+++ b/src/frontends/qt4/GuiTabular.cpp
@@ -218,9 +218,12 @@ void GuiTabular::checkEnabled()
        bool const is_tabular_star = !tabularWidthED->text().isEmpty();
        rotateTabularCB->setDisabled(is_tabular_star);
 
-       vAlignCO->setEnabled(!multirowCB->isChecked()
+       bool const enable_valign =
+               !multirowCB->isChecked()
                && !widgetsToLength(columnWidthED, columnWidthUnitLC).empty()
-               && specialAlignmentED->text().isEmpty());
+               && specialAlignmentED->text().isEmpty();
+       vAlignCO->setEnabled(enable_valign);
+       vAlignLA->setEnabled(enable_valign);
 
        topspaceED->setEnabled(topspaceCO->currentIndex() == 2);
        topspaceED->setEnabled(topspaceCO->currentIndex() == 2);
@@ -287,8 +290,10 @@ void GuiTabular::checkEnabled()
 
        multicolumnCB->setEnabled(funcEnabled(Tabular::MULTICOLUMN));
        multirowCB->setEnabled(funcEnabled(Tabular::MULTIROW));
-       multirowOffsetED->setEnabled(multirowCB->isChecked());
-       multirowOffsetUnitLC->setEnabled(multirowCB->isChecked());
+       bool const enable_mr = multirowCB->isChecked();
+       multirowOffsetLA->setEnabled(enable_mr);
+       multirowOffsetED->setEnabled(enable_mr);
+       multirowOffsetUnitLC->setEnabled(enable_mr);
 
        changed();
 }
@@ -408,7 +413,7 @@ void GuiTabular::setTableAlignment(string & param_str) const
 docstring GuiTabular::dialogToParams() const
 {
        // FIXME: We should use Tabular directly.
-       string param_str = "tabular";
+       string param_str = "tabular from-dialog";
 
        // table width
        string tabwidth = widgetsToLength(tabularWidthED, tabularWidthUnitLC);