X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxlength.C;h=c38e7a33729300a0e59ae5ecafa17f3faedb16a1;hb=c544107e324090c6eafb4c56749da2624b9b1122;hp=2e16c84ed3ea28f122cd381397dfbcd31f59d159;hpb=6a1167adab9c33e0800cf1e7b314344a21cf93fe;p=lyx.git diff --git a/src/lyxlength.C b/src/lyxlength.C index 2e16c84ed3..c38e7a3372 100644 --- a/src/lyxlength.C +++ b/src/lyxlength.C @@ -10,10 +10,6 @@ #include -#ifdef __GNUG__ -#pragma implementation -#endif - #include "lyxlength.h" #include "lengthcommon.h" #include "lyxrc.h" @@ -27,7 +23,7 @@ using std::abs; LyXLength::LyXLength() - : val_(0), unit_(LyXLength::PT) + : val_(0), unit_(LyXLength::UNIT_NONE) {} @@ -62,27 +58,27 @@ string const LyXLength::asLatexString() const ostringstream buffer; switch (unit_) { case PTW: - buffer << abs(static_cast(val_/100)) << "." + buffer << abs(static_cast(val_/100)) << '.' << abs(static_cast(val_)%100) << "\\textwidth"; break; case PCW: - buffer << abs(static_cast(val_/100)) << "." + buffer << abs(static_cast(val_/100)) << '.' << abs(static_cast(val_)%100) << "\\columnwidth"; break; case PPW: - buffer << abs(static_cast(val_/100)) << "." + buffer << abs(static_cast(val_/100)) << '.' << abs(static_cast(val_)%100) << "\\paperwidth"; break; case PLW: - buffer << abs(static_cast(val_/100)) << "." + buffer << abs(static_cast(val_/100)) << '.' << abs(static_cast(val_)%100) << "\\linewidth"; break; case PPH: - buffer << abs(static_cast(val_/100)) << "." + buffer << abs(static_cast(val_/100)) << '.' << abs(static_cast(val_)%100) << "\\paperheight"; break; case PTH: - buffer << abs(static_cast(val_/100)) << "." + buffer << abs(static_cast(val_/100)) << '.' << abs(static_cast(val_)%100) << "\\textheight"; break; default: @@ -123,6 +119,12 @@ bool LyXLength::zero() const } +bool LyXLength::empty() const +{ + return unit_ == LyXLength::UNIT_NONE; +} + + int LyXLength::inPixels(int text_width, int em_width_base) const { // Zoom factor specified by user in percent