diff options
Diffstat (limited to 'vcl/source/control/ctrl.cxx')
| -rw-r--r-- | vcl/source/control/ctrl.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx index 4da8279add86..845aba829795 100644 --- a/vcl/source/control/ctrl.cxx +++ b/vcl/source/control/ctrl.cxx @@ -131,7 +131,7 @@ bool Control::HasLayoutData() const // ----------------------------------------------------------------------- -void Control::SetText( const String& rStr ) +void Control::SetText( const OUString& rStr ) { ImplClearLayoutData(); Window::SetText( rStr ); @@ -271,11 +271,11 @@ long Control::ToRelativeLineIndex( long nIndex ) const // ----------------------------------------------------------------------- -String Control::GetDisplayText() const +OUString Control::GetDisplayText() const { if( !HasLayoutData() ) FillLayoutData(); - return mpControlData->mpLayoutData ? mpControlData->mpLayoutData->m_aDisplayText : GetText(); + return mpControlData->mpLayoutData ? OUString(mpControlData->mpLayoutData->m_aDisplayText) : GetText(); } // ----------------------------------------------------------------------- |