Partial fix bug 2092: branches not propagated to child documents

[lyx.git] / src / text.C

diff --git a/src/text.C b/src/text.C
index 6536f40233481cdf4a3a4a4e7680435acf08d451..264a732a3c8f08352e554fd1136600028d8a9070 100644 (file)
--- a/src/text.C
+++ b/src/text.C
@@ -1002,7 +1002,8 @@ void LyXText::setHeightOfRow(pit_type const pit, Row & row)
        if (bv_owner->text() == this) {
                if (pit == 0 && row.pos() == 0)
                        maxasc += 20;
-               if (pit + 1 == pars_.size() && row.endpos() == par.size())
+               if (pit + 1 == pit_type(pars_.size()) &&
+                   row.endpos() == par.size())
                        maxdesc += 20;
        }
 
@@ -1186,8 +1187,7 @@ void LyXText::insertChar(LCursor & cur, char c)
 
        current_font = rawtmpfont;
        real_current_font = realtmpfont;
-       //setCursor(cur, cur.pit(), cur.pos() + 1, false, cur.boundary());
-       setCursor(cur, cur.pit(), cur.pos() + 1, false, true);
+       setCursor(cur, cur.pit(), cur.pos() + 1, false, cur.boundary());
        charInserted();
 }
 
@@ -2314,7 +2314,7 @@ pos_type LyXText::x2pos(pit_type pit, int row, int x) const
 
 // x,y are screen coordinates
 // sets cursor only within this LyXText
-void LyXText::setCursorFromCoordinates(LCursor & cur, int const x, int const y)
+bool LyXText::setCursorFromCoordinates(LCursor & cur, int const x, int const y)
 {
        pit_type pit = getPitNearY(y);
        int yy = theCoords.get(this, pit).y_ - pars_[pit].ascent();
@@ -2353,5 +2353,5 @@ void LyXText::setCursorFromCoordinates(LCursor & cur, int const x, int const y)
                 << " pos: " << pos
                 << endl;
         
-       setCursor(cur, pit, pos, true, bound);
+       return setCursor(cur, pit, pos, true, bound);
 }