#include "layout.h"
#include "support/lstrings.h"
#include "support/lyxmanip.h"
+#include "support/LAssert.h"
#include "lyx_gui_misc.h"
-#include "insets/insettext.h"
using std::ostream;
using std::istream;
+using std::getline;
using std::max;
using std::endl;
/// Define a few methods for the inner structs
-LyXTable::cellstruct::cellstruct(Buffer * buf)
+LyXTable::cellstruct::cellstruct()
{
cellno = 0; //should be initilaized correctly later.
width_of_cell = 0;
has_cont_row = false;
rotate = false;
linebreaks = false;
- buf ? inset = new InsetText(buf): inset = 0;
-
}
LyXTable::cellstruct::~cellstruct()
{
- if (inset)
- delete inset;
}
LyXTable::cellstruct &
}
/* konstruktor */
-LyXTable::LyXTable(int rows_arg, int columns_arg, Buffer *buf)
+LyXTable::LyXTable(int rows_arg, int columns_arg)
{
- buffer = buf;
Init(rows_arg, columns_arg);
}
-LyXTable::LyXTable(LyXTable const & lt, Buffer * buf)
+LyXTable::LyXTable(LyXTable const & lt)
{
- buffer = buf;
Init(lt.rows, lt.columns);
operator=(lt);
}
-LyXTable::LyXTable(LyXLex & lex, Buffer *buf)
+LyXTable::LyXTable(LyXLex & lex)
{
istream & is = lex.getStream();
- buffer = buf;
Read(is);
}
LyXTable * LyXTable::Clone()
{
LyXTable * result = new LyXTable(rows, columns);
- int row, column;;
+ int row, column;
for (row = 0; row < rows; ++row) {
for (column = 0; column < columns; ++column) {
int cellno = 0;
for (i = 0; i < rows; ++i) {
- cell_info[i] = new cellstruct[columns](buffer);
+ cell_info[i] = new cellstruct[columns];
for (j = 0; j < columns; ++j) {
cell_info[i][j].cellno = cellno++;
}
os << "\\multicolumn{"
<< cells_in_multicolumn(nvcell)
<< "}{";
- if (!cellinfo_of_cell(cell+1)->align_special.empty()) {
- os << cellinfo_of_cell(cell+1)->align_special
+ if (!cellinfo_of_cell(nvcell)->align_special.empty()) {
+ os << cellinfo_of_cell(nvcell)->align_special
<< "}{";
} else {
if (LeftLine(nvcell))
}
}
if (nvcell < numberofcells && Linebreaks(nvcell)) {
-// !column_info[column_of_cell(nvcell)].p_width.empty()) {
- os << "\\parbox{"
+ os << "\\parbox[t]{"
<< GetPWidth(nvcell)
<< "}{\\smallskip{}";
}
{
return 0;
}
-
-InsetText * LyXTable::GetCellInset(int cell) const
-{
- return cell_info[row_of_cell(cell)][column_of_cell(cell)].inset;
-}