#include <config.h>
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
#include "vspace.h"
#include "lengthcommon.h"
-#include "lyx_main.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
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);
}
-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;
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;