Merge branch 'master' of git.lyx.org:lyx

[lyx.git] / src / TexRow.cpp

diff --git a/src/TexRow.cpp b/src/TexRow.cpp
index 516aade8120be5025fbfd170e22eed97468bc677..21be0b8e30f69f1eed42ea4273cad5d514746918 100644 (file)
--- a/src/TexRow.cpp
+++ b/src/TexRow.cpp
@@ -35,8 +35,11 @@ bool TexRow::RowEntryList::addEntry(RowEntry const & entry)
        if (!entry.is_math) {
                if (text_entry_ < size())
                        return false;
-               else
+               else {
                        text_entry_ = size();
+                       push_back(RowEntry(entry));
+                       return true;
+               }
        }
        forceAddEntry(entry);
        return true;
@@ -75,7 +78,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)
@@ -463,19 +466,19 @@ 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();
 }
 
 
 ///prepends the texrow to the source given by tex, for debugging purpose
 void TexRow::prepend(docstring_list & tex) const
 {
-       int const prefix_length = 25;
+       size_type const prefix_length = 25;
        if (tex.size() < rowlist_.size())
                tex.resize(rowlist_.size());
        std::vector<RowEntryList>::const_iterator it = rowlist_.begin();
@@ -489,7 +492,7 @@ void TexRow::prepend(docstring_list & tex) const
                        entry += asString(*it2);
                if (entry.length() < prefix_length)
                        entry = entry + docstring(prefix_length - entry.length(), L' ');
-               int i = it - beg;
+               ptrdiff_t i = it - beg;
                tex[i] = entry + "  " + tex[i];
        }
 }