diff options
| -rw-r--r-- | editeng/source/editeng/editobj.cxx | 2 | ||||
| -rw-r--r-- | include/editeng/editobj.hxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/Accessibility/AccessiblePageHeader.cxx | 2 | ||||
| -rw-r--r-- | sd/source/filter/ppt/pptinanimations.cxx | 2 | ||||
| -rw-r--r-- | svx/source/svdraw/svdotxat.cxx | 2 | ||||
| -rw-r--r-- | svx/source/table/cell.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/docvw/AnnotationWin.cxx | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx index 22e0cc639f3e..a5e67e43df5a 100644 --- a/editeng/source/editeng/editobj.cxx +++ b/editeng/source/editeng/editobj.cxx @@ -234,7 +234,7 @@ sal_Int32 EditTextObject::GetParagraphCount() const return mpImpl->GetParagraphCount(); } -String EditTextObject::GetText(sal_Int32 nPara) const +OUString EditTextObject::GetText(sal_Int32 nPara) const { return mpImpl->GetText(nPara); } diff --git a/include/editeng/editobj.hxx b/include/editeng/editobj.hxx index 4dd026cf52cd..cdb8fbb3a434 100644 --- a/include/editeng/editobj.hxx +++ b/include/editeng/editobj.hxx @@ -90,7 +90,7 @@ public: sal_Int32 GetParagraphCount() const; - String GetText(sal_Int32 nPara) const; + OUString GetText(sal_Int32 nPara) const; void ClearPortionInfo(); diff --git a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx index 0cf9957f1675..824049887371 100644 --- a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx +++ b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx @@ -400,7 +400,7 @@ sal_Bool ScAccessiblePageHeader::IsDefunc( const uno::Reference<XAccessibleState void ScAccessiblePageHeader::AddChild(const EditTextObject* pArea, sal_uInt32 nIndex, SvxAdjust eAdjust) { - if (pArea && (pArea->GetText(0).Len() || (pArea->GetParagraphCount() > 1))) + if (pArea && (!pArea->GetText(0).isEmpty() || (pArea->GetParagraphCount() > 1))) { if (maAreas[nIndex]) { diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx index f52379c0708f..8dfd43ae49b2 100644 --- a/sd/source/filter/ppt/pptinanimations.cxx +++ b/sd/source/filter/ppt/pptinanimations.cxx @@ -3076,7 +3076,7 @@ sal_Int32 AnimationImporter::importTargetElementContainer( const Atom* pAtom, An while( (nPara < nParaCount) && (begin > 0) ) { - sal_Int32 nParaLength = rEditTextObject.GetText( nPara ).Len() + 1; + sal_Int32 nParaLength = rEditTextObject.GetText( nPara ).getLength() + 1; begin -= nParaLength; end -= nParaLength; nPara++; diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx index bbb4f7f8f30e..912340fd2d3e 100644 --- a/svx/source/svdraw/svdotxat.cxx +++ b/svx/source/svdraw/svdotxat.cxx @@ -366,7 +366,7 @@ bool SdrTextObj::HasText() const sal_Int32 nParaCount = rETO.GetParagraphCount(); if( nParaCount > 0 ) - bHasText = (nParaCount > 1) || (rETO.GetText( 0 ).Len() != 0); + bHasText = (nParaCount > 1) || (!rETO.GetText( 0 ).isEmpty()); } return bHasText; diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index fd28d1cd546d..0ab0bd5f24ce 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -560,7 +560,7 @@ bool Cell::hasText() const { if( rTextObj.GetParagraphCount() == 1 ) { - if( rTextObj.GetText(0).Len() == 0 ) + if( rTextObj.GetText(0).isEmpty() ) return false; } return true; diff --git a/sw/source/ui/docvw/AnnotationWin.cxx b/sw/source/ui/docvw/AnnotationWin.cxx index 0efc8fb5d760..d08226efa105 100644 --- a/sw/source/ui/docvw/AnnotationWin.cxx +++ b/sw/source/ui/docvw/AnnotationWin.cxx @@ -235,7 +235,7 @@ void SwAnnotationWin::InitAnswer(OutlinerParaObject* pText) // insert old, selected text or "..." // TODO: iterate over all paragraphs, not only first one to find out if it is empty - if (pText->GetTextObject().GetText(0).Len()) + if (!pText->GetTextObject().GetText(0).isEmpty()) GetOutlinerView()->GetEditView().InsertText(pText->GetTextObject()); else GetOutlinerView()->InsertText(OUString("..."),false); |