diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-23 09:39:21 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-23 09:39:21 +0000 |
| commit | 677ccfda5617a329598a8afa1c8ba0cdd79e4fd7 (patch) | |
| tree | b90391b0d36660d781473baca133dd0acfce8bf5 /xmloff | |
| parent | 60ca0035369cdf2c0e8942286eee72e3421880cb (diff) | |
INTEGRATION: CWS impress49 (1.105.6); FILE MERGED
2005/08/02 15:17:32 cl 1.105.6.1: #i34321# load header&footer placeholder from handout page as presentation objects even if handout has no presentation styles
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/draw/ximpshap.cxx | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index 276d3adae8..2c934e62e2 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -4,9 +4,9 @@ * * $RCSfile: ximpshap.cxx,v $ * - * $Revision: 1.106 $ + * $Revision: 1.107 $ * - * last change: $Author: rt $ $Date: 2005-09-09 14:00:37 $ + * last change: $Author: hr $ $Date: 2005-09-23 10:39:21 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -905,11 +905,22 @@ void SdXMLShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUStr sal_Bool SdXMLShapeContext::isPresentationShape() const { - return (XML_STYLE_FAMILY_SD_PRESENTATION_ID == mnStyleFamily) && - maPresentationClass.getLength() && - (const_cast<SdXMLShapeContext*>(this))->GetImport().GetShapeImport()->IsPresentationShapesSupported(); -} + if( maPresentationClass.getLength() && (const_cast<SdXMLShapeContext*>(this))->GetImport().GetShapeImport()->IsPresentationShapesSupported() ) + { + if(XML_STYLE_FAMILY_SD_PRESENTATION_ID == mnStyleFamily) + { + return sal_True; + } + if( IsXMLToken( maPresentationClass, XML_HEADER ) || IsXMLToken( maPresentationClass, XML_FOOTER ) || + IsXMLToken( maPresentationClass, XML_PAGE_NUMBER ) || IsXMLToken( maPresentationClass, XML_DATE_TIME ) ) + { + return sal_True; + } + } + + return sal_False; +} //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// |