X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftabular.C;h=eae53660711a8fe4c323e176fa63c252b4d111f5;hb=1bb197b5d4821404cfe11509c71d1f8de7cee711;hp=3ba8ca8bf0065b1d65d2b4a170205a7f25a52d80;hpb=06f9f0ea08ddcf13e99ea02cff21471aa2020c9e;p=lyx.git

diff --git a/src/tabular.C b/src/tabular.C
index 3ba8ca8bf0..eae5366071 100644
--- a/src/tabular.C
+++ b/src/tabular.C
@@ -40,6 +40,7 @@
 #include <algorithm>
 #include <cstdlib>
 
+using std::abs;
 using std::ostream;
 using std::istream;
 using std::getline;
@@ -1448,7 +1449,8 @@ void LyXTabular::OldFormatRead(BufferParams const & bp,
 	Paragraph * par = new Paragraph;
 	Paragraph * return_par = 0;
 
-	par->layout(textclasslist[bp.textclass].defaultLayoutName());
+	par->layout(textclasslist[bp.textclass].defaultLayout());
+
 	string tmptok;
 	int pos = 0;
 	Paragraph::depth_type depth = 0;
@@ -2361,7 +2363,7 @@ int LyXTabular::docbookRow(Buffer const * buf, ostream & os, int row) const
 		}
 
 		os << ">";
-		ret += GetCellInset(cell)->docbook(buf, os);
+		ret += GetCellInset(cell)->docbook(buf, os, true);
 		os << "</entry>\n";
 		++cell;
 	}
@@ -2370,7 +2372,8 @@ int LyXTabular::docbookRow(Buffer const * buf, ostream & os, int row) const
 }
 
 
-int LyXTabular::docBook(Buffer const * buf, ostream & os) const
+int LyXTabular::docbook(Buffer const * buf, ostream & os,
+			bool /*mixcont*/) const
 {
 	int ret = 0;