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

GuiTabular.cpp: fix bug #8092 also for branch

Browse Source
This commit is contained in:
Uwe Stöhr 2012-03-21 21:50:34 +01:00
parent ba333248f3
commit 6f5ea2ae47
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -215,9 +215,6 @@ void GuiTabular::checkEnabled()
tabularWidthED->setEnabled(setwidth);
tabularWidthUnitLC->setEnabled(setwidth);
bool const is_tabular_star = !tabularWidthED->text().isEmpty();
rotateTabularCB->setDisabled(is_tabular_star);
vAlignCO->setEnabled(!multirowCB->isChecked()
&& !widgetsToLength(columnWidthED, columnWidthUnitLC).empty()
&& specialAlignmentED->text().isEmpty());
@ -231,6 +228,7 @@ void GuiTabular::checkEnabled()
interlinespaceUnitLC->setEnabled(interlinespaceCO->currentIndex() == 2);
// setting as longtable is not allowed when table is inside a float
bool const is_tabular_star = !tabularWidthED->text().isEmpty();
longTabularCB->setEnabled(!is_tabular_star && funcEnabled(Tabular::SET_LONGTABULAR));
bool const longtabular = longTabularCB->isChecked();
longtableGB->setEnabled(true);
@ -429,7 +427,7 @@ docstring GuiTabular::dialogToParams() const
// 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
// is set, multirows 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);

2
status.20x
View File

@ -101,6 +101,8 @@ What's new
- Fix the selection of rows below a multirow (bug 8083).
- Allow rotations of tables with a defined width (bug 8092).
* DOCUMENTATION AND LOCALIZATION