X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLength.cpp;h=0deed7481c915f3e2e70b6f2f100c80d7d993d64;hb=11e679f73ecca718c61307973c3d67739354e1c7;hp=af61d0fe7681a4f5dbf698e0eca5063be40ac206;hpb=bd5cccbb3446ac61ffd78a98f34b188a4be4307b;p=lyx.git

diff --git a/src/Length.cpp b/src/Length.cpp
index af61d0fe76..0deed7481c 100644
--- a/src/Length.cpp
+++ b/src/Length.cpp
@@ -57,17 +57,11 @@ 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;
-	os << val_ << unit_name[unit_]; // setw?
+	if (unit_ != UNIT_NONE)
+		os << val_ << unit_name[unit_]; // setw?
 	return os.str();
 }
 
@@ -75,7 +69,8 @@ string const Length::asString() const
 docstring const Length::asDocstring() const
 {
 	odocstringstream os;
-	os << val_ << unit_name[unit_]; // setw?
+	if (unit_ != UNIT_NONE)
+		os << val_ << unit_name[unit_]; // setw?
 	return os.str();
 }
 
@@ -96,11 +91,13 @@ string const Length::asLatexString() const
 	case PLW:
 		os << val_ / 100.0 << "\\linewidth";
 		break;
+	case PTH:
+		os << val_ / 100.0 << "\\textheight";
+		break;
 	case PPH:
 		os << val_ / 100.0 << "\\paperheight";
 		break;
-	case PTH:
-		os << val_ / 100.0 << "\\textheight";
+	case UNIT_NONE:
 		break;
 	default:
 		os << val_ << unit_name[unit_];
@@ -320,20 +317,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;
 }
 
 
@@ -376,6 +360,9 @@ GlueLength::GlueLength(string const & data)
 
 string const GlueLength::asString() const
 {
+	if (len_.empty())
+		return string();
+
 	ostringstream buffer;
 
 	buffer << len_.value();
@@ -427,13 +414,12 @@ string const GlueLength::asString() const
 string const GlueLength::asLatexString() const
 {
 	ostringstream buffer;
-
-	buffer << len_.value() << unit_name[len_.unit()];
-
+	// use Length::asLatexString() to handle also the percent lengths
+	buffer << len_.Length::asLatexString();
 	if (!plus_.zero())
-		buffer << " plus " << plus_.value() << unit_name[plus_.unit()];
+		buffer << " plus " << plus_.Length::asLatexString();
 	if (!minus_.zero())
-		buffer << " minus " << minus_.value() << unit_name[minus_.unit()];
+		buffer << " minus " << minus_.Length::asLatexString();
 	return buffer.str();
 }