Revert unintended commit.

[lyx.git] / src / Length.cpp

diff --git a/src/Length.cpp b/src/Length.cpp
index cc457365701cbe0e27024d878847fcd04fa243c9..e248d7c4f4e2e918065e4f8801ebae1b6cbd0361 100644 (file)
--- a/src/Length.cpp
+++ b/src/Length.cpp
@@ -4,7 +4,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Matthias Ettrich
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author Jean-Marc Lasgouttes
  * \author Angus Leeming
  * \author John Levon
@@ -23,12 +23,10 @@
 #include <sstream>
 #include <iomanip>
 
+using namespace std;
 
 namespace lyx {
 
-using std::ostringstream;
-using std::string;
-
 
 /////////////////////////////////////////////////////////////////////
 //
@@ -278,6 +276,26 @@ int Length::inBP() const
 }
 
 
+Length::UNIT Length::defaultUnit()
+{
+       // FIXME user a proper pref, since we should get rid of
+       // default_papersize in lyxrc.
+       UNIT u = Length::CM;
+       switch (lyxrc.default_papersize) {
+               case PAPER_USLETTER:
+               case PAPER_USLEGAL:
+               case PAPER_USEXECUTIVE:
+                       u = Length::IN;
+                       break;
+               default:
+                       break;
+       }
+
+       return u;
+}
+
+
+
 bool operator==(Length const & l1, Length const & l2)
 {
        return l1.value() == l2.value() && l1.unit() == l2.unit();