diff options
author | Kurt Zenker <kz@openoffice.org> | 2005-07-14 10:37:34 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2005-07-14 10:37:34 +0000 |
commit | 2ba097ec6f6c36f2c7188d3fd70a33dcdfcfde14 (patch) | |
tree | e391b6c8b0b11fba0691dbe3df47dea59682330e /xmloff/source/text | |
parent | ba4b550ddf51853370554303d84e1a3be99d327b (diff) |
INTEGRATION: CWS dvoqbfix4 (1.122.10); FILE MERGED
2005/04/27 18:02:20 dvo 1.122.10.1: #110569# use redline export only for redline-capable models
Diffstat (limited to 'xmloff/source/text')
-rw-r--r-- | xmloff/source/text/txtparae.cxx | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index d6da091b3093..c52f8408ff74 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -2,9 +2,9 @@ * * $RCSfile: txtparae.cxx,v $ * - * $Revision: 1.122 $ + * $Revision: 1.123 $ * - * last change: $Author: obo $ $Date: 2005-04-13 09:30:39 $ + * last change: $Author: kz $ $Date: 2005-07-14 11:37:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -166,6 +166,9 @@ #ifndef _COM_SUN_STAR_DOCUMENT_XEVENTSSUPPLIER_HPP_ #include <com/sun/star/document/XEventsSupplier.hpp> #endif +#ifndef _COM_SUN_STAR_DOCUMENT_XREDLINESSUPPLIER_HPP_ +#include <com/sun/star/document/XRedlinesSupplier.hpp> +#endif #ifndef _COM_SUN_STAR_TEXT_XTEXTSECTION_HPP_ #include <com/sun/star/text/XTextSection.hpp> @@ -992,7 +995,10 @@ XMLTextParagraphExport::XMLTextParagraphExport( pSectionExport = new XMLSectionExport( rExp, *this ); pIndexMarkExport = new XMLIndexMarkExport( rExp, *this ); - pRedlineExport = IsBlockMode() ? NULL : new XMLRedlineExport( rExp ); + + if( ! IsBlockMode() && + Reference<XRedlinesSupplier>( GetExport().GetModel(), UNO_QUERY ).is()) + pRedlineExport = new XMLRedlineExport( rExp ); // The text field helper needs a pre-constructed XMLPropertyState // to export the combined characters field. We construct that |