#6401 improve doc iterator to allow easy backward navigation

diff --git a/src/DocIterator.cpp b/src/DocIterator.cpp
index 0f4bc10fac73a0e1fda35d8f4dcc9e044bfd2a9f..6eba5a792e2d472d786feda2bf769e82b8dacb37 100644 (file)
--- a/src/DocIterator.cpp
+++ b/src/DocIterator.cpp
@@ -500,6 +500,18 @@ void DocIterator::backwardPos()
 }
 
 
+void DocIterator::backwardPosIgnoreCollapsed()
+{
+       backwardPos();
+       if (inTexted()) {
+               Inset const * ins = realInset();
+               if (ins && !ins->editable()) {
+                       pop_back(); // move out of collapsed inset
+               }
+       }
+}
+
+
 #if 0
 // works, but currently not needed
 void DocIterator::backwardInset()

diff --git a/src/DocIterator.h b/src/DocIterator.h
index 8ee4d4e373c790f50a909cdf2eca6c6d812eca3c..69930fcc7d09b3e50f3dc7e08bd5c30c87960bac 100644 (file)
--- a/src/DocIterator.h
+++ b/src/DocIterator.h
@@ -69,6 +69,8 @@ public:
 
        /// does this iterator have any content?
        bool empty() const { return slices_.empty(); }
+       /// is this the begin position?
+       bool atBegin() const { return depth() == 1 && pit() == 0 && pos() == 0; }
        /// is this the end position?
        bool atEnd() const { return slices_.empty(); }
 
@@ -210,6 +212,8 @@ public:
        void forwardInset();
        /// move backward one logical position
        void backwardPos();
+       /// move backward one logical position, skip collapsed insets
+       void backwardPosIgnoreCollapsed();
        /// move backward one physical character or inset
        void backwardChar();
        /// move backward one paragraph