Point fix, earlier forgotten

[lyx.git] / src / vspace.C

diff --git a/src/vspace.C b/src/vspace.C
index 9f86ce86deddf882fb72c99c2c9e9ea5ac2f1fd5..89b18dd6e3c3e0c1f9366d31804f5e064b76bf93 100644 (file)
--- a/src/vspace.C
+++ b/src/vspace.C
@@ -1,29 +1,29 @@
 /**
  * \file vspace.C
- * Copyright 1995-2002 the LyX Team
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
  * \author Matthias Ettrich
+ *
+ * Full author contact details are available in file CREDITS.
  */
 
 #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"
 
 #include <cstdio>
 
+using namespace lyx::support;
+
 #ifndef CXX_GLOBAL_CSTD
 using std::sscanf;
 #endif
@@ -469,24 +469,25 @@ string const VSpace::asLatexCommand(BufferParams const & params) const
 
 
 
-int VSpace::inPixels(BufferView const * bv) 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);
+               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 +505,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;