sfx2/source/doc/sfxbasemodel.cxx | 1 +
1 file changed, 1 insertion(+)
New commits:
commit ef1f3b6713118c5eb43da7fa85caf40107b468c1
Author: Michael Stahl <[email protected]>
Date: Thu Dec 4 21:46:44 2014 +0100
sfx2: reset the error code before 2nd load with repair (related: fdo#56245)
(regression from c7c385bb8e42d2051bcf05fd75b2146fe9852317)
Change-Id: I39eca96b45ad974a7e1a6913aa811c6b03ceced7
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 7e34a7b..19cbdf4 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())
_______________________________________________
Libreoffice-commits mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
