Cleanup: Replace a bunch of Cursor arguments with DocIterators.

[lyx.git] / src / Text3.cpp

diff --git a/src/Text3.cpp b/src/Text3.cpp
index 617a3ef6d7665a55bdf201acad70bd7f90ef24be..1874607f53ffa4dee0fe8044dd3e662b8abc1734 100644 (file)
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -245,7 +245,7 @@ static bool doInsertInset(Cursor & cur, Text * text,
                if (edit)
                        inset->edit(cur, true);
                // Now put this into inset
-               cur.text()->insertStringAsLines(cur, ds);
+               cur.text()->insertStringAsLines(cur, ds, cur.current_font);
                cur.leaveInset(*inset);
                return true;
        }
@@ -507,8 +507,9 @@ void Text::number(Cursor & cur)
 }
 
 
-bool Text::isRTL(Buffer const & buffer, Paragraph const & par) const
+bool Text::isRTL(Paragraph const & par) const
 {
+       Buffer const & buffer = owner_->buffer();
        return par.isRTL(buffer.params());
 }
 
@@ -1287,7 +1288,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                if (layout.empty())
                        layout = tclass.defaultLayoutName();
 
-               if (para.forcePlainLayout())
+               if (owner_->forcePlainLayout())
                        // in this case only the empty layout is allowed
                        layout = tclass.plainLayoutName();
                else if (para.usePlainLayout()) {
@@ -2543,7 +2544,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
                        enable = cur.inset().lyxCode() == FLEX_CODE
                                 && il.lyxtype() == type;
                } else {
-                       enable = ((!isMainText(cur.bv().buffer())
+                       enable = ((!isMainText()
                                      && cur.inset().nargs() == 1)
                                  || (cur.nextInset()
                                      && cur.nextInset()->nargs() == 1));
@@ -2571,7 +2572,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
        case LFUN_OUTLINE_OUT:
        case LFUN_OUTLINE_DRAGMOVE:
                // FIXME: LyX is not ready for outlining within inset.
-               enable = isMainText(cur.bv().buffer())
+               enable = isMainText()
                        && cur.paragraph().layout().toclevel != Layout::NOT_IN_TOC;
                break;
 
@@ -2778,9 +2779,9 @@ void Text::pasteString(Cursor & cur, docstring const & clip,
        if (!clip.empty()) {
                cur.recordUndo();
                if (asParagraphs)
-                       insertStringAsParagraphs(cur, clip);
+                       insertStringAsParagraphs(cur, clip, cur.current_font);
                else
-                       insertStringAsLines(cur, clip);
+                       insertStringAsLines(cur, clip, cur.current_font);
        }
 }