X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLength.cpp;h=f8eb920c0ff48e5b58bd0065d0aad38d00c9009a;hb=4d5bef1bdcbe7a20d67613a793acb89f0e583bf6;hp=4b269aa31517e1ee7bd72dd40f3aa4b3333e3caa;hpb=969a8356b8e9e93c37a855f3402b55f582f8831d;p=lyx.git

diff --git a/src/Length.cpp b/src/Length.cpp
index 4b269aa315..f8eb920c0f 100644
--- a/src/Length.cpp
+++ b/src/Length.cpp
@@ -96,12 +96,12 @@ string const Length::asLatexString() const
 	case PLW:
 		os << val_ / 100.0 << "\\linewidth";
 		break;
-	case PPH:
-		os << val_ / 100.0 << "\\paperheight";
-		break;
 	case PTH:
 		os << val_ / 100.0 << "\\textheight";
 		break;
+	case PPH:
+		os << val_ / 100.0 << "\\paperheight";
+		break;
 	default:
 		os << val_ << unit_name[unit_];
 	  break;
@@ -320,20 +320,7 @@ 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;
+	return lyxrc.default_length_unit;
 }