X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMetricsInfo.cpp;h=809c0cec68997f7f7b81533c7715ba4ee6a5f6dd;hb=5366666c831b6ad726e848a60d738b57ec8b0501;hp=15e772ea712b24b0320799d88f2533ac24dbfed7;hpb=196d9caeb0b9f74d02750f774de1ca63a483803f;p=lyx.git diff --git a/src/MetricsInfo.cpp b/src/MetricsInfo.cpp index 15e772ea71..809c0cec68 100644 --- a/src/MetricsInfo.cpp +++ b/src/MetricsInfo.cpp @@ -10,9 +10,10 @@ #include -#include "LyXRC.h" #include "MetricsInfo.h" +#include "LyXRC.h" + #include "insets/Inset.h" #include "mathed/MathSupport.h" @@ -20,8 +21,6 @@ #include "frontends/FontMetrics.h" #include "frontends/Painter.h" -#include "support/RefChanger.h" - using namespace std; @@ -82,16 +81,16 @@ Changer MetricsBase::changeEnsureMath(Inset::mode_type mode) { switch (mode) { case Inset::UNDECIDED_MODE: - return Changer(); + return noChange(); case Inset::TEXT_MODE: - return isMathFont(fontname) ? changeFontSet("textnormal") : Changer(); + return isMathFont(fontname) ? changeFontSet("textnormal") : noChange(); case Inset::MATH_MODE: // FIXME: // \textit{\ensuremath{\text{a}}} // should appear in italics - return isTextFont(fontname) ? changeFontSet("mathnormal"): Changer(); + return isTextFont(fontname) ? changeFontSet("mathnormal"): noChange(); } - return Changer(); + return noChange(); } @@ -195,10 +194,10 @@ Changer MetricsBase::changeScript() return font.changeStyle(SCRIPTSCRIPT_STYLE); case INHERIT_STYLE: case IGNORE_STYLE: - return Changer(); + return noChange(); } //remove Warning - return Changer(); + return noChange(); } @@ -214,10 +213,10 @@ Changer MetricsBase::changeFrac() return font.changeStyle(SCRIPTSCRIPT_STYLE); case INHERIT_STYLE: case IGNORE_STYLE: - return Changer(); + return noChange(); } //remove Warning - return Changer(); + return noChange(); } @@ -226,7 +225,7 @@ Changer MetricsBase::changeArray(bool small) if (small) return font.changeStyle(SCRIPT_STYLE); return (font.style() == DISPLAY_STYLE) ? font.changeStyle(TEXT_STYLE) - : Changer(); + : noChange(); }