Move isMultiCell() to Cursor, and use it.

[lyx.git] / src / insets / InsetCommandParams.cpp

diff --git a/src/insets/InsetCommandParams.cpp b/src/insets/InsetCommandParams.cpp
index 8dd3bceb96737d6460ba3992ed5143a5846050a5..2162c98666c43c2208de76fae948c6aebfe458a0 100644 (file)
--- a/src/insets/InsetCommandParams.cpp
+++ b/src/insets/InsetCommandParams.cpp
@@ -35,7 +35,7 @@
 #include "support/gettext.h"
 #include "support/lstrings.h"
 
-#include "support/assert.h"
+#include "support/lassert.h"
 
 using namespace std;
 using namespace lyx::support;
@@ -395,7 +395,7 @@ docstring InsetCommandParams::getFirstNonOptParam() const
                find_if(info_.begin(), info_.end(), 
                        not1(mem_fun_ref(&ParamInfo::ParamData::isOptional)));
        if (it == info_.end())
-               LASSERT(false, /**/);
+               LASSERT(false, return docstring());
        return (*this)[it->name()];
 }
 
@@ -403,7 +403,7 @@ docstring InsetCommandParams::getFirstNonOptParam() const
 docstring const & InsetCommandParams::operator[](string const & name) const
 {
        static const docstring dummy; //so we don't return a ref to temporary
-       LASSERT(info_.hasParam(name), /**/);
+       LASSERT(info_.hasParam(name), return dummy);
        ParamMap::const_iterator data = params_.find(name);
        if (data == params_.end() || data->second.empty())
                return dummy;