diff options
| author | MÁTÉ Gergely <sportember@caesar.elte.hu> | 2013-07-25 22:56:53 +0200 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-07-26 22:30:28 +0000 |
| commit | 2f9d2489791ee97a169df0cea932ed7f9ba1e66c (patch) | |
| tree | 814ca222d9bf308656904d5b0f1ff96a9822fc33 /sd | |
| parent | c02b3f8517e159c462a288d82e3b62cc4b2ab682 (diff) | |
OUString conversion in sd in textapi.hxx and related files
Change-Id: Id080ae9aaf08de1b0903ee12dc1082c7e531af0b
Reviewed-on: https://gerrit.libreoffice.org/5114
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/inc/textapi.hxx | 2 | ||||
| -rw-r--r-- | sd/source/core/text/textapi.cxx | 8 | ||||
| -rw-r--r-- | sd/source/ui/annotations/annotationmanager.cxx | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/sd/inc/textapi.hxx b/sd/inc/textapi.hxx index 12a67be9c879..ceb27cf63a8a 100644 --- a/sd/inc/textapi.hxx +++ b/sd/inc/textapi.hxx @@ -46,7 +46,7 @@ public: OutlinerParaObject* CreateText(); void SetText( OutlinerParaObject& rText ); - String GetText(); + OUString GetText(); static TextApiObject* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >& ); diff --git a/sd/source/core/text/textapi.cxx b/sd/source/core/text/textapi.cxx index afe6e80075ff..acd3e8630ff7 100644 --- a/sd/source/core/text/textapi.cxx +++ b/sd/source/core/text/textapi.cxx @@ -108,7 +108,7 @@ public: void Dispose(); void SetText( OutlinerParaObject& rText ); OutlinerParaObject* CreateText(); - String GetText(); + OUString GetText(); SdDrawDocument* GetDoc() { return pImpl->mpDoc; } }; @@ -174,7 +174,7 @@ void TextApiObject::SetText( OutlinerParaObject& rText ) maSelection.nStartPara = EE_PARA_MAX_COUNT; } -String TextApiObject::GetText() +OUString TextApiObject::GetText() { return mpSource->GetText(); } @@ -273,12 +273,12 @@ OutlinerParaObject* TextAPIEditSource::CreateText() return 0; } -String TextAPIEditSource::GetText() +OUString TextAPIEditSource::GetText() { if ( pImpl->mpDoc && pImpl->mpOutliner ) return pImpl->mpOutliner->GetEditEngine().GetText(); else - return String(); + return OUString(); } } // namespace sd diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index 5d95892ceddc..5baa4bae1f2a 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -469,10 +469,10 @@ void AnnotationManagerImpl::ExecuteReplyToAnnotation( SfxRequest& rReq ) aStr.Append( OUString( getAnnotationDateTimeString( xAnnotation ) ) ); aStr.Append( OUString("): \"") ); - String sQuote( pTextApi->GetText() ); + OUString sQuote( pTextApi->GetText() ); - if( sQuote.Len() == 0 ) - sQuote = OUString( "..." ); + if( sQuote.isEmpty() ) + sQuote = "..."; aStr.Append( sQuote ); aStr.Append( OUString("\"\n") ); |