Remove black box around GuiWorkarea? which is visible with Qt4.5.

[lyx.git] / src / lengthcommon.cpp

diff --git a/src/lengthcommon.cpp b/src/lengthcommon.cpp
index 05baafaaa278a3057cc4495a3ecdcf4d271d0c44..8fa5c07fd01e48df444e4ba84f9819718e2d6db1 100644 (file)
--- a/src/lengthcommon.cpp
+++ b/src/lengthcommon.cpp
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author Matthias Ettrich
  * \author John Levon
  *
@@ -17,9 +17,9 @@
 
 #include <string>
 
-namespace lyx {
+using namespace std;
 
-using std::string;
+namespace lyx {
 
 // I am not sure if "mu" should be possible to select (Lgb)
 
@@ -35,8 +35,9 @@ int const num_units = int(sizeof(unit_name) / sizeof(unit_name[0]) - 1);
 // the LyX gui units
 char const * const unit_name_gui[] = {
        N_("sp"), N_("pt"), N_("bp"), N_("dd"), N_("mm"), N_("pc"),
-       N_("cc[[unit of measure]]"), N_("cm"), N_("in"), N_("ex"), N_("em"), N_("mu"),
-       N_("Text Width %"), N_("Column Width %"), N_("Page Width %"), N_("Line Width %"),
+       N_("cc[[unit of measure]]"), N_("cm"), N_("in"), N_("ex"), N_("em"),
+       N_("mu[[unit of measure]]"), N_("Text Width %"),
+       N_("Column Width %"), N_("Page Width %"), N_("Line Width %"),
        N_("Text Height %"), N_("Page Height %"), "" };
 
 Length::UNIT unitFromString(string const & data)