diff options
Diffstat (limited to 'fpicker/source')
| -rw-r--r-- | fpicker/source/office/iodlg.cxx | 4 | ||||
| -rw-r--r-- | fpicker/source/office/iodlgimp.cxx | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index 78f8fe8facfd..13540848252b 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -1128,7 +1128,7 @@ IMPL_STATIC_LINK( SvtFileDialog, OpenHdl_Impl, void*, pVoid ) && pThis->_pImp->_pCbAutoExtension // auto extension is enabled in general && pThis->_pImp->_pCbAutoExtension->IsChecked() // auto extension is really to be used && pThis->GetDefaultExt().Len() // there is a default extension - && pThis->GetDefaultExt() != '*' // the default extension is not "all" + && !comphelper::string::equals(pThis->GetDefaultExt(), '*') // the default extension is not "all" && !( FILEDLG_MODE_SAVE == pThis->_pImp->_eMode // we're saving a file && pThis->_pFileView->GetSelectionCount() // there is a selected file in the file view -> it will later on ) // (in SvtFileDialog::GetPathList) be taken as file to save to @@ -2568,7 +2568,7 @@ sal_Bool SvtFileDialog::IsolateFilterFromPath_Impl( String& rPath, String& rFilt if ( nPathTokenPos == STRING_NOTFOUND ) { - String aDelim( + rtl::OUString aDelim( #if defined(WNT) '\\' #else diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx index cc0efe8a51fb..0309f3aa97ba 100644 --- a/fpicker/source/office/iodlgimp.cxx +++ b/fpicker/source/office/iodlgimp.cxx @@ -316,10 +316,11 @@ void SvtExpFileDlg_Impl::SetStandardDir( const String& _rDir ) namespace { String lcl_DecoratedFilter( const String& _rOriginalFilter ) { - String aDecoratedFilter = '<'; - aDecoratedFilter += _rOriginalFilter; - aDecoratedFilter += '>'; - return aDecoratedFilter; + rtl::OUStringBuffer aDecoratedFilter; + aDecoratedFilter.append('<'); + aDecoratedFilter.append(_rOriginalFilter); + aDecoratedFilter.append('>'); + return aDecoratedFilter.makeStringAndClear(); } } #endif |