Georg Baum's vspace change

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

diff --git a/src/mathed/formula.C b/src/mathed/formula.C
index 63cffade24a91543e4c2fa98288dd58cc22aa496..5c3a71e4939dc190c4e0993a266ba53131f04ac6 100644 (file)
--- a/src/mathed/formula.C
+++ b/src/mathed/formula.C
@@ -195,10 +195,13 @@ bool editing_inset(InsetFormula const * inset)
 
 void InsetFormula::draw(PainterInfo & pi, int x, int y) const
 {
+       xo_ = x;
+       yo_ = y;
+
        // The previews are drawn only when we're not editing the inset.
-       bool const use_preview = (!editing_inset(this) &&
-                                 RenderPreview::activated() &&
-                                 preview_->previewReady());
+       bool const use_preview = !editing_inset(this)
+               && RenderPreview::activated()
+               && preview_->previewReady();
 
        int const w = dim_.wid;
        int const d = dim_.des;
@@ -224,9 +227,6 @@ void InsetFormula::draw(PainterInfo & pi, int x, int y) const
 
                par_->draw(p, x, y);
        }
-
-       xo_ = x;
-       yo_ = y;
 }
 
 
@@ -260,9 +260,9 @@ bool InsetFormula::insetAllowed(InsetOld::Code code) const
 
 void InsetFormula::metrics(MetricsInfo & m, Dimension & dim) const
 {
-       bool const use_preview = (!editing_inset(this) &&
-                                 RenderPreview::activated() &&
-                                 preview_->previewReady());
+       bool const use_preview = !editing_inset(this)
+               && RenderPreview::activated()
+               && preview_->previewReady();
 
        if (use_preview) {
                preview_->metrics(m, dim);
@@ -303,10 +303,10 @@ namespace {
 
 string const latex_string(InsetFormula const & inset, Buffer const &)
 {
-       ostringstream ls;
-       WriteStream wi(ls, false, false);
+       ostringstream os;
+       WriteStream wi(os, false, false);
        inset.par()->write(wi);
-       return ls.str();
+       return os.str();
 }
 
 } // namespace anon