fix compilation bug

[lyx.git] / src / vspace.C

diff --git a/src/vspace.C b/src/vspace.C
index aaada260e04a1cd481ec80566262a7c1a2360b95..f62d348c10313cce41177e295d6544f8537fb751 100644 (file)
--- a/src/vspace.C
+++ b/src/vspace.C
@@ -8,16 +8,12 @@
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "vspace.h"
 #include "lengthcommon.h"
 #include "buffer.h"
 #include "lyxrc.h"
-#include "lyxtext.h"
 #include "BufferView.h"
+#include "lyxtext.h"
 #include "support/LAssert.h"
 
 #include "support/lstrings.h"
@@ -349,7 +345,7 @@ VSpace::VSpace(string const & data)
 
        string::size_type const length = input.length();
 
-       if (length > 1 && input[length-1] == '*') {
+       if (length > 1 && input[length - 1] == '*') {
                keep_ = true;
                input.erase(length - 1);
        }
@@ -472,21 +468,22 @@ string const VSpace::asLatexCommand(BufferParams const & params) const
 int VSpace::inPixels(BufferView const * bv) const
 {
        // Height of a normal line in pixels (zoom factor considered)
-       int const default_height = bv->text->defaultHeight(); // [pixels]
+       int const default_height = defaultRowHeight(); // [pixels]
 
        int retval = 0;
 
        switch (kind_) {
+
        case NONE:
-               // Value for this is already set
+               // value for this is already set
                break;
+
        case DEFSKIP:
                retval = bv->buffer()->params.getDefSkip().inPixels(bv);
                break;
 
-               // This is how the skips are normally defined by
-               // LateX.  But there should be some way to change
-               // this per document.
+       // This is how the skips are normally defined by LateX.
+       // But there should be some way to change this per document.
        case SMALLSKIP:
                retval = default_height / 4;
                break;
@@ -504,11 +501,9 @@ int VSpace::inPixels(BufferView const * bv) const
                retval = 3 * default_height;
                break;
 
-       case LENGTH: {
-               int const default_width  = bv->workWidth();
-               retval = len_.len().inPixels(default_width, default_height);
+       case LENGTH:
+               retval = len_.len().inPixels(bv->workWidth());
                break;
-       }
 
        }
        return retval;