diff options
author | Rüdiger Timm <rt@openoffice.org> | 2005-03-29 13:34:20 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2005-03-29 13:34:20 +0000 |
commit | e4acc501838ed487f084a86deb0a1a64aec0dfda (patch) | |
tree | 1dbc52e4c8d2d8221c62968ebbd7fbc493b7c42e /xmloff/source | |
parent | 890b95f1b59a12bfb1971903b1a67f548b48a682 (diff) |
INTEGRATION: CWS swqcore08 (1.93.60); FILE MERGED
2005/03/09 17:47:20 dvo 1.93.60.1: #i44564# don't attempt to export header/footeron handout page if no handout page is present.
Diffstat (limited to 'xmloff/source')
-rw-r--r-- | xmloff/source/draw/sdxmlexp.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index fd5a7d2854e9..7518fc72cd66 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sdxmlexp.cxx,v $ * - * $Revision: 1.96 $ + * $Revision: 1.97 $ * - * last change: $Author: rt $ $Date: 2005-03-29 14:14:02 $ + * last change: $Author: rt $ $Date: 2005-03-29 14:34:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -58,7 +58,6 @@ * * ************************************************************************/ - #pragma hdrstop #ifndef __COMPHELPER_UNOINTERFACETOUNIQUEIDENTIFIERMAPPER__ @@ -1900,8 +1899,11 @@ void SdXMLExport::ImpPrepMasterPageInfos() if( xHandoutSupp.is() ) { Reference< XDrawPage > xHandoutPage( xHandoutSupp->getHandoutMasterPage() ); - maHandoutPageHeaderFooterSettings = ImpPrepDrawPageHeaderFooterDecls( xHandoutPage ); - maHandoutMasterStyleName = ImpCreatePresPageStyleName( xHandoutPage, false ); + if( xHandoutPage.is() ) + { + maHandoutPageHeaderFooterSettings = ImpPrepDrawPageHeaderFooterDecls( xHandoutPage ); + maHandoutMasterStyleName = ImpCreatePresPageStyleName( xHandoutPage, false ); + } } } |