fix bug 2094 (assertion in collapsables)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10592 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/ChangeLog b/src/ChangeLog
index 2825558e496051ee637772b8d901d152a60c175c..1c38fc5a22062d3803e8fbd351ed1f08ca29b834 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-03  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
+
+       * bufferview_funcs.C (coordOffset): do not call cursorPos
+       for collapsed collapsables (fix bug 2094).
+
 2005-11-03  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
        * paragraph.C (fontSpan): make sure that the FontSpan does not

diff --git a/src/bufferview_funcs.C b/src/bufferview_funcs.C
index fedeccdd6b858ffd9c50f7c6fde0162605f081f9..4dcf38d8225f0ffd2da6f57302a1cf5c97997bf5 100644 (file)
--- a/src/bufferview_funcs.C
+++ b/src/bufferview_funcs.C
@@ -163,7 +163,8 @@ Point coordOffset(DocIterator const & dit, bool boundary)
                CursorSlice const & sl = dit[i];
                int xx = 0;
                int yy = 0;
-               sl.inset().cursorPos(sl, boundary && ((i+1) == dit.depth()), xx, yy);
+               if (sl.inset().editable() == InsetBase::HIGHLY_EDITABLE)
+                       sl.inset().cursorPos(sl, boundary && ((i+1) == dit.depth()), xx, yy);
                x += xx;
                y += yy;
                //lyxerr << "LCursor::getPos, i: "