Tiny clean-ups.

[lyx.git] / src / frontends / xforms / FormMathsMatrix.C

diff --git a/src/frontends/xforms/FormMathsMatrix.C b/src/frontends/xforms/FormMathsMatrix.C
index b071274b90e90e5a61bf5240cc86be45f2c75e34..9a12b1684acf67535fd45c76a4a170fe2c0d6d74 100644 (file)
--- a/src/frontends/xforms/FormMathsMatrix.C
+++ b/src/frontends/xforms/FormMathsMatrix.C
@@ -8,28 +8,27 @@
  * \author John Levon
  * \author Angus Leeming
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
-
 #include "FormMathsMatrix.h"
 #include "forms/form_maths_matrix.h"
 #include "ControlMath.h"
+
 #include "xformsBC.h"
-#include "ButtonController.h"
 
-#include "support/LAssert.h"
-#include "support/lyxalgo.h" // lyx::count
+#include "controllers/ButtonController.h"
 
-#include "Lsstream.h"
+#include "support/lyxalgo.h" // lyx::count
 
 #include "lyx_forms.h"
 
-#include <algorithm>
+#include "support/std_sstream.h"
+
 
-using namespace lyx::support;
+using std::ostringstream;
 
 #ifndef CXX_GLOBAL_CSTD
 using std::strlen;
@@ -46,10 +45,10 @@ extern "C" {
        int C_FormMathsMatrixAlignFilter(FL_OBJECT * ob, char const *,
                                         char const * cur, int c)
        {
-               Assert(ob);
+               BOOST_ASSERT(ob);
                FormMathsMatrix * pre =
                        static_cast<FormMathsMatrix *>(ob->u_vdata);
-               Assert(pre);
+               BOOST_ASSERT(pre);
                return pre->AlignFilter(cur, c);
        }
 
@@ -68,7 +67,7 @@ void FormMathsMatrix::build()
        dialog_.reset(build_maths_matrix(this));
 
        fl_addto_choice(dialog_->choice_valign,
-                       _("Top | Center | Bottom").c_str());
+                       _("Top | Middle | Bottom").c_str());
        fl_set_choice(dialog_->choice_valign, 2);
        fl_set_input(dialog_->input_halign, h_align_str);
        dialog_->input_halign->u_vdata = this;
@@ -96,7 +95,7 @@ void FormMathsMatrix::apply()
 
        ostringstream os;
        os << nx << ' ' << ny << ' ' << c << ' ' << sh;
-       controller().dispatchMatrix(STRCONV(os.str()));
+       controller().dispatchMatrix(os.str());
 }