diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-01-14 11:01:12 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-01-14 11:01:12 +0000 |
| commit | 474fc7f8b50d78a67a2ee803c2e20ce09837cf13 (patch) | |
| tree | a41349be30cc07342e58bc66bc555e8d37c08175 /xmloff | |
| parent | 356f913bc45134dafac4ce12792dd4411b6a0f3d (diff) | |
INTEGRATION: CWS impress25 (1.25.16); FILE MERGED
2004/12/17 14:06:01 cl 1.25.16.2: #i38753# fixed header/footer-decl export position
2004/12/10 16:58:09 cl 1.25.16.1: #i38514# do not crash when no document was set
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/draw/ximpbody.cxx | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/xmloff/source/draw/ximpbody.cxx b/xmloff/source/draw/ximpbody.cxx index 52562d7f4e34..7a7bd84f0fae 100644 --- a/xmloff/source/draw/ximpbody.cxx +++ b/xmloff/source/draw/ximpbody.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ximpbody.cxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.26 $ * - * last change: $Author: rt $ $Date: 2004-11-26 19:33:51 $ + * last change: $Author: kz $ $Date: 2005-01-14 12:01:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -382,6 +382,13 @@ SvXMLImportContext *SdXMLBodyContext::CreateChildContext( switch(rTokenMap.Get(nPrefix, rLocalName)) { + case XML_TOK_BODY_HEADER_DECL: + case XML_TOK_BODY_FOOTER_DECL: + case XML_TOK_BODY_DATE_TIME_DECL: + { + pContext = new SdXMLHeaderFooterDeclContext( GetImport(), nPrefix, rLocalName, xAttrList ); + break; + } case XML_TOK_BODY_PAGE: { // only read the first page in preview mode @@ -391,6 +398,9 @@ SvXMLImportContext *SdXMLBodyContext::CreateChildContext( uno::Reference< drawing::XDrawPage > xNewDrawPage; uno::Reference< drawing::XDrawPages > xDrawPages(GetSdImport().GetLocalDrawPages(), uno::UNO_QUERY); + if( !xDrawPages.is() ) + break; + if(GetSdImport().GetNewPageCount() + 1 > xDrawPages->getCount()) { // new page, create and insert |