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 /vcl | |
| parent | a22a7923c05df85a1f9c9435754c5feda66ce576 (diff) | |
convert GetSurroundingText family to OUString
Change-Id: Ifbb21fc26eedfde4afe2e3faf637346554f63d94
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/vcl/edit.hxx | 2 | ||||
| -rw-r--r-- | vcl/inc/vcl/window.hxx | 2 | ||||
| -rw-r--r-- | vcl/source/control/edit.cxx | 7 | ||||
| -rw-r--r-- | vcl/source/window/window.cxx | 4 |
4 files changed, 7 insertions, 8 deletions
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 |