LFUN_UNICODE_INSERT - unicode-insert

[lyx.git] / src / text2.C

diff --git a/src/text2.C b/src/text2.C
index 353527462c52f995eca23aa1798945d3383e7d81..cfb1a824b92c4e7d6c230e73002e16fc616dcd9f 100644 (file)
--- a/src/text2.C
+++ b/src/text2.C
@@ -40,7 +40,6 @@
 #include "lyxfunc.h"
 #include "lyxrc.h"
 #include "lyxrow.h"
-#include "lyxrow_funcs.h"
 #include "paragraph.h"
 #include "paragraph_funcs.h"
 #include "ParagraphParameters.h"
@@ -812,7 +811,7 @@ pos_type LyXText::getColumnNearX(pit_type const pit,
                                tmpx -= singleWidth(par, body_pos - 1);
                }
 
-               if (hfillExpansion(par, row, c)) {
+               if (par.hfillExpansion(row, c)) {
                        tmpx += singleWidth(par, c);
                        if (c >= body_pos)
                                tmpx += r.hfill;
@@ -959,6 +958,10 @@ Row const & LyXText::getRowNearY(int y, pit_type pit) const
 // sets cursor recursively descending into nested editable insets
 InsetBase * LyXText::editXY(LCursor & cur, int x, int y)
 {
+       if (lyxerr.debugging(Debug::WORKAREA)) {
+               lyxerr << "LyXText::editXY(cur, " << x << ", " << y << ")" << std::endl;
+               bv()->coordCache().dump();
+       }
        pit_type pit = getPitNearY(y);
        BOOST_ASSERT(pit != -1);
        Row const & row = getRowNearY(y, pit);
@@ -1259,7 +1262,7 @@ bool LyXText::deleteEmptyParagraphMechanism(LCursor & cur, LCursor & old)
                    && oldpar.isLineSeparator(old.pos())
                    && oldpar.isLineSeparator(old.pos() - 1)
                    && oldpar.lookupChange(old.pos() - 1).type != Change::DELETED) {
-                       oldpar.erase(old.pos() - 1, false); // do not track changes in DEPM
+                       oldpar.eraseChar(old.pos() - 1, false); // do not track changes in DEPM
 #ifdef WITH_WARNINGS
 #warning This will not work anymore when we have multiple views of the same buffer
 // In this case, we will have to correct also the cursors held by