INTEGRATION: CWS mav16 (1.81.16); FILE MERGED

2005/02/15 14:12:21 mav 1.81.16.2: RESYNC: (1.81-1.82); FILE MERGED
2005/02/10 14:09:57 mav 1.81.16.1: #i41809# treat documents without manifest.xml as broken documents
This commit is contained in:
Vladimir Glazounov 2005-02-25 08:36:50 +00:00
parent 05e1b136a6
commit 05be33c9b2

View file

@ -2,9 +2,9 @@
*
* $RCSfile: sfxbasemodel.cxx,v $
*
* $Revision: 1.84 $
* $Revision: 1.85 $
*
* last change: $Author: vg $ $Date: 2005-02-21 17:05:15 $
* last change: $Author: vg $ $Date: 2005-02-25 09:36:50 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -2222,6 +2222,8 @@ void SAL_CALL SfxBaseModel::load( const SEQUENCE< PROPERTYVALUE >& seqArgument
pMedium->GetItemSet()->Put( SfxBoolItem( SID_REPAIRPACKAGE, sal_True ) );
pMedium->GetItemSet()->Put( SfxBoolItem( SID_TEMPLATE, sal_True ) );
pMedium->GetItemSet()->Put( SfxStringItem( SID_DOCINFO_TITLE, aDocName ) );
m_pData->m_pObjectShell->ResetError();
if ( !m_pData->m_pObjectShell->DoLoad(pMedium) )
nError=ERRCODE_IO_GENERAL;
nError = m_pData->m_pObjectShell->GetErrorCode();