whichFont down to 5.3%

[lyx.git] / src / mathed / math_macro.C

diff --git a/src/mathed/math_macro.C b/src/mathed/math_macro.C
index 8f413d47bd672bba12323d998dd36092aef713d6..70d066b1b67246c58c888b57000470a95a433d0a 100644 (file)
--- a/src/mathed/math_macro.C
+++ b/src/mathed/math_macro.C
@@ -20,7 +20,6 @@
 
 #include "math_macro.h"
 #include "math_support.h"
-#include "math_cursor.h"
 #include "math_extern.h"
 #include "math_macrotable.h"
 #include "math_macrotemplate.h"
@@ -64,12 +63,6 @@ bool MathMacro::defining() const
 }
 
 
-bool MathMacro::editing() const
-{
-       return mathcursor && mathcursor->isInside(this);
-}
-
-
 void MathMacro::metrics(MathMetricsInfo const & mi) const
 {
        mi_ = mi;
@@ -162,14 +155,16 @@ void MathMacro::dump() const
 }
 
 
-bool MathMacro::idxUp(idx_type & idx, pos_type & pos) const
+bool MathMacro::idxUp(idx_type & idx) const
 {
+       pos_type pos;
        return MathNestInset::idxLeft(idx, pos);
 }
 
 
-bool MathMacro::idxDown(idx_type & idx, pos_type & pos) const
+bool MathMacro::idxDown(idx_type & idx) const
 {
+       pos_type pos;
        return MathNestInset::idxRight(idx, pos);
 }
 
@@ -196,24 +191,21 @@ void MathMacro::validate(LaTeXFeatures & features) const
 
 void MathMacro::maplize(MapleStream & os) const
 {
-       expanded_ = tmplate_->xcell(0);
-       expanded_.data_.substitute(*this);
+       updateExpansion();
        ::maplize(expanded_.data_, os);
 }
 
 
 void MathMacro::mathmlize(MathMLStream & os) const
 {
-       expanded_ = tmplate_->xcell(0);
-       expanded_.data_.substitute(*this);
+       updateExpansion();
        ::mathmlize(expanded_.data_, os);
 }
 
 
 void MathMacro::octavize(OctaveStream & os) const
 {
-       expanded_ = tmplate_->xcell(0);
-       expanded_.data_.substitute(*this);
+       updateExpansion();
        ::octavize(expanded_.data_, os);
 }
 
@@ -235,3 +227,10 @@ void MathMacro::write(WriteStream & os) const
        if (nargs() == 0) 
                os << ' ';
 }
+
+
+void MathMacro::updateExpansion() const
+{
+       expanded_ = tmplate_->xcell(0);
+       expanded_.data_.substitute(*this);
+}