Cmake tests: macro setmarkedtestlabel() worked only by chance

[lyx.git] / src / TexRow.cpp

diff --git a/src/TexRow.cpp b/src/TexRow.cpp
index 60a3539c2936de8841de1edea38a4cda22fb3074..37e5f64c21a1918f169b3903f29241df4938d022 100644 (file)
--- a/src/TexRow.cpp
+++ b/src/TexRow.cpp
@@ -75,7 +75,7 @@ void TexRow::RowEntryList::append(RowEntryList const & row)
 
 
 TexRow::TextEntry const TexRow::text_none = { -1, 0 };
-TexRow::RowEntry const TexRow::row_none = { false, TexRow::text_none };
+TexRow::RowEntry const TexRow::row_none = { false, { TexRow::text_none } };
 
 
 bool TexRow::isNone(TextEntry const & t)
@@ -204,15 +204,12 @@ void TexRow::append(TexRow const & texrow)
 bool TexRow::getIdFromRow(int row, int & id, int & pos) const
 {
        TextEntry t = text_none;
-       bool ret = false;
        if (row <= int(rowlist_.size()))
                while (row > 0 && isNone(t = rowlist_[row - 1].getTextEntry()))
                        --row;
-       if (row > 0)
-               ret = true;
        id = t.id;
        pos = t.pos;
-       return ret;
+       return !isNone(t);
 }
 
 
@@ -466,12 +463,12 @@ std::pair<int,int> TexRow::rowFromCursor(Cursor const & cur) const
 ///
 docstring TexRow::asString(RowEntry const & entry)
 {
-       std::ostringstream t;
+       odocstringstream os;
        if (entry.is_math)
-               t << "(1," << entry.math.id << "," << entry.math.cell << ")";
+               os << "(1," << entry.math.id << "," << entry.math.cell << ")";
        else
-               t << "(0," << entry.text.id << "," << entry.text.pos << ")";
-       return from_utf8( t.str() );
+               os << "(0," << entry.text.id << "," << entry.text.pos << ")";
+       return os.str();
 }