Painter and scrollbar API patches

[lyx.git] / src / buffer.C

diff --git a/src/buffer.C b/src/buffer.C
index 481ca4990a549bc0ef8b096e934786a2b2896097..95912feaeab49a280436490b8ae52e43d46ff85a 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -110,6 +110,9 @@
 #include <locale>
 #endif
 
+#ifndef CXX_GLOBAL_CSTD
+using std::pow;
+#endif
 
 using std::ostream;
 using std::ofstream;
@@ -1180,15 +1183,21 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
        } else if (token == "\\added_space_top") {
                lex.nextToken();
                VSpace value = VSpace(lex.getString());
+               // only add the length when value > 0 or
+               // with option keep
                if ((value.length().len().value() != 0) ||
+                   value.keep() ||
                    (value.kind() != VSpace::LENGTH))
-                   par->params().spaceTop(value);
+                       par->params().spaceTop(value);
        } else if (token == "\\added_space_bottom") {
                lex.nextToken();
                VSpace value = VSpace(lex.getString());
+               // only add the length when value > 0 or
+               // with option keep
                if ((value.length().len().value() != 0) ||
+                   value.keep() ||
                    (value.kind() != VSpace::LENGTH))
-                   par->params().spaceBottom(value);
+                       par->params().spaceBottom(value);
 #ifndef NO_COMPABILITY
 #ifndef NO_PEXTRA_REALLY
        } else if (token == "\\pextra_type") {
@@ -3195,12 +3204,14 @@ void Buffer::simpleLinuxDocOnePar(ostream & os,
 void Buffer::sgmlError(Paragraph * /*par*/, int /*pos*/,
        string const & /*message*/) const
 {
+#ifdef WITH_WARNINGS
 #warning This is wrong we cannot insert an inset like this!!!
        // I guess this was Jose' so I explain you more or less why this
        // is wrong. This way you insert something in the paragraph and
        // don't tell it to LyXText (row rebreaking and undo handling!!!)
        // I deactivate this code, have a look at BufferView::insertErrors
        // how you should do this correctly! (Jug 20020315)
+#endif
 #if 0
        // insert an error marker in text
        InsetError * new_inset = new InsetError(message);