diff options
author | Michael Stahl <mstahl@redhat.com> | 2014-12-04 21:46:44 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2014-12-04 21:59:43 +0100 |
commit | ef1f3b6713118c5eb43da7fa85caf40107b468c1 (patch) | |
tree | 0e9b69a5de883005c10b60aef50984c7dfd60726 /sfx2 | |
parent | No need to have TableData as a template (diff) | |
download | core-ef1f3b6713118c5eb43da7fa85caf40107b468c1.tar.gz core-ef1f3b6713118c5eb43da7fa85caf40107b468c1.zip |
sfx2: reset the error code before 2nd load with repair (related: fdo#56245)
(regression from c7c385bb8e42d2051bcf05fd75b2146fe9852317)
Change-Id: I39eca96b45ad974a7e1a6913aa811c6b03ceced7
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/source/doc/sfxbasemodel.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 7e34a7be6811..19cbdf4d3f6b 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -1883,6 +1883,7 @@ void SAL_CALL SfxBaseModel::load( const Sequence< beans::PropertyValue >& seqA pMedium->ResetError(); pMedium->CloseStorage(); m_pData->m_pObjectShell->PrepareSecondTryLoad_Impl(); + nError = ERRCODE_NONE; if ( !m_pData->m_pObjectShell->DoLoad(pMedium) ) nError=ERRCODE_IO_GENERAL; if (m_pData->m_pObjectShell->GetErrorCode()) |