diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-03-18 17:35:56 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-03-18 17:35:56 +0000 |
| commit | 1cd9c677d5bc543ef138fdef2fa845b81689fc89 (patch) | |
| tree | a257a78a96ef38619e6b060a711a479ef4e3d06b /sw/source/filter/xml/xmlexp.cxx | |
| parent | 552aeff3f2179a99e6712dfa8c7cdfd40e1312f3 (diff) | |
INTEGRATION: CWS xmlperf02 (1.74.158); FILE MERGED
2005/02/01 15:03:27 fs 1.74.158.1: #119224# XFormsSupplier extended by XFormsSupplier2, which allows for *cheaply* asking whether a draw page currently has forms
Diffstat (limited to 'sw/source/filter/xml/xmlexp.cxx')
| -rw-r--r-- | sw/source/filter/xml/xmlexp.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx index 532df6f70ea2..966f7933a95d 100644 --- a/sw/source/filter/xml/xmlexp.cxx +++ b/sw/source/filter/xml/xmlexp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlexp.cxx,v $ * - * $Revision: 1.74 $ + * $Revision: 1.75 $ * - * last change: $Author: hr $ $Date: 2004-11-09 12:32:58 $ + * last change: $Author: kz $ $Date: 2005-03-18 18:35:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -77,8 +77,8 @@ #ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> #endif -#ifndef _COM_SUN_STAR_FORM_XFORMSSUPPLIER_HPP_ -#include <com/sun/star/form/XFormsSupplier.hpp> +#ifndef _COM_SUN_STAR_FORM_XFORMSSUPPLIER2_HPP_ +#include <com/sun/star/form/XFormsSupplier2.hpp> #endif #ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HPP_ #include <com/sun/star/container/XNameContainer.hpp> @@ -692,8 +692,9 @@ void SwXMLExport::_ExportContent() GetTextParagraphExport()->PreventExportOfControlsInMuteSections( xIAPage, GetFormExport() ); - Reference<XFormsSupplier> xFormSupp(xPage, UNO_QUERY); - if (xFormSupp->getForms()->hasElements()) + Reference<XFormsSupplier2> xFormSupp(xPage, UNO_QUERY); + DBG_ASSERT( xFormSupp.is(), "SwXMLExport::_ExportContent: no forms supplier?" ); + if ( xFormSupp.is() && xFormSupp->hasForms() ) { ::xmloff::OOfficeFormsExport aOfficeForms(*this); |