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

OUString conversion in sd in textapi.hxx and related files

Browse Source 
Change-Id: Id080ae9aaf08de1b0903ee12dc1082c7e531af0b
Reviewed-on: https://gerrit.libreoffice.org/5114
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
This commit is contained in:
MÁTÉ Gergely 2013-07-25 22:56:53 +02:00 committed by Norbert Thiebaud
parent c02b3f8517
commit 2f9d248979
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sd/inc/textapi.hxx
View File

@ -46,7 +46,7 @@ public:
OutlinerParaObject* CreateText(); OutlinerParaObject* CreateText();
void SetText( OutlinerParaObject& rText ); void SetText( OutlinerParaObject& rText );
String GetText(); OUString GetText();
static TextApiObject* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >& ); static TextApiObject* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >& );

8
sd/source/core/text/textapi.cxx
View File

@ -108,7 +108,7 @@ public:
void Dispose(); void Dispose();
void SetText( OutlinerParaObject& rText ); void SetText( OutlinerParaObject& rText );
OutlinerParaObject* CreateText(); OutlinerParaObject* CreateText();
String GetText(); OUString GetText();
SdDrawDocument* GetDoc() { return pImpl->mpDoc; } SdDrawDocument* GetDoc() { return pImpl->mpDoc; }
}; };
@ -174,7 +174,7 @@ void TextApiObject::SetText( OutlinerParaObject& rText )
maSelection.nStartPara = EE_PARA_MAX_COUNT; maSelection.nStartPara = EE_PARA_MAX_COUNT;
} }
String TextApiObject::GetText() OUString TextApiObject::GetText()
{ {
return mpSource->GetText(); return mpSource->GetText();
} }
@ -273,12 +273,12 @@ OutlinerParaObject* TextAPIEditSource::CreateText()
return 0; return 0;
} }
String TextAPIEditSource::GetText() OUString TextAPIEditSource::GetText()
{ {
if ( pImpl->mpDoc && pImpl->mpOutliner ) if ( pImpl->mpDoc && pImpl->mpOutliner )
return pImpl->mpOutliner->GetEditEngine().GetText(); return pImpl->mpOutliner->GetEditEngine().GetText();
else else
return String(); return OUString();
} }
} // namespace sd } // namespace sd

6
sd/source/ui/annotations/annotationmanager.cxx
View File

@ -469,10 +469,10 @@ void AnnotationManagerImpl::ExecuteReplyToAnnotation( SfxRequest& rReq )
aStr.Append( OUString( getAnnotationDateTimeString( xAnnotation ) ) ); aStr.Append( OUString( getAnnotationDateTimeString( xAnnotation ) ) );
aStr.Append( OUString("): \"") ); aStr.Append( OUString("): \"") );
String sQuote( pTextApi->GetText() ); OUString sQuote( pTextApi->GetText() );
if( sQuote.Len() == 0 ) if( sQuote.isEmpty() )
sQuote = OUString( "..." ); sQuote = "...";
aStr.Append( sQuote ); aStr.Append( sQuote );
aStr.Append( OUString("\"\n") ); aStr.Append( OUString("\"\n") );