InsetInfo: Output 'undefined' instead of an error message for undefined shortcut

[lyx.git] / src / Length.cpp

diff --git a/src/Length.cpp b/src/Length.cpp
index 4627f8bf47104e3101df88970131353d9411b922..90da83a74ca7080a9fbc2b75762ce761f13501f0 100644 (file)
--- a/src/Length.cpp
+++ b/src/Length.cpp
@@ -23,12 +23,10 @@
 #include <sstream>
 #include <iomanip>
 
+using namespace std;
 
 namespace lyx {
 
-using std::ostringstream;
-using std::string;
-
 
 /////////////////////////////////////////////////////////////////////
 //
@@ -59,6 +57,13 @@ Length::Length(string const & data)
 }
 
 
+void Length::swap(Length & rhs)
+{
+       std::swap(val_, rhs.val_);
+       std::swap(unit_, rhs.unit_);
+}
+
+
 string const Length::asString() const
 {
        ostringstream os;
@@ -153,7 +158,7 @@ int Length::inPixels(int text_width, int em_width_base) const
                ? em_width_base
                : 10*(dpi/72.27)*zoom;
        // A different estimate for em_width is
-       // theFontMetrics(Font(Font::ALL_SANE)).width('M')
+       // theFontMetrics(FontInfo(sane_font)).width('M')
        // but this estimate might not be more accurate as the screen font
        // is different then the latex font.