anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-23 13:31:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

unicode: ditch another utf8 roundtrip

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15865 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Georg Baum 2006-11-11 20:59:04 +00:00
parent f6730f66b0
commit a956cc56e6
4 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/insets/insetvspace.C
View File

@ -107,8 +107,7 @@ void InsetVSpace::write(Buffer const &, ostream & os) const
docstring const InsetVSpace::label() const
{
static docstring const label = _("Vertical Space");
// FIXME UNICODE
return label + " (" + from_utf8(space_.asGUIName()) + ')';
return label + " (" + space_.asGUIName() + ')';
}

1
src/lyxlength.h
View File

@ -16,7 +16,6 @@
#define LYX_LENGTH_H
#include "support/docstring.h"
#include <string>
namespace lyx {

18
src/vspace.C
View File

@ -482,31 +482,31 @@ 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 = to_utf8(_("Default skip"));
result = _("Default skip");
break;
case SMALLSKIP:
result = to_utf8(_("Small skip"));
result = _("Small skip");
break;
case MEDSKIP:
result = to_utf8(_("Medium skip"));
result = _("Medium skip");
break;
case BIGSKIP:
result = to_utf8(_("Big skip"));
result = _("Big skip");
break;
case VFILL:
result = to_utf8(_("Vertical fill"));
result = _("Vertical fill");
break;
case LENGTH:
result = len_.asString();
result = from_ascii(len_.asString());
break;
}
if (keep_)
result += ", " + to_utf8(_("protected"));
result += ", " + _("protected");
return result;
}

2
src/vspace.h
View File

@ -65,7 +65,7 @@ public:
/// the latex representation
std::string const asLatexCommand(BufferParams const & params) const;
/// how it is seen in the LyX window
std::string const asGUIName() const;
docstring const asGUIName() const;
/// the size of the space on-screen
int inPixels(BufferView const & bv) const;