Replace LString.h with support/std_string.h,

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

diff --git a/src/mathed/formulabase.C b/src/mathed/formulabase.C
index 004e04502505d1239daedaf2990e7d6a4c249c6a..c50427587aff15045308bfaa425a397065a12262 100644 (file)
--- a/src/mathed/formulabase.C
+++ b/src/mathed/formulabase.C
@@ -11,44 +11,31 @@
 
 #include <config.h>
 
-#include "Lsstream.h"
+#include "formulabase.h"
+#include "support/std_sstream.h"
 #include "support/LAssert.h"
 #include "formula.h"
 #include "formulamacro.h"
-#include "lyxrc.h"
 #include "funcrequest.h"
 #include "BufferView.h"
 #include "lyxtext.h"
 #include "gettext.h"
-#include "LaTeXFeatures.h"
 #include "debug.h"
 #include "math_support.h"
-#include "metricsinfo.h"
-#include "math_data.h"
 #include "support/lstrings.h"
 #include "support/lyxlib.h"
 #include "frontends/LyXView.h"
-#include "frontends/font_metrics.h"
-#include "frontends/mouse_state.h"
 #include "math_arrayinset.h"
-#include "math_charinset.h"
 #include "math_deliminset.h"
 #include "math_cursor.h"
 #include "math_factory.h"
-#include "math_fontinset.h"
 #include "math_hullinset.h"
-#include "math_iterator.h"
-#include "math_macrotable.h"
 #include "math_parser.h"
-#include "math_pos.h"
 #include "math_spaceinset.h"
 #include "undo_funcs.h"
-#include "textpainter.h"
 #include "frontends/Dialogs.h"
-#include "intl.h"
 #include "ref_inset.h"
 
-#include <fstream>
 
 using namespace lyx::support;
 
@@ -83,7 +70,7 @@ bool openNewInset(BufferView * bv, UpdatableInset * new_inset)
 
 
 InsetFormulaBase::InsetFormulaBase()
-       : xo_(0), yo_(0)
+       : view_(0), xo_(0), yo_(0)
 {
        // This is needed as long the math parser is not re-entrant
        initMath();
@@ -892,7 +879,7 @@ void mathDispatchCreation(FuncRequest const & cmd, bool display)
        //      sel = "";
        //else
 
-       string sel = bv->getLyXText()->selectionAsString(bv->buffer(), false);
+       string sel = bv->getLyXText()->selectionAsString(*bv->buffer(), false);
 
        if (sel.empty()) {
                InsetFormula * f = new InsetFormula(bv);