diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-11-18 21:18:18 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-11-19 21:11:02 +0000 |
| commit | bb997c001982dc36ef393fbc76ace65dd12b461d (patch) | |
| tree | e1fbefe6899aaf6d65b071c3eb8a43f967a6d434 /sfx2 | |
| parent | ca02d728082a86780d68ede7b9d565128dbc0434 (diff) | |
implEnsureURLExtension just returns the first argument, remove it
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/dialog/filedlghelper.cxx | 14 | ||||
| -rw-r--r-- | sfx2/source/dialog/filedlgimpl.hxx | 2 |
2 files changed, 3 insertions, 13 deletions
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index b5dfe5c2a0eb..f8b905878a45 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -1344,14 +1344,6 @@ void FileDialogHelper_Impl::implStartExecute() } // ------------------------------------------------------------------------ -String FileDialogHelper_Impl::implEnsureURLExtension(const String& sURL, - const String& /*sExtension*/) -{ - return sURL; - -} - -// ------------------------------------------------------------------------ void lcl_saveLastURLs(SvStringsDtor*& rpURLList , ::comphelper::SequenceAsVector< ::rtl::OUString >& lLastURLs ) { @@ -1386,7 +1378,7 @@ void FileDialogHelper_Impl::implGetAndCacheFiles(const uno::Reference< XInterfac ::sal_Int32 nFiles = lFiles.getLength(); for (::sal_Int32 i = 0; i < nFiles; i++) { - String* pURL = new String(implEnsureURLExtension(lFiles[i], sExtension)); + String* pURL = new String(lFiles[i]); rpURLList->Insert( pURL, rpURLList->Count() ); } } @@ -1400,7 +1392,7 @@ void FileDialogHelper_Impl::implGetAndCacheFiles(const uno::Reference< XInterfac if ( nFiles == 1 ) { rpURLList = new SvStringsDtor; - String* pURL = new String(implEnsureURLExtension(lFiles[0], sExtension)); + String* pURL = new String(lFiles[0]); rpURLList->Insert( pURL, 0 ); } else @@ -1418,7 +1410,7 @@ void FileDialogHelper_Impl::implGetAndCacheFiles(const uno::Reference< XInterfac else aPath.setName( lFiles[i] ); - String* pURL = new String(implEnsureURLExtension(aPath.GetMainURL( INetURLObject::NO_DECODE ), sExtension) ); + String* pURL = new String(aPath.GetMainURL( INetURLObject::NO_DECODE ) ); rpURLList->Insert( pURL, rpURLList->Count() ); } } diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx index 0a76cb1eca67..6b6b66d64c46 100644 --- a/sfx2/source/dialog/filedlgimpl.hxx +++ b/sfx2/source/dialog/filedlgimpl.hxx @@ -159,8 +159,6 @@ namespace sfx2 void implGetAndCacheFiles( const ::com::sun::star::uno::Reference< XInterface >& xPicker , SvStringsDtor*& rpURLList, const SfxFilter* pFilter ); - String implEnsureURLExtension(const String& sURL , - const String& sExtension); DECL_LINK( TimeOutHdl_Impl, Timer* ); DECL_LINK( HandleEvent, FileDialogHelper* ); |