INTEGRATION: CWS xmlfilter03_DEV300 (1.2.4); FILE MERGED

2008/02/05 14:08:07 dr 1.2.4.2: oox::core::ContextHandler2 and oox::core::FragmentHandler2 for convenience
2008/01/25 12:53:11 dr 1.2.4.1: simplified OoxContextHelper interface

3 files changed, 62 insertions, 62 deletions

diff --git a/oox/source/xls/pivotcachefragment.cxx b/oox/source/xls/pivotcachefragment.cxx
index adc7fe2076cb..e253bc210d3e 100644
--- a/oox/source/xls/pivotcachefragment.cxx
+++ b/oox/source/xls/pivotcachefragment.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: pivotcachefragment.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2008-01-17 08:06:09 $
+ *  last change: $Author: kz $ $Date: 2008-03-05 19:04:00 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -59,24 +59,30 @@ OoxPivotCacheFragment::OoxPivotCacheFragment( const WorkbookHelper& rHelper,
 {
 }
 
-bool OoxPivotCacheFragment::onCanCreateContext( sal_Int32 nElement ) const
+ContextWrapper OoxPivotCacheFragment::onCreateContext( sal_Int32 nElement, const AttributeList& )
 {
-    switch( getCurrentContext() )
+    switch( getCurrentElement() )
     {
-        case XML_ROOT_CONTEXT:                      return nElement == XLS_TOKEN( pivotCacheDefinition );
-        case XLS_TOKEN( pivotCacheDefinition ):     return (nElement == XLS_TOKEN( cacheSource ) ||
-                                                            nElement == XLS_TOKEN( cacheFields ));
-        case XLS_TOKEN( cacheSource ):              return nElement == XLS_TOKEN( worksheetSource );
-        case XLS_TOKEN( cacheFields ):              return nElement == XLS_TOKEN( cacheField );
-        case XLS_TOKEN( cacheField ):               return nElement == XLS_TOKEN( sharedItems );
-        case XLS_TOKEN( sharedItems ):              return nElement == XLS_TOKEN( s );
+        case XML_ROOT_CONTEXT:
+            return  (nElement == XLS_TOKEN( pivotCacheDefinition ));
+        case XLS_TOKEN( pivotCacheDefinition ):
+            return  (nElement == XLS_TOKEN( cacheSource )) ||
+                    (nElement == XLS_TOKEN( cacheFields ));
+        case XLS_TOKEN( cacheSource ):
+            return  (nElement == XLS_TOKEN( worksheetSource ));
+        case XLS_TOKEN( cacheFields ):
+            return  (nElement == XLS_TOKEN( cacheField ));
+        case XLS_TOKEN( cacheField ):
+            return  (nElement == XLS_TOKEN( sharedItems ));
+        case XLS_TOKEN( sharedItems ):
+            return  (nElement == XLS_TOKEN( s ));
     }
     return false;
 }
 
 void OoxPivotCacheFragment::onStartElement( const AttributeList& rAttribs )
 {
-    switch ( getCurrentContext() )
+    switch ( getCurrentElement() )
     {
         case XLS_TOKEN( pivotCacheDefinition ):
             importPivotCacheDefinition( rAttribs );
diff --git a/oox/source/xls/pivottablefragment.cxx b/oox/source/xls/pivottablefragment.cxx
index 48f99cb4d41c..5496133d828c 100644
--- a/oox/source/xls/pivottablefragment.cxx
+++ b/oox/source/xls/pivottablefragment.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: pivottablefragment.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2008-01-17 08:06:09 $
+ *  last change: $Author: kz $ $Date: 2008-03-05 19:04:21 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -38,24 +38,10 @@
 #include "oox/helper/propertyset.hxx"
 #include "oox/xls/addressconverter.hxx"
 
-#define DEBUG_OOX_PIVOTTABLE 1
-
 #include <vector>
-#include <stdexcept>
-#if DEBUG_OOX_PIVOTTABLE
-#include <stdio.h>
-#endif
 
 using ::rtl::OUString;
-using ::com::sun::star::uno::Any;
-using ::com::sun::star::uno::Reference;
-using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::uno::Exception;
-using ::com::sun::star::uno::RuntimeException;
-using ::com::sun::star::uno::UNO_QUERY;
-using ::com::sun::star::uno::UNO_QUERY_THROW;
 using ::com::sun::star::table::CellRangeAddress;
-using ::com::sun::star::xml::sax::SAXException;
 
 namespace oox {
 namespace xls {
@@ -67,36 +53,47 @@ OoxPivotTableFragment::OoxPivotTableFragment(
 {
 }
 
-bool OoxPivotTableFragment::onCanCreateContext( sal_Int32 nElement ) const
+ContextWrapper OoxPivotTableFragment::onCreateContext( sal_Int32 nElement, const AttributeList& )
 {
-    switch( getCurrentContext() )
+    switch( getCurrentElement() )
     {
-        case XML_ROOT_CONTEXT:                      return (nElement == XLS_TOKEN( pivotTableDefinition ));
-        case XLS_TOKEN( pivotTableDefinition ):     return (nElement == XLS_TOKEN( location )) ||
-                                                           (nElement == XLS_TOKEN( pivotFields )) ||
-                                                           (nElement == XLS_TOKEN( rowFields )) ||
-                                                           (nElement == XLS_TOKEN( rowItems )) ||
-                                                           (nElement == XLS_TOKEN( colFields )) ||
-                                                           (nElement == XLS_TOKEN( colItems )) ||
-                                                           (nElement == XLS_TOKEN( pageFields )) ||
-                                                           (nElement == XLS_TOKEN( dataFields )) ||
-                                                           (nElement == XLS_TOKEN( pivotTableStyleInfo ));
-        case XLS_TOKEN( pivotFields ):              return (nElement == XLS_TOKEN( pivotField ));
-        case XLS_TOKEN( pivotField ):               return (nElement == XLS_TOKEN( items ));
-        case XLS_TOKEN( items ):                    return (nElement == XLS_TOKEN( item ));
-        case XLS_TOKEN( rowFields ):                return (nElement == XLS_TOKEN( field ));
-        case XLS_TOKEN( colFields ):                return (nElement == XLS_TOKEN( field ));
-        case XLS_TOKEN( pageFields ):               return (nElement == XLS_TOKEN( pageField ));
-        case XLS_TOKEN( dataFields ):               return (nElement == XLS_TOKEN( dataField ));
-        case XLS_TOKEN( colItems ):                 return (nElement == XLS_TOKEN( i ));
-        case XLS_TOKEN( rowItems ):                 return (nElement == XLS_TOKEN( i ));
+        case XML_ROOT_CONTEXT:
+            return  (nElement == XLS_TOKEN( pivotTableDefinition ));
+        case XLS_TOKEN( pivotTableDefinition ):
+            return  (nElement == XLS_TOKEN( location )) ||
+                    (nElement == XLS_TOKEN( pivotFields )) ||
+                    (nElement == XLS_TOKEN( rowFields )) ||
+                    (nElement == XLS_TOKEN( rowItems )) ||
+                    (nElement == XLS_TOKEN( colFields )) ||
+                    (nElement == XLS_TOKEN( colItems )) ||
+                    (nElement == XLS_TOKEN( pageFields )) ||
+                    (nElement == XLS_TOKEN( dataFields )) ||
+                    (nElement == XLS_TOKEN( pivotTableStyleInfo ));
+        case XLS_TOKEN( pivotFields ):
+            return  (nElement == XLS_TOKEN( pivotField ));
+        case XLS_TOKEN( pivotField ):
+            return  (nElement == XLS_TOKEN( items ));
+        case XLS_TOKEN( items ):
+            return  (nElement == XLS_TOKEN( item ));
+        case XLS_TOKEN( rowFields ):
+            return  (nElement == XLS_TOKEN( field ));
+        case XLS_TOKEN( colFields ):
+            return  (nElement == XLS_TOKEN( field ));
+        case XLS_TOKEN( pageFields ):
+            return  (nElement == XLS_TOKEN( pageField ));
+        case XLS_TOKEN( dataFields ):
+            return  (nElement == XLS_TOKEN( dataField ));
+        case XLS_TOKEN( colItems ):
+            return  (nElement == XLS_TOKEN( i ));
+        case XLS_TOKEN( rowItems ):
+            return  (nElement == XLS_TOKEN( i ));
     }
     return false;
 }
 
 void OoxPivotTableFragment::onStartElement( const AttributeList& rAttribs )
 {
-    switch ( getCurrentContext() )
+    switch ( getCurrentElement() )
     {
         case XLS_TOKEN( pivotTableDefinition ):
             importPivotTableDefinition( rAttribs );
@@ -192,3 +189,4 @@ void OoxPivotTableFragment::importPivotField( const AttributeList& rAttribs )
 
 } // namespace xls
 } // namespace oox
+
diff --git a/oox/source/xls/querytablefragment.cxx b/oox/source/xls/querytablefragment.cxx
index 703ec9f9f156..9ce282588007 100644
--- a/oox/source/xls/querytablefragment.cxx
+++ b/oox/source/xls/querytablefragment.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: querytablefragment.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2008-01-17 08:06:09 $
+ *  last change: $Author: kz $ $Date: 2008-03-05 19:04:38 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -38,12 +38,6 @@
 
 using ::rtl::OUString;
 using ::com::sun::star::uno::Reference;
-using ::com::sun::star::uno::Exception;
-using ::com::sun::star::uno::RuntimeException;
-using ::com::sun::star::uno::UNO_QUERY;
-using ::com::sun::star::uno::UNO_QUERY_THROW;
-using ::com::sun::star::sheet::XSpreadsheet;
-using ::com::sun::star::xml::sax::SAXException;
 
 namespace oox {
 namespace xls {
@@ -54,18 +48,19 @@ OoxQueryTableFragment::OoxQueryTableFragment(
 {
 }
 
-bool OoxQueryTableFragment::onCanCreateContext( sal_Int32 nElement ) const
+ContextWrapper OoxQueryTableFragment::onCreateContext( sal_Int32 nElement, const AttributeList& )
 {
-    switch( getCurrentContext() )
+    switch( getCurrentElement() )
     {
-        case XML_ROOT_CONTEXT: return (nElement == XLS_TOKEN( queryTable ));
+        case XML_ROOT_CONTEXT:
+            return  (nElement == XLS_TOKEN( queryTable ));
     }
     return false;
 }
 
 void OoxQueryTableFragment::onStartElement( const AttributeList& rAttribs )
 {
-    switch ( getCurrentContext() )
+    switch ( getCurrentElement() )
     {
         case XLS_TOKEN( queryTable ):
             importQueryTable( rAttribs );
@@ -80,3 +75,4 @@ void OoxQueryTableFragment::importQueryTable( const AttributeList& rAttribs )
 
 } // namespace xls
 } // namespace oox
+