#include "frontends/LyXView.h"
#include "frontends/Painter.h"
-#include "support/std_sstream.h"
-
+#include <sstream>
#include <iostream>
using lyx::graphics::PreviewLoader;
InsetTabular::InsetTabular(Buffer const & buf, int rows, int columns)
: tabular(buf.params(), max(rows, 1), max(columns, 1)),
buffer_(&buf), cursorx_(0)
-{
- tabular.setOwner(this);
-}
+{}
InsetTabular::InsetTabular(InsetTabular const & tab)
: UpdatableInset(tab), tabular(tab.tabular),
buffer_(tab.buffer_), cursorx_(0)
-{
- tabular.setOwner(this);
-}
+{}
InsetTabular::~InsetTabular()
}
-void InsetTabular::buffer(Buffer * b)
+void InsetTabular::buffer(Buffer const * b)
{
buffer_ = b;
}
BufferView * bv = pi.base.bv;
setPosCache(pi, x, y);
- if (!owner())
- x += scroll();
-
+ x += scroll();
x += ADD_TO_TABULAR_WIDTH;
int idx = 0;
cur.selection() = false;
resetPos(cur);
cur.bv().fitCursor();
- cur.push(this);
+ cur.push(*this);
cur.idx() = cell;
}
{
//lyxerr << "InsetTabular::editXY: " << this << endl;
cur.selection() = false;
- cur.push(this);
+ cur.push(*this);
return setPos(cur, x, y);
//int xx = cursorx_ - xo_ + tabular.getBeginningOfTextInCell(actcell);
}
-void InsetTabular::priv_dispatch(LCursor & cur, FuncRequest const & cmd)
+void InsetTabular::priv_dispatch(LCursor & cur, FuncRequest & cmd)
{
lyxerr << "# InsetTabular::dispatch: cmd: " << cmd << endl;
//lyxerr << " cur:\n" << cur << endl;
- CursorSlice sl = cur.current();
+ CursorSlice sl = cur.top();
+ LCursor & bvcur = cur.bv().cursor();
switch (cmd.action) {
cur.selection() = false;
setPos(cur, cmd.x, cmd.y);
cur.resetAnchor();
- cur.bv().cursor() = cur;
+ bvcur = cur;
//if (cmd.button() == mouse_button::button2)
// dispatch(cur, FuncRequest(LFUN_PASTESELECTION, "paragraph"));
//lyxerr << "# InsetTabular::MousePress\n" << cur.bv().cursor() << endl;
case LFUN_MOUSE_MOTION:
if (cmd.button() != mouse_button::button1)
break;
+ // ignore motions deeper nested than the real anchor
+ if (bvcur.selection() && bvcur.anchor_.size() < cur.size())
+ break;
setPos(cur, cmd.x, cmd.y);
- cur.bv().cursor().cursor_ = cur.cursor_;
- cur.bv().cursor().selection() = true;
- //lyxerr << "# InsetTabular::MouseMotion\n" << cur.bv().cursor() << endl;
+ bvcur.setCursor(cur, true);
+ //lyxerr << "# InsetTabular::MouseMotion\n" << bvcur << endl;
break;
case LFUN_MOUSE_RELEASE:
- //lyxerr << "# InsetTabular::MouseRelease\n" << cur.bv().cursor() << endl;
+ //lyxerr << "# InsetTabular::MouseRelease\n" << bvcur << endl;
if (cmd.button() == mouse_button::button3)
InsetTabularMailer(*this).showDialog(&cur.bv());
break;
scroll(cur.bv(), static_cast<float>(strToDbl(cmd.argument)));
else
scroll(cur.bv(), strToInt(cmd.argument));
- cur.update();
break;
case LFUN_RIGHTSEL:
case LFUN_RIGHT:
cell(cur.idx()).dispatch(cur, cmd);
- if (sl == cur.current())
+ cur.dispatched(); // override the cell's decision
+ if (sl == cur.top())
isRightToLeft(cur) ? movePrevCell(cur) : moveNextCell(cur);
- if (sl == cur.current())
- cur.dispatched(FINISHED_RIGHT);
+ if (sl == cur.top()) {
+ cmd = FuncRequest(LFUN_FINISHED_RIGHT);
+ cur.undispatched();
+ }
break;
- case LFUN_LEFTSEL:
+ case LFUN_LEFTSEL:
case LFUN_LEFT:
cell(cur.idx()).dispatch(cur, cmd);
- if (sl == cur.current())
+ cur.dispatched(); // override the cell's decision
+ if (sl == cur.top())
isRightToLeft(cur) ? moveNextCell(cur) : movePrevCell(cur);
- if (sl == cur.current())
- cur.dispatched(FINISHED);
+ if (sl == cur.top()) {
+ cmd = FuncRequest(LFUN_FINISHED_LEFT);
+ cur.undispatched();
+ }
break;
case LFUN_DOWNSEL:
case LFUN_DOWN:
cell(cur.idx()).dispatch(cur, cmd);
- if (sl == cur.current())
+ cur.dispatched(); // override the cell's decision
+ if (sl == cur.top())
if (tabular.row_of_cell(cur.idx()) != tabular.rows() - 1) {
cur.idx() = tabular.getCellBelow(cur.idx());
+ cur.par() = 0;
+ cur.pos() = 0;
resetPos(cur);
}
- if (sl == cur.current())
- cur.dispatched(FINISHED_DOWN);
+ if (sl == cur.top()) {
+ cmd = FuncRequest(LFUN_FINISHED_DOWN);
+ cur.undispatched();
+ }
break;
case LFUN_UPSEL:
case LFUN_UP:
cell(cur.idx()).dispatch(cur, cmd);
- if (sl == cur.current())
+ cur.dispatched(); // override the cell's decision
+ if (sl == cur.top())
if (tabular.row_of_cell(cur.idx()) != 0) {
cur.idx() = tabular.getCellAbove(cur.idx());
+ cur.par() = cur.lastpar();
+ cur.pos() = cur.lastpos();
resetPos(cur);
}
- if (sl == cur.current())
- cur.dispatched(FINISHED_UP);
+ if (sl == cur.top()) {
+ cmd = FuncRequest(LFUN_FINISHED_UP);
+ cur.undispatched();
+ }
break;
case LFUN_NEXT: {
case LFUN_TABULAR_FEATURE:
if (!tabularFeatures(cur, cmd.argument))
- cur.notdispatched();
+ cur.undispatched();
break;
// insert file functions
case LFUN_FILE_INSERT_ASCII: {
string tmpstr = getContentsOfAsciiFile(&cur.bv(), cmd.argument, false);
if (!tmpstr.empty() && !insertAsciiString(cur.bv(), tmpstr, false))
- cur.notdispatched();
+ cur.undispatched();
break;
}
- case LFUN_LANGUAGE:
- case LFUN_EMPH:
- case LFUN_BOLD:
- case LFUN_NOUN:
- case LFUN_CODE:
- case LFUN_SANS:
- case LFUN_ROMAN:
- case LFUN_DEFAULT:
- case LFUN_UNDERLINE:
- case LFUN_FONT_SIZE:
- lyxerr << "font changes not re-implemented for tables after LOCK" << endl;
- break;
-
case LFUN_CUT:
if (copySelection(cur)) {
recordUndo(cur, Undo::DELETE);
maxCols = max(cols, maxCols);
paste_tabular.reset(
- new LyXTabular(cur.bv().buffer()->params(), rows, maxCols));
+ new LyXTabular(cur.buffer().params(), rows, maxCols));
string::size_type op = 0;
int cell = 0;
}
+// function sets an object as defined in func_status.h:
+// states OK, Unknown, Disabled, On, Off.
+bool InsetTabular::getStatus(LCursor & cur, FuncRequest const & cmd,
+ FuncStatus & status) const
+{
+ switch (cmd.action) {
+ case LFUN_TABULAR_FEATURE: {
+ int actcell = cur.idx();
+ int action = LyXTabular::LAST_ACTION;
+ int i = 0;
+ for (; tabularFeature[i].action != LyXTabular::LAST_ACTION; ++i) {
+ string const tmp = tabularFeature[i].feature;
+ if (tmp == cmd.argument.substr(0, tmp.length())) {
+ action = tabularFeature[i].action;
+ break;
+ }
+ }
+ if (action == LyXTabular::LAST_ACTION) {
+ status.clear();
+ status.unknown(true);
+ return true;
+ }
+
+ string const argument
+ = ltrim(cmd.argument.substr(tabularFeature[i].feature.length()));
+
+ int sel_row_start = 0;
+ int sel_row_end = 0;
+ int dummy;
+ LyXTabular::ltType dummyltt;
+ bool flag = true;
+
+ getSelection(cur, sel_row_start, sel_row_end, dummy, dummy);
+
+ switch (action) {
+ case LyXTabular::SET_PWIDTH:
+ case LyXTabular::SET_MPWIDTH:
+ case LyXTabular::SET_SPECIAL_COLUMN:
+ case LyXTabular::SET_SPECIAL_MULTI:
+ case LyXTabular::APPEND_ROW:
+ case LyXTabular::APPEND_COLUMN:
+ case LyXTabular::DELETE_ROW:
+ case LyXTabular::DELETE_COLUMN:
+ case LyXTabular::SET_ALL_LINES:
+ case LyXTabular::UNSET_ALL_LINES:
+ status.clear();
+ return true;
+
+ case LyXTabular::MULTICOLUMN:
+ status.setOnOff(tabular.isMultiColumn(actcell));
+ break;
+
+ case LyXTabular::M_TOGGLE_LINE_TOP:
+ flag = false;
+ case LyXTabular::TOGGLE_LINE_TOP:
+ status.setOnOff(tabular.topLine(actcell, flag));
+ break;
+
+ case LyXTabular::M_TOGGLE_LINE_BOTTOM:
+ flag = false;
+ case LyXTabular::TOGGLE_LINE_BOTTOM:
+ status.setOnOff(tabular.bottomLine(actcell, flag));
+ break;
+
+ case LyXTabular::M_TOGGLE_LINE_LEFT:
+ flag = false;
+ case LyXTabular::TOGGLE_LINE_LEFT:
+ status.setOnOff(tabular.leftLine(actcell, flag));
+ break;
+
+ case LyXTabular::M_TOGGLE_LINE_RIGHT:
+ flag = false;
+ case LyXTabular::TOGGLE_LINE_RIGHT:
+ status.setOnOff(tabular.rightLine(actcell, flag));
+ break;
+
+ case LyXTabular::M_ALIGN_LEFT:
+ flag = false;
+ case LyXTabular::ALIGN_LEFT:
+ status.setOnOff(tabular.getAlignment(actcell, flag) == LYX_ALIGN_LEFT);
+ break;
+
+ case LyXTabular::M_ALIGN_RIGHT:
+ flag = false;
+ case LyXTabular::ALIGN_RIGHT:
+ status.setOnOff(tabular.getAlignment(actcell, flag) == LYX_ALIGN_RIGHT);
+ break;
+
+ case LyXTabular::M_ALIGN_CENTER:
+ flag = false;
+ case LyXTabular::ALIGN_CENTER:
+ status.setOnOff(tabular.getAlignment(actcell, flag) == LYX_ALIGN_CENTER);
+ break;
+
+ case LyXTabular::ALIGN_BLOCK:
+ status.enabled(!tabular.getPWidth(actcell).zero());
+ status.setOnOff(tabular.getAlignment(actcell, flag) == LYX_ALIGN_BLOCK);
+ break;
+
+ case LyXTabular::M_VALIGN_TOP:
+ flag = false;
+ case LyXTabular::VALIGN_TOP:
+ status.setOnOff(
+ tabular.getVAlignment(actcell, flag) == LyXTabular::LYX_VALIGN_TOP);
+ break;
+
+ case LyXTabular::M_VALIGN_BOTTOM:
+ flag = false;
+ case LyXTabular::VALIGN_BOTTOM:
+ status.setOnOff(
+ tabular.getVAlignment(actcell, flag) == LyXTabular::LYX_VALIGN_BOTTOM);
+ break;
+
+ case LyXTabular::M_VALIGN_MIDDLE:
+ flag = false;
+ case LyXTabular::VALIGN_MIDDLE:
+ status.setOnOff(
+ tabular.getVAlignment(actcell, flag) == LyXTabular::LYX_VALIGN_MIDDLE);
+ break;
+
+ case LyXTabular::SET_LONGTABULAR:
+ status.setOnOff(tabular.isLongTabular());
+ break;
+
+ case LyXTabular::UNSET_LONGTABULAR:
+ status.setOnOff(!tabular.isLongTabular());
+ break;
+
+ case LyXTabular::SET_ROTATE_TABULAR:
+ status.setOnOff(tabular.getRotateTabular());
+ break;
+
+ case LyXTabular::UNSET_ROTATE_TABULAR:
+ status.setOnOff(!tabular.getRotateTabular());
+ break;
+
+ case LyXTabular::SET_ROTATE_CELL:
+ status.setOnOff(tabular.getRotateCell(actcell));
+ break;
+
+ case LyXTabular::UNSET_ROTATE_CELL:
+ status.setOnOff(!tabular.getRotateCell(actcell));
+ break;
+
+ case LyXTabular::SET_USEBOX:
+ status.setOnOff(strToInt(argument) == tabular.getUsebox(actcell));
+ break;
+
+ case LyXTabular::SET_LTFIRSTHEAD:
+ status.setOnOff(tabular.getRowOfLTHead(sel_row_start, dummyltt));
+ break;
+
+ case LyXTabular::SET_LTHEAD:
+ status.setOnOff(tabular.getRowOfLTHead(sel_row_start, dummyltt));
+ break;
+
+ case LyXTabular::SET_LTFOOT:
+ status.setOnOff(tabular.getRowOfLTFoot(sel_row_start, dummyltt));
+ break;
+
+ case LyXTabular::SET_LTLASTFOOT:
+ status.setOnOff(tabular.getRowOfLTFoot(sel_row_start, dummyltt));
+ break;
+
+ case LyXTabular::SET_LTNEWPAGE:
+ status.setOnOff(tabular.getLTNewPage(sel_row_start));
+ break;
+
+ default:
+ status.clear();
+ status.enabled(false);
+ break;
+ }
+ return true;
+ }
+
+ default:
+ // we try to handle this event in the insets dispatch function.
+ return cell(cur.idx()).getStatus(cur, cmd, status);
+ }
+}
+
+
int InsetTabular::latex(Buffer const & buf, ostream & os,
OutputParams const & runparams) const
{
OutputParams const & runparams) const
{
int ret = 0;
- InsetOld * master;
+ InsetOld * master = 0;
+#ifdef WITH_WARNINGS
+#warning Why not pass a proper DocIterator here?
+#endif
+#if 0
// if the table is inside a float it doesn't need the informaltable
// wrapper. Search for it.
for (master = owner(); master; master = master->owner())
if (master->lyxCode() == InsetOld::FLOAT_CODE)
break;
+#endif
if (!master) {
os << "<informaltable>";
}
-void InsetTabular::getCursorPos(CursorSlice const & cur, int & x, int & y) const
+void InsetTabular::getCursorPos(LCursor const & cur, int & x, int & y) const
{
cell(cur.idx()).getCursorPos(cur, x, y);
}
void InsetTabular::moveNextCell(LCursor & cur)
{
- lyxerr << "InsetTabular::moveNextCell 1 cur: " << cur << endl;
+ lyxerr << "InsetTabular::moveNextCell 1 cur: " << cur.top() << endl;
if (isRightToLeft(cur)) {
+ lyxerr << "InsetTabular::moveNextCell A cur: " << endl;
if (tabular.isFirstCellInRow(cur.idx())) {
int row = tabular.row_of_cell(cur.idx());
if (row == tabular.rows() - 1)
--cur.idx();
}
} else {
+ lyxerr << "InsetTabular::moveNextCell B cur: " << endl;
if (tabular.isLastCell(cur.idx()))
return;
++cur.idx();
}
cur.par() = 0;
cur.pos() = 0;
- lyxerr << "InsetTabular::moveNextCell 2 cur: " << cur << endl;
+ lyxerr << "InsetTabular::moveNextCell 2 cur: " << cur.top() << endl;
resetPos(cur);
}
case LyXTabular::APPEND_ROW:
// append the row into the tabular
tabular.appendRow(bv.buffer()->params(), actcell);
- tabular.setOwner(this);
break;
case LyXTabular::APPEND_COLUMN:
// append the column into the tabular
tabular.appendColumn(bv.buffer()->params(), actcell);
- tabular.setOwner(this);
actcell = tabular.getCellNumber(row, column);
break;
#if 0
// just multicol for one Single Cell
if (!hasSelection()) {
- // check wether we are completly in a multicol
+ // check whether we are completly in a multicol
if (tabular.isMultiColumn(actcell))
tabular.unsetMultiColumn(actcell);
else
}
-//
-// function returns an object as defined in func_status.h:
-// states OK, Unknown, Disabled, On, Off.
-//
-FuncStatus InsetTabular::getStatus(BufferView & bv,
- string const & what, int actcell) const
-{
- FuncStatus status;
- int action = LyXTabular::LAST_ACTION;
- LCursor & cur = bv.cursor();
-
- int i = 0;
- for (; tabularFeature[i].action != LyXTabular::LAST_ACTION; ++i) {
- string const tmp = tabularFeature[i].feature;
- if (tmp == what.substr(0, tmp.length())) {
- //if (!compare(tabularFeatures[i].feature.c_str(), what.c_str(),
- // tabularFeatures[i].feature.length()))
- action = tabularFeature[i].action;
- break;
- }
- }
- if (action == LyXTabular::LAST_ACTION) {
- status.clear();
- status.unknown(true);
- return status;
- }
-
- string const argument
- = ltrim(what.substr(tabularFeature[i].feature.length()));
-
- int sel_row_start = 0;
- int sel_row_end = 0;
- int dummy;
- LyXTabular::ltType dummyltt;
- bool flag = true;
-
- getSelection(cur, sel_row_start, sel_row_end, dummy, dummy);
-
- switch (action) {
- case LyXTabular::SET_PWIDTH:
- case LyXTabular::SET_MPWIDTH:
- case LyXTabular::SET_SPECIAL_COLUMN:
- case LyXTabular::SET_SPECIAL_MULTI:
- case LyXTabular::APPEND_ROW:
- case LyXTabular::APPEND_COLUMN:
- case LyXTabular::DELETE_ROW:
- case LyXTabular::DELETE_COLUMN:
- case LyXTabular::SET_ALL_LINES:
- case LyXTabular::UNSET_ALL_LINES:
- status.clear();
- return status;
-
- case LyXTabular::MULTICOLUMN:
- status.setOnOff(tabular.isMultiColumn(actcell));
- break;
-
- case LyXTabular::M_TOGGLE_LINE_TOP:
- flag = false;
- case LyXTabular::TOGGLE_LINE_TOP:
- status.setOnOff(tabular.topLine(actcell, flag));
- break;
-
- case LyXTabular::M_TOGGLE_LINE_BOTTOM:
- flag = false;
- case LyXTabular::TOGGLE_LINE_BOTTOM:
- status.setOnOff(tabular.bottomLine(actcell, flag));
- break;
-
- case LyXTabular::M_TOGGLE_LINE_LEFT:
- flag = false;
- case LyXTabular::TOGGLE_LINE_LEFT:
- status.setOnOff(tabular.leftLine(actcell, flag));
- break;
-
- case LyXTabular::M_TOGGLE_LINE_RIGHT:
- flag = false;
- case LyXTabular::TOGGLE_LINE_RIGHT:
- status.setOnOff(tabular.rightLine(actcell, flag));
- break;
-
- case LyXTabular::M_ALIGN_LEFT:
- flag = false;
- case LyXTabular::ALIGN_LEFT:
- status.setOnOff(tabular.getAlignment(actcell, flag) == LYX_ALIGN_LEFT);
- break;
-
- case LyXTabular::M_ALIGN_RIGHT:
- flag = false;
- case LyXTabular::ALIGN_RIGHT:
- status.setOnOff(tabular.getAlignment(actcell, flag) == LYX_ALIGN_RIGHT);
- break;
-
- case LyXTabular::M_ALIGN_CENTER:
- flag = false;
- case LyXTabular::ALIGN_CENTER:
- status.setOnOff(tabular.getAlignment(actcell, flag) == LYX_ALIGN_CENTER);
- break;
-
- case LyXTabular::ALIGN_BLOCK:
- status.disabled(tabular.getPWidth(actcell).zero());
- status.setOnOff(tabular.getAlignment(actcell, flag) == LYX_ALIGN_BLOCK);
- break;
-
- case LyXTabular::M_VALIGN_TOP:
- flag = false;
- case LyXTabular::VALIGN_TOP:
- status.setOnOff(
- tabular.getVAlignment(actcell, flag) == LyXTabular::LYX_VALIGN_TOP);
- break;
-
- case LyXTabular::M_VALIGN_BOTTOM:
- flag = false;
- case LyXTabular::VALIGN_BOTTOM:
- status.setOnOff(
- tabular.getVAlignment(actcell, flag) == LyXTabular::LYX_VALIGN_BOTTOM);
- break;
-
- case LyXTabular::M_VALIGN_MIDDLE:
- flag = false;
- case LyXTabular::VALIGN_MIDDLE:
- status.setOnOff(
- tabular.getVAlignment(actcell, flag) == LyXTabular::LYX_VALIGN_MIDDLE);
- break;
-
- case LyXTabular::SET_LONGTABULAR:
- status.setOnOff(tabular.isLongTabular());
- break;
-
- case LyXTabular::UNSET_LONGTABULAR:
- status.setOnOff(!tabular.isLongTabular());
- break;
-
- case LyXTabular::SET_ROTATE_TABULAR:
- status.setOnOff(tabular.getRotateTabular());
- break;
-
- case LyXTabular::UNSET_ROTATE_TABULAR:
- status.setOnOff(!tabular.getRotateTabular());
- break;
-
- case LyXTabular::SET_ROTATE_CELL:
- status.setOnOff(tabular.getRotateCell(actcell));
- break;
-
- case LyXTabular::UNSET_ROTATE_CELL:
- status.setOnOff(!tabular.getRotateCell(actcell));
- break;
-
- case LyXTabular::SET_USEBOX:
- status.setOnOff(strToInt(argument) == tabular.getUsebox(actcell));
- break;
-
- case LyXTabular::SET_LTFIRSTHEAD:
- status.setOnOff(tabular.getRowOfLTHead(sel_row_start, dummyltt));
- break;
-
- case LyXTabular::SET_LTHEAD:
- status.setOnOff(tabular.getRowOfLTHead(sel_row_start, dummyltt));
- break;
-
- case LyXTabular::SET_LTFOOT:
- status.setOnOff(tabular.getRowOfLTFoot(sel_row_start, dummyltt));
- break;
-
- case LyXTabular::SET_LTLASTFOOT:
- status.setOnOff(tabular.getRowOfLTFoot(sel_row_start, dummyltt));
- break;
-
- case LyXTabular::SET_LTNEWPAGE:
- status.setOnOff(tabular.getLTNewPage(sel_row_start));
- break;
-
- default:
- status.clear();
- status.disabled(true);
- break;
- }
- return status;
-}
-
-
void InsetTabular::getLabelList(Buffer const & buffer,
vector<string> & list) const
{
getSelection(cur, rs, re, cs, ce);
paste_tabular.reset(new LyXTabular(tabular));
- paste_tabular->setOwner(this);
for (int i = 0; i < rs; ++i)
paste_tabular->deleteRow(0);
ostringstream os;
OutputParams const runparams;
- paste_tabular->plaintext(*cur.bv().buffer(), os, runparams, 0, true, '\t');
+ paste_tabular->plaintext(cur.buffer(), os, runparams, 0, true, '\t');
cur.bv().stuffClipboard(os.str());
return true;
}
}
InsetText & inset = tabular.getCellInset(r2, c2);
inset = paste_tabular->getCellInset(r1, c1);
- inset.setOwner(this);
inset.markNew();
}
}
if (!cur.selection())
return;
- bool const track = cur.bv().buffer()->params().tracking_changes;
+ bool const track = cur.buffer().params().tracking_changes;
int rs, re, cs, ce;
- getSelection(cur, rs, re, cs, ce);
+ getSelection(cur, rs, re, cs, ce);
for (int i = rs; i <= re; ++i)
for (int j = cs; j <= ce; ++j)
cell(tabular.getCellNumber(i, j)).clear(track);
void InsetTabular::getSelection(LCursor & cur,
int & rs, int & re, int & cs, int & ce) const
{
- CursorSlice & beg = cur.selBegin();
- CursorSlice & end = cur.selEnd();
+ CursorSlice const & beg = cur.selBegin();
+ CursorSlice const & end = cur.selEnd();
cs = tabular.column_of_cell(beg.idx());
ce = tabular.column_of_cell(end.idx());
if (cs > ce) {
if (usePaste) {
paste_tabular.reset(
new LyXTabular(bv.buffer()->params(), rows, maxCols));
- paste_tabular->setOwner(this);
loctab = paste_tabular.get();
cols = 0;
} else {
// we can only set this if we are not too far right
if (cols < columns) {
InsetText & inset = loctab->getCellInset(cell);
- LyXFont const font = inset.text_.
- getFont(inset.paragraphs().begin(), 0);
+ LyXFont const font = inset.text_.getFont(0, 0);
inset.setText(buf.substr(op, p - op), font);
++cols;
++cell;
// we can only set this if we are not too far right
if (cols < columns) {
InsetText & inset = tabular.getCellInset(cell);
- LyXFont const font = inset.text_.
- getFont(inset.paragraphs().begin(), 0);
+ LyXFont const font = inset.text_.getFont(0, 0);
inset.setText(buf.substr(op, p - op), font);
}
cols = ocol;
// check for the last cell if there is no trailing '\n'
if (cell < cells && op < len) {
InsetText & inset = loctab->getCellInset(cell);
- LyXFont const font = inset.text_.getFont(inset.paragraphs().begin(), 0);
+ LyXFont const font = inset.text_.getFont(0, 0);
inset.setText(buf.substr(op, len - op), font);
}
return true;
bool InsetTabular::tablemode(LCursor & cur) const
{
- return cur.selBegin().idx() != cur.selEnd().idx();
+ return cur.selection() && cur.selBegin().idx() != cur.selEnd().idx();
}
LyXLex lex(0,0);
lex.setStream(data);
+#ifdef WITH_WARNINGS
#warning CHECK verify that this is a sane value to return.
+#endif
if (in.empty())
return -1;
string const InsetTabularMailer::params2string(InsetTabular const & inset)
{
ostringstream data;
+#ifdef WITH_WARNINGS
#warning wrong!
+#endif
//data << name_ << " \\active_cell " << inset.getActCell() << '\n';
data << name_ << " \\active_cell " << 0 << '\n';
inset.write(inset.buffer(), data);
projects / features.git / blobdiff