diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-12-01 14:28:45 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-12-01 14:28:45 +0000 |
| commit | 5be6ee22cbbb05de846dbaa7a102332843f250b1 (patch) | |
| tree | 704dfca20ea8cc2cfd300c1c48643c783480396f /xmloff | |
| parent | c39fb5121df44daf509960b764ebef07846cfff8 (diff) | |
INTEGRATION: CWS swautomatic01 (1.64.122); FILE MERGED
2006/11/16 14:31:33 fme 1.64.122.4: RESYNC: (1.67-1.68); FILE MERGED
2006/10/10 16:43:09 fme 1.64.122.3: RESYNC: (1.66-1.67); FILE MERGED
2006/08/10 15:55:14 fme 1.64.122.2: RESYNC: (1.64-1.66); FILE MERGED
2006/06/23 14:41:28 fme 1.64.122.1: #i65476#: Automatic Styles
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/text/txtflde.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx index 4811f14ea0fa..5c442c95f833 100644 --- a/xmloff/source/text/txtflde.cxx +++ b/xmloff/source/text/txtflde.cxx @@ -4,9 +4,9 @@ * * $RCSfile: txtflde.cxx,v $ * - * $Revision: 1.68 $ + * $Revision: 1.69 $ * - * last change: $Author: obo $ $Date: 2006-10-12 14:54:40 $ + * last change: $Author: rt $ $Date: 2006-12-01 15:28:45 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1107,9 +1107,10 @@ void XMLTextFieldExport::ExportField(const Reference<XTextField> & rTextField ) // find out whether we need to set the style or hyperlink sal_Bool bHasHyperlink; sal_Bool bIsUICharStyle; + sal_Bool bHasAutoStyle; OUString sStyle = GetExport().GetTextParagraphExport()-> FindTextStyleAndHyperlink( xRangePropSet, bHasHyperlink, bIsUICharStyle, - pStates ); + bHasAutoStyle, pStates ); sal_Bool bHasStyle = (sStyle.getLength() > 0); // export hyperlink (if we have one) @@ -1146,7 +1147,7 @@ void XMLTextFieldExport::ExportField(const Reference<XTextField> & rTextField ) GetExport(), bIsUICharStyle && GetExport().GetTextParagraphExport() ->GetCharStyleNamesPropInfoCache().hasProperty( - xRangePropSet, xRangePropSetInfo ), + xRangePropSet, xRangePropSetInfo ), sal_False, xRangePropSet, sPropertyCharStyleNames ); // export span with style (if necessary) |