diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-12-04 21:46:44 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-12-05 12:02:11 +0100 |
| commit | 39ce75b14650819f88362b0e2fd2db9b1a8dcf71 (patch) | |
| tree | e6eb69a177337da99c68deffef0ea2a9312d3f88 /sfx2 | |
| parent | 564f74ce4f70211290c93881f3c0e4e5f1587b2e (diff) | |
sfx2: reset the error code before 2nd load with repair (related: fdo#56245)
(regression from c7c385bb8e42d2051bcf05fd75b2146fe9852317)
Change-Id: I39eca96b45ad974a7e1a6913aa811c6b03ceced7
(cherry picked from commit ef1f3b6713118c5eb43da7fa85caf40107b468c1)
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 cbefd5349786..7d72879d6fea 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -1882,6 +1882,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()) |