diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-05-25 12:20:13 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-05-25 12:20:13 +0000 |
| commit | a591d1c38a5a9eca044ea64303221cf0d39218d3 (patch) | |
| tree | 8c3d1d3623f81db07c952a0bd10cc1d51c9ab8ac /xmloff | |
| parent | 5ffa33f6031988435928c9c06919d19155688d95 (diff) | |
INTEGRATION: CWS swautomaticfixes (1.134.36); FILE MERGED
2007/04/23 10:14:14 fme 1.134.36.2: RESYNC: (1.134-1.135); FILE MERGED
2007/04/10 10:51:20 fme 1.134.36.1: #i75398# Don't forget to export character style if there are additional hard attributes set at fields
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/text/txtparae.cxx | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index 95dc2164dbf5..39ec690f12ce 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -4,9 +4,9 @@ * * $RCSfile: txtparae.cxx,v $ * - * $Revision: 1.135 $ + * $Revision: 1.136 $ * - * last change: $Author: rt $ $Date: 2007-04-18 07:50:17 $ + * last change: $Author: vg $ $Date: 2007-05-25 13:20:13 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -2558,17 +2558,22 @@ void XMLTextParagraphExport::exportAnyTextFrame( { sal_Bool bAddCharStyles = pRangePropSet && lcl_txtpara_isBoundAsChar( xPropSet, xPropSetInfo ); + sal_Bool bIsUICharStyle; + sal_Bool bHasAutoStyle = sal_False; + sal_Bool bDummy; + OUString sStyle; + if( bAddCharStyles ) - sStyle = FindTextStyle( *pRangePropSet, bIsUICharStyle ); + sStyle = FindTextStyleAndHyperlink( *pRangePropSet, bDummy, bIsUICharStyle, bHasAutoStyle ); else bIsUICharStyle = sal_False; XMLTextCharStyleNamesElementExport aCharStylesExport( GetExport(), bIsUICharStyle && aCharStyleNamesPropInfoCache.hasProperty( - *pRangePropSet ), sal_False, + *pRangePropSet ), bHasAutoStyle, *pRangePropSet, sCharStyleNames ); if( sStyle.getLength() ) |