From 011320d56939846b0ed69476cb465c574dc87749 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 29 Sep 2011 14:05:52 +0200 Subject: Removed uses of rtl::O[U]String[Buffer]::operator sal_{char|Unicode} const *() in Mac OS X only code. --- fpicker/source/aqua/FilterHelper.cxx | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) (limited to 'fpicker') diff --git a/fpicker/source/aqua/FilterHelper.cxx b/fpicker/source/aqua/FilterHelper.cxx index d1f5a7dde6f2..fbeb0ad3c109 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() ); } } -- cgit