diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-10-05 09:34:32 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-10-05 09:34:32 +0100 |
| commit | ceb199f0bf1f54c15cfb61c29c6ad3b58df8807e (patch) | |
| tree | ee1251d24c306cc247ecc4b0078c0358a1b2aadc | |
| parent | 08f312431ebd5de7f6537fbc534d4276806bb319 (diff) | |
conversion operator gone now
| -rw-r--r-- | connectivity/source/drivers/evoab2/NDebug.cxx | 5 | ||||
| -rw-r--r-- | connectivity/source/drivers/evoab2/NStatement.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/window.cxx | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/connectivity/source/drivers/evoab2/NDebug.cxx b/connectivity/source/drivers/evoab2/NDebug.cxx index 612bb9319437..76360205e458 100644 --- a/connectivity/source/drivers/evoab2/NDebug.cxx +++ b/connectivity/source/drivers/evoab2/NDebug.cxx @@ -34,9 +34,8 @@ void evo_traceStringMessage( const sal_Char *pFormat, const ::rtl::OUString& rString ) { - rtl::OString aStr; - aStr = ::rtl::OUStringToOString (rString, RTL_TEXTENCODING_UTF8); - OSL_TRACE(pFormat, (const sal_Char *) aStr ); + rtl::OString aStr(::rtl::OUStringToOString(rString, RTL_TEXTENCODING_UTF8)); + OSL_TRACE(pFormat, aStr.getStr()); } #endif diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx index c0d9ee3e698e..25a9666c516e 100644 --- a/connectivity/source/drivers/evoab2/NStatement.cxx +++ b/connectivity/source/drivers/evoab2/NStatement.cxx @@ -628,7 +628,7 @@ Reference< XResultSet > OCommonStatement::impl_executeQuery_throw( const ::rtl:: #ifdef DEBUG g_message( "Parse SQL '%s'\n", - (const sal_Char *)OUStringToOString( _rSql, RTL_TEXTENCODING_UTF8 ) ); + OUStringToOString(_rSql, RTL_TEXTENCODING_UTF8).getStr() ); #endif return impl_executeQuery_throw( impl_getEBookQuery_throw( _rSql ) ); diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 321daba1e268..debf6e2a0419 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -4360,7 +4360,7 @@ Window::~Window() RTL_TEXTENCODING_UTF8)); aTempStr.append(RTL_CONSTASCII_STRINGPARAM( ") with living SystemWindow(s) destroyed: ")); - aTempStr.append(aErrorStr); + aTempStr.append(aErrorStr.toString()); OSL_FAIL(aTempStr.getStr()); // abort in non-pro version, this must be fixed! GetpApp()->Abort(rtl::OStringToOUString( @@ -4383,7 +4383,7 @@ Window::~Window() rtl::OStringBuffer aTempStr( "Window (" ); aTempStr.append(rtl::OUStringToOString(GetText(), RTL_TEXTENCODING_UTF8)); aTempStr.append(") with living SystemWindow(s) destroyed: "); - aTempStr.append(aErrorStr); + aTempStr.append(aErrorStr.toString()); OSL_FAIL( aTempStr.getStr() ); GetpApp()->Abort(rtl::OStringToOUString(aTempStr.makeStringAndClear(), RTL_TEXTENCODING_UTF8)); // abort in non-pro version, this must be fixed! } |