summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-08-14 13:44:38 +0100
committerCaolán McNamara <caolanm@redhat.com>2013-08-14 16:10:09 +0100
commit96f24b9cc07d3b83618811434e4cfcac515f8aa1 (patch)
tree149297f843e0d588bcc4316a8955165a3cdc1b9f /sd
parentaab7a316dc127f71e530552cebfb34d5b8f5fa19 (diff)
XubString->OUString
Change-Id: I9ccb06134dfadd9bf1ecb8e5edcd24c02980b754
Diffstat (limited to 'sd')
-rw-r--r--sd/source/core/drawdoc.cxx2
-rw-r--r--sd/source/ui/annotations/annotationmanager.cxx2
-rw-r--r--sd/source/ui/func/fuinsfil.cxx4
-rw-r--r--sd/source/ui/func/futext.cxx2
4 files changed, 5 insertions, 5 deletions
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index 552e46dad8c6..ede243c8ea67 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -814,7 +814,7 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool
// Advantages:
// a) no unnecessary Clear calls
// b) no wasted memory
- DBG_ASSERT( !mpInternalOutliner || ( ( mpInternalOutliner->GetParagraphCount() == 1 ) && ( mpInternalOutliner->GetText( mpInternalOutliner->GetParagraph( 0 ) ).Len() == 0 ) ), "InternalOutliner: not empty!" );
+ DBG_ASSERT( !mpInternalOutliner || ( ( mpInternalOutliner->GetParagraphCount() == 1 ) && ( mpInternalOutliner->GetText( mpInternalOutliner->GetParagraph( 0 ) ).isEmpty() ) ), "InternalOutliner: not empty!" );
return mpInternalOutliner;
}
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx
index 5baa4bae1f2a..a6128cb9f0e8 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -487,7 +487,7 @@ void AnnotationManagerImpl::ExecuteReplyToAnnotation( SfxRequest& rReq )
ESelection aSel;
aSel.nEndPara = pOutliner->GetParagraphCount()-2;
- aSel.nEndPos = pOutliner->GetText( pOutliner->GetParagraph( aSel.nEndPara ) ).Len();
+ aSel.nEndPos = pOutliner->GetText( pOutliner->GetParagraph( aSel.nEndPara ) ).getLength();
pOutliner->QuickSetAttribs( aAnswerSet, aSel );
}
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index e84696fc78f3..e7f882b55262 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -488,7 +488,7 @@ void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium)
while ( pOutliner->GetParagraphCount() > 1 )
{
Paragraph* pPara = pOutliner->GetParagraph( 0 );
- sal_uLong nLen = pOutliner->GetText( pPara, 1 ).Len();
+ sal_uLong nLen = pOutliner->GetText( pPara, 1 ).getLength();
pOutliner->QuickDelete( ESelection( 0, (sal_uInt16) nLen, 1, 0 ) );
pOutliner->QuickInsertLineBreak( ESelection( 0, (sal_uInt16) nLen, 0, (sal_uInt16) nLen ) );
}
@@ -647,7 +647,7 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium)
// only take the last paragraph if it is filled
if (nSourcePos < nParaCount - 1 ||
- pOutliner->GetText(pSourcePara).Len() > 0)
+ !pOutliner->GetText(pSourcePara).isEmpty())
{
pDocliner->Insert( pOutliner->GetText(pSourcePara), nTargetPos, nDepth );
String aStyleSheetName( pStyleSheet->GetName() );
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index 6784daa67140..ada19370191e 100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -1031,7 +1031,7 @@ void FuText::SetInEditMode(const MouseEvent& rMEvt, sal_Bool bQuickDrag)
if (nParaAnz==1 && p1stPara)
{
// with only one paragraph
- if (pOutl->GetText(p1stPara).Len() == 0)
+ if (pOutl->GetText(p1stPara).isEmpty())
{
bEmptyOutliner = sal_True;
}