diff options
Diffstat (limited to 'vcl/source/window/window.cxx')
| -rw-r--r-- | vcl/source/window/window.cxx | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index b4468848ef20..adfde5afb448 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -273,8 +273,7 @@ Window::~Window() aTempStr.append(aErrorStr.toString()); OSL_FAIL(aTempStr.getStr()); // abort in debug builds, must be fixed! - Application::Abort(OStringToOUString( - aTempStr.makeStringAndClear(), RTL_TEXTENCODING_UTF8)); + Application::Abort(OUString::fromUtf8(aTempStr.makeStringAndClear())); } } @@ -296,7 +295,7 @@ Window::~Window() aTempStr.append(") with live SystemWindows destroyed: "); aTempStr.append(aErrorStr.toString()); OSL_FAIL( aTempStr.getStr() ); - Application::Abort(OStringToOUString(aTempStr.makeStringAndClear(), RTL_TEXTENCODING_UTF8)); // abort in debug builds, this must be fixed! + Application::Abort(OUString::fromUtf8(aTempStr.makeStringAndClear())); // abort in debug builds, this must be fixed! } if ( mpWindowImpl->mpFirstChild ) @@ -311,7 +310,7 @@ Window::~Window() pTempWin = pTempWin->mpWindowImpl->mpNext; } OSL_FAIL( aTempStr.getStr() ); - Application::Abort(OStringToOUString(aTempStr.makeStringAndClear(), RTL_TEXTENCODING_UTF8)); // abort in debug builds, this must be fixed! + Application::Abort(OUString::fromUtf8(aTempStr.makeStringAndClear())); // abort in debug builds, this must be fixed! } if ( mpWindowImpl->mpFirstOverlap ) @@ -326,7 +325,7 @@ Window::~Window() pTempWin = pTempWin->mpWindowImpl->mpNext; } OSL_FAIL( aTempStr.getStr() ); - Application::Abort(OStringToOUString(aTempStr.makeStringAndClear(), RTL_TEXTENCODING_UTF8)); // abort in debug builds, this must be fixed! + Application::Abort(OUString::fromUtf8(aTempStr.makeStringAndClear())); // abort in debug builds, this must be fixed! } vcl::Window* pMyParent = GetParent(); @@ -346,7 +345,7 @@ Window::~Window() aTempStr.append(OUStringToOString(GetText(), RTL_TEXTENCODING_UTF8)); aTempStr.append(") still in TaskPanelList!"); OSL_FAIL( aTempStr.getStr() ); - Application::Abort(OStringToOUString(aTempStr.makeStringAndClear(), RTL_TEXTENCODING_UTF8)); // abort in debug builds, this must be fixed! + Application::Abort(OUString::fromUtf8(aTempStr.makeStringAndClear())); // abort in debug builds, this must be fixed! } } #endif @@ -417,7 +416,7 @@ Window::~Window() RTL_TEXTENCODING_UTF8)). append(") with focussed child window destroyed ! THIS WILL LEAD TO CRASHES AND MUST BE FIXED !"); OSL_FAIL( aTempStr.getStr() ); - Application::Abort(OStringToOUString(aTempStr.makeStringAndClear(), RTL_TEXTENCODING_UTF8 )); // abort in debug build version, this must be fixed! + Application::Abort(OUString::fromUtf8(aTempStr.makeStringAndClear())); // abort in debug build version, this must be fixed! #endif } @@ -1946,7 +1945,7 @@ void Window::RequestHelp( const HelpEvent& rHEvt ) } else { - OUString aStrHelpId( OStringToOUString( GetHelpId(), RTL_TEXTENCODING_UTF8 ) ); + OUString aStrHelpId( OUString::fromUtf8( GetHelpId() ) ); if ( aStrHelpId.isEmpty() && ImplGetParent() ) ImplGetParent()->RequestHelp( rHEvt ); else @@ -3209,7 +3208,7 @@ const Wallpaper& Window::GetDisplayBackground() const const OUString& Window::GetHelpText() const { - OUString aStrHelpId( OStringToOUString( GetHelpId(), RTL_TEXTENCODING_UTF8 ) ); + OUString aStrHelpId( OUString::fromUtf8( GetHelpId() ) ); bool bStrHelpId = !aStrHelpId.isEmpty(); if ( !mpWindowImpl->maHelpText.getLength() && bStrHelpId ) |