ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

these are file urls, so don't need ucb

Browse Source 
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>
This commit is contained in:
Caolán McNamara
2017-04-03 13:37:25 +00:00
parent dbaab58c14
commit e5b0183bd8
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sot/source/sdstor/ucbstorage.cxx
+8 -7
View File
@@ -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();
}
}
sw/source/filter/ww8/ww8par.cxx
+1
View File
@@ -6215,6 +6215,7 @@ bool SAL_CALL TestImportDOC(SvStream &rStream, const OUString &rFltName)
aPaM.GetPoint()->nContent.Assign(aIdx.GetNode().GetContentNode(), 0);
bool bRet = pReader->Read(*pD, OUString(), aPaM, OUString()) == 0;
delete pReader;
return bRet;
}