mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

convert include/editeng/editobj.hxx from String to OUString

Browse Source 
Change-Id: I076ae20fb21accf8ff7e7fad096534e97ba7dab4
This commit is contained in:
Noel Grandin
2013-09-09 10:48:58 +02:00
parent fbffa4e79a
commit d178cb406b
7 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
editeng/source/editeng/editobj.cxx
View File

@@ -234,7 +234,7 @@ sal_Int32 EditTextObject::GetParagraphCount() const
return mpImpl->GetParagraphCount(); return mpImpl->GetParagraphCount();
} }
String EditTextObject::GetText(sal_Int32 nPara) const OUString EditTextObject::GetText(sal_Int32 nPara) const
{ {
return mpImpl->GetText(nPara); return mpImpl->GetText(nPara);
} }

2
include/editeng/editobj.hxx
View File

@@ -90,7 +90,7 @@ public:
sal_Int32 GetParagraphCount() const; sal_Int32 GetParagraphCount() const;
String GetText(sal_Int32 nPara) const; OUString GetText(sal_Int32 nPara) const;
void ClearPortionInfo(); void ClearPortionInfo();

2
sc/source/ui/Accessibility/AccessiblePageHeader.cxx
View File

@@ -400,7 +400,7 @@ sal_Bool ScAccessiblePageHeader::IsDefunc( const uno::Reference<XAccessibleState
void ScAccessiblePageHeader::AddChild(const EditTextObject* pArea, sal_uInt32 nIndex, SvxAdjust eAdjust) 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]) if (maAreas[nIndex])
{ {

2
sd/source/filter/ppt/pptinanimations.cxx
View File

@@ -3076,7 +3076,7 @@ sal_Int32 AnimationImporter::importTargetElementContainer( const Atom* pAtom, An
while( (nPara < nParaCount) && (begin > 0) ) while( (nPara < nParaCount) && (begin > 0) )
{ {
sal_Int32 nParaLength = rEditTextObject.GetText( nPara ).Len() + 1; sal_Int32 nParaLength = rEditTextObject.GetText( nPara ).getLength() + 1;
begin -= nParaLength; begin -= nParaLength;
end -= nParaLength; end -= nParaLength;
nPara++; nPara++;

2
svx/source/svdraw/svdotxat.cxx
View File

@@ -366,7 +366,7 @@ bool SdrTextObj::HasText() const
sal_Int32 nParaCount = rETO.GetParagraphCount(); sal_Int32 nParaCount = rETO.GetParagraphCount();
if( nParaCount > 0 ) if( nParaCount > 0 )
bHasText = (nParaCount > 1) || (rETO.GetText( 0 ).Len() != 0); bHasText = (nParaCount > 1) || (!rETO.GetText( 0 ).isEmpty());
} }
return bHasText; return bHasText;

2
svx/source/table/cell.cxx
View File

@@ -560,7 +560,7 @@ bool Cell::hasText() const
{ {
if( rTextObj.GetParagraphCount() == 1 ) if( rTextObj.GetParagraphCount() == 1 )
{ {
if( rTextObj.GetText(0).Len() == 0 ) if( rTextObj.GetText(0).isEmpty() )
return false; return false;
} }
return true; return true;

2
sw/source/ui/docvw/AnnotationWin.cxx
View File

@@ -235,7 +235,7 @@ void SwAnnotationWin::InitAnswer(OutlinerParaObject* pText)
// insert old, selected text or "..." // insert old, selected text or "..."
// TODO: iterate over all paragraphs, not only first one to find out if it is empty // 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()); GetOutlinerView()->GetEditView().InsertText(pText->GetTextObject());
else else
GetOutlinerView()->InsertText(OUString("..."),false); GetOutlinerView()->InsertText(OUString("..."),false);