diff options
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/dialog/docrecovery.cxx | 3 | ||||
| -rw-r--r-- | svx/source/gallery2/galtheme.cxx | 6 | ||||
| -rw-r--r-- | svx/source/svdraw/svdotxln.cxx | 4 | ||||
| -rw-r--r-- | svx/source/unodraw/unoshap2.cxx | 4 |
4 files changed, 8 insertions, 9 deletions
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index 629e6455d9de..c08b4b9f7bc9 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -55,7 +55,6 @@ #include <osl/security.hxx> #include <rtl/bootstrap.hxx> #include <unotools/pathoptions.hxx> -#include <unotools/localfilehelper.hxx> #include "svtools/treelistentry.hxx" #include <officecfg/Office/Recovery.hxx> #include <boost/scoped_ptr.hpp> @@ -1337,7 +1336,7 @@ IMPL_LINK_NOARG(BrokenRecoveryDialog, OkButtonHdl) { OUString sPhysicalPath = comphelper::string::strip(m_pSaveDirED->GetText(), ' '); OUString sURL; - ::utl::LocalFileHelper::ConvertPhysicalNameToURL( sPhysicalPath, sURL ); + osl::FileBase::getFileURLFromSystemPath( sPhysicalPath, sURL ); m_sSavePath = sURL; while (m_sSavePath.isEmpty()) impl_askForSavePath(); diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index f1b8ecac0ef1..e1ad48142975 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -24,12 +24,12 @@ #include <algorithm> #include <comphelper/processfactory.hxx> +#include <osl/file.hxx> #include <tools/urlobj.hxx> #include <tools/vcompat.hxx> #include <unotools/streamwrap.hxx> #include <unotools/ucbstreamhelper.hxx> #include <unotools/tempfile.hxx> -#include <unotools/localfilehelper.hxx> #include <ucbhelper/content.hxx> #include <sot/storage.hxx> #include <sot/formats.hxx> @@ -1215,7 +1215,7 @@ bool GalleryTheme::InsertTransferable( const uno::Reference< datatransfer::XTran { OUString aLocalURL; - if( ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aFile, aLocalURL ) ) + if( osl::FileBase::getFileURLFromSystemPath( aFile, aLocalURL ) == osl::FileBase::E_None ) aURL = INetURLObject( aLocalURL ); } @@ -1468,7 +1468,7 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm ) pObj->aURL = INetURLObject( aFileName ); if( ( pObj->aURL.GetProtocol() == INetProtocol::NotValid ) && - ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aFileName, aLocalURL ) ) + osl::FileBase::getFileURLFromSystemPath( aFileName, aLocalURL ) == osl::FileBase::E_None ) { pObj->aURL = INetURLObject( aLocalURL ); } diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx index a0d8910d960c..dccb9cd7cb80 100644 --- a/svx/source/svdraw/svdotxln.cxx +++ b/svx/source/svdraw/svdotxln.cxx @@ -20,9 +20,9 @@ #include "sal/config.h" #include <comphelper/processfactory.hxx> +#include <osl/file.hxx> #include <osl/thread.h> #include <unotools/ucbstreamhelper.hxx> -#include <unotools/localfilehelper.hxx> #include <ucbhelper/content.hxx> #include <unotools/datetime.hxx> #include <svx/svdotext.hxx> @@ -212,7 +212,7 @@ bool SdrTextObj::LoadText(const OUString& rFileName, const OUString& /*rFilterNa { OUString aFileURLStr; - if( ::utl::LocalFileHelper::ConvertPhysicalNameToURL( rFileName, aFileURLStr ) ) + if( osl::FileBase::getFileURLFromSystemPath( rFileName, aFileURLStr ) == osl::FileBase::E_None ) aFileURL = INetURLObject( aFileURLStr ); else aFileURL.SetSmartURL( rFileName ); diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index d6f6017470d7..63b29ea8205e 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -28,8 +28,8 @@ #include <com/sun/star/drawing/PointSequence.hpp> #include <com/sun/star/graphic/XGraphic.hpp> #include <tools/urlobj.hxx> -#include <unotools/localfilehelper.hxx> #include <vcl/svapp.hxx> +#include <osl/file.hxx> #include <osl/mutex.hxx> #include <vcl/fltcall.hxx> #include <vcl/graphicfilter.hxx> @@ -1504,7 +1504,7 @@ bool SvxGraphicObject::setPropertyValueImpl( const OUString& rName, const SfxIte { OUString aValidURL; - if( ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aURL, aValidURL ) ) + if( osl::FileBase::getFileURLFromSystemPath( aURL, aValidURL ) == osl::FileBase::E_None ) aURLObj = INetURLObject( aValidURL ); } |