and back to cvs

[lyx.git] / src / tabular.C

diff --git a/src/tabular.C b/src/tabular.C
index cc6744465c7b5e9472280d363243939d1ba1bed1..d158cf339fbeeec518181ca2583c5a71433345ee 100644 (file)
--- a/src/tabular.C
+++ b/src/tabular.C
@@ -92,7 +92,9 @@ LyXTabular::LyXTabular(InsetTabular * inset, LyXTabular const & lt)
 {
     owner_ = inset;
     Init(lt.rows_, lt.columns_);
+#ifdef WITH_WARNINGS
 #warning Jürgen, can you make it the other way round. So that copy assignment depends on the copy constructor and not the other way. (Lgb)
+#endif
     operator=(lt);
 }
 
@@ -342,7 +344,9 @@ void LyXTabular::set_row_column_number_info(bool oldformat)
     }
 #else
     // Isn't this the same as the while above? (Lgb)
+#ifdef WITH_WARNINGS
 #warning Please check this Jürgen.
+#endif
     // if ok please delete the #if 0 section above. (Lgb)
     for (int row = 0, column = 0, c = 0;
         c < numberofcells && row < rows_ && column < columns_;) {
@@ -1262,7 +1266,6 @@ void LyXTabular::OldFormatRead(LyXLex & lex, string const & fl)
     int e = 0;
     int f = 0;
     int g = 0;
-    int h = 0;
        
     istream & is = lex.getStream();
     string s(fl);
@@ -1314,7 +1317,7 @@ void LyXTabular::OldFormatRead(LyXLex & lex, string const & fl)
        endfoot = c;
        endlastfoot = d;
        for (i = 0; i < rows_; ++i) {
-           a = b = c = d = e = f = g = h = 0;
+           a = b = c = d = e = f = g = 0;
            is >> a >> b >> c >> d;
            row_info[i].top_line = a;
            row_info[i].bottom_line = b;
@@ -1460,7 +1463,7 @@ void LyXTabular::OldFormatRead(LyXLex & lex, string const & fl)
                par->InsertChar(i, ' ');
            }
        }
-       par->CopyIntoMinibuffer(owner_->BufferOwner()->params, i);
+       par->CopyIntoMinibuffer(*owner_->BufferOwner(), i);
        inset->par->InsertFromMinibuffer(inset->par->Last());
     }
     delete par;
@@ -2031,8 +2034,8 @@ int LyXTabular::TeXCellPreamble(ostream & os, int cell) const
     }
     if (IsMultiColumn(cell)) {
        os << "\\multicolumn{" << cells_in_multicolumn(cell) << "}{";
-       if (!cellinfo_of_cell(cell+1)->align_special.empty()) {
-           os << cellinfo_of_cell(cell+1)->align_special << "}{";
+       if (!cellinfo_of_cell(cell)->align_special.empty()) {
+           os << cellinfo_of_cell(cell)->align_special << "}{";
        } else {
            if (LeftLine(cell))
                os << '|';
@@ -2387,7 +2390,9 @@ int LyXTabular::AsciiTopHLine(ostream & os, int row,
        return 0;
 #else
     // Isn't this equivalent? (Lgb)
+#ifdef WITH_WARNINGS
 #warning Please check this Jürgen.
+#endif
     // If ok please delete the abofe #if 0 section. (Lgb)
     for (int i = fcell; i < n; ++i) {
            if (TopLine(i))
@@ -2443,7 +2448,9 @@ int LyXTabular::AsciiBottomHLine(ostream & os, int row,
        return 0;
 #else
     // Isn't this equivalent? (Lgb)
+#ifdef WITH_WARNINGS
 #warning Please check this Jürgen.
+#endif
     // If ok, please delete the above #if 0 section. (Lgb)
     for (int i = fcell; i < n; ++i) {
        if (BottomLine(i))