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 /sfx2 | |
| parent | bdc3053067175eea4d30d5ca6d304366174c9316 (diff) | |
ConvertURLToSystemPath->getSystemPathFromFileURL
Change-Id: I7dc0e1b596f80b8f0870aed1722f711bb287ec0a
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/doc/printhelper.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/inet/inettbc.cxx | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx index ce0d467d0c93..9e5c69132f64 100644 --- a/sfx2/source/doc/printhelper.cxx +++ b/sfx2/source/doc/printhelper.cxx @@ -635,7 +635,7 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >& throw ::com::sun::star::lang::IllegalArgumentException(); } - OUString sPath ; + OUString sPath; OUString sURL (sTemp); INetURLObject aCheck(sURL ); if (aCheck.GetProtocol()==INetProtocol::NotValid) @@ -662,7 +662,7 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >& else // It's a valid URL. but now we must know, if it is a local one or not. // It's a question of using ucb or not! - if (::utl::LocalFileHelper::ConvertURLToSystemPath(sURL,sPath)) + if (osl::FileBase::getSystemPathFromFileURL(sURL, sPath) == osl::FileBase::E_None) { // it's a local file, we can use vcl without special handling // And we have to use the system notation of the incoming URL. diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx index 59a98315e2f5..f23ec36d29b0 100644 --- a/sfx2/source/inet/inettbc.cxx +++ b/sfx2/source/inet/inettbc.cxx @@ -29,6 +29,7 @@ #include <unotools/historyoptions.hxx> #include <vcl/toolbox.hxx> #include <toolkit/helper/vclunohelper.hxx> +#include <osl/file.hxx> #include <osl/thread.hxx> #include <osl/mutex.hxx> #include <rtl/ustring.hxx> @@ -235,7 +236,7 @@ void SfxURLToolBoxControl_Impl::StateChanged OUString sMainURL( aURL.GetMainURL( INetURLObject::DECODE_WITH_CHARSET ) ); OUString sFile; - if (::utl::LocalFileHelper::ConvertURLToSystemPath(sMainURL,sFile)) + if (osl::FileBase::getSystemPathFromFileURL(sMainURL, sFile) == osl::FileBase::E_None) pURLBox->InsertEntry(sFile); else pURLBox->InsertEntry(sMainURL); |