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

fix tabular multicolumn handling

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9298 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Georg Baum 2004-11-24 16:48:21 +00:00
parent 59413be9a0
commit 2621ad0763
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/insets/ChangeLog
View File

@ -1,3 +1,7 @@
2004-11-24 Georg Baum <Georg.Baum@post.rwth-aachen.de>
* insettabular.C (tabularFeatures): fix multicolumn handling
2004-11-23 Lars Gullik Bjonnes <larsbj@gullik.net>
* render_base.h (operator=): use common semantics

20
src/insets/insettabular.C
View File

@ -1328,10 +1328,9 @@ void InsetTabular::tabularFeatures(LCursor & cur,
_("You cannot set multicolumn vertically."));
return;
}
#if 0
// just multicol for one Single Cell
if (!hasSelection()) {
// check whether we are completly in a multicol
if (!cur.selection()) {
// just multicol for one single cell
// check whether we are completely in a multicol
if (tabular.isMultiColumn(cur.idx()))
tabular.unsetMultiColumn(cur.idx());
else
@ -1340,21 +1339,12 @@ void InsetTabular::tabularFeatures(LCursor & cur,
}
// we have a selection so this means we just add all this
// cells to form a multicolumn cell
int s_start;
int s_end;
if (sel_cell_start > sel_cell_end) {
s_start = sel_cell_end;
s_end = sel_cell_start;
} else {
s_start = sel_cell_start;
s_end = sel_cell_end;
}
CursorSlice::idx_type const s_start = cur.selBegin().idx();
CursorSlice::idx_type const s_end = cur.selEnd().idx();
tabular.setMultiColumn(bv.buffer(), s_start, s_end - s_start + 1);
cur.idx() = s_start;
cur.par() = 0;
cur.pos() = 0;
#endif
cur.selection() = false;
break;
}