INTEGRATION: CWS xmlfilter03_DEV300 (1.2.4); FILE MERGED

2008/02/11 10:27:57 dr 1.2.4.4: comments
2008/02/05 14:05:42 dr 1.2.4.3: oox::core::ContextHandler2 and oox::core::FragmentHandler2 for convenience
2008/02/04 13:32:17 dr 1.2.4.2: rework of fragment handler/context handler base classes
2008/01/25 12:51:28 dr 1.2.4.1: simplified OoxContextHelper interface

2 files changed, 13 insertions, 14 deletions

diff --git a/oox/inc/oox/xls/autofiltercontext.hxx b/oox/inc/oox/xls/autofiltercontext.hxx
index beece28d0136..776eb8d8e0f6 100644
--- a/oox/inc/oox/xls/autofiltercontext.hxx
+++ b/oox/inc/oox/xls/autofiltercontext.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: autofiltercontext.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2008-01-17 08:05:48 $
+ *  last change: $Author: kz $ $Date: 2008-03-05 17:59:33 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -38,8 +38,7 @@
 
 #define USE_SC_MULTI_STRING_FILTER_PATCH 0
 
-#include "oox/xls/ooxcontexthandler.hxx"
-#include "oox/xls/worksheethelper.hxx"
+#include "oox/xls/excelhandlers.hxx"
 #include <com/sun/star/table/CellRangeAddress.hpp>
 
 #if USE_SC_MULTI_STRING_FILTER_PATCH
@@ -87,12 +86,12 @@ struct FilterFieldItem
 class OoxAutoFilterContext : public OoxWorksheetContextBase
 {
 public:
-    explicit            OoxAutoFilterContext( const OoxWorksheetFragmentBase& rFragment );
+    explicit            OoxAutoFilterContext( OoxWorksheetFragmentBase& rFragment );
 
 protected:
-    // oox.xls.OoxContextHelper interface -------------------------------------
+    // oox.core.ContextHandler2Helper interface -------------------------------
 
-    virtual bool        onCanCreateContext( sal_Int32 nElement ) const;
+    virtual ContextWrapper onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
     virtual void        onStartElement( const AttributeList& rAttribs );
     virtual void        onEndElement( const ::rtl::OUString& rChars );
 
diff --git a/oox/inc/oox/xls/condformatcontext.hxx b/oox/inc/oox/xls/condformatcontext.hxx
index 758d5fb3142c..a1603dca280f 100644
--- a/oox/inc/oox/xls/condformatcontext.hxx
+++ b/oox/inc/oox/xls/condformatcontext.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: condformatcontext.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2008-01-17 08:05:48 $
+ *  last change: $Author: kz $ $Date: 2008-03-05 18:02:14 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -37,7 +37,7 @@
 #define OOX_XLS_CONDFORMATCONTEXT_HXX
 
 #include "oox/xls/condformatbuffer.hxx"
-#include "oox/xls/ooxcontexthandler.hxx"
+#include "oox/xls/excelhandlers.hxx"
 
 namespace oox {
 namespace xls {
@@ -47,16 +47,16 @@ namespace xls {
 class OoxCondFormatContext : public OoxWorksheetContextBase
 {
 public:
-    explicit            OoxCondFormatContext( const OoxWorksheetFragmentBase& rFragment );
+    explicit            OoxCondFormatContext( OoxWorksheetFragmentBase& rFragment );
 
 protected:
-    // oox.xls.OoxContextHelper interface -------------------------------------
+    // oox.core.ContextHandler2Helper interface -------------------------------
 
-    virtual bool        onCanCreateContext( sal_Int32 nElement ) const;
+    virtual ContextWrapper onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
     virtual void        onStartElement( const AttributeList& rAttribs );
     virtual void        onEndElement( const ::rtl::OUString& rChars );
 
-    virtual bool        onCanCreateRecordContext( sal_Int32 nRecId );
+    virtual ContextWrapper onCreateRecordContext( sal_Int32 nRecId, RecordInputStream& rStrm );
     virtual void        onStartRecord( RecordInputStream& rStrm );
 
 private: