INTEGRATION: CWS xmlfilter03_DEV300 (1.2.4); FILE MERGED

2008/02/06 10:11:10 dr 1.2.4.2: implement ThemeFragmentHandler using FragmentHandler2
2008/02/04 13:31:34 dr 1.2.4.1: rework of fragment handler/context handler base classes

2 files changed, 29 insertions, 25 deletions

diff --git a/oox/inc/oox/drawingml/shapegroupcontext.hxx b/oox/inc/oox/drawingml/shapegroupcontext.hxx
index 9afc48215a7d..8f028561fe1f 100644
--- a/oox/inc/oox/drawingml/shapegroupcontext.hxx
+++ b/oox/inc/oox/drawingml/shapegroupcontext.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: shapegroupcontext.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2008-01-17 08:05:45 $
+ *  last change: $Author: kz $ $Date: 2008-03-05 17:42:42 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -41,20 +41,17 @@
 
 namespace oox { namespace drawingml {
 
-class ShapeGroupContext : public ::oox::core::Context
+class ShapeGroupContext : public ::oox::core::ContextHandler
 {
 public:
-    ShapeGroupContext( const ::oox::core::FragmentHandlerRef& xHandler, sal_Int32 aElementToken,
-        oox::drawingml::ShapePtr pMasterShapePtr, oox::drawingml::ShapePtr pGroupShapePtr );
+    ShapeGroupContext( ::oox::core::ContextHandler& rParent, ShapePtr pMasterShapePtr, ShapePtr pGroupShapePtr );
     virtual ~ShapeGroupContext();
     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);
 
-    const ::oox::core::XmlFilterRef& GetFilter() const { return mxHandler->getFilter(); }
-
 protected:
 
-    oox::drawingml::ShapePtr    mpGroupShapePtr;
-    oox::drawingml::ShapePtr    mpMasterShapePtr;
+    ShapePtr            mpGroupShapePtr;
+    ShapePtr            mpMasterShapePtr;
 };
 
 } }
diff --git a/oox/inc/oox/drawingml/themefragmenthandler.hxx b/oox/inc/oox/drawingml/themefragmenthandler.hxx
index a816d1d88a4c..3e5a76ed7c23 100644
--- a/oox/inc/oox/drawingml/themefragmenthandler.hxx
+++ b/oox/inc/oox/drawingml/themefragmenthandler.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: themefragmenthandler.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2008-01-17 08:05:46 $
+ *  last change: $Author: kz $ $Date: 2008-03-05 17:47:09 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -33,29 +33,36 @@
  *
  ************************************************************************/
 
-#ifndef OOX_DRAWINGML_THEMEFRAGMENTHANDLER
-#define OOX_DRAWINGML_THEMEFRAGMENTHANDLER
+#ifndef OOX_DRAWINGML_THEMEFRAGMENTHANDLER_HXX
+#define OOX_DRAWINGML_THEMEFRAGMENTHANDLER_HXX
 
-#include "oox/core/fragmenthandler.hxx"
+#include "oox/core/fragmenthandler2.hxx"
 #include "oox/drawingml/theme.hxx"
-#include <vector>
 
-namespace oox { namespace drawingml {
+namespace oox {
+namespace drawingml {
 
-class ThemeFragmentHandler : public ::oox::core::FragmentHandler
+// ============================================================================
+
+class ThemeFragmentHandler : public ::oox::core::FragmentHandler2
 {
 public:
-    ThemeFragmentHandler( const oox::core::XmlFilterRef& xFilter, const ::rtl::OUString& rFragmentPath, oox::drawingml::Theme& rTheme ) throw();
-    virtual ~ThemeFragmentHandler() throw();
+    explicit            ThemeFragmentHandler(
+                            ::oox::core::XmlFilterBase& rFilter,
+                            const ::rtl::OUString& rFragmentPath,
+                            Theme& rTheme );
+    virtual             ~ThemeFragmentHandler();
 
-    virtual void SAL_CALL endDocument() 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::ContextWrapper onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
 
 private:
-
-    oox::drawingml::Theme& mrTheme;
+    Theme&              mrTheme;
 };
 
-} }
+// ============================================================================
+
+} // namespace drawingml
+} // namespace oox
+
+#endif
 
-#endif // OOX_DRAWINGML_THEMEFRAGMENTHANDLER