diff options
author | Michael Stahl <mstahl@redhat.com> | 2013-02-18 18:36:45 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2013-02-18 20:16:07 +0100 |
commit | 0295c8a34e39326414c1b98cf4da905802f061b0 (patch) | |
tree | 0595896589edc155fae7775fe586403c59842379 /sw/source/core/layout | |
parent | 24eae2b75c201292990122e69954072f36b6f218 (diff) |
sw: let SwTxtNode::GetTxt() return OUString
Change-Id: I36e777b2f623429773277e092284f7d2ba61e6ef
Diffstat (limited to 'sw/source/core/layout')
-rw-r--r-- | sw/source/core/layout/calcmove.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/layout/layact.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/layout/laycache.cxx | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx index 0316791b8d54..b9ddf6ce71f4 100644 --- a/sw/source/core/layout/calcmove.cxx +++ b/sw/source/core/layout/calcmove.cxx @@ -913,7 +913,9 @@ void SwLayoutFrm::MakeAll() |*************************************************************************/ bool SwTxtNode::IsCollapse() const { - if ( GetDoc()->get( IDocumentSettingAccess::COLLAPSE_EMPTY_CELL_PARA ) && GetTxt().Len()==0 ) { + if (GetDoc()->get( IDocumentSettingAccess::COLLAPSE_EMPTY_CELL_PARA ) + && GetTxt().isEmpty()) + { sal_uLong nIdx=GetIndex(); const SwEndNode *pNdBefore=GetNodes()[nIdx-1]->GetEndNode(); const SwEndNode *pNdAfter=GetNodes()[nIdx+1]->GetEndNode(); diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx index 81060e118d44..6fd3a4a461b2 100644 --- a/sw/source/core/layout/layact.cxx +++ b/sw/source/core/layout/layact.cxx @@ -2109,7 +2109,7 @@ sal_Bool SwLayIdle::_DoIdleJob( const SwCntntFrm *pCnt, IdleJobType eJob ) break; case WORD_COUNT : { - const xub_StrLen nEnd = pTxtNode->GetTxt().Len(); + const xub_StrLen nEnd = pTxtNode->GetTxt().getLength(); SwDocStat aStat; pTxtNode->CountWords( aStat, 0, nEnd ); if ( Application::AnyInput( VCL_INPUT_ANY ) ) diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx index 4a9aef7b020f..20f23c1fd629 100644 --- a/sw/source/core/layout/laycache.cxx +++ b/sw/source/core/layout/laycache.cxx @@ -782,7 +782,7 @@ bool SwLayHelper::CheckInsert( sal_uLong nNodeIndex ) sal_uInt16 nRepeat( 0 ); if( !bLongTab && rpFrm->IsTxtFrm() && SW_LAYCACHE_IO_REC_PARA == nType && - nOfst<((SwTxtFrm*)rpFrm)->GetTxtNode()->GetTxt().Len() ) + nOfst<((SwTxtFrm*)rpFrm)->GetTxtNode()->GetTxt().getLength()) bSplit = true; else if( rpFrm->IsTabFrm() && nRowCount < nOfst && ( bLongTab || SW_LAYCACHE_IO_REC_TABLE == nType ) ) |