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 #include #include +#include #include #include #include @@ -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(); } } diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 5fa0270e53da..85e17a57f258 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -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; }