Replace LString.h with support/std_string.h,

[features.git] / src / mathed / math_gridinset.C

diff --git a/src/mathed/math_gridinset.C b/src/mathed/math_gridinset.C
index 73069213011f4d90c6493b03b7a0ac9764811e3e..5d21dfd5d0bd0bba243e400cffbcd6cfd357ca5a 100644 (file)
--- a/src/mathed/math_gridinset.C
+++ b/src/mathed/math_gridinset.C
@@ -1,11 +1,22 @@
+/**
+ * \file math_gridinset.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
+#include <config.h>
+
 #include "math_gridinset.h"
 #include "math_mathmlstream.h"
 #include "math_streamstr.h"
-#include "lyxfont.h"
 #include "funcrequest.h"
 #include "frontends/Painter.h"
 #include "debug.h"
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 
 
 #include "insets/mailinset.h"
@@ -15,6 +26,8 @@ using std::max;
 using std::min;
 using std::vector;
 using std::istream;
+using std::auto_ptr;
+using std::endl;
 
 
 class GridInsetMailer : public MailInset {
@@ -27,7 +40,7 @@ public:
                return theName;
        }
        ///
-       virtual string const inset2string() const
+       virtual string const inset2string(Buffer const &) const
        {
                ostringstream data;
                //data << name() << " active_cell " << inset.getActCell() << '\n';
@@ -114,7 +127,7 @@ MathGridInset::MathGridInset(char v, string const & h)
        setDefaults();
        valign(v);
        halign(h);
-       //lyxerr << "created grid with " << ncols() << " columns\n";
+       //lyxerr << "created grid with " << ncols() << " columns" << endl;
 }
 
 
@@ -160,9 +173,9 @@ MathGridInset::~MathGridInset()
 }
 
 
-InsetBase * MathGridInset::clone() const
+auto_ptr<InsetBase> MathGridInset::clone() const
 {
-       return new MathGridInset(*this);
+       return auto_ptr<InsetBase>(new MathGridInset(*this));
 }
 
 
@@ -175,9 +188,9 @@ MathInset::idx_type MathGridInset::index(row_type row, col_type col) const
 void MathGridInset::setDefaults()
 {
        if (ncols() <= 0)
-               lyxerr << "positive number of columns expected\n";
+               lyxerr << "positive number of columns expected" << endl;
        //if (nrows() <= 0)
-       //      lyxerr << "positive number of rows expected\n";
+       //      lyxerr << "positive number of rows expected" << endl;
        for (col_type col = 0; col < ncols(); ++col) {
                colinfo_[col].align_ = defaultColAlign(col);
                colinfo_[col].skip_  = defaultColSpace(col);
@@ -199,7 +212,7 @@ void MathGridInset::halign(string const & hh)
                        ++col;
                        colinfo_[col].lines_ = 0;
                } else {
-                       lyxerr << "unknown column separator: '" << c << "'\n";
+                       lyxerr << "unknown column separator: '" << c << "'" << endl;
                }
        }
 
@@ -1052,12 +1065,12 @@ dispatch_result MathGridInset::dispatch
                        return DISPATCHED_POP;
 
                case LFUN_CELL_SPLIT:
-                       //bv->lockedInsetStoreUndo(Undo::EDIT);
+                       //recordUndo(bv, Undo::ATOMIC);
                        splitCell(idx, pos);
                        return DISPATCHED_POP;
 
                case LFUN_BREAKLINE: {
-                       //bv->lockedInsetStoreUndo(Undo::INSERT);
+                       //recordUndo(bv, Undo::INSERT);
                        row_type const r = row(idx);
                        addRow(r);
 
@@ -1077,13 +1090,13 @@ dispatch_result MathGridInset::dispatch
                }
 
                case LFUN_TABULAR_FEATURE: {
-                       //lyxerr << "handling tabular-feature " << cmd.argument << "\n";
+                       //lyxerr << "handling tabular-feature " << cmd.argument << endl;
                        istringstream is(STRCONV(cmd.argument));
                        string s;
                        is >> s;
                        if (s == "valign-top")
                                valign('t');
-                       else if (s == "valign-center")
+                       else if (s == "valign-middle")
                                valign('c');
                        else if (s == "valign-bottom")
                                valign('b');
@@ -1129,12 +1142,12 @@ dispatch_result MathGridInset::dispatch
                                swapCol(col(idx));
                        else
                                return UNDISPATCHED;
-                       lyxerr << "returning DISPATCHED_POP\n";
+                       lyxerr << "returning DISPATCHED_POP" << endl;
                        return DISPATCHED_POP;
                }
 
                case LFUN_PASTE: {
-                       //lyxerr << "pasting '" << cmd.argument << "'\n";
+                       //lyxerr << "pasting '" << cmd.argument << "'" << endl;
                        MathGridInset grid(1, 1);
                        mathed_parse_normal(grid, cmd.argument);
                        if (grid.nargs() == 1) {