diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2005-03-23 12:40:36 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2005-03-23 12:40:36 +0000 |
| commit | b2350683e48405bb2f67cd63474295eff1435436 (patch) | |
| tree | f9a08d7da681aa7a4c6d2d03817bc64a1c9ee8f5 /xmloff | |
| parent | c3d68390660d752b7953d21cdf42e1b6788e2b78 (diff) | |
INTEGRATION: CWS calcuno01 (1.17.236); FILE MERGED
2005/01/06 10:49:22 sab 1.17.236.5: RESYNC: (1.22-1.23); FILE MERGED
2004/10/13 11:07:52 sab 1.17.236.4: RESYNC: (1.18-1.22); FILE MERGED
2004/02/13 19:12:50 sab 1.17.236.3: RESYNC: (1.17-1.18); FILE MERGED
2004/02/12 17:43:46 sab 1.17.236.2: #i22706#; better using of API
2004/01/05 15:43:24 sab 1.17.236.1: #i22706#; using new interface XTolerantMultiPropertySet
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/text/txtstyli.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/xmloff/source/text/txtstyli.cxx b/xmloff/source/text/txtstyli.cxx index d391a0a765c7..09b2e1df14a0 100644 --- a/xmloff/source/text/txtstyli.cxx +++ b/xmloff/source/text/txtstyli.cxx @@ -2,9 +2,9 @@ * * $RCSfile: txtstyli.cxx,v $ * - * $Revision: 1.24 $ + * $Revision: 1.25 $ * - * last change: $Author: vg $ $Date: 2005-03-08 11:11:32 $ + * last change: $Author: vg $ $Date: 2005-03-23 13:40:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -475,8 +475,8 @@ void XMLTextStyleContext::FillPropertySet( if( IsDefaultStyle() && GetFamily() == XML_STYLE_FAMILY_TABLE_TABLE ) { - OUString sCollapsingBorders = - OUString( RTL_CONSTASCII_USTRINGPARAM( "CollapsingBorders" ) ); + OUString sCollapsingBorders( + OUString( RTL_CONSTASCII_USTRINGPARAM( "CollapsingBorders" ) ) ); DBG_ASSERT( rPropSet->getPropertySetInfo()->hasPropertyByName( sCollapsingBorders ), "property missing?" ); rPropSet->setPropertyValue( sCollapsingBorders, @@ -489,6 +489,9 @@ void XMLTextStyleContext::FillPropertySet( #ifdef CONV_STAR_FONTS // check for StarBats and StarMath fonts + if (!xInfo.is()) + xInfo.set(rPropSet->getPropertySetInfo()); + // iterate over aContextIDs entries 1..3 for ( sal_Int32 i = 2; i < 5; i++ ) { |