Convert all ContextHandler-derived clases over to ContextHandler2

Change-Id: I81f54e3b7d29a0807ec4c2f082ae00fd6e1d6138
Reviewed-on: https://gerrit.libreoffice.org/4580
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>

28 files changed, 187 insertions, 245 deletions

diff --git a/include/oox/drawingml/clrschemecontext.hxx b/include/oox/drawingml/clrschemecontext.hxx
index 466b852a37cf..fc2a09159139 100644
--- a/include/oox/drawingml/clrschemecontext.hxx
+++ b/include/oox/drawingml/clrschemecontext.hxx
@@ -20,24 +20,24 @@
 #ifndef OOX_DRAWINGML_CLRSCHEMECONTEXT_HXX
 #define OOX_DRAWINGML_CLRSCHEMECONTEXT_HXX
 
-#include "oox/core/contexthandler.hxx"
+#include "oox/core/contexthandler2.hxx"
 #include "oox/drawingml/clrscheme.hxx"
 #include "oox/drawingml/color.hxx"
 #include "oox/drawingml/colorchoicecontext.hxx"
 
 namespace oox { namespace drawingml {
 
-class clrMapContext : public oox::core::ContextHandler
+class clrMapContext : public oox::core::ContextHandler2
 {
 public:
-    clrMapContext( ::oox::core::ContextHandler& rParent,
-        const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttributes, ClrMap& rClrMap );
+    clrMapContext( ::oox::core::ContextHandler2Helper& rParent,
+        const ::oox::AttributeList& rAttributes, ClrMap& rClrMap );
 };
 
 class clrSchemeColorContext : private Color, public ColorContext
 {
 public:
-    clrSchemeColorContext( ::oox::core::ContextHandler& rParent, ClrScheme& rClrScheme, sal_Int32 nColorToken );
+    clrSchemeColorContext( ::oox::core::ContextHandler2Helper& rParent, ClrScheme& rClrScheme, sal_Int32 nColorToken );
     virtual ~clrSchemeColorContext();
 
 private:
@@ -45,11 +45,11 @@ private:
     sal_Int32       mnColorToken;
 };
 
-class clrSchemeContext : public oox::core::ContextHandler
+class clrSchemeContext : public oox::core::ContextHandler2
 {
 public:
-    clrSchemeContext( ::oox::core::ContextHandler& rParent, ClrScheme& rClrScheme );
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+    clrSchemeContext( ::oox::core::ContextHandler2Helper& rParent, ClrScheme& rClrScheme );
+    virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE;
 
 private:
     ClrScheme&      mrClrScheme;
diff --git a/include/oox/drawingml/colorchoicecontext.hxx b/include/oox/drawingml/colorchoicecontext.hxx
index aaacfd44d5b7..ba28ee9e930f 100644
--- a/include/oox/drawingml/colorchoicecontext.hxx
+++ b/include/oox/drawingml/colorchoicecontext.hxx
@@ -20,7 +20,7 @@
 #ifndef OOX_DRAWINGML_COLORCHOICECONTEXT_HXX
 #define OOX_DRAWINGML_COLORCHOICECONTEXT_HXX
 
-#include "oox/core/contexthandler.hxx"
+#include "oox/core/contexthandler2.hxx"
 
 namespace oox {
 namespace drawingml {
@@ -31,21 +31,19 @@ class Color;
 
 /** Context handler for the different color value elements (a:scrgbClr,
     a:srgbClr, a:hslClr, a:sysClr, a:schemeClr, a:prstClr). */
-class ColorValueContext : public ::oox::core::ContextHandler
+class ColorValueContext : public ::oox::core::ContextHandler2
 {
 public:
-    explicit            ColorValueContext( ::oox::core::ContextHandler& rParent, Color& rColor );
+    explicit            ColorValueContext( ::oox::core::ContextHandler2Helper& rParent, Color& rColor );
 
-    virtual void SAL_CALL startFastElement(
-                            sal_Int32 nElement,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs )
-                        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(
+    virtual void onStartElement(
+                            const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE;
+
+    virtual ::oox::core::ContextHandlerRef
+                        onCreateContext(
                             sal_Int32 nElement,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs )
-                        throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+                            const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE;
 
 private:
     Color&              mrColor;
@@ -55,16 +53,15 @@ private:
 
 /** Context handler for elements that *contain* a color value element
     (a:scrgbClr, a:srgbClr, a:hslClr, a:sysClr, a:schemeClr, a:prstClr). */
-class ColorContext : public ::oox::core::ContextHandler
+class ColorContext : public ::oox::core::ContextHandler2
 {
 public:
-    explicit            ColorContext( ::oox::core::ContextHandler& rParent, Color& rColor );
+    explicit            ColorContext( ::oox::core::ContextHandler2Helper& rParent, Color& rColor );
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL
-                        createFastChildContext(
+    virtual ::oox::core::ContextHandlerRef
+                        onCreateContext(
                             sal_Int32 nElement,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs )
-                        throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+                            const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE;
 
 private:
     Color&              mrColor;
diff --git a/include/oox/drawingml/customshapegeometry.hxx b/include/oox/drawingml/customshapegeometry.hxx
index 3920881f123a..db13be62aded 100644
--- a/include/oox/drawingml/customshapegeometry.hxx
+++ b/include/oox/drawingml/customshapegeometry.hxx
@@ -22,7 +22,7 @@
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include "oox/helper/propertymap.hxx"
-#include "oox/core/contexthandler.hxx"
+#include "oox/core/contexthandler2.hxx"
 #include "oox/drawingml/shape.hxx"
 
 namespace oox { namespace drawingml {
@@ -30,11 +30,11 @@ namespace oox { namespace drawingml {
 
 // ---------------------------------------------------------------------
 // CT_CustomGeometry2D
-class CustomShapeGeometryContext : public ::oox::core::ContextHandler
+class CustomShapeGeometryContext : public ::oox::core::ContextHandler2
 {
 public:
-    CustomShapeGeometryContext( ::oox::core::ContextHandler& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttributes, CustomShapeProperties& rCustomShapeProperties );
-    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);
+    CustomShapeGeometryContext( ::oox::core::ContextHandler2Helper& rParent, const ::oox::AttributeList& rAttributes, CustomShapeProperties& rCustomShapeProperties );
+    virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 aElementToken, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE;
 
 private:
     CustomShapeProperties& mrCustomShapeProperties;
@@ -42,11 +42,11 @@ private:
 
 // ---------------------------------------------------------------------
 // CT_PresetGeometry2D
-class PresetShapeGeometryContext : public ::oox::core::ContextHandler
+class PresetShapeGeometryContext : public ::oox::core::ContextHandler2
 {
 public:
-    PresetShapeGeometryContext( ::oox::core::ContextHandler& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttributes, CustomShapeProperties& rCustomShapeProperties );
-    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);
+    PresetShapeGeometryContext( ::oox::core::ContextHandler2Helper& rParent, const ::oox::AttributeList& rAttributes, CustomShapeProperties& rCustomShapeProperties );
+    virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 aElementToken, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE;
 
 private:
     CustomShapeProperties& mrCustomShapeProperties;
@@ -54,11 +54,11 @@ private:
 
 // ---------------------------------------------------------------------
 // CT_PresetTextShape
-class PresetTextShapeContext : public ::oox::core::ContextHandler
+class PresetTextShapeContext : public ::oox::core::ContextHandler2
 {
 public:
-    PresetTextShapeContext( ::oox::core::ContextHandler& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttributes, CustomShapeProperties& rCustomShapeProperties );
-    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);
+    PresetTextShapeContext( ::oox::core::ContextHandler2Helper& rParent, const ::oox::AttributeList& rAttributes, CustomShapeProperties& rCustomShapeProperties );
+    virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 aElementToken, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE;
 
 private:
     CustomShapeProperties& mrCustomShapeProperties;
diff --git a/include/oox/drawingml/effectpropertiescontext.hxx b/include/oox/drawingml/effectpropertiescontext.hxx
index cd5e2eba28f5..43a8dd9a959f 100644
--- a/include/oox/drawingml/effectpropertiescontext.hxx
+++ b/include/oox/drawingml/effectpropertiescontext.hxx
@@ -10,7 +10,7 @@
 #ifndef OOX_DRAWINGML_EFFECTPROPERTIESCONTEXT_HXX
 #define OOX_DRAWINGML_EFFECTPROPERTIESCONTEXT_HXX
 
-#include "oox/core/contexthandler.hxx"
+#include "oox/core/contexthandler2.hxx"
 #include "oox/dllapi.h"
 
 namespace oox { namespace drawingml {
@@ -19,16 +19,15 @@ namespace oox { namespace drawingml {
 
 struct EffectProperties;
 
-class OOX_DLLPUBLIC EffectPropertiesContext : public ::oox::core::ContextHandler
+class OOX_DLLPUBLIC EffectPropertiesContext : public ::oox::core::ContextHandler2
 {
 public:
-    EffectPropertiesContext( ::oox::core::ContextHandler& rParent,
+    EffectPropertiesContext( ::oox::core::ContextHandler2Helper& rParent,
             EffectProperties& rEffectProperties ) throw();
     ~EffectPropertiesContext();
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL
-        createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs )
-            throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+    virtual ::oox::core::ContextHandlerRef
+        onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE;
 
 protected:
     EffectProperties& mrEffectProperties;
diff --git a/include/oox/drawingml/fillpropertiesgroupcontext.hxx b/include/oox/drawingml/fillpropertiesgroupcontext.hxx
index 81d8a6e0db20..64980aa4c285 100644
--- a/include/oox/drawingml/fillpropertiesgroupcontext.hxx
+++ b/include/oox/drawingml/fillpropertiesgroupcontext.hxx
@@ -33,152 +33,133 @@ class SolidFillContext : public ColorContext
 {
 public:
     explicit            SolidFillContext(
-                            ::oox::core::ContextHandler& rParent,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs,
+                            ::oox::core::ContextHandler2Helper& rParent,
+                            const ::oox::AttributeList& rAttribs,
                             FillProperties& rFillProps );
 };
 
 // ============================================================================
 
 /** Context handler that imports the a:gradFill element. */
-class GradientFillContext : public ::oox::core::ContextHandler
+class GradientFillContext : public ::oox::core::ContextHandler2
 {
 public:
     explicit            GradientFillContext(
-                            ::oox::core::ContextHandler& rParent,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs,
+                            ::oox::core::ContextHandler2Helper& rParent,
+                            const ::oox::AttributeList& rAttribs,
                             GradientFillProperties& rGradientProps );
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL
-                        createFastChildContext(
+    virtual ::oox::core::ContextHandlerRef
+                        onCreateContext(
                             sal_Int32 nElement,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs )
-                        throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException );
+                            const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE;
 
 private:
     GradientFillProperties& mrGradientProps;
 };
 
-// ============================================================================
-
 /** Context handler that imports the a:pattFill element. */
-class PatternFillContext : public ::oox::core::ContextHandler
+class PatternFillContext : public ::oox::core::ContextHandler2
 {
 public:
     explicit            PatternFillContext(
-                            ::oox::core::ContextHandler& rParent,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs,
+                            ::oox::core::ContextHandler2Helper& rParent,
+                            const ::oox::AttributeList& rAttribs,
                             PatternFillProperties& rPatternProps );
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL
-                        createFastChildContext(
+    virtual ::oox::core::ContextHandlerRef
+                        onCreateContext(
                             sal_Int32 nElement,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs )
-                        throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException );
+                            const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE;
 
 private:
     PatternFillProperties& mrPatternProps;
 };
 
-// ============================================================================
-// ============================================================================
 
 /** Context handler that imports the a:clrChange element containing the colors
     of a bitmap color change transformation. */
-class ColorChangeContext : public ::oox::core::ContextHandler
+class ColorChangeContext : public ::oox::core::ContextHandler2
 {
 public:
     explicit            ColorChangeContext(
-                            ::oox::core::ContextHandler& rParent,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs,
+                            ::oox::core::ContextHandler2Helper& rParent,
+                            const ::oox::AttributeList& rAttribs,
                             BlipFillProperties& rBlipProps );
     virtual             ~ColorChangeContext();
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL
-                        createFastChildContext(
+    virtual ::oox::core::ContextHandlerRef
+                        onCreateContext(
                             sal_Int32 nElement,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs )
-                        throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException );
+                            const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE;
 
 private:
     BlipFillProperties& mrBlipProps;
     bool                mbUseAlpha;
 };
 
-// ============================================================================
-
 /** Context handler that imports the a:blip element containing the fill bitmap
     and bitmap color transformation settings. */
-class BlipContext : public ::oox::core::ContextHandler
+class BlipContext : public ::oox::core::ContextHandler2
 {
 public:
     explicit            BlipContext(
-                            ::oox::core::ContextHandler& rParent,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs,
+                            ::oox::core::ContextHandler2Helper& rParent,
+                            const ::oox::AttributeList& rAttribs,
                             BlipFillProperties& rBlipProps );
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL
-                        createFastChildContext(
+    virtual ::oox::core::ContextHandlerRef
+                        onCreateContext(
                             sal_Int32 nElement,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs )
-                        throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException );
+                            const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE;
 
 private:
     BlipFillProperties& mrBlipProps;
 };
 
-// ============================================================================
-
 /** Context handler that imports the a:blipFill element. */
-class BlipFillContext : public ::oox::core::ContextHandler
+class BlipFillContext : public ::oox::core::ContextHandler2
 {
 public:
     explicit            BlipFillContext(
-                            ::oox::core::ContextHandler& rParent,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs,
+                            ::oox::core::ContextHandler2Helper& rParent,
+                            const ::oox::AttributeList& rAttribs,
                             BlipFillProperties& rBlipProps );
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL
-                        createFastChildContext(
+    virtual ::oox::core::ContextHandlerRef
+                        onCreateContext(
                             sal_Int32 nElement,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs )
-                        throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException );
+                            const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE;
 
 private:
     BlipFillProperties& mrBlipProps;
 };
 
-// ============================================================================
-// ============================================================================
-
 /** Context handler for elements that contain a fill property element
     (a:noFill, a:solidFill, a:gradFill, a:pattFill, a:blipFill, a:grpFill). */
-class FillPropertiesContext : public ::oox::core::ContextHandler
+class FillPropertiesContext : public ::oox::core::ContextHandler2
 {
 public:
     explicit            FillPropertiesContext(
-                            ::oox::core::ContextHandler& rParent,
+                            ::oox::core::ContextHandler2Helper& rParent,
                             FillProperties& rFillProps );
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL
-                        createFastChildContext(
+    virtual ::oox::core::ContextHandlerRef
+                        onCreateContext(
                             sal_Int32 nElement,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs )
-                        throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException );
+                            const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE;
 
-    static ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler >
+    static ::oox::core::ContextHandlerRef
                         createFillContext(
-                            ::oox::core::ContextHandler& rParent,
+                            ::oox::core::ContextHandler2Helper& rParent,
                             sal_Int32 nElement,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs,
+                            const ::oox::AttributeList& rAttribs,
                             FillProperties& rFillProps );
 
 protected:
     FillProperties&     mrFillProps;
 };
 
-// ============================================================================
-
 /** Context handler for elements that contain a fill property element
     (a:noFill, a:solidFill, a:gradFill, a:pattFill, a:blipFill, a:grpFill).
 
@@ -190,7 +171,7 @@ class SimpleFillPropertiesContext : private FillProperties, public FillPropertie
 {
 public:
     explicit            SimpleFillPropertiesContext(
-                            ::oox::core::ContextHandler& rParent,
+                            ::oox::core::ContextHandler2Helper& rParent,
                             Color& rColor );
     virtual             ~SimpleFillPropertiesContext();
 
@@ -198,8 +179,6 @@ protected:
     Color&              mrColor;
 };
 
-// ============================================================================
-
 } // namespace drawingml
 } // namespace oox
 
diff --git a/include/oox/drawingml/guidcontext.hxx b/include/oox/drawingml/guidcontext.hxx
index 8a60bf20ab5c..c13c9e8eaade 100644
--- a/include/oox/drawingml/guidcontext.hxx
+++ b/include/oox/drawingml/guidcontext.hxx
@@ -20,22 +20,20 @@
 #ifndef OOX_DRAWINGML_GUIDCONTEXT_HXX
 #define OOX_DRAWINGML_GUIDCONTEXT_HXX
 
-#include "oox/core/contexthandler.hxx"
+#include "oox/core/contexthandler2.hxx"
 
 namespace oox { namespace drawingml {
 
-    class GuidContext : public ::oox::core::ContextHandler
+    class GuidContext : public ::oox::core::ContextHandler2
     {
 
     public:
-        GuidContext( ::oox::core::ContextHandler& rParent, OUString& rGuidId );
-        virtual void SAL_CALL characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+        GuidContext( ::oox::core::ContextHandler2Helper& rParent, OUString& rGuidId );
+        virtual void onCharacters( const OUString& aChars ) SAL_OVERRIDE;
 
     private:
-
         OUString& mrGuidId;
     };
-
 } }
 
 #endif
diff --git a/include/oox/drawingml/linepropertiescontext.hxx b/include/oox/drawingml/linepropertiescontext.hxx
index e0454ddb2250..0d78aba02045 100644
--- a/include/oox/drawingml/linepropertiescontext.hxx
+++ b/include/oox/drawingml/linepropertiescontext.hxx
@@ -20,7 +20,7 @@
 #ifndef OOX_DRAWINGML_LINEPROPERTIESCONTEXT_HXX
 #define OOX_DRAWINGML_LINEPROPERTIESCONTEXT_HXX
 
-#include "oox/core/contexthandler.hxx"
+#include "oox/core/contexthandler2.hxx"
 #include "oox/dllapi.h"
 
 namespace oox { namespace drawingml {
@@ -29,17 +29,16 @@ namespace oox { namespace drawingml {
 
 struct LineProperties;
 
-class OOX_DLLPUBLIC LinePropertiesContext : public ::oox::core::ContextHandler
+class OOX_DLLPUBLIC LinePropertiesContext : public ::oox::core::ContextHandler2
 {
 public:
-    LinePropertiesContext( ::oox::core::ContextHandler& rParent,
-        const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttributes,
+    LinePropertiesContext( ::oox::core::ContextHandler2Helper& rParent,
+            const ::oox::AttributeList& rAttributes,
             LineProperties& rLineProperties ) throw();
     ~LinePropertiesContext();
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL
-        createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs )
-            throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+    virtual ::oox::core::ContextHandlerRef
+        onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE;
 
 protected:
     LineProperties& mrLineProperties;
diff --git a/include/oox/drawingml/objectdefaultcontext.hxx b/include/oox/drawingml/objectdefaultcontext.hxx
index b8b1d5b95ede..13e27a7b7f56 100644
--- a/include/oox/drawingml/objectdefaultcontext.hxx
+++ b/include/oox/drawingml/objectdefaultcontext.hxx
@@ -20,17 +20,17 @@
 #ifndef OOX_DRAWINGML_OBJECTDEFAULTCONTEXT_HXX
 #define OOX_DRAWINGML_OBJECTDEFAULTCONTEXT_HXX
 
-#include "oox/core/contexthandler.hxx"
+#include "oox/core/contexthandler2.hxx"
 
 namespace oox { namespace drawingml {
 
 class Theme;
 
-class objectDefaultContext : public oox::core::ContextHandler
+class objectDefaultContext : public oox::core::ContextHandler2
 {
 public:
-    objectDefaultContext( ::oox::core::ContextHandler& rParent, Theme& rTheme );
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+    objectDefaultContext( ::oox::core::ContextHandler2Helper& rParent, Theme& rTheme );
+    virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE;
 
 protected:
     Theme& mrTheme;
diff --git a/include/oox/drawingml/scene3dcontext.hxx b/include/oox/drawingml/scene3dcontext.hxx
index cc3341ddf310..d1478b928a65 100644
--- a/include/oox/drawingml/scene3dcontext.hxx
+++ b/include/oox/drawingml/scene3dcontext.hxx
@@ -20,21 +20,18 @@
 #ifndef OOX_DRAWINGML_SCENE3DPROPERTIESCONTEXT_HPP
 #define OOX_DRAWINGML_SCENE3DPROPERTIESCONTEXT_HPP
 
-#include "oox/core/contexthandler.hxx"
+#include "oox/core/contexthandler2.hxx"
 
 namespace oox { namespace drawingml {
 
 struct Shape3DProperties;
 
-// ---------------------------------------------------------------------
-
-class Scene3DPropertiesContext : public ::oox::core::ContextHandler
+class Scene3DPropertiesContext : public ::oox::core::ContextHandler2
 {
 public:
-    Scene3DPropertiesContext( ::oox::core::ContextHandler& rParent, Shape3DProperties& r3DProperties ) throw();
+    Scene3DPropertiesContext( ::oox::core::ContextHandler2Helper& rParent, Shape3DProperties& r3DProperties ) throw();
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs )
-            throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException );
+    ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE;
 
 private:
     Shape3DProperties& mr3DProperties;
diff --git a/include/oox/drawingml/shapepropertiescontext.hxx b/include/oox/drawingml/shapepropertiescontext.hxx
index 31da8a9c0f23..ac4f9d7589c9 100644
--- a/include/oox/drawingml/shapepropertiescontext.hxx
+++ b/include/oox/drawingml/shapepropertiescontext.hxx
@@ -20,17 +20,17 @@
 #ifndef OOX_DRAWINGML_SHAPEPROPERTIESCONTEXT_HXX
 #define OOX_DRAWINGML_SHAPEPROPERTIESCONTEXT_HXX
 
-#include "oox/core/contexthandler.hxx"
+#include "oox/core/contexthandler2.hxx"
 #include "oox/drawingml/shape.hxx"
 
 namespace oox { namespace drawingml {
 
-class ShapePropertiesContext : public ::oox::core::ContextHandler
+class ShapePropertiesContext : public ::oox::core::ContextHandler2
 {
 public:
-    ShapePropertiesContext( ::oox::core::ContextHandler& rParent, Shape& rShape );
+    ShapePropertiesContext( ::oox::core::ContextHandler2Helper& rParent, Shape& rShape );
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+    virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE;
 
 protected:
     Shape&              mrShape;
diff --git a/include/oox/drawingml/shapestylecontext.hxx b/include/oox/drawingml/shapestylecontext.hxx
index 88338a16b59a..e7b888fa9a6c 100644
--- a/include/oox/drawingml/shapestylecontext.hxx
+++ b/include/oox/drawingml/shapestylecontext.hxx
@@ -21,18 +21,17 @@
 #define OOX_DRAWINGML_SHAPESTYLECONTEXT_HXX
 
 #include "oox/drawingml/shape.hxx"
-#include "oox/core/contexthandler.hxx"
+#include "oox/core/contexthandler2.hxx"
 
 namespace oox { namespace drawingml {
 
-class ShapeStyleContext : public ::oox::core::ContextHandler
+class ShapeStyleContext : public ::oox::core::ContextHandler2
 {
 public:
-    ShapeStyleContext( ::oox::core::ContextHandler& rParent, Shape& rShape );
+    ShapeStyleContext( ::oox::core::ContextHandler2Helper& rParent, Shape& rShape );
     ~ShapeStyleContext();
 
-    virtual void SAL_CALL endFastElement( ::sal_Int32 Element ) 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 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+    virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE;
 
 protected:
     Shape&              mrShape;
diff --git a/include/oox/drawingml/spdefcontext.hxx b/include/oox/drawingml/spdefcontext.hxx
index 1fa773fb57dc..00906e1458a2 100644
--- a/include/oox/drawingml/spdefcontext.hxx
+++ b/include/oox/drawingml/spdefcontext.hxx
@@ -21,15 +21,15 @@
 #define OOX_DRAWINGML_SPDEFCONTEXT_HXX
 
 #include "oox/drawingml/shape.hxx"
-#include "oox/core/contexthandler.hxx"
+#include "oox/core/contexthandler2.hxx"
 
 namespace oox { namespace drawingml {
 
-class spDefContext : public oox::core::ContextHandler
+class spDefContext : public oox::core::ContextHandler2
 {
 public:
-    spDefContext( ::oox::core::ContextHandler& rParent, Shape& rDefaultObject );
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+    spDefContext( ::oox::core::ContextHandler2Helper& rParent, Shape& rDefaultObject );
+    virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE;
 
 protected:
     Shape& mrDefaultObject;
diff --git a/include/oox/drawingml/table/tablebackgroundstylecontext.hxx b/include/oox/drawingml/table/tablebackgroundstylecontext.hxx
index 185987df8ad7..5082362c64f2 100644
--- a/include/oox/drawingml/table/tablebackgroundstylecontext.hxx
+++ b/include/oox/drawingml/table/tablebackgroundstylecontext.hxx
@@ -21,18 +21,18 @@
 #ifndef OOX_DRAWINGML_TABLEBACKGROUNDSTYLECONTEXT
 #define OOX_DRAWINGML_TABLEBACKGROUNDSTYLECONTEXT
 
-#include "oox/core/contexthandler.hxx"
+#include "oox/core/contexthandler2.hxx"
 #include "oox/drawingml/table/tablestyle.hxx"
 
 namespace oox { namespace drawingml { namespace table {
 
-class TableBackgroundStyleContext : public ::oox::core::ContextHandler
+class TableBackgroundStyleContext : public ::oox::core::ContextHandler2
 {
 public:
-    TableBackgroundStyleContext( ::oox::core::ContextHandler& rParent, TableStyle& rTableStyle );
+    TableBackgroundStyleContext( ::oox::core::ContextHandler2Helper& rParent, TableStyle& rTableStyle );
     ~TableBackgroundStyleContext();
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+    virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE;
 
 private:
 
diff --git a/include/oox/drawingml/table/tablecellcontext.hxx b/include/oox/drawingml/table/tablecellcontext.hxx
index a2c04bbff9a7..24de66c19566 100644
--- a/include/oox/drawingml/table/tablecellcontext.hxx
+++ b/include/oox/drawingml/table/tablecellcontext.hxx
@@ -26,14 +26,14 @@
 
 namespace oox { namespace drawingml { namespace table {
 
-class TableCellContext : public ::oox::core::ContextHandler
+class TableCellContext : public ::oox::core::ContextHandler2
 {
 public:
-    TableCellContext( ::oox::core::ContextHandler& rParent,
-        const com::sun::star::uno::Reference< com::sun::star::xml::sax::XFastAttributeList >& xAttribs, TableCell& rTableCell );
+    TableCellContext( ::oox::core::ContextHandler2Helper& rParent,
+        const ::oox::AttributeList& rAttribs, TableCell& rTableCell );
     ~TableCellContext();
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+    virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE;
 
 private:
 
@@ -42,7 +42,6 @@ private:
 
 } } }
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/oox/drawingml/table/tablepartstylecontext.hxx b/include/oox/drawingml/table/tablepartstylecontext.hxx
index 14b38547d9f4..4a0df7c4d0e7 100644
--- a/include/oox/drawingml/table/tablepartstylecontext.hxx
+++ b/include/oox/drawingml/table/tablepartstylecontext.hxx
@@ -21,18 +21,18 @@
 #ifndef OOX_DRAWINGML_TABLEPARTSTYLECONTEXT
 #define OOX_DRAWINGML_TABLEPARTSTYLECONTEXT
 
-#include "oox/core/contexthandler.hxx"
+#include "oox/core/contexthandler2.hxx"
 #include "oox/drawingml/table/tablestylepart.hxx"
 
 namespace oox { namespace drawingml { namespace table {
 
-class TablePartStyleContext : public ::oox::core::ContextHandler
+class TablePartStyleContext : public ::oox::core::ContextHandler2
 {
 public:
-    TablePartStyleContext( ::oox::core::ContextHandler& rParent, TableStylePart& rTableStylePart );
+    TablePartStyleContext( ::oox::core::ContextHandler2Helper& rParent, TableStylePart& rTableStylePart );
     ~TablePartStyleContext();
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+    virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE;
 
 private:
 
@@ -41,7 +41,6 @@ private:
 
 } } }
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/oox/drawingml/table/tablerowcontext.hxx b/include/oox/drawingml/table/tablerowcontext.hxx
index 58ab0da0cd3a..68e35d433246 100644
--- a/include/oox/drawingml/table/tablerowcontext.hxx
+++ b/include/oox/drawingml/table/tablerowcontext.hxx
@@ -21,20 +21,20 @@
 #ifndef OOX_DRAWINGML_TABLEROWCONTEXT
 #define OOX_DRAWINGML_TABLEROWCONTEXT
 
-#include "oox/core/contexthandler.hxx"
+#include "oox/core/contexthandler2.hxx"
 
 namespace oox { namespace drawingml { namespace table {
 
 class TableRow;
 
-class TableRowContext : public ::oox::core::ContextHandler
+class TableRowContext : public ::oox::core::ContextHandler2
 {
 public:
-    TableRowContext( ::oox::core::ContextHandler& rParent,
-        const com::sun::star::uno::Reference< com::sun::star::xml::sax::XFastAttributeList >& xAttribs, TableRow& rTableRow );
+    TableRowContext( ::oox::core::ContextHandler2Helper& rParent,
+                     const ::oox::AttributeList& rAttribs, TableRow& rTableRow );
     ~TableRowContext();
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+    virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE;
 
 private:
 
@@ -43,7 +43,6 @@ private:
 
 } } }
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/oox/drawingml/table/tablestylecellstylecontext.hxx b/include/oox/drawingml/table/tablestylecellstylecontext.hxx
index ae0997ab6d88..8eb477fd339f 100644
--- a/include/oox/drawingml/table/tablestylecellstylecontext.hxx
+++ b/include/oox/drawingml/table/tablestylecellstylecontext.hxx
@@ -21,28 +21,26 @@
 #ifndef OOX_DRAWINGML_TABLESTYLECELLSTYLECONTEXT
 #define OOX_DRAWINGML_TABLESTYLECELLSTYLECONTEXT
 
-#include "oox/core/contexthandler.hxx"
+#include "oox/core/contexthandler2.hxx"
 #include "oox/drawingml/table/tablestylepart.hxx"
 
 namespace oox { namespace drawingml { namespace table {
 
-class TableStyleCellStyleContext : public ::oox::core::ContextHandler
+class TableStyleCellStyleContext : public ::oox::core::ContextHandler2
 {
 public:
-    TableStyleCellStyleContext( ::oox::core::ContextHandler& rParent, TableStylePart& rTableStylePart );
+    TableStyleCellStyleContext( ::oox::core::ContextHandler2Helper& rParent, TableStylePart& rTableStylePart );
     ~TableStyleCellStyleContext();
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+    virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE;
 
 private:
-
     TableStylePart&             mrTableStylePart;
     sal_Int32                   mnLineType;
 };
 
 } } }
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/oox/drawingml/table/tablestylecontext.hxx b/include/oox/drawingml/table/tablestylecontext.hxx
index f9600d38365c..9dd1be81172c 100644
--- a/include/oox/drawingml/table/tablestylecontext.hxx
+++ b/include/oox/drawingml/table/tablestylecontext.hxx
@@ -21,29 +21,27 @@
 #ifndef OOX_DRAWINGML_TABLESTYLECONTEXT
 #define OOX_DRAWINGML_TABLESTYLECONTEXT
 
-#include "oox/core/contexthandler.hxx"
+#include "oox/core/contexthandler2.hxx"
 #include "oox/drawingml/table/tablestyle.hxx"
 
 namespace oox { namespace drawingml { namespace table {
 
-class TableStyleContext : public ::oox::core::ContextHandler
+class TableStyleContext : public ::oox::core::ContextHandler2
 {
 public:
-    TableStyleContext( ::oox::core::ContextHandler& rParent,
-        const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs,
+    TableStyleContext( ::oox::core::ContextHandler2Helper& rParent,
+            const ::oox::AttributeList& rAttribs,
             TableStyle& rTableStyle );
     ~TableStyleContext();
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+    virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE;
 
 private:
-
     TableStyle& mrTableStyle;
 };
 
 } } }
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/oox/drawingml/table/tablestyletextstylecontext.hxx b/include/oox/drawingml/table/tablestyletextstylecontext.hxx
index 10714743ad58..eb10bb89d6ab 100644
--- a/include/oox/drawingml/table/tablestyletextstylecontext.hxx
+++ b/include/oox/drawingml/table/tablestyletextstylecontext.hxx
@@ -26,24 +26,22 @@
 
 namespace oox { namespace drawingml { namespace table {
 
-class TableStyleTextStyleContext : public ::oox::core::ContextHandler
+class TableStyleTextStyleContext : public ::oox::core::ContextHandler2
 {
 public:
-    TableStyleTextStyleContext( ::oox::core::ContextHandler& rParent,
-        const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs,
+    TableStyleTextStyleContext( ::oox::core::ContextHandler2Helper& rParent,
+            const ::oox::AttributeList& rAttribs,
             TableStylePart& rTableStylePart );
     ~TableStyleTextStyleContext();
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+    virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE;
 
 private:
-
     TableStylePart& mrTableStylePart;
 };
 
 } } }
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/oox/drawingml/textbodycontext.hxx b/include/oox/drawingml/textbodycontext.hxx
index d46272e853a6..aaa6f97e187a 100644
--- a/include/oox/drawingml/textbodycontext.hxx
+++ b/include/oox/drawingml/textbodycontext.hxx
@@ -24,17 +24,16 @@
 
 #include "oox/drawingml/textbody.hxx"
 #include "oox/drawingml/textrun.hxx"
-#include "oox/core/contexthandler.hxx"
+#include "oox/core/contexthandler2.hxx"
 
 namespace oox { namespace drawingml {
 
-class TextBodyContext : public ::oox::core::ContextHandler
+class TextBodyContext : public ::oox::core::ContextHandler2
 {
 public:
-    TextBodyContext( ::oox::core::ContextHandler& rParent, TextBody& rTextBody );
+    TextBodyContext( ::oox::core::ContextHandler2Helper& rParent, TextBody& rTextBody );
 
-    virtual void SAL_CALL endFastElement( ::sal_Int32 Element ) 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 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+    virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE;
 
 protected:
     TextBody&           mrTextBody;
@@ -42,14 +41,14 @@ protected:
 };
 
 // CT_RegularTextRun
-class RegularTextRunContext : public ::oox::core::ContextHandler
+class RegularTextRunContext : public ::oox::core::ContextHandler2
 {
 public:
-    RegularTextRunContext( ::oox::core::ContextHandler& rParent, TextRunPtr pRunPtr );
+    RegularTextRunContext( ::oox::core::ContextHandler2Helper& rParent, TextRunPtr pRunPtr );
 
-    virtual void SAL_CALL endFastElement( ::sal_Int32 Element ) 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 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL onEndElement() SAL_OVERRIDE;
+    virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE;
+    virtual void SAL_CALL onCharacters( const OUString& aChars ) SAL_OVERRIDE;
 
 protected:
     TextRunPtr          mpRunPtr;
diff --git a/include/oox/drawingml/textbodypropertiescontext.hxx b/include/oox/drawingml/textbodypropertiescontext.hxx
index e907a60b94d8..2c0ba15e106a 100644
--- a/include/oox/drawingml/textbodypropertiescontext.hxx
+++ b/include/oox/drawingml/textbodypropertiescontext.hxx
@@ -20,21 +20,20 @@
 #ifndef OOX_DRAWINGML_TEXTBODYPROPERTIESCONTEXT_HXX
 #define OOX_DRAWINGML_TEXTBODYPROPERTIESCONTEXT_HXX
 
-#include "oox/core/contexthandler.hxx"
+#include "oox/core/contexthandler2.hxx"
 
 namespace oox { namespace drawingml {
 
 struct TextBodyProperties;
 
-class TextBodyPropertiesContext : public ::oox::core::ContextHandler
+class TextBodyPropertiesContext : public ::oox::core::ContextHandler2
 {
 public:
-    TextBodyPropertiesContext( ::oox::core::ContextHandler& rParent,
-             const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttributes,
+    TextBodyPropertiesContext( ::oox::core::ContextHandler2Helper& rParent,
+             const ::oox::AttributeList& rAttributes,
              TextBodyProperties& rTextBodyProp );
 
-    virtual void SAL_CALL endFastElement( ::sal_Int32 Element ) 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 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+    virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE;
 
 protected:
     TextBodyProperties& mrTextBodyProp;
diff --git a/include/oox/drawingml/textcharacterpropertiescontext.hxx b/include/oox/drawingml/textcharacterpropertiescontext.hxx
index f31e86b27ca4..c6efcbded67f 100644
--- a/include/oox/drawingml/textcharacterpropertiescontext.hxx
+++ b/include/oox/drawingml/textcharacterpropertiescontext.hxx
@@ -20,22 +20,21 @@
 #ifndef OOX_DRAWINGML_TEXTCHARACTERPROPERTIESCONTEXT_HXX
 #define OOX_DRAWINGML_TEXTCHARACTERPROPERTIESCONTEXT_HXX
 
-#include "oox/core/contexthandler.hxx"
+#include "oox/core/contexthandler2.hxx"
 
 namespace oox { namespace drawingml {
 
 struct TextCharacterProperties;
 
-class TextCharacterPropertiesContext : public ::oox::core::ContextHandler
+class TextCharacterPropertiesContext : public ::oox::core::ContextHandler2
 {
 public:
-    TextCharacterPropertiesContext( ::oox::core::ContextHandler& rParent,
-        const com::sun::star::uno::Reference< com::sun::star::xml::sax::XFastAttributeList >& rXAttributes,
+    TextCharacterPropertiesContext( ::oox::core::ContextHandler2Helper& rParent,
+            const ::oox::AttributeList& rAttribs,
             TextCharacterProperties& rTextCharacterProperties );
     virtual ~TextCharacterPropertiesContext();
 
-    virtual void SAL_CALL endFastElement( ::sal_Int32 Element ) 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 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+    virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE;
 
 protected:
     TextCharacterProperties& mrTextCharacterProperties;
diff --git a/include/oox/drawingml/textfieldcontext.hxx b/include/oox/drawingml/textfieldcontext.hxx
index 3a50ea93620f..3b0314b177ec 100644
--- a/include/oox/drawingml/textfieldcontext.hxx
+++ b/include/oox/drawingml/textfieldcontext.hxx
@@ -20,24 +20,23 @@
 #ifndef OOX_DRAWINGML_TEXTFIELDCONTEXT_HXX
 #define OOX_DRAWINGML_TEXTFIELDCONTEXT_HXX
 
-#include "oox/core/contexthandler.hxx"
+#include "oox/core/contexthandler2.hxx"
 
 namespace oox { namespace drawingml {
 
 class TextField;
 
 class TextFieldContext
-    : public ::oox::core::ContextHandler
+    : public ::oox::core::ContextHandler2
 {
 public:
-    TextFieldContext( ::oox::core::ContextHandler& rParent,
-                        const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rXAttributes,
+    TextFieldContext( ::oox::core::ContextHandler2Helper& rParent,
+                        const ::oox::AttributeList& rAttributes,
                         TextField& rTextField);
-    virtual void SAL_CALL endFastElement( sal_Int32 aElementToken ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL characters( const OUString& aChars ) 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 >& rXAttributes )
-        throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+    virtual void onEndElement( ) SAL_OVERRIDE;
+    virtual void onCharacters( const OUString& aChars ) SAL_OVERRIDE;
+    virtual ::oox::core::ContextHandlerRef onCreateContext(
+        sal_Int32 aElementToken, const ::oox::AttributeList& rAttributes ) SAL_OVERRIDE;
 
 private:
     TextField& mrTextField;
@@ -46,7 +45,6 @@ private:
 
 } }
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/oox/drawingml/textliststylecontext.hxx b/include/oox/drawingml/textliststylecontext.hxx
index 2d480c709be5..41bdcb717288 100644
--- a/include/oox/drawingml/textliststylecontext.hxx
+++ b/include/oox/drawingml/textliststylecontext.hxx
@@ -21,18 +21,17 @@
 #define OOX_DRAWINGML_TEXTLISTSTYLECONTEXT_HXX
 
 #include "oox/drawingml/textliststyle.hxx"
-#include "oox/core/contexthandler.hxx"
+#include "oox/core/contexthandler2.hxx"
 
 namespace oox { namespace drawingml {
 
-class TextListStyleContext : public ::oox::core::ContextHandler
+class TextListStyleContext : public ::oox::core::ContextHandler2
 {
 public:
-    TextListStyleContext( ::oox::core::ContextHandler& rParent, TextListStyle& rTextListStyle );
+    TextListStyleContext( ::oox::core::ContextHandler2Helper& rParent, TextListStyle& rTextListStyle );
     ~TextListStyleContext();
 
-    virtual void SAL_CALL endFastElement( ::sal_Int32 Element ) 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 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+    virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE;
 
 protected:
     TextListStyle& mrTextListStyle;
diff --git a/include/oox/drawingml/textparagraphpropertiescontext.hxx b/include/oox/drawingml/textparagraphpropertiescontext.hxx
index db0f3426a680..12b8f1b4aa05 100644
--- a/include/oox/drawingml/textparagraphpropertiescontext.hxx
+++ b/include/oox/drawingml/textparagraphpropertiescontext.hxx
@@ -26,20 +26,19 @@
 #include "oox/drawingml/drawingmltypes.hxx"
 #include "oox/drawingml/textparagraphproperties.hxx"
 #include "oox/drawingml/textspacing.hxx"
-#include "oox/core/contexthandler.hxx"
+#include "oox/core/contexthandler2.hxx"
 
 namespace oox { namespace drawingml {
 
-class TextParagraphPropertiesContext : public ::oox::core::ContextHandler
+class TextParagraphPropertiesContext : public ::oox::core::ContextHandler2
 {
 public:
-    TextParagraphPropertiesContext( ::oox::core::ContextHandler& rParent,
-        const com::sun::star::uno::Reference< com::sun::star::xml::sax::XFastAttributeList >& rXAttributes,
+    TextParagraphPropertiesContext( ::oox::core::ContextHandler2Helper& rParent,
+            const ::oox::AttributeList& rAttributes,
             TextParagraphProperties& rTextParagraphProperties );
     ~TextParagraphPropertiesContext();
 
-    virtual void SAL_CALL endFastElement( ::sal_Int32 Element ) 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 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+    virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE;
 
 protected:
     TextParagraphProperties& mrTextParagraphProperties;
diff --git a/include/oox/drawingml/themeelementscontext.hxx b/include/oox/drawingml/themeelementscontext.hxx
index a3d36a9d8225..14bc601e157f 100644
--- a/include/oox/drawingml/themeelementscontext.hxx
+++ b/include/oox/drawingml/themeelementscontext.hxx
@@ -20,29 +20,24 @@
 #ifndef OOX_DRAWINGML_THEMEELEMENTSCONTEXT_HXX
 #define OOX_DRAWINGML_THEMEELEMENTSCONTEXT_HXX
 
-#include "oox/core/contexthandler.hxx"
+#include "oox/core/contexthandler2.hxx"
 
 namespace oox {
 namespace drawingml {
 
 class Theme;
 
-// ============================================================================
-
-class ThemeElementsContext : public oox::core::ContextHandler
+class ThemeElementsContext : public oox::core::ContextHandler2
 {
 public:
-    ThemeElementsContext( ::oox::core::ContextHandler& rParent, Theme& rTheme );
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 nElement,
-        const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs )
-            throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+    ThemeElementsContext( ::oox::core::ContextHandler2Helper& rParent, Theme& rTheme );
+    virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement,
+        const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE;
 
 private:
     Theme& mrTheme;
 };
 
-// ============================================================================
-
 } // namespace drawingml
 } // namespace oox
 
diff --git a/include/oox/drawingml/transform2dcontext.hxx b/include/oox/drawingml/transform2dcontext.hxx
index 6bbbe191e77c..a3ad02164a13 100644
--- a/include/oox/drawingml/transform2dcontext.hxx
+++ b/include/oox/drawingml/transform2dcontext.hxx
@@ -20,30 +20,26 @@
 #ifndef OOX_DRAWINGML_TRANSFORM2DCONTEXT_HXX
 #define OOX_DRAWINGML_TRANSFORM2DCONTEXT_HXX
 
-#include "oox/core/contexthandler.hxx"
+#include "oox/core/contexthandler2.hxx"
 
 namespace oox {
 namespace drawingml {
 
-// ============================================================================
-
 class Shape;
 
 /** context to import a CT_Transform2D */
-class Transform2DContext : public ::oox::core::ContextHandler
+class Transform2DContext : public ::oox::core::ContextHandler2
 {
 public:
-    Transform2DContext( ::oox::core::ContextHandler& rParent,
-        const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttributes, Shape& rShape, bool btxXfrm = false ) throw();
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+    Transform2DContext( ::oox::core::ContextHandler2Helper& rParent,
+                        const ::oox::AttributeList& rAttributes, Shape& rShape, bool btxXfrm = false ) throw();
+    virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE;
 
 protected:
     Shape&              mrShape;
     bool                mbtxXfrm;
 };
 
-// ============================================================================
-
 } // namespace drawingml
 } // namespace oox
 
diff --git a/include/oox/ppt/pptshapepropertiescontext.hxx b/include/oox/ppt/pptshapepropertiescontext.hxx
index f979c6efd3db..eddf70dbf62c 100644
--- a/include/oox/ppt/pptshapepropertiescontext.hxx
+++ b/include/oox/ppt/pptshapepropertiescontext.hxx
@@ -27,10 +27,9 @@ namespace oox { namespace ppt {
 class PPTShapePropertiesContext : public ::oox::drawingml::ShapePropertiesContext
 {
 public:
-    PPTShapePropertiesContext( ::oox::core::ContextHandler& rParent, ::oox::drawingml::Shape& rShape );
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL
-        createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs )
-            throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+    PPTShapePropertiesContext( ::oox::core::ContextHandler2Helper& rParent, ::oox::drawingml::Shape& rShape );
+    virtual ::oox::core::ContextHandlerRef
+        onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE;
 };
 
 } }