diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-08-18 17:11:09 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-08-18 17:24:22 +0100 |
| commit | 58d68a1bc9146334376206ae7ba8b1a6594a1040 (patch) | |
| tree | 269d465b387964054dce91316b1d800dcc22e0e5 /fpicker | |
| parent | bdc3053067175eea4d30d5ca6d304366174c9316 (diff) | |
ConvertURLToSystemPath->getSystemPathFromFileURL
Change-Id: I7dc0e1b596f80b8f0870aed1722f711bb287ec0a
Diffstat (limited to 'fpicker')
| -rw-r--r-- | fpicker/source/office/iodlg.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index 496fd8a5cb69..e4c5637006a7 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -70,7 +70,7 @@ #include <comphelper/processfactory.hxx> #include <comphelper/string.hxx> -#include <osl/file.h> +#include <osl/file.hxx> #include <vcl/dibtools.hxx> #include <vcl/waitobj.hxx> #include <vcl/settings.hxx> @@ -1070,7 +1070,7 @@ IMPL_LINK( SvtFileDialog, OpenHdl_Impl, void*, pVoid ) else { OUString aCurPath; - if ( ::utl::LocalFileHelper::ConvertURLToSystemPath( aFileName, aCurPath ) ) + if (osl::FileBase::getSystemPathFromFileURL(aFileName, aCurPath) == osl::FileBase::E_None) { // if content does not exist: at least its path must exist INetURLObject aPathObj = aFileObj; @@ -1409,7 +1409,7 @@ void SvtFileDialog::UpdateControls( const OUString& rURL ) if ( aObj.getSegmentCount() ) { - ::utl::LocalFileHelper::ConvertURLToSystemPath( rURL, sText ); + osl::FileBase::getSystemPathFromFileURL(rURL, sText); if ( !sText.isEmpty() ) { // no Fsys path for server file system ( only UCB has mountpoints! ) @@ -1431,7 +1431,7 @@ void SvtFileDialog::UpdateControls( const OUString& rURL ) { aObj.removeFinalSlash(); OUString sURL( aObj.GetMainURL( INetURLObject::NO_DECODE ) ); - if ( !::utl::LocalFileHelper::ConvertURLToSystemPath( sURL, sText ) ) + if (osl::FileBase::getSystemPathFromFileURL(sURL, sText) != osl::FileBase::E_None) sText = sURL; } @@ -1785,7 +1785,7 @@ void SvtFileDialog::displayIOException( const OUString& _rURL, IOErrorCode _eCod { // create make a human-readable string from the URL OUString sDisplayPath( _rURL ); - ::utl::LocalFileHelper::ConvertURLToSystemPath( _rURL, sDisplayPath ); + osl::FileBase::getSystemPathFromFileURL(_rURL, sDisplayPath); // build an own exception which tells "access denied" InteractiveAugmentedIOException aException; |