INTEGRATION: CWS xmlfilter03_DEV300 (1.2.4); FILE MERGED

2008/02/04 13:32:48 dr 1.2.4.1: rework of fragment handler/context handler base classes

20 files changed, 149 insertions, 151 deletions

diff --git a/oox/source/ppt/animvariantcontext.cxx b/oox/source/ppt/animvariantcontext.cxx
index 85fc20f55b75..571263d5af4c 100644
--- a/oox/source/ppt/animvariantcontext.cxx
+++ b/oox/source/ppt/animvariantcontext.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: animvariantcontext.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2008-01-17 08:06:00 $
+ *  last change: $Author: kz $ $Date: 2008-03-05 18:43:44 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -56,9 +56,8 @@ using namespace ::com::sun::star::xml::sax;
 
 namespace oox { namespace ppt {
 
-    AnimVariantContext::AnimVariantContext( const FragmentHandlerRef & xHandler, sal_Int32 aElement,
-                                                                                     Any & aValue )
-        : Context( xHandler )
+    AnimVariantContext::AnimVariantContext( ContextHandler& rParent, sal_Int32 aElement, Any & aValue )
+        : ContextHandler( rParent )
             , mnElement( aElement )
             , maValue( aValue )
     {
@@ -73,14 +72,14 @@ namespace oox { namespace ppt {
     {
         if( ( aElement == mnElement ) && maColor.isUsed() )
         {
-            maValue = makeAny( maColor.getColor( *getHandler()->getFilter().get() ) );
+            maValue = makeAny( maColor.getColor( getFilter() ) );
         }
     }
 
 
     Reference< XFastContextHandler >
     SAL_CALL AnimVariantContext::createFastChildContext( ::sal_Int32 aElementToken,
-                                                                                                             const Reference< XFastAttributeList >& xAttribs )
+                             const Reference< XFastAttributeList >& xAttribs )
         throw ( SAXException, RuntimeException )
     {
         Reference< XFastContextHandler > xRet;
@@ -95,7 +94,7 @@ namespace oox { namespace ppt {
             break;
         }
         case NMSP_PPT|XML_clrVal:
-            xRet.set( new ::oox::drawingml::colorChoiceContext( getHandler(), maColor ) );
+            xRet.set( new ::oox::drawingml::colorChoiceContext( *this, maColor ) );
             // we'll defer setting the Any until the end.
             break;
         case NMSP_PPT|XML_fltVal:
diff --git a/oox/source/ppt/animvariantcontext.hxx b/oox/source/ppt/animvariantcontext.hxx
index 8b88e33944d9..f20d2edc173e 100644
--- a/oox/source/ppt/animvariantcontext.hxx
+++ b/oox/source/ppt/animvariantcontext.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: animvariantcontext.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2008-01-17 08:06:00 $
+ *  last change: $Author: kz $ $Date: 2008-03-05 18:44:05 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -41,18 +41,17 @@
 
 #include <com/sun/star/uno/Any.hxx>
 
-#include "oox/core/context.hxx"
-#include "oox/core/fragmenthandler.hxx"
+#include "oox/core/contexthandler.hxx"
 #include "oox/drawingml/color.hxx"
 
 namespace oox { namespace ppt {
 
     /** context CT_TLAnimVariant */
     class AnimVariantContext
-        : public ::oox::core::Context
+        : public ::oox::core::ContextHandler
     {
     public:
-        AnimVariantContext( const ::oox::core::FragmentHandlerRef & xHandler, ::sal_Int32 aElement, ::com::sun::star::uno::Any & aValue );
+        AnimVariantContext( ::oox::core::ContextHandler& rParent, ::sal_Int32 aElement, ::com::sun::star::uno::Any & aValue );
         ~AnimVariantContext( ) throw( );
         virtual void SAL_CALL endFastElement( sal_Int32 /*aElement*/ ) throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 aElementToken, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttribs ) throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException );
diff --git a/oox/source/ppt/backgroundproperties.cxx b/oox/source/ppt/backgroundproperties.cxx
index e039a17ccb41..0bd736627437 100644
--- a/oox/source/ppt/backgroundproperties.cxx
+++ b/oox/source/ppt/backgroundproperties.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: backgroundproperties.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2008-01-17 08:06:00 $
+ *  last change: $Author: kz $ $Date: 2008-03-05 18:44:25 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -53,8 +53,8 @@ using namespace ::com::sun::star::xml::sax;
 namespace oox { namespace drawingml {
 // ---------------------------------------------------------------------
 
-BackgroundPropertiesContext::BackgroundPropertiesContext( const FragmentHandlerRef& xHandler, FillPropertiesPtr pFillPropertiesPtr ) throw()
-: Context( xHandler )
+BackgroundPropertiesContext::BackgroundPropertiesContext( ContextHandler& rParent, FillPropertiesPtr pFillPropertiesPtr ) throw()
+: ContextHandler( rParent )
 , mpFillPropertiesPtr( pFillPropertiesPtr )
 {
 }
@@ -71,7 +71,7 @@ Reference< XFastContextHandler > BackgroundPropertiesContext::createFastChildCon
 
     // FillPropertiesGroupContext
     if( !xRet.is() )
-        xRet = FillPropertiesGroupContext::StaticCreateContext( getHandler(), aElementToken, xAttribs, *(mpFillPropertiesPtr.get()) );
+        xRet = FillPropertiesGroupContext::StaticCreateContext( *this, aElementToken, xAttribs, *mpFillPropertiesPtr );
 
     return xRet;
 }
diff --git a/oox/source/ppt/buildlistcontext.cxx b/oox/source/ppt/buildlistcontext.cxx
index dcff9e1b1b30..c3483ed56609 100644
--- a/oox/source/ppt/buildlistcontext.cxx
+++ b/oox/source/ppt/buildlistcontext.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: buildlistcontext.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2008-01-17 08:06:00 $
+ *  last change: $Author: kz $ $Date: 2008-03-05 18:44:45 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -46,10 +46,10 @@ using ::rtl::OUString;
 
 namespace oox { namespace ppt {
 
-    BuildListContext::BuildListContext( const FragmentHandlerRef& xHandler,
-                                                                            const Reference< XFastAttributeList >& /*xAttribs*/,
-                                                                            TimeNodePtrList & aTimeNodeList)
-        : Context( xHandler )
+    BuildListContext::BuildListContext( ContextHandler& rParent,
+                const Reference< XFastAttributeList >& /*xAttribs*/,
+                TimeNodePtrList & aTimeNodeList)
+        : ContextHandler( rParent )
         , maTimeNodeList( aTimeNodeList )
         , mbInBldGraphic( false )
         ,   mbBuildAsOne( false )
diff --git a/oox/source/ppt/buildlistcontext.hxx b/oox/source/ppt/buildlistcontext.hxx
index 82d10b0ae91a..f6f611932d58 100644
--- a/oox/source/ppt/buildlistcontext.hxx
+++ b/oox/source/ppt/buildlistcontext.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: buildlistcontext.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2008-01-17 08:06:00 $
+ *  last change: $Author: kz $ $Date: 2008-03-05 18:45:04 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -39,19 +39,19 @@
 #define OOX_PPT_BUILDLISTCONTEXT
 
 #include "oox/ppt/timenode.hxx"
-#include "oox/core/context.hxx"
+#include "oox/core/contexthandler.hxx"
 
 namespace oox { namespace ppt {
 
 
     /** CT_BuildList */
     class BuildListContext
-        : public ::oox::core::Context
+        : public ::oox::core::ContextHandler
     {
     public:
-        BuildListContext( const ::oox::core::FragmentHandlerRef& xHandler,
-                                            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttribs,
-                                            TimeNodePtrList & aTimeNodeList);
+        BuildListContext( ::oox::core::ContextHandler& rParent,
+                const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttribs,
+                TimeNodePtrList & aTimeNodeList);
 
         ~BuildListContext( );
 
diff --git a/oox/source/ppt/commonbehaviorcontext.hxx b/oox/source/ppt/commonbehaviorcontext.hxx
index 375495e19e3c..f311f009d99f 100644
--- a/oox/source/ppt/commonbehaviorcontext.hxx
+++ b/oox/source/ppt/commonbehaviorcontext.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: commonbehaviorcontext.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2008-01-17 08:06:00 $
+ *  last change: $Author: kz $ $Date: 2008-03-05 18:45:33 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -57,9 +57,9 @@ namespace oox { namespace ppt {
         : public TimeNodeContext
     {
     public:
-        CommonBehaviorContext( const ::oox::core::FragmentHandlerRef& xHandler,
-                                                     const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttribs,
-                                                     const TimeNodePtr & pNode );
+        CommonBehaviorContext( ::oox::core::ContextHandler& rParent,
+             const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttribs,
+             const TimeNodePtr & pNode );
         ~CommonBehaviorContext( )
             throw( );
 
diff --git a/oox/source/ppt/commontimenodecontext.cxx b/oox/source/ppt/commontimenodecontext.cxx
index 232d59cb8d81..8bbb17574efe 100644
--- a/oox/source/ppt/commontimenodecontext.cxx
+++ b/oox/source/ppt/commontimenodecontext.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: commontimenodecontext.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2008-01-17 08:06:00 $
+ *  last change: $Author: kz $ $Date: 2008-03-05 18:45:54 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -382,11 +382,12 @@ static OUString getConvertedSubType( sal_Int16 nPresetClass, sal_Int32 nPresetId
 
 // END
 
-    CommonTimeNodeContext::CommonTimeNodeContext( const FragmentHandlerRef& xHandler,
-                                                                                                sal_Int32  aElement,
-                                                                                                const Reference< XFastAttributeList >& xAttribs,
-                                                                                                const TimeNodePtr & pNode )
-        : TimeNodeContext( xHandler, aElement, xAttribs, pNode )
+    CommonTimeNodeContext::CommonTimeNodeContext(
+            ContextHandler& rParent,
+            sal_Int32  aElement,
+            const Reference< XFastAttributeList >& xAttribs,
+            const TimeNodePtr & pNode )
+        : TimeNodeContext( rParent, aElement, xAttribs, pNode )
             , mbIterate( false )
     {
         AttributeList attribs( xAttribs );
@@ -641,18 +642,18 @@ static OUString getConvertedSubType( sal_Int16 nPresetClass, sal_Int32 nPresetId
         {
         case NMSP_PPT|XML_childTnLst:
         case NMSP_PPT|XML_subTnLst:
-            xRet.set( new TimeNodeListContext( getHandler(), mpNode->getChilds() ) );
+            xRet.set( new TimeNodeListContext( *this, mpNode->getChilds() ) );
             break;
 
         case NMSP_PPT|XML_stCondLst:
-            xRet.set( new CondListContext( getHandler(), aElementToken, xAttribs, mpNode, mpNode->getStartCondition() ) );
+            xRet.set( new CondListContext( *this, aElementToken, xAttribs, mpNode, mpNode->getStartCondition() ) );
             break;
         case NMSP_PPT|XML_endCondLst:
-            xRet.set( new CondListContext( getHandler(), aElementToken, xAttribs, mpNode, mpNode->getEndCondition() ) );
+            xRet.set( new CondListContext( *this, aElementToken, xAttribs, mpNode, mpNode->getEndCondition() ) );
             break;
 
         case NMSP_PPT|XML_endSync:
-            xRet.set( new CondContext( getHandler(), xAttribs, mpNode, mpNode->getEndSyncValue() ) );
+            xRet.set( new CondContext( *this, xAttribs, mpNode, mpNode->getEndSyncValue() ) );
             break;
         case NMSP_PPT|XML_iterate:
         {
diff --git a/oox/source/ppt/commontimenodecontext.hxx b/oox/source/ppt/commontimenodecontext.hxx
index 245a96d5d3d9..6d78a249d056 100644
--- a/oox/source/ppt/commontimenodecontext.hxx
+++ b/oox/source/ppt/commontimenodecontext.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: commontimenodecontext.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2008-01-17 08:06:00 $
+ *  last change: $Author: kz $ $Date: 2008-03-05 18:46:08 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -51,7 +51,7 @@ namespace oox { namespace ppt {
         : public TimeNodeContext
     {
     public:
-        CommonTimeNodeContext( const ::oox::core::FragmentHandlerRef& xHandler, sal_Int32  aElement, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttribs, const TimeNodePtr & pNode);
+        CommonTimeNodeContext( ::oox::core::ContextHandler& rParent, sal_Int32  aElement, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttribs, const TimeNodePtr & pNode);
         ~CommonTimeNodeContext( ) throw( );
 
         virtual void SAL_CALL endFastElement( sal_Int32 aElement ) throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
diff --git a/oox/source/ppt/conditioncontext.cxx b/oox/source/ppt/conditioncontext.cxx
index 59234c7f80e0..a8da196a2f15 100644
--- a/oox/source/ppt/conditioncontext.cxx
+++ b/oox/source/ppt/conditioncontext.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: conditioncontext.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2008-01-17 08:06:00 $
+ *  last change: $Author: kz $ $Date: 2008-03-05 18:46:23 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -46,8 +46,7 @@
 
 #include "oox/helper/attributelist.hxx"
 #include "oox/core/namespaces.hxx"
-#include "oox/core/fragmenthandler.hxx"
-#include "oox/core/context.hxx"
+#include "oox/core/contexthandler.hxx"
 #include "oox/ppt/animationspersist.hxx"
 #include "animationtypes.hxx"
 
@@ -61,9 +60,9 @@ using namespace ::com::sun::star::animations;
 
 namespace oox { namespace ppt {
 
-    CondContext::CondContext( const FragmentHandlerRef & xHandler, const Reference< XFastAttributeList >& xAttribs,
-                                                        const TimeNodePtr & pNode, AnimationCondition & aValue )
-        :  TimeNodeContext( xHandler, NMSP_PPT|XML_cond, xAttribs, pNode )
+    CondContext::CondContext( ContextHandler& rParent, const Reference< XFastAttributeList >& xAttribs,
+                const TimeNodePtr & pNode, AnimationCondition & aValue )
+        :  TimeNodeContext( rParent, NMSP_PPT|XML_cond, xAttribs, pNode )
         , maCond( aValue )
     {
         maEvent.Trigger =  EventTrigger::NONE;
@@ -166,7 +165,7 @@ namespace oox { namespace ppt {
         }
         case NMSP_PPT|XML_tgtEl:
             // CT_TLTimeTargetElement
-            xRet.set( new TimeTargetElementContext( getHandler(), maCond.getTarget() ) );
+            xRet.set( new TimeTargetElementContext( *this, maCond.getTarget() ) );
             break;
         default:
             break;
@@ -182,11 +181,12 @@ namespace oox { namespace ppt {
 
 
     /** CT_TLTimeConditionList */
-    CondListContext::CondListContext( const FragmentHandlerRef & xHandler, sal_Int32  aElement,
-                                                                        const Reference< XFastAttributeList >& xAttribs,
-                                                                        const TimeNodePtr & pNode,
-                                                                        AnimationConditionList & aCond )
-        : TimeNodeContext( xHandler, aElement, xAttribs, pNode )
+    CondListContext::CondListContext(
+            ContextHandler& rParent, sal_Int32  aElement,
+            const Reference< XFastAttributeList >& xAttribs,
+            const TimeNodePtr & pNode,
+            AnimationConditionList & aCond )
+        : TimeNodeContext( rParent, aElement, xAttribs, pNode )
         , maConditions( aCond )
     {
     }
@@ -205,7 +205,7 @@ namespace oox { namespace ppt {
         case NMSP_PPT|XML_cond:
             // add a condition to the list
             maConditions.push_back( AnimationCondition() );
-            xRet.set( new CondContext( getHandler(), xAttribs, mpNode, maConditions.back() ) );
+            xRet.set( new CondContext( *this, xAttribs, mpNode, maConditions.back() ) );
             break;
         default:
             break;
diff --git a/oox/source/ppt/conditioncontext.hxx b/oox/source/ppt/conditioncontext.hxx
index c0e3dc139ddf..27d53a872fb2 100644
--- a/oox/source/ppt/conditioncontext.hxx
+++ b/oox/source/ppt/conditioncontext.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: conditioncontext.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2008-01-17 08:06:00 $
+ *  last change: $Author: kz $ $Date: 2008-03-05 18:46:40 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -53,7 +53,7 @@ namespace oox { namespace ppt {
         : public TimeNodeContext
     {
     public:
-        CondContext( const ::oox::core::FragmentHandlerRef & xHandler,
+        CondContext( ::oox::core::ContextHandler& rParent,
                      const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttribs,
                      const TimeNodePtr & pNode, AnimationCondition & aCond );
         ~CondContext( ) throw( );
@@ -73,10 +73,10 @@ namespace oox { namespace ppt {
         : public TimeNodeContext
     {
     public:
-        CondListContext( const ::oox::core::FragmentHandlerRef & xHandler,
-                                         sal_Int32  aElement,
-                                         const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttribs,
-                                         const TimeNodePtr & pNode, AnimationConditionList & aCondList );
+        CondListContext( ::oox::core::ContextHandler& rParent,
+             sal_Int32  aElement,
+             const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttribs,
+             const TimeNodePtr & pNode, AnimationConditionList & aCondList );
         ~CondListContext( ) throw( );
 
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 aElementToken, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& /*xAttribs*/ ) throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException );
diff --git a/oox/source/ppt/customshowlistcontext.cxx b/oox/source/ppt/customshowlistcontext.cxx
index 01d57cee5c8c..38acb6a29697 100644
--- a/oox/source/ppt/customshowlistcontext.cxx
+++ b/oox/source/ppt/customshowlistcontext.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: customshowlistcontext.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2008-01-17 08:06:00 $
+ *  last change: $Author: kz $ $Date: 2008-03-05 18:46:55 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -44,12 +44,12 @@ using namespace ::com::sun::star::xml::sax;
 
 namespace oox { namespace ppt {
 
-class CustomShowContext : public ::oox::core::Context
+class CustomShowContext : public ::oox::core::ContextHandler
 {
     CustomShow mrCustomShow;
 
 public:
-    CustomShowContext( const ::oox::core::FragmentHandlerRef& xHandler,
+    CustomShowContext( ::oox::core::ContextHandler& rParent,
         const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttribs,
             CustomShow& rCustomShow );
     ~CustomShowContext( );
@@ -58,10 +58,10 @@ public:
             throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException );
 };
 
-CustomShowContext::CustomShowContext( const FragmentHandlerRef& xHandler,
+CustomShowContext::CustomShowContext( ContextHandler& rParent,
     const Reference< XFastAttributeList >& rxAttribs,
         CustomShow& rCustomShow )
-: Context( xHandler )
+: ContextHandler( rParent )
 , mrCustomShow( rCustomShow )
 {
     mrCustomShow.maName = rxAttribs->getOptionalValue( XML_name );
@@ -92,9 +92,9 @@ Reference< XFastContextHandler > SAL_CALL CustomShowContext::createFastChildCont
 
 //---------------------------------------------------------------------------
 
-CustomShowListContext::CustomShowListContext( const FragmentHandlerRef& xHandler,
+CustomShowListContext::CustomShowListContext( ContextHandler& rParent,
     std::vector< CustomShow >& rCustomShowList )
-: Context( xHandler )
+: ContextHandler( rParent )
 , mrCustomShowList( rCustomShowList )
 {
 }
@@ -114,7 +114,7 @@ Reference< XFastContextHandler > SAL_CALL CustomShowListContext::createFastChild
         {
             CustomShow aCustomShow;
             mrCustomShowList.push_back( aCustomShow );
-            xRet = new CustomShowContext( getHandler(), xAttribs, mrCustomShowList.back() );
+            xRet = new CustomShowContext( *this, xAttribs, mrCustomShowList.back() );
         }
         default:
         break;
diff --git a/oox/source/ppt/customshowlistcontext.hxx b/oox/source/ppt/customshowlistcontext.hxx
index 6cebe9acfe1d..af3f8d9f5db0 100644
--- a/oox/source/ppt/customshowlistcontext.hxx
+++ b/oox/source/ppt/customshowlistcontext.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: customshowlistcontext.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2008-01-17 08:06:00 $
+ *  last change: $Author: kz $ $Date: 2008-03-05 18:47:10 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -38,7 +38,7 @@
 #ifndef OOX_POWERPOINT_CUSTOMSHOWLISTCONTEXT_HXX
 #define OOX_POWERPOINT_CUSTOMSHOWLISTCONTEXT_HXX
 
-#include "oox/core/context.hxx"
+#include "oox/core/contexthandler.hxx"
 #include <vector>
 
 namespace oox { namespace ppt {
@@ -52,12 +52,12 @@ namespace oox { namespace ppt {
     };
 
     /** CT_ */
-    class CustomShowListContext : public ::oox::core::Context
+    class CustomShowListContext : public ::oox::core::ContextHandler
     {
         std::vector< CustomShow >& mrCustomShowList;
 
     public:
-        CustomShowListContext( const ::oox::core::FragmentHandlerRef& xHandler,
+        CustomShowListContext( ::oox::core::ContextHandler& rParent,
                 std::vector< CustomShow >& rCustomShowList );
 
         ~CustomShowListContext( );
diff --git a/oox/source/ppt/layoutfragmenthandler.cxx b/oox/source/ppt/layoutfragmenthandler.cxx
index 2f2bdf83db81..b7c0868d8a29 100644
--- a/oox/source/ppt/layoutfragmenthandler.cxx
+++ b/oox/source/ppt/layoutfragmenthandler.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: layoutfragmenthandler.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2008-01-17 08:06:00 $
+ *  last change: $Author: kz $ $Date: 2008-03-05 18:47:25 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -56,9 +56,9 @@ namespace oox { namespace ppt {
 
 // CT_SlideLayout
 
-LayoutFragmentHandler::LayoutFragmentHandler( const oox::core::XmlFilterRef& xFilter, const ::rtl::OUString& rFragmentPath, oox::ppt::SlidePersistPtr pMasterPersistPtr )
+LayoutFragmentHandler::LayoutFragmentHandler( XmlFilterBase& rFilter, const OUString& rFragmentPath, SlidePersistPtr pMasterPersistPtr )
     throw()
-: SlideFragmentHandler( xFilter, rFragmentPath, pMasterPersistPtr, Layout )
+: SlideFragmentHandler( rFilter, rFragmentPath, pMasterPersistPtr, Layout )
 {
 }
 
@@ -71,7 +71,7 @@ LayoutFragmentHandler::~LayoutFragmentHandler()
 Reference< XFastContextHandler > LayoutFragmentHandler::createFastChildContext( sal_Int32 aElementToken, const Reference< XFastAttributeList >& xAttribs )
     throw (SAXException, RuntimeException)
 {
-    Reference< XFastContextHandler > xRet( this );
+    Reference< XFastContextHandler > xRet = getFastContextHandler();
     switch( aElementToken )
     {
         case NMSP_PPT|XML_sldLayout:        // CT_SlideLayout
diff --git a/oox/source/ppt/makefile.mk b/oox/source/ppt/makefile.mk
index 3614459118a7..d0384619c393 100644
--- a/oox/source/ppt/makefile.mk
+++ b/oox/source/ppt/makefile.mk
@@ -4,9 +4,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: rt $ $Date: 2008-01-17 08:06:00 $
+#   last change: $Author: kz $ $Date: 2008-03-05 18:47:41 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -49,34 +49,34 @@ ENABLE_EXCEPTIONS=TRUE
 # --- Files --------------------------------------------------------
 
 SLOFILES =	\
-        $(SLO)$/pptimport.obj\
-        $(SLO)$/presentationfragmenthandler.obj\
-        $(SLO)$/slidefragmenthandler.obj\
-        $(SLO)$/layoutfragmenthandler.obj\
+        $(SLO)$/animationspersist.obj \
+        $(SLO)$/animationtypes.obj \
+        $(SLO)$/animvariantcontext.obj \
         $(SLO)$/backgroundproperties.obj\
-        $(SLO)$/slidetransitioncontext.obj\
-        $(SLO)$/slidetransition.obj\
-        $(SLO)$/slidetimingcontext.obj\
-        $(SLO)$/slidepersist.obj\
-        $(SLO)$/slidemastertextstylescontext.obj \
-        $(SLO)$/timenode.obj\
-        $(SLO)$/pptfilterhelpers.obj\
-        $(SLO)$/soundactioncontext.obj \
-        $(SLO)$/commontimenodecontext.obj \
+        $(SLO)$/buildlistcontext.obj \
         $(SLO)$/commonbehaviorcontext.obj \
+        $(SLO)$/commontimenodecontext.obj \
         $(SLO)$/conditioncontext.obj \
-        $(SLO)$/timetargetelementcontext.obj \
-        $(SLO)$/timenodelistcontext.obj \
-        $(SLO)$/animationspersist.obj \
-        $(SLO)$/animvariantcontext.obj \
-        $(SLO)$/timeanimvaluecontext.obj \
+        $(SLO)$/customshowlistcontext.obj \
+        $(SLO)$/layoutfragmenthandler.obj\
+        $(SLO)$/pptfilterhelpers.obj\
+        $(SLO)$/pptimport.obj\
         $(SLO)$/pptshape.obj \
-        $(SLO)$/pptshapegroupcontext.obj \
         $(SLO)$/pptshapecontext.obj \
+        $(SLO)$/pptshapegroupcontext.obj \
         $(SLO)$/pptshapepropertiescontext.obj \
-        $(SLO)$/buildlistcontext.obj \
-        $(SLO)$/animationtypes.obj \
-        $(SLO)$/customshowlistcontext.obj
+        $(SLO)$/presentationfragmenthandler.obj\
+        $(SLO)$/slidefragmenthandler.obj\
+        $(SLO)$/slidemastertextstylescontext.obj \
+        $(SLO)$/slidepersist.obj\
+        $(SLO)$/slidetimingcontext.obj\
+        $(SLO)$/slidetransition.obj\
+        $(SLO)$/slidetransitioncontext.obj\
+        $(SLO)$/soundactioncontext.obj \
+        $(SLO)$/timeanimvaluecontext.obj \
+        $(SLO)$/timenode.obj\
+        $(SLO)$/timenodelistcontext.obj \
+        $(SLO)$/timetargetelementcontext.obj
 
 # --- Targets -------------------------------------------------------
 
diff --git a/oox/source/ppt/pptshapecontext.cxx b/oox/source/ppt/pptshapecontext.cxx
index 00631845d63b..843ea3bcdb2e 100644
--- a/oox/source/ppt/pptshapecontext.cxx
+++ b/oox/source/ppt/pptshapecontext.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: pptshapecontext.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2008-01-17 08:06:00 $
+ *  last change: $Author: kz $ $Date: 2008-03-05 18:48:27 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -64,9 +64,8 @@ using namespace ::com::sun::star::xml::sax;
 namespace oox { namespace ppt {
 
 // CT_Shape
-PPTShapeContext::PPTShapeContext( const oox::ppt::SlidePersistPtr pSlidePersistPtr, const FragmentHandlerRef& xHandler,
-        oox::drawingml::ShapePtr pMasterShapePtr, oox::drawingml::ShapePtr pShapePtr )
-: oox::drawingml::ShapeContext( xHandler, pMasterShapePtr, pShapePtr )
+PPTShapeContext::PPTShapeContext( ContextHandler& rParent, const SlidePersistPtr pSlidePersistPtr, oox::drawingml::ShapePtr pMasterShapePtr, oox::drawingml::ShapePtr pShapePtr )
+: oox::drawingml::ShapeContext( rParent, pMasterShapePtr, pShapePtr )
 , mpSlidePersistPtr( pSlidePersistPtr )
 {
 }
@@ -185,16 +184,16 @@ Reference< XFastContextHandler > PPTShapeContext::createFastChildContext( sal_In
     // nvSpPr CT_ShapeNonVisual end
 
     case NMSP_PPT|XML_spPr:
-        xRet = new PPTShapePropertiesContext( this, *(mpShapePtr.get()) );
+        xRet = new PPTShapePropertiesContext( *this, *mpShapePtr );
         break;
 
     case NMSP_PPT|XML_style:
-        xRet = new oox::drawingml::ShapeStyleContext( this, *(mpShapePtr.get()) );
+        xRet = new oox::drawingml::ShapeStyleContext( *this, *mpShapePtr );
         break;
 
     case NMSP_PPT|XML_txBody:
     {
-        xRet = new oox::drawingml::TextBodyContext( getHandler(), *(mpShapePtr.get()) );
+        xRet = new oox::drawingml::TextBodyContext( *this, *mpShapePtr );
         break;
     }
     }
diff --git a/oox/source/ppt/pptshapepropertiescontext.cxx b/oox/source/ppt/pptshapepropertiescontext.cxx
index c4455fd310c5..3d59e5135431 100644
--- a/oox/source/ppt/pptshapepropertiescontext.cxx
+++ b/oox/source/ppt/pptshapepropertiescontext.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: pptshapepropertiescontext.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2008-01-17 08:06:00 $
+ *  last change: $Author: kz $ $Date: 2008-03-05 18:48:54 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -63,8 +63,8 @@ using namespace ::com::sun::star::xml::sax;
 namespace oox { namespace ppt {
 
 // CT_Shape
-PPTShapePropertiesContext::PPTShapePropertiesContext( const ContextRef& xParent, ::oox::drawingml::Shape& rShape )
-: ShapePropertiesContext( xParent, rShape )
+PPTShapePropertiesContext::PPTShapePropertiesContext( ContextHandler& rParent, ::oox::drawingml::Shape& rShape )
+: ShapePropertiesContext( rParent, rShape )
 {
 }
 
diff --git a/oox/source/ppt/slidemastertextstylescontext.cxx b/oox/source/ppt/slidemastertextstylescontext.cxx
index 6a389131eb03..e5a624c83d60 100644
--- a/oox/source/ppt/slidemastertextstylescontext.cxx
+++ b/oox/source/ppt/slidemastertextstylescontext.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: slidemastertextstylescontext.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2008-01-17 08:06:00 $
+ *  last change: $Author: kz $ $Date: 2008-03-05 18:49:38 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -46,8 +46,8 @@ using namespace ::com::sun::star::xml::sax;
 
 namespace oox { namespace ppt {
 
-SlideMasterTextStylesContext::SlideMasterTextStylesContext( const ::oox::core::FragmentHandlerRef& xHandler, SlidePersistPtr pSlidePersistPtr )
-: Context( xHandler )
+SlideMasterTextStylesContext::SlideMasterTextStylesContext( ContextHandler& rParent, SlidePersistPtr pSlidePersistPtr )
+: ContextHandler( rParent )
 , mpSlidePersistPtr( pSlidePersistPtr )
 {
 }
@@ -84,7 +84,7 @@ Reference< XFastContextHandler > SlideMasterTextStylesContext::createFastChildCo
         }
     }
     if ( aTextListStylePtr )
-        xRet.set( new oox::drawingml::TextListStyleContext( getHandler(), *(aTextListStylePtr.get()) ) );
+        xRet.set( new oox::drawingml::TextListStyleContext( *this, *aTextListStylePtr ) );
     if( !xRet.is() )
         xRet.set( this );
 
diff --git a/oox/source/ppt/slidetimingcontext.cxx b/oox/source/ppt/slidetimingcontext.cxx
index a0c15363b27c..dbae07bf301a 100644
--- a/oox/source/ppt/slidetimingcontext.cxx
+++ b/oox/source/ppt/slidetimingcontext.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: slidetimingcontext.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2008-01-17 08:06:00 $
+ *  last change: $Author: kz $ $Date: 2008-03-05 18:50:16 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -59,9 +59,9 @@ using namespace ::com::sun::star::container;
 
 namespace oox { namespace ppt {
 
-SlideTimingContext::SlideTimingContext( const ::oox::core::FragmentHandlerRef& xHandler,  TimeNodePtrList & aTimeNodeList ) throw()
-    : Context( xHandler )
-        , maTimeNodeList( aTimeNodeList )
+SlideTimingContext::SlideTimingContext( ContextHandler& rParent, TimeNodePtrList & aTimeNodeList ) throw()
+    : ContextHandler( rParent )
+    , maTimeNodeList( aTimeNodeList )
 {
 }
 
@@ -82,15 +82,15 @@ Reference< XFastContextHandler > SlideTimingContext::createFastChildContext( sal
     switch( aElementToken )
     {
     case NMSP_PPT|XML_bldLst:
-        xRet.set( new BuildListContext( getHandler(), xAttribs, maTimeNodeList ) );
+        xRet.set( new BuildListContext( *this, xAttribs, maTimeNodeList ) );
         break;
     case NMSP_PPT|XML_extLst:
-        xRet.set( new SkipContext( getHandler() ) );
+        xRet.set( new SkipContext( *this ) );
         break;
     case NMSP_PPT|XML_tnLst:
         // timing nodes
     {
-        xRet.set( new TimeNodeListContext( getHandler(), maTimeNodeList ) );
+        xRet.set( new TimeNodeListContext( *this, maTimeNodeList ) );
     }
     break;
 
diff --git a/oox/source/ppt/slidetransitioncontext.cxx b/oox/source/ppt/slidetransitioncontext.cxx
index c26067b9fa69..b7c98280664c 100644
--- a/oox/source/ppt/slidetransitioncontext.cxx
+++ b/oox/source/ppt/slidetransitioncontext.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: slidetransitioncontext.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2008-01-17 08:06:00 $
+ *  last change: $Author: kz $ $Date: 2008-03-05 18:50:56 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -62,8 +62,8 @@ using namespace ::com::sun::star::container;
 namespace oox { namespace ppt {
 
 
-SlideTransitionContext::SlideTransitionContext( const FragmentHandlerRef& xHandler, const Reference< XFastAttributeList >& xAttribs, PropertyMap & aProperties ) throw()
-: Context( xHandler )
+SlideTransitionContext::SlideTransitionContext( ContextHandler& rParent, const Reference< XFastAttributeList >& xAttribs, PropertyMap & aProperties ) throw()
+: ContextHandler( rParent )
 , maSlideProperties( aProperties )
 , mbHasTransition( sal_False )
 {
@@ -181,10 +181,10 @@ Reference< XFastContextHandler > SlideTransitionContext::createFastChildContext(
 
     case NMSP_PPT|XML_sndAc: // CT_TransitionSoundAction
         //"Sound"
-        xRet.set( new SoundActionContext ( this->getHandler(), maSlideProperties ) );
+        xRet.set( new SoundActionContext ( *this, maSlideProperties ) );
         break;
     case NMSP_PPT|XML_extLst: // CT_OfficeArtExtensionList
-        xRet.set( new SkipContext( getHandler() ) );
+        xRet.set( new SkipContext( *this ) );
         break;
     default:
         break;
diff --git a/oox/source/ppt/soundactioncontext.cxx b/oox/source/ppt/soundactioncontext.cxx
index b5e8c3dbd84d..515ff7efe0ad 100644
--- a/oox/source/ppt/soundactioncontext.cxx
+++ b/oox/source/ppt/soundactioncontext.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: soundactioncontext.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2008-01-17 08:06:00 $
+ *  last change: $Author: kz $ $Date: 2008-03-05 18:51:09 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -53,8 +53,8 @@ using namespace ::com::sun::star::uno;
 namespace oox { namespace ppt {
 
 
-    SoundActionContext::SoundActionContext( const FragmentHandlerRef& xHandler, PropertyMap & aProperties ) throw()
-    : Context( xHandler )
+    SoundActionContext::SoundActionContext( ContextHandler& rParent, PropertyMap & aProperties ) throw()
+    : ContextHandler( rParent )
     , maSlideProperties( aProperties )
     , mbHasStartSound( false )
     , mbLoopSound( false )
@@ -117,7 +117,7 @@ namespace oox { namespace ppt {
             if( mbHasStartSound )
             {
                 drawingml::EmbeddedWAVAudioFile aAudio;
-                drawingml::getEmbeddedWAVAudioFile( getHandler(), xAttribs, aAudio);
+                drawingml::getEmbeddedWAVAudioFile( getRelations(), xAttribs, aAudio);
 
                 msSndName = ( aAudio.mbBuiltIn ? aAudio.msName : aAudio.msLink );
             }