Fix assertion when checking if change in selection

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

diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp
index 78d5ad5e899ab67f8d7adede7495e617d205c5f3..107753e8ab7aaa433ae82b3cf230155b2fd8a798 100644 (file)
--- a/src/insets/InsetText.cpp
+++ b/src/insets/InsetText.cpp
@@ -232,12 +232,6 @@ void InsetText::draw(PainterInfo & pi, int x, int y) const
                tm.draw(pi, x + TEXT_TO_INSET_OFFSET, y);
        }
 
-       if (canPaintChange(*pi.base.bv) && (!change_drawn || pi.change_.deleted()))
-               // Do not draw the change tracking cue if already done by RowPainter and
-               // do not draw the cue for INSERTED if the information is already in the
-               // color of the frame
-               pi.change_.paintCue(pi, xframe, yframe, xframe + w, yframe + h);
-
        if (drawFrame_) {
                // Change color of the frame in tracked changes, like for tabulars.
                // Only do so if the color is not custom. But do so even if RowPainter
@@ -258,6 +252,12 @@ void InsetText::draw(PainterInfo & pi, int x, int y) const
                        c = frameColor();
                pi.pain.rectangle(xframe, yframe, w, h, c);
        }
+
+       if (canPaintChange(*pi.base.bv) && (!change_drawn || pi.change_.deleted()))
+               // Do not draw the change tracking cue if already done by RowPainter and
+               // do not draw the cue for INSERTED if the information is already in the
+               // color of the frame
+               pi.change_.paintCue(pi, xframe, yframe, xframe + w, yframe + h);
 }
 
 
@@ -814,13 +814,13 @@ void InsetText::updateBuffer(ParIterator const & it, UpdateType utype)
                // Note that we do not need to call:
                //      tclass.counters().clearLastLayout()
                // since we are saving and restoring the existing counters, etc.
-               Counters const savecnt = tclass.counters();
+               Counters savecnt = tclass.counters();
                tclass.counters().reset();
                // we need float information even in note insets (#9760)
                tclass.counters().current_float(savecnt.current_float());
                tclass.counters().isSubfloat(savecnt.isSubfloat());
                buffer().updateBuffer(it2, utype);
-               tclass.counters() = savecnt;
+               tclass.counters() = move(savecnt);
        }
 }
 
@@ -1071,7 +1071,11 @@ docstring InsetText::toolTipText(docstring prefix, size_t const len) const
        for (; it != end; ++it) {
                if (it != beg)
                        oss << '\n';
+               if ((*it).isRTL(buffer().params()))
+                       oss << "<div dir=\"rtl\">";
                writePlaintextParagraph(buffer(), *it, oss, rp, ref_printed, len);
+               if ((*it).isRTL(buffer().params()))
+                       oss << "</div>";
                if (oss.tellp() >= 0 && size_t(oss.tellp()) > len)
                        break;
        }