Applied Angus patch to compile on DEC C++ and to avoid name clashes

[lyx.git] / src / tabular.C

diff --git a/src/tabular.C b/src/tabular.C
index 7e26aa1e249a52a69c10b1416701ba69efdd4aee..5f149ce2660bc1ca72a7eee90ba8133aefd410f0 100644 (file)
--- a/src/tabular.C
+++ b/src/tabular.C
@@ -1993,6 +1993,7 @@ int LyXTabular::TeXCellPreamble(ostream & os, int cell) const
            if (LeftLine(cell))
                os << '|';
            if (!GetPWidth(cell).empty()) {
+#warning Jürgen, are these alignments correct? (Lgb)
                switch (GetVAlignment(cell)) {
                case LYX_VALIGN_TOP:
                    os << "p";
@@ -2043,6 +2044,7 @@ int LyXTabular::TeXCellPreamble(ostream & os, int cell) const
     } else if (GetUsebox(cell) == BOX_MINIPAGE) {
        os << "\\begin{minipage}[";
        switch (GetVAlignment(cell)) {
+#warning Jürgen, are these alignments correct? (Lgb)
        case LYX_VALIGN_TOP:
            os << "t";
            break;
@@ -2107,6 +2109,7 @@ int LyXTabular::Latex(Buffer const * buf,
            os << column_info[i].align_special;
        } else if (!column_info[i].p_width.empty()) {
            switch (column_info[i].valignment) {
+#warning Jürgen, are these alignments correct? (Lgb)
            case LYX_VALIGN_TOP:
                os << "p";
                break;
@@ -2553,7 +2556,7 @@ void LyXTabular::Validate(LaTeXFeatures & features) const
         features.longtable = true;
     if (NeedRotating())
        features.rotating = true;
-    for (int cell = 0; cell < numberofcells; ++cell) {
+    for (int cell = 0; !features.array && (cell < numberofcells); ++cell) {
        if (GetVAlignment(cell) != LYX_VALIGN_TOP)
            features.array = true;
        GetCellInset(cell)->Validate(features);