partial framebox support

[lyx.git] / src / vspace.C

diff --git a/src/vspace.C b/src/vspace.C
index 6b4d25a7ed5a16e73484828a3ec1d4267c60a0ac..9f86ce86deddf882fb72c99c2c9e9ea5ac2f1fd5 100644 (file)
--- a/src/vspace.C
+++ b/src/vspace.C
@@ -14,7 +14,6 @@
 
 #include "vspace.h"
 #include "lengthcommon.h"
-#include "lyx_main.h"
 #include "buffer.h"
 #include "lyxrc.h"
 #include "lyxtext.h"
@@ -25,6 +24,9 @@
 
 #include <cstdio>
 
+#ifndef CXX_GLOBAL_CSTD
+using std::sscanf;
+#endif
 
 namespace {
 
@@ -52,7 +54,7 @@ void lyx_advance(string & data, string::size_type n)
 inline
 bool isEndOfData(string const & data)
 {
-       return frontStrip(data).empty();
+       return ltrim(data).empty();
 }
 
 /**
@@ -69,7 +71,7 @@ bool isEndOfData(string const & data)
  */
 char nextToken(string & data)
 {
-       data = frontStrip(data);
+       data = ltrim(data);
        if (data.empty())
                return '\0';
        else if (data[0] == '+') {
@@ -199,7 +201,7 @@ bool isValidGlueLength(string const & data, LyXGlueLength * result)
 
        if (data.empty())
                return true;
-       string buffer = frontStrip(data);
+       string buffer = ltrim(data);
 
        // To make isValidGlueLength recognize negative values as
        // the first number this little hack is needed:
@@ -343,11 +345,11 @@ VSpace::VSpace(string const & data)
        if (data.empty())
                return;
        double value;
-       string input  = strip(data);
+       string input  = rtrim(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);
        }
@@ -467,7 +469,7 @@ string const VSpace::asLatexCommand(BufferParams const & params) const
 
 
 
-int VSpace::inPixels(BufferView * 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]