add missing writeNormal() methods to some insets

[lyx.git] / src / vspace.C

diff --git a/src/vspace.C b/src/vspace.C
index a314e312543f6d74e3cf4a839ec072eecf27a33b..dd2f63a348fca766dd05c959062bd65f7dbbc0a8 100644 (file)
--- a/src/vspace.C
+++ b/src/vspace.C
@@ -52,7 +52,7 @@ int unit_index;
 
 
 inline
-void lyx_advance(string & data, unsigned int n)
+void lyx_advance(string & data, string::size_type n)
 {
        data.erase(0, n);
 }
@@ -341,10 +341,10 @@ string const LyXLength::asLatexString() const
            buffer << abs(static_cast<int>(val/100)) << "." << abs(static_cast<int>(val)%100) << "\\columnwidth";
            break;
        case PP:
-           buffer << "." << abs(static_cast<int>(val/100)) << "." << abs(static_cast<int>(val)%100) << "\\pagewidth";
+           buffer << abs(static_cast<int>(val/100)) << "." << abs(static_cast<int>(val)%100) << "\\pagewidth";
            break;
        case PL:
-           buffer << "." << abs(static_cast<int>(val/100)) << "." << abs(static_cast<int>(val)%100) << "\\linewidth";
+           buffer << abs(static_cast<int>(val/100)) << "." << abs(static_cast<int>(val)%100) << "\\linewidth";
            break;
        default:
            buffer << val << unit_name[uni]; // setw?
@@ -467,7 +467,7 @@ VSpace::VSpace (string const & data)
        float   value;
        string input  = strip(data);
 
-       int length = input.length();
+       string::size_type const length = input.length();
 
        if (length > 1 && input[length-1] == '*') {
                kp = true;
@@ -597,7 +597,7 @@ int VSpace::inPixels(int default_height, int default_skip, int default_width) co
                // can't display negative anyway
                result = 0.0;
                value = len.value();
-               short val_sign = value < 0.0 ? -1 : 1;
+               int val_sign = value < 0.0 ? -1 : 1;
                
                switch (len.unit()) {
                case LyXLength::SP: