anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

simplify some conditions

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34611 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Edwin Leuven 2010-06-07 09:39:04 +00:00
parent f6071af49d
commit fea446303d
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/insets/InsetTabular.cpp
View File

@ -2137,7 +2137,7 @@ int Tabular::TeXCellPreamble(odocstream & os, idx_type cell,
// we center in multicol when no decimal point
ismulticol |= ((column_info[c].alignment == LYX_ALIGN_DECIMAL)
&& (cellInfo(cell).decimal_width == 0) || isMultiRow(cell));
&& (cellInfo(cell).decimal_width == 0));
// up counter by 1 for each decimally aligned col since they use 2 latex cols
int latexcolspan = columnSpan(cell);
@ -2466,7 +2466,7 @@ int Tabular::TeXRow(odocstream & os, row_type row,
: OutputParams::ALIGNED;
if (getAlignment(cell) == LYX_ALIGN_DECIMAL
&& cellInfo(cell).decimal_width != 0 && !isMultiRow(cell)) {
&& cellInfo(cell).decimal_width != 0) {
// copy cell and split in 2
InsetTableCell head = InsetTableCell(*cellInset(cell).get());
head.getText(0)->setMacrocontextPosition(
@ -3362,9 +3362,7 @@ void InsetTabular::metrics(MetricsInfo & mi, Dimension & dim) const
// determine horiz offset because of decimal align (if necessary)
int decimal_hoffset = 0;
int decimal_width = 0;
if ((tabular.column_info[c].alignment == LYX_ALIGN_DECIMAL)
&& !tabular.isMultiColumn(cell)
&& !tabular.isMultiRow(cell)) {
if (tabular.getAlignment(cell) == LYX_ALIGN_DECIMAL) {
// make a copy which we will split in 2
InsetTableCell head = InsetTableCell(*tabular.cellInset(cell).get());
head.getText(0)->setMacrocontextPosition(