diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-04-03 13:24:29 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-04-03 13:37:25 +0000 |
| commit | e5b0183bd8a54edcfb68fa4f3d44740a833c70ab (patch) | |
| tree | 6665dd0a76d9b418f73e95a8bfb4779c8be61e05 /sot | |
| parent | dbaab58c1442e7f62ef0732376fe5a49840e9fd6 (diff) | |
these are file urls, so don't need ucb
Change-Id: I25beaeab002db1de34be3b5f4a774bd15b71f5d3
Reviewed-on: https://gerrit.libreoffice.org/36045
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sot')
| -rw-r--r-- | sot/source/sdstor/ucbstorage.cxx | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx index 3d15a40dd037..a7de41a9bb00 100644 --- a/sot/source/sdstor/ucbstorage.cxx +++ b/sot/source/sdstor/ucbstorage.cxx @@ -46,6 +46,7 @@ #include <memory> #include <rtl/digest.h> #include <osl/diagnose.h> +#include <osl/file.hxx> #include <tools/ref.hxx> #include <tools/debug.hxx> #include <unotools/streamhelper.hxx> @@ -124,8 +125,8 @@ FileStreamWrapper_Impl::~FileStreamWrapper_Impl() #endif } - if ( !m_aURL.isEmpty() ) - ::utl::UCBContentHelper::Kill( m_aURL ); + if (!m_aURL.isEmpty()) + osl::File::remove(m_aURL); } @@ -227,7 +228,7 @@ void SAL_CALL FileStreamWrapper_Impl::closeInput() #if OSL_DEBUG_LEVEL > 0 --nOpenFiles; #endif - ::utl::UCBContentHelper::Kill( m_aURL ); + osl::File::remove(m_aURL); m_aURL.clear(); } @@ -683,8 +684,8 @@ UCBStorageStream_Impl::~UCBStorageStream_Impl() delete m_pStream; - if ( !m_aTempURL.isEmpty() ) - ::utl::UCBContentHelper::Kill( m_aTempURL ); + if (!m_aTempURL.isEmpty()) + osl::File::remove(m_aTempURL); delete m_pContent; } @@ -1125,7 +1126,7 @@ void UCBStorageStream_Impl::Revert() Free(); if ( !m_aTempURL.isEmpty() ) { - ::utl::UCBContentHelper::Kill( m_aTempURL ); + osl::File::remove(m_aTempURL); m_aTempURL.clear(); } @@ -1211,7 +1212,7 @@ void UCBStorageStream_Impl::PrepareCachedForReopen( StreamMode nMode ) if ( !m_aTempURL.isEmpty() ) { - ::utl::UCBContentHelper::Kill( m_aTempURL ); + osl::File::remove(m_aTempURL); m_aTempURL.clear(); } } |