4 files changed, 8 insertions, 15 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();
diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx
index 1842903602ff..367822ff0124 100644
--- a/sd/source/ui/inc/Window.hxx
+++ b/sd/source/ui/inc/Window.hxx
@@ -209,7 +209,7 @@ protected:
         ::com::sun::star::accessibility::XAccessible>
         CreateAccessible (void);
 
-    XubString GetSurroundingText() const;
+    rtl::OUString GetSurroundingText() const;
     Selection GetSurroundingTextSelection() const;
 };
 
diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx
index 0590702f158d..f070b10cfa6d 100644
--- a/sd/source/ui/view/sdwindow.cxx
+++ b/sd/source/ui/view/sdwindow.cxx
@@ -1179,21 +1179,16 @@ void Window::DropScroll(const Point& rMousePos)
     }
 }
 
-XubString Window::GetSurroundingText() const
+rtl::OUString Window::GetSurroundingText() const
 {
     if ( mpViewShell->GetShellType() == ViewShell::ST_OUTLINE )
-    {
-        return XubString();
-    }
+        return rtl::OUString();
     else if ( mpViewShell->GetView()->IsTextEdit() )
     {
         OutlinerView *pOLV = mpViewShell->GetView()->GetTextEditOutlinerView();
         return pOLV->GetEditView().GetSurroundingText();
     }
-    else
-    {
-        return XubString();
-    }
+    return rtl::OUString();
 }
 
 Selection Window::GetSurroundingTextSelection() const