Move cursor to the right of brace when the closing brace is typed.

3 files changed, 10 insertions, 4 deletions

diff --git a/starmath/inc/caret.hxx b/starmath/inc/caret.hxx
index cec8bd722482..76e25279fb55 100644
--- a/starmath/inc/caret.hxx
+++ b/starmath/inc/caret.hxx
@@ -50,7 +50,7 @@ struct SmCaretPos{
     //TODO: Consider forgetting about the todo above... As it's really unpleasent.
     int Index;
     /** True, if this is a valid caret position */
-    bool IsValid() { return pSelectedNode != NULL; }
+    bool IsValid() const { return pSelectedNode != NULL; }
     bool operator!=(SmCaretPos pos) const {
         return pos.pSelectedNode != pSelectedNode || Index != pos.Index;
     }
diff --git a/starmath/inc/cursor.hxx b/starmath/inc/cursor.hxx
index 6b6e7168a59c..dcfea886736d 100644
--- a/starmath/inc/cursor.hxx
+++ b/starmath/inc/cursor.hxx
@@ -118,7 +118,7 @@ public:
     SmCaretPos GetAnchor(){ return anchor->CaretPos; }
 
     /** Get position */
-    SmCaretPos GetPosition() { return position->CaretPos; }
+    SmCaretPos GetPosition() const { return position->CaretPos; }
 
     /** True, if the cursor has a selection */
     bool HasSelection() { return anchor != position; }
@@ -236,6 +236,9 @@ public:
     /** Draw the caret */
     void Draw(OutputDevice& pDev, Point Offset, bool isCaretVisible);
 
+    bool IsAtTailOfBracket(SmBracketType eBracketType, SmBraceNode** ppBraceNode = NULL) const;
+    void MoveAfterBracket(SmBraceNode* pBraceNode, bool bMoveAnchor = true);
+
 private:
     friend class SmDocShell;
 
diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index 07aca32eaa29..1ecde44b406e 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -119,13 +119,13 @@ public:
     virtual SmNode *    GetSubNode(sal_uInt16 nIndex);
             const SmNode * GetSubNode(sal_uInt16 nIndex) const
             {
-                return ((SmNode *) this)->GetSubNode(nIndex);
+                return const_cast<SmNode *>(this)->GetSubNode(nIndex);
             }
 
     virtual SmNode *       GetLeftMost();
             const SmNode * GetLeftMost() const
             {
-                return ((SmNode *) this)->GetLeftMost();
+                return const_cast<SmNode *>(this)->GetLeftMost();
             }
 
             sal_uInt16 &    Flags() { return nFlags; }
@@ -149,6 +149,8 @@ public:
     virtual void Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell);
     virtual void PrepareAttributes();
 
+    sal_uInt16 FindIndex() const;
+
 #if OSL_DEBUG_LEVEL
             void ToggleDebug() const;
 #endif
@@ -206,6 +208,7 @@ public:
 
     /** Get the parent node of this node */
     SmStructureNode* GetParent(){ return aParentNode; }
+    const SmStructureNode* GetParent() const { return aParentNode; }
     /** Set the parent node */
     void SetParent(SmStructureNode* parent){
         aParentNode = parent;