Revert 82c7669381

[lyx.git] / src / CursorSlice.cpp

diff --git a/src/CursorSlice.cpp b/src/CursorSlice.cpp
index 0a600ab4bef0c2a77a8d929905df2c97accf68f6..ae3686fd1ebf9417fc965a46490cfc5f52e09bf2 100644 (file)
--- a/src/CursorSlice.cpp
+++ b/src/CursorSlice.cpp
@@ -44,7 +44,7 @@ CursorSlice::CursorSlice()
 CursorSlice::CursorSlice(Inset & p)
        : inset_(&p), idx_(0), pit_(0), pos_(0)
 {
-       LBUFERR(inset_, _("Invalid initialization of CursorSlice!"));
+       LBUFERR(inset_);
 }
 
 
@@ -62,7 +62,7 @@ Paragraph & CursorSlice::paragraph() const
 
 pos_type CursorSlice::lastpos() const
 {
-       LBUFERR(inset_, _("Cursor slice not properly initialized!"));
+       LBUFERR(inset_);
        InsetMath const * math = inset_->asInsetMath();
        bool paramless_macro = math && math->asMacro() && !math->asMacro()->nargs();
        return math ? (paramless_macro ? 0 : cell().size()) 
@@ -80,19 +80,15 @@ pit_type CursorSlice::lastpit() const
 
 CursorSlice::row_type CursorSlice::row() const
 {
-       // LASSERT: This should only ever be called from an InsetMath.
-       // Should we crash in release mode, though, or try to continue?
-       LASSERT(asInsetMath(), /**/);
-       return asInsetMath()->row(idx_);
+       LASSERT(inset_, return 0);
+       return inset_->row(idx_);
 }
 
 
 CursorSlice::col_type CursorSlice::col() const
 {
-       // LASSERT: This should only ever be called from an InsetMath.
-       // Should we crash in release mode, though, or try to continue?
-       LASSERT(asInsetMath(), /**/);
-       return asInsetMath()->col(idx_);
+       LASSERT(inset_, return 0);
+       return inset_->col(idx_);
 }
 
 
@@ -158,15 +154,27 @@ void CursorSlice::backwardPos()
 }
 
 
-bool CursorSlice::at_end() const 
+bool CursorSlice::at_cell_end() const
 {
-       return idx_ == lastidx() && pit_ == lastpit() && pos_ == lastpos();
+       return pit_ == lastpit() && pos_ == lastpos();
+}
+
+
+bool CursorSlice::at_cell_begin() const
+{
+       return pit_ == 0 && pos_ == 0;
+}
+
+
+bool CursorSlice::at_end() const
+{
+       return idx_ == lastidx() && at_cell_end();
 }
 
 
 bool CursorSlice::at_begin() const
 {
-       return idx_ == 0 && pit_ == 0 && pos_ == 0;
+       return idx_ == 0 && at_cell_begin();
 }