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

InsetTabular.cpp, GuiTabular.cpp: backport #6585 to branch

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@36573 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Uwe Stöhr 2010-11-29 04:48:48 +00:00
parent ca9f73e94e
commit 9650b8c408
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -648,6 +648,9 @@ void GuiTabular::updateContents()
rotateCellCB->setChecked(tabular_.getRotateCell(cell)); rotateCellCB->setChecked(tabular_.getRotateCell(cell));
rotateTabularCB->setChecked(tabular_.rotate); rotateTabularCB->setChecked(tabular_.rotate);
// setting as longtable is not allowed when table is inside a float
longTabularCB->setEnabled(funcEnabled(Tabular::SET_LONGTABULAR));
longTabularCB->setChecked(tabular_.is_long_tabular); longTabularCB->setChecked(tabular_.is_long_tabular);
update_borders(); update_borders();

6
src/insets/InsetTabular.cpp
View File

@ -3891,6 +3891,12 @@ bool InsetTabular::getStatus(Cursor & cur, FuncRequest const & cmd,
break; break;
case Tabular::SET_LONGTABULAR: case Tabular::SET_LONGTABULAR:
// setting as longtable is not allowed when table is inside a float
if (cur.innerInsetOfType(FLOAT_CODE) != 0
|| cur.innerInsetOfType(WRAP_CODE) != 0)
status.setEnabled(false);
else
status.setEnabled(true);
status.setOnOff(tabular.is_long_tabular); status.setOnOff(tabular.is_long_tabular);
break; break;

7
status.16x
View File

@ -66,11 +66,14 @@ What's new
- Make the modules description in Document > Settings fully translatable - Make the modules description in Document > Settings fully translatable
(bug 6987). (bug 6987).
- Fix table line bug when unsetting a multicolumn cell via the table dialog - Fix table line bug when unsetting a multicolumn cell via the table
(bug 7000). dialog (bug 7000).
- Fix the display of table cell alignment in the context menu (bug 7053). - Fix the display of table cell alignment in the context menu (bug 7053).
- Don't allow to make tables within in floats longtables as this could
lead to LaTeX-errors (bug 6585).
- Correct the Denomination of norsk and nynorsk languages. - Correct the Denomination of norsk and nynorsk languages.