diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-03-14 00:05:53 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-03-14 00:41:31 +0100 |
| commit | be500fc6edfcc192ac71f1a4cc2bd7ab33328489 (patch) | |
| tree | 3954e3f406811696fee1bee53394d1700a0c8b82 /sw/inc/viscrs.hxx | |
| parent | ce0e635a65dd637d96f63931950f7571b051d128 (diff) | |
sw: prefix members of SwShellCrsr
Change-Id: I0be44b2686bf5f6d54cda4e26a1b61cb0c078656
Diffstat (limited to 'sw/inc/viscrs.hxx')
| -rw-r--r-- | sw/inc/viscrs.hxx | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/sw/inc/viscrs.hxx b/sw/inc/viscrs.hxx index db3a964edd88..855107d86599 100644 --- a/sw/inc/viscrs.hxx +++ b/sw/inc/viscrs.hxx @@ -114,9 +114,11 @@ public: class SwShellCrsr : public virtual SwCursor, public SwSelPaintRects { +private: // Document positions of start/end characters of a SSelection. - Point aMkPt, aPtPt; - const SwPosition* pPt; // For assignment of GetPoint() to aPtPt. + Point m_MarkPt; + Point m_PointPt; + const SwPosition* m_pInitialPoint; // For assignment of GetPoint() to m_PointPt. using SwCursor::UpDown; @@ -135,14 +137,14 @@ public: void Hide(); // Hide all selections. void Invalidate( const SwRect& rRect ); - const Point& GetPtPos() const { return( SwPaM::GetPoint() == pPt ? aPtPt : aMkPt ); } - Point& GetPtPos() { return( SwPaM::GetPoint() == pPt ? aPtPt : aMkPt ); } - const Point& GetMkPos() const { return( SwPaM::GetMark() == pPt ? aPtPt : aMkPt ); } - Point& GetMkPos() { return( SwPaM::GetMark() == pPt ? aPtPt : aMkPt ); } - const Point& GetSttPos() const { return( SwPaM::Start() == pPt ? aPtPt : aMkPt ); } - Point& GetSttPos() { return( SwPaM::Start() == pPt ? aPtPt : aMkPt ); } - const Point& GetEndPos() const { return( SwPaM::End() == pPt ? aPtPt : aMkPt ); } - Point& GetEndPos() { return( SwPaM::End() == pPt ? aPtPt : aMkPt ); } + const Point& GetPtPos() const { return (SwPaM::GetPoint() == m_pInitialPoint) ? m_PointPt : m_MarkPt; } + Point& GetPtPos() { return (SwPaM::GetPoint() == m_pInitialPoint) ? m_PointPt : m_MarkPt; } + const Point& GetMkPos() const { return (SwPaM::GetMark() == m_pInitialPoint) ? m_PointPt : m_MarkPt; } + Point& GetMkPos() { return (SwPaM::GetMark() == m_pInitialPoint) ? m_PointPt : m_MarkPt; } + const Point& GetSttPos() const { return (SwPaM::Start() == m_pInitialPoint) ? m_PointPt : m_MarkPt; } + Point& GetSttPos() { return (SwPaM::Start() == m_pInitialPoint) ? m_PointPt : m_MarkPt; } + const Point& GetEndPos() const { return (SwPaM::End() == m_pInitialPoint) ? m_PointPt : m_MarkPt; } + Point& GetEndPos() { return (SwPaM::End() == m_pInitialPoint) ? m_PointPt : m_MarkPt; } virtual void SetMark() SAL_OVERRIDE; |