Push r38098 again in

[lyx.git] / src / TextMetrics.cpp

diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index 7d967f37a2be7e8c31f00786563494ef2028cb1d..085040990dfe8f8da9089b0a291c901704f0b8a9 100644 (file)
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -158,6 +158,7 @@ pair<pit_type, ParagraphMetrics const *> TextMetrics::first() const
 
 pair<pit_type, ParagraphMetrics const *> TextMetrics::last() const
 {
+       LASSERT(!par_metrics_.empty(), /**/);
        ParMetricsCache::const_reverse_iterator it = par_metrics_.rbegin();
        return make_pair(it->first, &it->second);
 }
@@ -1494,7 +1495,7 @@ Inset * TextMetrics::editXY(Cursor & cur, int x, int y,
        // This should be just before or just behind the
        // cursor position set above.
        LASSERT(inset == inset_before 
-               || inset == pars[pit].getInset(pos), /**/);
+               || inset == pars[pit].getInset(pos), return 0);
 
        // Make sure the cursor points to the position before
        // this inset.