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

bug 849

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6060 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2003-02-07 14:57:36 +00:00
parent 666e7059c4
commit 53537c02bc
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/frontends/qt2/ChangeLog
View File

@ -1,3 +1,8 @@
2003-02-07 Juergen Spitzmueller <j.spitzmueller@gmx.de>
* QTabular.C (closeGUI): do not change if nothing has to
be changed (bug 849).
2003-01-31 Michael Schmitt <michael.schmitt@teststep.org>
* ui/BulletsModuleBase.ui: Replace LaTeX font size names by LyX

21
src/frontends/qt2/QTabular.C
View File

@ -328,17 +328,20 @@ void QTabular::closeGUI()
// apply the fixed width values
int cell = inset->getActCell();
string str1 = LyXLength(dialog_->widthED->text().toDouble(),
dialog_->widthUnit->currentLengthItem()).asString();
bool const multicol(controller().isMulticolumnCell());
string str1 = widgetsToLength(dialog_->widthED, dialog_->widthUnit);
string str2;
LyXLength llen(tabular->GetColumnPWidth(cell));
if (llen.zero())
str2 = "";
else
str2 = llen.asString();
LyXLength llenMulti(tabular->GetMColumnPWidth(cell));
if (multicol && !llenMulti.zero())
str2 = llenMulti.asString();
else if (!multicol && !llen.zero())
str2 = llen.asString();
if (str1 != str2) {
if (controller().isMulticolumnCell())
if (multicol)
controller().set(LyXTabular::SET_MPWIDTH, str1);
else
controller().set(LyXTabular::SET_PWIDTH, str1);
@ -346,13 +349,13 @@ void QTabular::closeGUI()
// apply the special alignment
str1 = fromqstr(dialog_->specialAlignmentED->text());
if (controller().isMulticolumnCell())
if (multicol)
str2 = tabular->GetAlignSpecial(cell, LyXTabular::SET_SPECIAL_MULTI);
else
str2 = tabular->GetAlignSpecial(cell, LyXTabular::SET_SPECIAL_COLUMN);
if (str1 != str2) {
if (controller().isMulticolumnCell())
if (multicol)
controller().set(LyXTabular::SET_SPECIAL_MULTI, str1);
else
controller().set(LyXTabular::SET_SPECIAL_COLUMN, str1);