connectivity/source/drivers/macab/MacabDriver.cxx | 2 - connectivity/source/drivers/macab/MacabRecords.cxx | 4 +-- fpicker/source/aqua/FilterHelper.cxx | 22 ++++++++------------- 3 files changed, 12 insertions(+), 16 deletions(-)
New commits: commit 011320d56939846b0ed69476cb465c574dc87749 Author: Stephan Bergmann <[email protected]> Date: Thu Sep 29 14:05:52 2011 +0200 Removed uses of rtl::O[U]String[Buffer]::operator sal_{char|Unicode} const *() in Mac OS X only code. diff --git a/connectivity/source/drivers/macab/MacabDriver.cxx b/connectivity/source/drivers/macab/MacabDriver.cxx index 92d3e0f..47016da 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 86d34a8..2bad0c2 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()); } } diff --git a/fpicker/source/aqua/FilterHelper.cxx b/fpicker/source/aqua/FilterHelper.cxx index d1f5a7d..fbeb0ad 100644 --- a/fpicker/source/aqua/FilterHelper.cxx +++ b/fpicker/source/aqua/FilterHelper.cxx @@ -103,27 +103,23 @@ shrinkFilterName( const rtl::OUString aFilterName, bool bAllowNoStar = false ) { // DBG_PRINT_ENTRY(CLASS_NAME, "shrinkFilterName", "filterName", aFilterName); - int i; - int nBracketLen = -1; - int nBracketEnd = -1; - rtl::OUString rFilterName = aFilterName; - const sal_Unicode *pStr = rFilterName; - rtl::OUString aRealName = rFilterName; - - for( i = aRealName.getLength() - 1; i > 0; i-- ) + sal_Int32 nBracketEnd = -1; + rtl::OUString aRealName(aFilterName); + + for( sal_Int32 i = aRealName.getLength() - 1; i > 0; i-- ) { - if( pStr[i] == ')' ) + if( aFilterName[i] == ')' ) nBracketEnd = i; - else if( pStr[i] == '(' ) + else if( aFilterName[i] == '(' ) { - nBracketLen = nBracketEnd - i; + sal_Int32 nBracketLen = nBracketEnd - i; if( nBracketEnd <= 0 ) continue; - if( isFilterString( rFilterName.copy( i + 1, nBracketLen - 1 ), "*." ) ) + if( isFilterString( aFilterName.copy( i + 1, nBracketLen - 1 ), "*." ) ) aRealName = aRealName.replaceAt( i, nBracketLen + 1, rtl::OUString() ); else if (bAllowNoStar) { - if( isFilterString( rFilterName.copy( i + 1, nBracketLen - 1 ), ".") ) + if( isFilterString( aFilterName.copy( i + 1, nBracketLen - 1 ), ".") ) aRealName = aRealName.replaceAt( i, nBracketLen + 1, rtl::OUString() ); } } _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
