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 /sw/source/ui | |
| parent | a22a7923c05df85a1f9c9435754c5feda66ce576 (diff) | |
convert GetSurroundingText family to OUString
Change-Id: Ifbb21fc26eedfde4afe2e3faf637346554f63d94
Diffstat (limited to 'sw/source/ui')
| -rw-r--r-- | sw/source/ui/docvw/SidebarTxtControl.cxx | 7 | ||||
| -rw-r--r-- | sw/source/ui/docvw/SidebarTxtControl.hxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/docvw/edtwin.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/inc/edtwin.hxx | 2 |
4 files changed, 6 insertions, 7 deletions
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, |