diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-03-18 17:31:21 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-03-18 17:31:21 +0000 |
| commit | 54e231804467fa6e129c238642c4de4f95160e37 (patch) | |
| tree | 73aa3479d91564b6edca97e15e033d36de3c7ffa /xmloff | |
| parent | a50e5fcb1d075784c9bee2c2d47f7a5d5a7545b8 (diff) | |
INTEGRATION: CWS xmlperf02 (1.93.24); FILE MERGED
2005/02/01 14:32:42 fs 1.93.24.1: #119224# XFormsSupplier allows for asking for existence of a draw page's forms in a cheaper way
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/draw/sdxmlexp.cxx | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index a7f18f7c86c8..69a9a0f73f2a 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sdxmlexp.cxx,v $ * - * $Revision: 1.94 $ + * $Revision: 1.95 $ * - * last change: $Author: vg $ $Date: 2005-03-08 14:55:55 $ + * last change: $Author: kz $ $Date: 2005-03-18 18:31:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -149,8 +149,8 @@ #include <com/sun/star/style/XStyle.hpp> #endif -#ifndef _COM_SUN_STAR_FORM_XFORMSUPPLIER_HPP_ -#include <com/sun/star/form/XFormsSupplier.hpp> +#ifndef _COM_SUN_STAR_FORM_XFORMSUPPLIER2_HPP_ +#include <com/sun/star/form/XFormsSupplier2.hpp> #endif #ifndef _COM_SUN_STAR_PRESENTATION_XPRESENTATIONPAGE_HPP_ @@ -2668,16 +2668,12 @@ void SdXMLExport::exportFormsElement( Reference< XDrawPage > xDrawPage ) { if( xDrawPage.is() ) { - Reference< form::XFormsSupplier > xFormsSupplier( xDrawPage, UNO_QUERY ); - if( xFormsSupplier.is() ) + Reference< form::XFormsSupplier2 > xFormsSupplier( xDrawPage, UNO_QUERY ); + if ( xFormsSupplier.is() && xFormsSupplier->hasForms() ) { - Reference< container::XNameContainer > xForms( xFormsSupplier->getForms() ); - if( xForms.is() && xForms->hasElements() ) - { - // write masterpage - ::xmloff::OOfficeFormsExport aForms(*this); - GetFormExport()->exportForms( xDrawPage ); - } + // write masterpage + ::xmloff::OOfficeFormsExport aForms(*this); + GetFormExport()->exportForms( xDrawPage ); } sal_Bool bRet = GetFormExport()->seekPage( xDrawPage ); |