INTEGRATION: CWS swautomatic01 (1.26.120); FILE MERGED

2006/11/16 14:32:53 fme 1.26.120.7: RESYNC: (1.28-1.31); FILE MERGED
2006/10/10 16:45:21 fme 1.26.120.6: RESYNC: (1.27-1.28); FILE MERGED
2006/08/21 13:11:56 ama 1.26.120.5: #i65476#: Optimization for automatic paragraphs/numbering
2006/08/16 09:59:39 ama 1.26.120.4: #i65476#: Automatic styles (paragraph)
2006/08/10 15:58:48 fme 1.26.120.3: RESYNC: (1.26-1.27); FILE MERGED
2006/07/06 13:49:24 ama 1.26.120.2: #i65476#: Automatic Styles
2006/06/15 10:22:19 ama 1.26.120.1: #i65476#: Automatic Styles

xmloff/source/text/txtstyli.cxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: txtstyli.cxx,v $
  *
- *  $Revision: 1.31 $
+ *  $Revision: 1.32 $
  *
- *  last change: $Author: vg $ $Date: 2006-11-01 15:07:53 $
+ *  last change: $Author: rt $ $Date: 2006-12-01 15:29:31 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -470,7 +470,31 @@ void XMLTextStyleContext::FillPropertySet(
             { CTF_FONTFAMILYNAME_CTL, -1 },
             { -1, -1 }
         };
-        xImpPrMap->FillPropertySet( GetProperties(), rPropSet, aContextIDs );
+
+        bool bAutomatic = false;
+        if( ((SvXMLStylesContext *)GetStyles())->IsAutomaticStyle() &&
+            ( GetFamily() == XML_STYLE_FAMILY_TEXT_TEXT || GetFamily() == XML_STYLE_FAMILY_TEXT_PARAGRAPH ) )
+        {
+            bAutomatic = true;
+            if( GetAutoName().getLength() )
+            {
+                OUString sAutoProp = ( GetFamily() == XML_STYLE_FAMILY_TEXT_TEXT ) ?
+                    OUString( RTL_CONSTASCII_USTRINGPARAM("CharAutoStyleName") ):
+                    OUString( RTL_CONSTASCII_USTRINGPARAM("ParaAutoStyleName") );
+                try
+                {
+                    rPropSet->setPropertyValue( sAutoProp, makeAny(GetAutoName()) );
+                }
+                catch( UnknownPropertyException )
+                {
+                    bAutomatic = false;
+                }
+            }
+        }
+        if( bAutomatic )
+            xImpPrMap->CheckSpecialContext( GetProperties(), rPropSet, aContextIDs );
+        else
+            xImpPrMap->FillPropertySet( GetProperties(), rPropSet, aContextIDs );
 
         // have we found a combined characters
         sal_Int32 nIndex = aContextIDs[0].nIndex;