* text2.C (changeDepthAllowed): exit early when selection spans

several cells (bug 2630)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_4_X@14677 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2006-08-14 19:02:04 +00:00
parent eee8e74783
commit e554bf9a8d
3 changed files with 11 additions and 0 deletions

View File

@ -1,3 +1,8 @@
2006-08-14 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* text2.C (changeDepthAllowed): exit early when selection spans
several cells (bug 2630)
2006-08-13 Jean-Marc Lasgouttes <lasgouttes@lyx.org> 2006-08-13 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* dociterator.C (forwardPosNoDescend): when at the end of the * dociterator.C (forwardPosNoDescend): when at the end of the

View File

@ -385,6 +385,10 @@ bool changeDepthAllowed(LyXText::DEPTH_CHANGE type,
bool LyXText::changeDepthAllowed(LCursor & cur, DEPTH_CHANGE type) const bool LyXText::changeDepthAllowed(LCursor & cur, DEPTH_CHANGE type) const
{ {
BOOST_ASSERT(this == cur.text()); BOOST_ASSERT(this == cur.text());
// this happens when selecting several cells in tabular (bug 2630)
if (cur.selBegin().idx() != cur.selEnd().idx())
return false;
pit_type const beg = cur.selBegin().pit(); pit_type const beg = cur.selBegin().pit();
pit_type const end = cur.selEnd().pit() + 1; pit_type const end = cur.selEnd().pit() + 1;
int max_depth = (beg != 0 ? pars_[beg - 1].getMaxDepthAfter() : 0); int max_depth = (beg != 0 ? pars_[beg - 1].getMaxDepthAfter() : 0);

View File

@ -60,6 +60,8 @@ What's new
- Fix crash on save (including dataloss) when the backup directory - Fix crash on save (including dataloss) when the backup directory
was invalid or not writeable(bug 2740). was invalid or not writeable(bug 2740).
- Fix crash when selecting several cells in a tabular (bug 2630).
- Fix lockup when accepting a change in a text inset (bug 2510). - Fix lockup when accepting a change in a text inset (bug 2510).
- Fix editing of document while Error List dialog is open (bug 2179). - Fix editing of document while Error List dialog is open (bug 2179).