3 files changed, 14 insertions, 16 deletions
diff --git a/svx/inc/textchain.hxx b/svx/inc/textchain.hxx
index a74b6c9f6768..0607052b188e 100644
--- a/svx/inc/textchain.hxx
+++ b/svx/inc/textchain.hxx
@@ -33,7 +33,7 @@ class OUString;
 
 typedef OUString ChainLinkId;
 
-enum class CursorChainingEvent
+enum class CursorChainingEvent : sal_uInt8
 {
     TO_NEXT_LINK,
     TO_PREV_LINK,
@@ -58,10 +58,10 @@ protected:
 
 private:
     // NOTE: Remember to set default value in constructor when adding field
-    bool aNilChainingEvent;
-    CursorChainingEvent aCursorEvent;
     ESelection aPreChainingSel;
     ESelection aPostChainingSel;
+    CursorChainingEvent aCursorEvent;
+    bool aNilChainingEvent;
     bool aIsPartOfLastParaInNextLink;
     bool aSwitchingToNextBox;
 };
diff --git a/svx/inc/textchaincursor.hxx b/svx/inc/textchaincursor.hxx
index 8dfb65725a92..84171ab56167 100644
--- a/svx/inc/textchaincursor.hxx
+++ b/svx/inc/textchaincursor.hxx
@@ -23,7 +23,7 @@ class SdrObjEditView;
 class SdrTextObj;
 class KeyEvent;
 class SdrOutliner;
-enum class CursorChainingEvent;
+enum class CursorChainingEvent : sal_uInt8;
 struct ESelection;
 
 
diff --git a/svx/inc/textchainflow.hxx b/svx/inc/textchainflow.hxx
index a46c47a2d59a..d423939b6b89 100644
--- a/svx/inc/textchainflow.hxx
+++ b/svx/inc/textchainflow.hxx
@@ -51,14 +51,6 @@ public:
     SdrTextObj* GetLinkTarget() const;
 
 protected:
-    // Cursor related
-    bool mbPossiblyCursorOut;
-    ESelection maOverflowPosSel;
-    ESelection maPostChainingSel;
-
-    std::unique_ptr<OFlowChainedText> mpOverflChText;
-    std::unique_ptr<UFlowChainedText> mpUnderflChText;
-
     void impCheckForFlowEvents(SdrOutliner*, SdrOutliner*);
 
     TextChain* GetTextChain() const;
@@ -69,15 +61,21 @@ protected:
     virtual void impSetFlowOutlinerParams(SdrOutliner*, SdrOutliner*);
 
 private:
-    bool mbOFisUFinduced;
-
     void impUpdateCursorInfo();
 
+protected:
+    std::unique_ptr<OFlowChainedText> mpOverflChText;
+    std::unique_ptr<UFlowChainedText> mpUnderflChText;
+    // Cursor related
+    ESelection maOverflowPosSel;
+    ESelection maPostChainingSel;
+    bool mbPossiblyCursorOut;
+
+private:
     SdrTextObj* mpTargetLink;
     SdrTextObj* mpNextLink;
-
     TextChain* mpTextChain;
-
+    bool mbOFisUFinduced;
     bool bUnderflow;
     bool bOverflow;
 };