INTEGRATION: CWS xmlfilter06 (1.4.6); FILE MERGED

2008/07/10 14:00:01 dr 1.4.6.8: #i10000# resync
2008/07/10 11:33:04 dr 1.4.6.7: #i10000# resync
2008/07/10 11:13:27 dr 1.4.6.6: RESYNC: (1.5-1.6); FILE MERGED
2008/06/30 16:21:11 dr 1.4.6.5: #i10000# resync additions
2008/06/30 09:57:19 dr 1.4.6.4: RESYNC: (1.4-1.5); FILE MERGED
2008/06/20 14:24:47 dr 1.4.6.3: resolve theme font names, e.g. '+mj-lt' or '+mn-ea'
2008/06/20 11:58:16 dr 1.4.6.2: line/fill/character properties rework; first steps of chart text formatting and rotation import; make line arrow import work
2008/05/27 10:40:36 dr 1.4.6.1: joined changes from CWS xmlfilter05

1 files changed, 11 insertions, 13 deletions

diff --git a/oox/source/drawingml/textparagraphpropertiescontext.cxx b/oox/source/drawingml/textparagraphpropertiescontext.cxx
index 0fecc90f229f..1de845ffd2f6 100644
--- a/oox/source/drawingml/textparagraphpropertiescontext.cxx
+++ b/oox/source/drawingml/textparagraphpropertiescontext.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: textparagraphpropertiescontext.cxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -35,8 +35,7 @@
 
 #include "oox/drawingml/colorchoicecontext.hxx"
 #include "oox/drawingml/textcharacterpropertiescontext.hxx"
-#include "oox/drawingml/drawingmltypes.hxx"
-#include "oox/drawingml/textfontcontext.hxx"
+#include "oox/drawingml/fillproperties.hxx"
 #include "oox/helper/attributelist.hxx"
 #include "oox/core/namespaces.hxx"
 #include "textspacingcontext.hxx"
@@ -172,12 +171,10 @@ TextParagraphPropertiesContext::~TextParagraphPropertiesContext()
         const OUString sParaTabStops( CREATE_OUSTRING( "ParaTabStops" ) );
         rPropertyMap[ sParaTabStops ] <<= aSeq;
     }
-    if ( mpFillPropertiesPtr )
-    {
-        ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > xGraphic( mpFillPropertiesPtr->getXGraphic() );
-        if ( xGraphic.is() )
-            mrBulletList.setGraphic( xGraphic );
-    }
+
+    if ( mpFillPropertiesPtr && mpFillPropertiesPtr->mxGraphic.is() )
+        mrBulletList.setGraphic( mpFillPropertiesPtr->mxGraphic );
+
     if( mrBulletList.is() )
     {
         const rtl::OUString sIsNumbering( CREATE_OUSTRING( "IsNumbering" ) );
@@ -204,6 +201,7 @@ void TextParagraphPropertiesContext::endFastElement( sal_Int32 ) throw (SAXExcep
 
 Reference< XFastContextHandler > TextParagraphPropertiesContext::createFastChildContext( sal_Int32 aElementToken, const Reference< XFastAttributeList >& rXAttributes ) throw (SAXException, RuntimeException)
 {
+    AttributeList aAttribs( rXAttributes );
     Reference< XFastContextHandler > xRet;
     switch( aElementToken )
     {
@@ -242,7 +240,7 @@ Reference< XFastContextHandler > TextParagraphPropertiesContext::createFastChild
             mrBulletList.mbBulletFontFollowText <<= sal_True;
             break;
         case NMSP_DRAWINGML|XML_buFont:         // CT_TextFont
-            xRet.set( new TextFontContext( *this, aElementToken, rXAttributes, mrBulletList.maBulletFont ) );
+            mrBulletList.maBulletFont.setAttributes( aAttribs );
             break;
 
         // EG_TextBullet
@@ -283,8 +281,8 @@ Reference< XFastContextHandler > TextParagraphPropertiesContext::createFastChild
             break;
         case NMSP_DRAWINGML|XML_buBlip:         // CT_TextBlipBullet
             {
-                mpFillPropertiesPtr = FillPropertiesPtr( new FillProperties() );
-                xRet.set( new BlipFillPropertiesContext( *this, rXAttributes, *mpFillPropertiesPtr.get() ) );
+                mpFillPropertiesPtr.reset( new FillProperties );
+                xRet.set( new BlipFillPropertiesContext( *this, rXAttributes, *mpFillPropertiesPtr ) );
             }
             break;
 
@@ -292,7 +290,7 @@ Reference< XFastContextHandler > TextParagraphPropertiesContext::createFastChild
             xRet.set( new TextTabStopListContext( *this, maTabList ) );
             break;
         case NMSP_DRAWINGML|XML_defRPr:         // CT_TextCharacterProperties
-            xRet.set( new TextCharacterPropertiesContext( *this, rXAttributes, *mrTextParagraphProperties.getTextCharacterProperties() ) );
+            xRet.set( new TextCharacterPropertiesContext( *this, rXAttributes, mrTextParagraphProperties.getTextCharacterProperties() ) );
             break;
     }
     if ( !xRet.is() )