diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-06-27 14:32:18 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-06-27 14:32:18 +0000 |
| commit | 383214819ddfc9baa4f2712a5103b59575e871b0 (patch) | |
| tree | f72ff31da596fb38563315bbd9a57053fe7c2abd /xmloff | |
| parent | fa5af66a5d925532d50a0296381146ba717e154b (diff) | |
INTEGRATION: CWS impress122 (1.111.38); FILE MERGED
2007/06/14 09:57:18 cl 1.111.38.1: #i24969# moved slide transition and sound to smil timing root node
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/draw/sdxmlexp.cxx | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index 4d580fd3730c..470796cf138f 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -4,9 +4,9 @@ * * $RCSfile: sdxmlexp.cxx,v $ * - * $Revision: 1.112 $ + * $Revision: 1.113 $ * - * last change: $Author: hr $ $Date: 2007-06-27 15:05:03 $ + * last change: $Author: hr $ $Date: 2007-06-27 15:32:18 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -2046,15 +2046,10 @@ void SdXMLExport::_ExportContent() if( IsImpress() ) ImplExportHeaderFooterDeclAttributes( maDrawPagesHeaderFooterSettings[nPageInd] ); - // write page - SvXMLElementExport aDPG(*this, XML_NAMESPACE_DRAW, XML_PAGE, sal_True, sal_True); - - // write optional office:forms - exportFormsElement( xDrawPage ); - UniReference< xmloff::AnimationsExporter > xAnimationsExporter; uno::Reference< ::com::sun::star::animations::XAnimationNodeSupplier > xAnimNodeSupplier; + // prepare animation export if(IsImpress()) { if( getExportFlags() & EXPORT_OASIS ) @@ -2065,7 +2060,7 @@ void SdXMLExport::_ExportContent() // prepare animations exporter if impress if(xAnimNodeSupplier.is()) { - xAnimationsExporter = new xmloff::AnimationsExporter( *this ); + xAnimationsExporter = new xmloff::AnimationsExporter( *this, xProps ); xAnimationsExporter->prepare( xAnimNodeSupplier->getAnimationNode() ); } } @@ -2077,6 +2072,17 @@ void SdXMLExport::_ExportContent() } } + // write draw:id + const OUString aPageId = getInterfaceToIdentifierMapper().getIdentifier( xDrawPage ); + if( aPageId.getLength() != 0 ) + AddAttribute ( XML_NAMESPACE_DRAW, XML_ID, aPageId ); + + // write page + SvXMLElementExport aDPG(*this, XML_NAMESPACE_DRAW, XML_PAGE, sal_True, sal_True); + + // write optional office:forms + exportFormsElement( xDrawPage ); + // write graphic objects on this page (if any) Reference< drawing::XShapes > xExportShapes(xDrawPage, UNO_QUERY); if(xExportShapes.is() && xExportShapes->getCount()) |