diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-09 11:32:22 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-09 11:32:22 +0000 |
| commit | 374a96cd54525d3e3099a7d19291df855638eee6 (patch) | |
| tree | a0a3dd9abeed6fa0c5818375a929d75186e8fc89 /sw/source/filter/xml/wrtxml.cxx | |
| parent | INTEGRATION: CWS oasisbf1 (1.55.54); FILE MERGED (diff) | |
| download | core-374a96cd54525d3e3099a7d19291df855638eee6.tar.gz core-374a96cd54525d3e3099a7d19291df855638eee6.zip | |
INTEGRATION: CWS oasisbf1 (1.43.54); FILE MERGED
2004/10/15 10:01:46 mib 1.43.54.3: RESYNC: (1.44-1.45); FILE MERGED
2004/09/02 09:27:18 mib 1.43.54.2: RESYNC: (1.43-1.44); FILE MERGED
2004/08/19 10:53:11 mib 1.43.54.1: #i32781#: set insert/style modes by using properties rather than UNOTunnel
Diffstat (limited to 'sw/source/filter/xml/wrtxml.cxx')
| -rw-r--r-- | sw/source/filter/xml/wrtxml.cxx | 45 |
1 files changed, 25 insertions, 20 deletions
diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx index 74a1f1e1d27a..1c36418bff89 100644 --- a/sw/source/filter/xml/wrtxml.cxx +++ b/sw/source/filter/xml/wrtxml.cxx @@ -2,9 +2,9 @@ * * $RCSfile: wrtxml.cxx,v $ * - * $Revision: 1.45 $ + * $Revision: 1.46 $ * - * last change: $Author: kz $ $Date: 2004-10-04 19:21:40 $ + * last change: $Author: hr $ $Date: 2004-11-09 12:32:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -77,6 +77,15 @@ #ifndef _COM_SUN_STAR_IO_XACTIVEDATASOURCE_HPP_ #include <com/sun/star/io/XActiveDataSource.hpp> #endif +#ifndef _COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HPP_ +#include <com/sun/star/xml/sax/XDocumentHandler.hpp> +#endif +#ifndef _COM_SUN_STAR_DOCUMENT_XEXPORTER_HPP_ +#include <com/sun/star/document/XExporter.hpp> +#endif +#ifndef _COM_SUN_STAR_DOCUMENT_XFILTER_HPP_ +#include <com/sun/star/document/XFilter.hpp> +#endif #ifndef _COMPHELPER_PROCESSFACTORY_HXX_ #include <comphelper/processfactory.hxx> #endif @@ -129,9 +138,6 @@ #ifndef _WRTXML_HXX #include <wrtxml.hxx> #endif -#ifndef _XMLEXP_HXX -#include <xmlexp.hxx> -#endif #ifndef _STATSTR_HRC #include <statstr.hrc> #endif @@ -235,6 +241,9 @@ sal_uInt32 SwXMLWriter::_Write() { "StreamName", sizeof("StreamName")-1, 0, &::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, + { "AutoTextMode", sizeof("AutoTextMode")-1, 0, + &::getBooleanCppuType(), + beans::PropertyAttribute::MAYBEVOID, 0 }, { NULL, 0, 0, NULL, 0, 0 } }; uno::Reference< beans::XPropertySet > xInfoSet( @@ -286,7 +295,7 @@ sal_uInt32 SwXMLWriter::_Write() OUString sProgressRange(RTL_CONSTASCII_USTRINGPARAM("ProgressRange")); xInfoSet->setPropertyValue(sProgressRange, aAny); - aAny <<= XML_PROGRESS_REF_NOT_SET; + aAny <<= static_cast < sal_Int32 >( -1 ); OUString sProgressMax(RTL_CONSTASCII_USTRINGPARAM("ProgressMax")); xInfoSet->setPropertyValue(sProgressMax, aAny); } @@ -347,6 +356,16 @@ sal_uInt32 SwXMLWriter::_Write() else if ( !bBaseURLSet ) xInfoSet->setPropertyValue( sPropName, makeAny( ::rtl::OUString( INetURLObject::GetBaseURL() ) ) ); + if( bBlock ) + { + OUString sAutoTextMode( + RTL_CONSTASCII_USTRINGPARAM("AutoTextMode")); + sal_Bool bTmp = sal_True; + Any aAny; + aAny.setValue( &bTmp, ::getBooleanCppuType() ); + xInfoSet->setPropertyValue( sAutoTextMode, aAny ); + } + // filter arguments // - graphics + object resolver for styles + content @@ -672,20 +691,6 @@ sal_Bool SwXMLWriter::WriteThroughComponent( return sal_False; RTL_LOGFILE_CONTEXT_TRACE1( aFilterLog, "%s instantiated.", pServiceName ); - // set block mode (if appropriate) - if( bBlock ) - { - Reference<XUnoTunnel> xFilterTunnel( xExporter, UNO_QUERY ); - if (xFilterTunnel.is()) - { - SwXMLExport *pFilter = (SwXMLExport *)xFilterTunnel->getSomething( - SwXMLExport::getUnoTunnelId() ); - if (NULL != pFilter) - pFilter->setBlockMode(); - } - } - - // connect model and filter xExporter->setSourceDocument( xComponent ); |