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/filter/xml | |
| parent | add comphelper::string::indexOfAny() (diff) | |
| download | core-0295c8a34e39326414c1b98cf4da905802f061b0.tar.gz core-0295c8a34e39326414c1b98cf4da905802f061b0.zip | |
sw: let SwTxtNode::GetTxt() return OUString
Change-Id: I36e777b2f623429773277e092284f7d2ba61e6ef
Diffstat (limited to 'sw/source/filter/xml')
| -rw-r--r-- | sw/source/filter/xml/xmlimp.cxx | 10 | ||||
| -rw-r--r-- | sw/source/filter/xml/xmltbli.cxx | 3 |
2 files changed, 7 insertions, 6 deletions
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index e45dc1cc82d2..558fbb70ab2f 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -765,7 +765,7 @@ void SwXMLImport::endDocument( void ) { pPaM->GetPoint()->nNode = *pSttNdIdx; pPaM->GetPoint()->nContent.Assign( pTxtNode, - pTxtNode->GetTxt().Len() ); + pTxtNode->GetTxt().getLength()); } #if OSL_DEBUG_LEVEL > 0 @@ -783,7 +783,7 @@ void SwXMLImport::endDocument( void ) sal_uInt16 nCntPos = pPaM->GetBound( sal_True ).nContent.GetIndex(); pPaM->GetBound( sal_True ).nContent.Assign( pTxtNode, - pTxtNode->GetTxt().Len() + nCntPos ); + pTxtNode->GetTxt().getLength() + nCntPos ); } if( pSttNdIdx->GetIndex()+1 == pPaM->GetBound( sal_False ).nNode.GetIndex() ) @@ -791,14 +791,14 @@ void SwXMLImport::endDocument( void ) sal_uInt16 nCntPos = pPaM->GetBound( sal_False ).nContent.GetIndex(); pPaM->GetBound( sal_False ).nContent.Assign( pTxtNode, - pTxtNode->GetTxt().Len() + nCntPos ); + pTxtNode->GetTxt().getLength() + nCntPos ); } #endif // If the first new node isn't empty, convert the node's text // attributes into hints. Otherwise, set the new node's // paragraph style at the previous (empty) node. SwTxtNode* pDelNd = aNxtIdx.GetNode().GetTxtNode(); - if( pTxtNode->GetTxt().Len() ) + if (!pTxtNode->GetTxt().isEmpty()) pDelNd->FmtToTxtAttr( pTxtNode ); else pTxtNode->ChgFmtColl( pDelNd->GetTxtColl() ); @@ -853,7 +853,7 @@ void SwXMLImport::endDocument( void ) pNextNd->JoinPrev(); } } - else if( !pCurrNd->GetTxt().Len() ) + else if (pCurrNd->GetTxt().isEmpty()) { pPos->nContent.Assign( 0, 0 ); pPaM->SetMark(); pPaM->DeleteMark(); diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index d35254d0c7fb..66d3402c17d7 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -2114,7 +2114,8 @@ SwTableBox *SwXMLTableContext::MakeTableBox( SAL_WARN_IF(!pTxtNode, "sw", "Should have a text node in cell?"); if (pTxtNode) { - SAL_WARN_IF(pTxtNode->GetTxt().Len(), "sw", "why text here?"); + SAL_WARN_IF(!pTxtNode->GetTxt().isEmpty(), "sw", + "why text here?"); pTxtNode->InsertText(*pCell->GetStringValue(), SwIndex(pTxtNode, 0)); } |