summaryrefslogtreecommitdiff
path: root/fpicker
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-08-26 22:24:36 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-08-27 08:00:32 +0200
commita6050c32f30796743f9ab9b2a5c793ced9b8f747 (patch)
treea2fa6d05708d1c99414893064adaee56460ac728 /fpicker
parent01ed4bf52db701c4e7824f4a92b5a3afa2a5ca4b (diff)
Clean up aEmpty
Change-Id: I4c4294b7fb1cb537ba3ae3e6e7e747a3333b7469
Diffstat (limited to 'fpicker')
-rw-r--r--fpicker/source/office/iodlg.cxx5
-rw-r--r--fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx3
2 files changed, 3 insertions, 5 deletions
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 6b875793a8e9..156d103142d7 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -2268,7 +2268,6 @@ std::vector<OUString> SvtFileDialog::GetPathList() const
bool SvtFileDialog::IsolateFilterFromPath_Impl( OUString& rPath, OUString& rFilter )
{
- OUString aEmpty;
OUString aReversePath = comphelper::string::reverseString(rPath);
sal_Int32 nQuestionMarkPos = rPath.indexOf( '?' );
sal_Int32 nWildCardPos = rPath.indexOf( FILEDIALOG_DEF_WILDCARD );
@@ -2284,7 +2283,7 @@ bool SvtFileDialog::IsolateFilterFromPath_Impl( OUString& rPath, OUString& rFilt
nWildCardPos = std::min( nWildCardPos, nQuestionMarkPos );
}
- rFilter = aEmpty;
+ rFilter.clear();
if ( nWildCardPos != -1 )
{
@@ -2331,7 +2330,7 @@ bool SvtFileDialog::IsolateFilterFromPath_Impl( OUString& rPath, OUString& rFilt
else
{
rFilter = rPath;
- rPath = aEmpty;
+ rPath.clear();
}
}
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
index 54f30690767a..08d947e3a17a 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
@@ -348,11 +348,10 @@ void VistaFilePickerImpl::impl_sta_appendFilterGroup(const RequestRef& rRequest)
rRequest->getArgumentOrDefault(PROP_FILTER_GROUP, css::uno::Sequence< css::beans::StringPair >());
// SYNCHRONIZED->
- OUString aEmpty;
::osl::ResettableMutexGuard aLock(m_aMutex);
if ( m_lFilters.numFilter() > 0 && aFilterGroup.getLength() > 0 )
- m_lFilters.addFilter( STRING_SEPARATOR, aEmpty, sal_True );
+ m_lFilters.addFilter( STRING_SEPARATOR, "", sal_True );
::sal_Int32 c = aFilterGroup.getLength();
::sal_Int32 i = 0;