just the next_rit check fixed

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

diff --git a/src/text.C b/src/text.C
index c065bc19da954170a015d0512153d82ca5c4359a..d91566387eafe424675fbeeb25c778443accc377 100644 (file)
--- a/src/text.C
+++ b/src/text.C
@@ -731,9 +731,9 @@ pos_type LyXText::rowBreakPoint(ParagraphList::iterator pit,
                                        break;  
                                }
                        }
-               // emergency exit:
-               if (i + 1 < last)               
-                       break;  
+                       // emergency exit:
+                       if (i + 1 < last)               
+                               break;  
                }
 
                InsetOld * in = pit->getInset(i);
@@ -1468,10 +1468,9 @@ void LyXText::prepareToPrint(ParagraphList::iterator pit,
            case LYX_ALIGN_BLOCK:
                {
                        int const ns = numberOfSeparators(*pit, *rit);
-                       RowList::iterator next_row = boost::next(rit);
                        bool disp_inset = false;
-                       if (next_row != pit->rows.end()) {
-                               InsetOld * in = pit->getInset(next_row->pos());
+                       if (rit->end() < pit->size()) {
+                               InsetOld * in = pit->getInset(rit->end());
                                if (in)
                                        disp_inset = in->display();
                        }
@@ -1480,7 +1479,7 @@ void LyXText::prepareToPrint(ParagraphList::iterator pit,
                        // display inset... then stretch it
                        if (ns
                                && rit->end() < pit->size()
-                               && !pit->isNewline(next_row->pos() - 1)
+                               && !pit->isNewline(rit->end())
                                && !disp_inset
                                ) {
                                        fill_separator = w / ns;