findadv: using \w instead of [[:word:]] makes test-case std::regex compatible; also...

[lyx.git] / src / VSpace.cpp

diff --git a/src/VSpace.cpp b/src/VSpace.cpp
index 72315072d61c8b646e47655f54fb0f57931ff8d1..342105727f849ad12049763529d034437660b423 100644 (file)
--- a/src/VSpace.cpp
+++ b/src/VSpace.cpp
@@ -147,9 +147,10 @@ string const VSpace::asLatexCommand(BufferParams const & params) const
                        : "\\vspace{" + len_.asLatexString() + '}';
 
        default:
-               LASSERT(false, /**/);
-               return string();
+               LATTEST(false);
+               // fall through in release mode
        }
+       return string();
 }
 
 
@@ -200,6 +201,7 @@ string VSpace::asHTMLLength() const
        return result;
 }
 
+
 int VSpace::inPixels(BufferView const & bv) const
 {
        // Height of a normal line in pixels (zoom factor considered)
@@ -210,13 +212,13 @@ int VSpace::inPixels(BufferView const & bv) const
        case DEFSKIP:
                return bv.buffer().params().getDefSkip().inPixels(bv);
 
-       // This is how the skips are normally defined by LateX.
+       // This is how the skips are normally defined by LaTeX.
        // But there should be some way to change this per document.
        case SMALLSKIP:
-               return default_height / 4;
+               return int(default_height / 4);
 
        case MEDSKIP:
-               return default_height / 2;
+               return int(default_height / 2);
 
        case BIGSKIP:
                return default_height;
@@ -229,9 +231,10 @@ int VSpace::inPixels(BufferView const & bv) const
                return len_.len().inPixels(bv.workWidth());
 
        default:
-               LASSERT(false, /**/);
-               return 0;
+               LATTEST(false);
+               // fall through in release mode
        }
+       return 0;
 }