diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-09-29 14:05:52 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-09-29 14:50:17 +0200 |
| commit | 011320d56939846b0ed69476cb465c574dc87749 (patch) | |
| tree | 1fe719e4d140db59827488bd6eb5009b412f86c1 /connectivity | |
| parent | 377316db2b02c56a552c8ebb9ee4d4fc02e1a708 (diff) | |
Removed uses of rtl::O[U]String[Buffer]::operator sal_{char|Unicode} const *() in Mac OS X only code.
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/drivers/macab/MacabDriver.cxx | 2 | ||||
| -rw-r--r-- | connectivity/source/drivers/macab/MacabRecords.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/connectivity/source/drivers/macab/MacabDriver.cxx b/connectivity/source/drivers/macab/MacabDriver.cxx index 92d3e0f16963..47016da57b57 100644 --- a/connectivity/source/drivers/macab/MacabDriver.cxx +++ b/connectivity/source/drivers/macab/MacabDriver.cxx @@ -84,7 +84,7 @@ namespace if ( !_rFunction ) { // did not find the symbol - OSL_FAIL( ::rtl::OString( "lcl_getFunctionFromModuleOrUnload: could not find the symbol " ) + ::rtl::OString( _pAsciiSymbolName ) ); + OSL_FAIL( ( ::rtl::OString( "lcl_getFunctionFromModuleOrUnload: could not find the symbol " ) + ::rtl::OString( _pAsciiSymbolName ) ).getStr() ); osl_unloadModule( _rModule ); _rModule = NULL; } diff --git a/connectivity/source/drivers/macab/MacabRecords.cxx b/connectivity/source/drivers/macab/MacabRecords.cxx index 86d34a808355..2bad0c2f0f14 100644 --- a/connectivity/source/drivers/macab/MacabRecords.cxx +++ b/connectivity/source/drivers/macab/MacabRecords.cxx @@ -448,8 +448,8 @@ MacabHeader *MacabRecords::createHeaderForRecordType(const CFArrayRef _records, else { // Couldn't find a required property... - OSL_FAIL(::rtl::OString("MacabRecords::createHeaderForRecordType: could not find required property: ") + - ::rtl::OUStringToOString(CFStringToOUString(requiredProperties[i]), RTL_TEXTENCODING_ASCII_US)); + OSL_FAIL((::rtl::OString("MacabRecords::createHeaderForRecordType: could not find required property: ") + + ::rtl::OUStringToOString(CFStringToOUString(requiredProperties[i]), RTL_TEXTENCODING_ASCII_US)).getStr()); } } |