Create a grfx::Loader class and so move large chunks of code out of

[lyx.git] / src / tabular.C

diff --git a/src/tabular.C b/src/tabular.C
index f8631459c2e8e841bdccb5b5c24c72fd01d4f2c1..eae53660711a8fe4c323e176fa63c252b4d111f5 100644 (file)
--- a/src/tabular.C
+++ b/src/tabular.C
@@ -1449,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;
@@ -2362,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;
        }
@@ -2371,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;