X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flengthcommon.cpp;h=4478d84ae5da41acdf531b91669d7b85d379b1fb;hb=7441172d4d9a26eb4824bb8bee003f457ef34f1c;hp=c4fe515e093275a80996f10d4f6c2f2c55f3bb5d;hpb=d9c9c6b36d007e42b086f75640fd242fd29a4445;p=lyx.git diff --git a/src/lengthcommon.cpp b/src/lengthcommon.cpp index c4fe515e09..4478d84ae5 100644 --- a/src/lengthcommon.cpp +++ b/src/lengthcommon.cpp @@ -32,7 +32,7 @@ char const * const unit_name[] = { "bp", "cc", "cm", "dd", "em", "ex", "in", "mm", "mu", "pc", "pt", "sp", "text%", "col%", "page%", "line%", - "theight%", "pheight%", "" }; + "theight%", "pheight%", "baselineskip%", "" }; int const num_units = int(sizeof(unit_name) / sizeof(unit_name[0]) - 1); @@ -42,7 +42,7 @@ char const * const unit_name_gui[] = { N_("ex"), N_("in[[unit of measure]]"), N_("mm"), N_("mu[[unit of measure]]"), N_("pc"), N_("pt"), N_("sp"), N_("Text Width %"), N_("Column Width %"), N_("Page Width %"), N_("Line Width %"), - N_("Text Height %"), N_("Page Height %"), "" }; + N_("Text Height %"), N_("Page Height %"), N_("Line Distance %"), "" }; Length::UNIT unitFromString(string const & data) @@ -204,13 +204,13 @@ LaTeXLength table[] = { }; -} // namespace anon +} // namespace const char * stringFromUnit(int unit) { if (unit < 0 || unit > num_units) - return 0; + return nullptr; return unit_name[unit]; }