sw/inc/pam.hxx | 3 ++- sw/qa/core/swdoc-test.cxx | 2 +- sw/source/core/crsr/pam.cxx | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-)
New commits: commit e85b4e8531125c5b437db515981a344138b8fdd5 Author: Miklos Vajna <vmik...@suse.cz> Date: Mon Jan 14 15:54:05 2013 +0100 document SwPaM::SetMark() Change-Id: I2a57cdea7e952c52f5ee93466a7b81da73b75a7c diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx index 9c0f04b..384fbb9 100644 --- a/sw/inc/pam.hxx +++ b/sw/inc/pam.hxx @@ -208,6 +208,7 @@ public: inline bool IsInFrontOfLabel() const { return m_bIsInFrontOfLabel; } inline void _SetInFrontOfLabel( bool bNew ) { m_bIsInFrontOfLabel = bNew; } + /// Unless this is called, the getter method of Mark will return Point. virtual void SetMark(); void DeleteMark() commit 55b7d15ae984d4ff772e147414c775d2ad69c9f0 Author: Miklos Vajna <vmik...@suse.cz> Date: Mon Jan 14 15:52:58 2013 +0100 SwPaM::HasReadonlySel: sal_Bool -> bool Change-Id: If4c9cb523c6ac357683522029769a82ba10667f1 diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx index 31e1008..9c0f04b 100644 --- a/sw/inc/pam.hxx +++ b/sw/inc/pam.hxx @@ -288,7 +288,7 @@ public: /** Is in something protected (readonly) or selection contains something protected. */ - sal_Bool HasReadonlySel( bool bFormView ) const; + bool HasReadonlySel( bool bFormView ) const; sal_Bool ContainsPosition(const SwPosition & rPos) { return *Start() <= rPos && rPos <= *End(); } diff --git a/sw/qa/core/swdoc-test.cxx b/sw/qa/core/swdoc-test.cxx index f2cc9cc..189a25c 100644 --- a/sw/qa/core/swdoc-test.cxx +++ b/sw/qa/core/swdoc-test.cxx @@ -893,7 +893,7 @@ void SwDocTest::testFdo57938() aPaM.GetPoint()->nContent = 0; aPaM.GetMark()->nContent = 1; // The problem was that "a" was considered read-only, so could not be deleted. - CPPUNIT_ASSERT_EQUAL(false, bool(aPaM.HasReadonlySel(false))); + CPPUNIT_ASSERT_EQUAL(false, aPaM.HasReadonlySel(false)); } void SwDocTest::setUp() diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx index 5fbf4bc..505477a 100644 --- a/sw/source/core/crsr/pam.cxx +++ b/sw/source/core/crsr/pam.cxx @@ -590,9 +590,9 @@ static const SwFrm* lcl_FindEditInReadonlyFrm( const SwFrm& rFrm ) } /// is in protected section or selection surrounds something protected -sal_Bool SwPaM::HasReadonlySel( bool bFormView ) const +bool SwPaM::HasReadonlySel( bool bFormView ) const { - sal_Bool bRet = sal_False; + bool bRet = sal_False; Point aTmpPt; const SwCntntNode *pNd; const SwCntntFrm *pFrm; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits