diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-05-20 21:15:20 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-05-22 12:48:27 +0100 |
| commit | ae167f81e68fc05693f195fa9a680071b741dcbf (patch) | |
| tree | 53f45162b52ce74e708b909a85d3616a9b6cf87a /sd/source/ui/annotations | |
| parent | a22a7923c05df85a1f9c9435754c5feda66ce576 (diff) | |
convert GetSurroundingText family to OUString
Change-Id: Ifbb21fc26eedfde4afe2e3faf637346554f63d94
Diffstat (limited to 'sd/source/ui/annotations')
| -rw-r--r-- | sd/source/ui/annotations/annotationwindow.cxx | 8 | ||||
| -rw-r--r-- | sd/source/ui/annotations/annotationwindow.hxx | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index d6bc9177f915..34950f9f299f 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -242,7 +242,7 @@ void AnnotationTextWindow::LoseFocus() Window::LoseFocus(); } -XubString AnnotationTextWindow::GetSurroundingText() const +rtl::OUString AnnotationTextWindow::GetSurroundingText() const { if( mpOutlinerView ) { @@ -252,12 +252,10 @@ XubString AnnotationTextWindow::GetSurroundingText() const else { ESelection aSelection = mpOutlinerView->GetEditView().GetSelection(); - XubString aStr = aEditEngine->GetText(aSelection.nStartPara); - return aStr; + return aEditEngine->GetText(aSelection.nStartPara); } } - else - return XubString::EmptyString(); + return rtl::OUString(); } Selection AnnotationTextWindow::GetSurroundingTextSelection() const diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx index 777b78c56be2..da49c763c41d 100644 --- a/sd/source/ui/annotations/annotationwindow.hxx +++ b/sd/source/ui/annotations/annotationwindow.hxx @@ -78,7 +78,7 @@ public: void SetOutlinerView( OutlinerView* pOutlinerView ) { mpOutlinerView = pOutlinerView; } - virtual XubString GetSurroundingText() const; + virtual rtl::OUString GetSurroundingText() const; virtual Selection GetSurroundingTextSelection() const; virtual void GetFocus(); |