Do not scale statusbar icons

[lyx.git] / src / Text.cpp

diff --git a/src/Text.cpp b/src/Text.cpp
index 98d19dfb023693c7453768a18eec361174b22412..8f30f4eb7c151f0c6a9d8c1986252949445d3c24 100644 (file)
--- a/src/Text.cpp
+++ b/src/Text.cpp
@@ -895,12 +895,12 @@ void Text::insertStringAsLines(Cursor & cur, docstring const & str,
                                ++pos;
                                space_inserted = true;
                        }
-               } else if (specialchars.find(ch) != specialchars.end()) {
-                       if (par.insertInset(pos, new InsetSpecialChar(specialchars.find(ch)->second),
-                                       font, bparams.track_changes ?
-                                               Change(Change::INSERTED)
-                                                 : Change(Change::UNCHANGED)))
-                               ++pos;
+               } else if (specialchars.find(ch) != specialchars.end()
+                          && (par.insertInset(pos, new InsetSpecialChar(specialchars.find(ch)->second),
+                                              font, bparams.track_changes
+                                              ? Change(Change::INSERTED)
+                                              : Change(Change::UNCHANGED)))) {
+                       ++pos;
                        space_inserted = false;
                } else if (!isPrintable(ch)) {
                        // Ignore (other) unprintables
@@ -1496,7 +1496,8 @@ void Text::acceptOrRejectChanges(Cursor & cur, ChangeOp op)
        }
 
        // finally, invoke the DEPM
-       deleteEmptyParagraphMechanism(begPit, endPit, cur.buffer()->params().track_changes);
+       deleteEmptyParagraphMechanism(begPit, endPit, begPos, endPos,
+                                     cur.buffer()->params().track_changes);
 
        cur.finishUndo();
        cur.clearSelection();
@@ -1881,6 +1882,7 @@ bool Text::dissolveInset(Cursor & cur)
                }
 
                pasteParagraphList(cur, plist, b.params().documentClassPtr(),
+                                  b.params().authors(),
                                   b.errorList("Paste"));
        }