convert GetSurroundingText family to OUString

Change-Id: Ifbb21fc26eedfde4afe2e3faf637346554f63d94

12 files changed, 21 insertions, 30 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
diff --git a/sw/source/ui/docvw/SidebarTxtControl.cxx b/sw/source/ui/docvw/SidebarTxtControl.cxx
index 95cc889c9cee..b26b1b39e503 100644
--- a/sw/source/ui/docvw/SidebarTxtControl.cxx
+++ b/sw/source/ui/docvw/SidebarTxtControl.cxx
@@ -392,12 +392,11 @@ void SidebarTxtControl::Command( const CommandEvent& rCEvt )
     }
 }
 
-XubString SidebarTxtControl::GetSurroundingText() const
+rtl::OUString SidebarTxtControl::GetSurroundingText() const
 {
-    if( GetTextView() )
+    if (GetTextView())
         return GetTextView()->GetSurroundingText();
-    else
-        return XubString::EmptyString();
+    return rtl::OUString();
 }
 
 Selection SidebarTxtControl::GetSurroundingTextSelection() const
diff --git a/sw/source/ui/docvw/SidebarTxtControl.hxx b/sw/source/ui/docvw/SidebarTxtControl.hxx
index e536cee4a2c2..e3d37421d2f7 100644
--- a/sw/source/ui/docvw/SidebarTxtControl.hxx
+++ b/sw/source/ui/docvw/SidebarTxtControl.hxx
@@ -58,7 +58,7 @@ class SidebarTxtControl : public Control
         virtual void    Command( const CommandEvent& rCEvt );
         virtual void    LoseFocus();
         virtual void    RequestHelp(const HelpEvent &rEvt);
-        virtual XubString GetSurroundingText() const;
+        virtual rtl::OUString GetSurroundingText() const;
         virtual Selection GetSurroundingTextSelection() const;
 
         DECL_LINK( Select, Menu* );
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index e6ae67870736..6d5cc4f0df21 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -5717,7 +5717,7 @@ void SwEditWin::SetUseInputLanguage( sal_Bool bNew )
     bUseInputLanguage = bNew;
 }
 
-XubString SwEditWin::GetSurroundingText() const
+rtl::OUString SwEditWin::GetSurroundingText() const
 {
     String sReturn;
     SwWrtShell& rSh = rView.GetWrtShell();
diff --git a/sw/source/ui/inc/edtwin.hxx b/sw/source/ui/inc/edtwin.hxx
index 45bc2776036a..ac78de99a8f2 100644
--- a/sw/source/ui/inc/edtwin.hxx
+++ b/sw/source/ui/inc/edtwin.hxx
@@ -221,7 +221,7 @@ protected:
     virtual sal_Int8    ExecuteDrop( const ExecuteDropEvent& rEvt );
     virtual void        StartDrag( sal_Int8 nAction, const Point& rPosPixel );
 
-    virtual XubString GetSurroundingText() const;
+    virtual rtl::OUString GetSurroundingText() const;
     virtual Selection GetSurroundingTextSelection() const;
 
     void    ShowAutoTextCorrectQuickHelp( const String& rWord, SvxAutoCorrCfg* pACfg,
diff --git a/vcl/inc/vcl/edit.hxx b/vcl/inc/vcl/edit.hxx
index 9ca82bd0bfd9..359b9d7ce29b 100644
--- a/vcl/inc/vcl/edit.hxx
+++ b/vcl/inc/vcl/edit.hxx
@@ -246,7 +246,7 @@ public:
     static PopupMenu*   CreatePopupMenu();
     static void         DeletePopupMenu( PopupMenu* pMenu );
 
-    virtual XubString GetSurroundingText() const;
+    virtual rtl::OUString GetSurroundingText() const;
     virtual Selection GetSurroundingTextSelection() const;
 
     // returns the minimum size a bordered Edit should have given the current
diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx
index 881522f9d740..94a3fbea738b 100644
--- a/vcl/inc/vcl/window.hxx
+++ b/vcl/inc/vcl/window.hxx
@@ -1089,7 +1089,7 @@ public:
 
     void SimulateKeyPress( sal_uInt16 nKeyCode ) const;
 
-    virtual XubString GetSurroundingText() const;
+    virtual rtl::OUString GetSurroundingText() const;
     virtual Selection GetSurroundingTextSelection() const;
 
     // ExtImpl
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 128d7db6b878..534b813a15af 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -3147,11 +3147,10 @@ void ImplSubEdit::Modify()
     GetParent()->Modify();
 }
 
-XubString Edit::GetSurroundingText() const
+rtl::OUString Edit::GetSurroundingText() const
 {
-  if ( mpSubEdit )
-    return mpSubEdit->GetSurroundingText();
-  else
+    if (mpSubEdit)
+        return mpSubEdit->GetSurroundingText();
     return maText;
 }
 
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index a71dda23c1e3..ee6c4a5290ab 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -9579,9 +9579,9 @@ void Window::PaintToDevice( OutputDevice* pDev, const Point& rPos, const Size& /
         SetParent( pRealParent );
 }
 
-XubString Window::GetSurroundingText() const
+rtl::OUString Window::GetSurroundingText() const
 {
-  return XubString::EmptyString();
+  return rtl::OUString();
 }
 
 Selection Window::GetSurroundingTextSelection() const