diff options
Diffstat (limited to 'sw/inc/unocrsr.hxx')
| -rw-r--r-- | sw/inc/unocrsr.hxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/sw/inc/unocrsr.hxx b/sw/inc/unocrsr.hxx index 902e75530423..9ee9261de581 100644 --- a/sw/inc/unocrsr.hxx +++ b/sw/inc/unocrsr.hxx @@ -31,7 +31,7 @@ namespace sw }; } -class SwUnoCrsr : public virtual SwCursor, public SwModify +class SwUnoCursor : public virtual SwCursor, public SwModify { private: bool m_bRemainInSection : 1; @@ -39,13 +39,13 @@ private: bool m_bSkipOverProtectSections : 1; public: - SwUnoCrsr( const SwPosition &rPos, SwPaM* pRing = nullptr ); - virtual ~SwUnoCrsr(); + SwUnoCursor( const SwPosition &rPos, SwPaM* pRing = nullptr ); + virtual ~SwUnoCursor(); protected: - virtual const SwContentFrm* DoSetBidiLevelLeftRight( - bool & io_rbLeft, bool bVisualAllowed, bool bInsertCrsr) override; + virtual const SwContentFrame* DoSetBidiLevelLeftRight( + bool & io_rbLeft, bool bVisualAllowed, bool bInsertCursor) override; virtual void DoSetBidiLevelUpDown() override; public: @@ -72,10 +72,10 @@ public: void SetSkipOverHiddenSections( bool bFlag ) { m_bSkipOverHiddenSections = bFlag; } - DECL_FIXEDMEMPOOL_NEWDEL( SwUnoCrsr ) + DECL_FIXEDMEMPOOL_NEWDEL( SwUnoCursor ) }; -class SwUnoTableCrsr : public virtual SwUnoCrsr, public virtual SwTableCursor +class SwUnoTableCursor : public virtual SwUnoCursor, public virtual SwTableCursor { // The selection has the same order as the table boxes, i.e. // if something is deleted from the one array at a certain position @@ -85,8 +85,8 @@ class SwUnoTableCrsr : public virtual SwUnoCrsr, public virtual SwTableCursor using SwTableCursor::MakeBoxSels; public: - SwUnoTableCrsr( const SwPosition& rPos ); - virtual ~SwUnoTableCrsr(); + SwUnoTableCursor( const SwPosition& rPos ); + virtual ~SwUnoTableCursor(); // Does a selection of content exist in table? // Return value indicates if the cursor remains at its old position. @@ -109,7 +109,7 @@ namespace sw UnoCursorPointer() : m_pCursor(nullptr), m_bSectionRestricted(false) {} - UnoCursorPointer(std::shared_ptr<SwUnoCrsr> pCursor, bool bSectionRestricted=false) + UnoCursorPointer(std::shared_ptr<SwUnoCursor> pCursor, bool bSectionRestricted=false) : m_pCursor(pCursor), m_bSectionRestricted(bSectionRestricted) { m_pCursor->Add(this); @@ -144,9 +144,9 @@ namespace sw if(!GetRegisteredIn()) m_pCursor.reset(); }; - SwUnoCrsr& operator*() const + SwUnoCursor& operator*() const { return *m_pCursor.get(); } - SwUnoCrsr* operator->() const + SwUnoCursor* operator->() const { return m_pCursor.get(); } UnoCursorPointer& operator=(UnoCursorPointer aOther) { @@ -157,7 +157,7 @@ namespace sw } explicit operator bool() const { return static_cast<bool>(m_pCursor); } - void reset(std::shared_ptr<SwUnoCrsr> pNew) + void reset(std::shared_ptr<SwUnoCursor> pNew) { if(pNew) pNew->Add(this); @@ -166,7 +166,7 @@ namespace sw m_pCursor = pNew; } private: - std::shared_ptr<SwUnoCrsr> m_pCursor; + std::shared_ptr<SwUnoCursor> m_pCursor; const bool m_bSectionRestricted; }; } |