X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fvspace.C;h=c1fdbf71ad93d5747f5dc0a219b58b96658fdd18;hb=c68f3da771a54ef78bd309b8f1a81c374d2fea4c;hp=3e80d370a256f165a9f6556357fa3abec23187da;hpb=0f51d7cabf6b80c8fe0a065991867eeded8e5d89;p=lyx.git diff --git a/src/vspace.C b/src/vspace.C index 3e80d370a2..c1fdbf71ad 100644 --- a/src/vspace.C +++ b/src/vspace.C @@ -21,11 +21,14 @@ #include "support/convert.h" #include "support/lstrings.h" -using lyx::support::compare; -using lyx::support::isStrDbl; -using lyx::support::ltrim; -using lyx::support::prefixIs; -using lyx::support::rtrim; + +namespace lyx { + +using support::compare; +using support::isStrDbl; +using support::ltrim; +using support::prefixIs; +using support::rtrim; using std::string; @@ -479,9 +482,9 @@ string const VSpace::asLatexCommand(BufferParams const & params) const } -string const VSpace::asGUIName() const +docstring const VSpace::asGUIName() const { - string result; + docstring result; switch (kind_) { case DEFSKIP: result = _("Default skip"); @@ -499,7 +502,7 @@ string const VSpace::asGUIName() const result = _("Vertical fill"); break; case LENGTH: - result = len_.asString(); + result = from_ascii(len_.asString()); break; } if (keep_) @@ -541,3 +544,6 @@ int VSpace::inPixels(BufferView const & bv) const return 0; } } + + +} // namespace lyx