INTEGRATION: CWS koheidatapilot01 (1.8.216); FILE MERGED

2008/04/25 20:59:19 kohei 1.8.216.5: RESYNC: (1.10-1.11); FILE MERGED
2007/12/06 06:41:12 kohei 1.8.216.4: properly format the drill-down sheet per data source format & removed unused method.
2007/12/04 16:51:06 kohei 1.8.216.3: RESYNC: (1.8-1.10); FILE MERGED
2007/11/07 03:12:54 kohei 1.8.216.2: We still need to call InitFrom for referenced items, more refactoring and in-line comments, and more const keyword uses for read-only parameters (makes it easier to understand code).
2007/10/29 17:44:39 kohei 1.8.216.1: initial checkin

1 files changed, 24 insertions, 10 deletions

diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx
index 96ab8197cb5a..2fda053e510b 100644
--- a/sc/inc/dptabsrc.hxx
+++ b/sc/inc/dptabsrc.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: dptabsrc.hxx,v $
- * $Revision: 1.11 $
+ * $Revision: 1.12 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -50,6 +50,7 @@
 #include <com/sun/star/sheet/DataPilotFieldReference.hpp>
 #include <com/sun/star/sheet/DataPilotFieldSortInfo.hpp>
 #include <com/sun/star/util/XRefreshable.hpp>
+#include <com/sun/star/sheet/XDrillDownDataSupplier.hpp>
 #include <com/sun/star/util/XCloneable.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -57,11 +58,18 @@
 #include <cppuhelper/implbase2.hxx>
 #include <cppuhelper/implbase3.hxx>
 #include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase6.hxx>
+
 #include "dptabdat.hxx"
 
-namespace com { namespace sun { namespace star { namespace sheet {
-    struct DataPilotFieldFilter;
-}}}}
+namespace com { namespace sun { namespace star {
+    namespace sheet {
+        struct DataPilotFieldFilter;
+    }
+    namespace table {
+        struct CellAddress;
+    }
+}}}
 
 class ScDPResultMember;
 class ScDPResultData;
@@ -91,14 +99,18 @@ class ScDPMembers;
 class ScDPMember;
 
 
-class ScDPSource : public cppu::WeakImplHelper5<
+class ScDPSource : public cppu::WeakImplHelper6<
                             com::sun::star::sheet::XDimensionsSupplier,
                             com::sun::star::sheet::XDataPilotResults,
                             com::sun::star::util::XRefreshable,
+                            com::sun::star::sheet::XDrillDownDataSupplier,
                             com::sun::star::beans::XPropertySet,
                             com::sun::star::lang::XServiceInfo >
 {
 private:
+    void FillCalcInfo(bool bIsRow, ScDPTableData::CalcInfo& rInfo, bool &bHasAutoShow);
+
+private:
     ScDPTableData*          pData;              // data source
     ScDPDimensions*         pDimensions;        // api objects
                                                 // settings:
@@ -125,7 +137,6 @@ private:
     com::sun::star::uno::Sequence<com::sun::star::sheet::MemberResult>* pRowResults;
     List                    aColLevelList;
     List                    aRowLevelList;
-    ScSubTotalFunc          eDataFunctions[SC_DAPI_MAXFIELDS];
     BOOL                    bResultOverflow;
 
     void                    CreateRes_Impl();
@@ -166,9 +177,6 @@ public:
 
     void                    DumpState( ScDocument* pDoc, const ScAddress& rPos );
 
-    void                    WriteDrillDownData( ScDocument* pDoc, const ScAddress& rPos,
-                                    const ::std::vector< ::com::sun::star::sheet::DataPilotFieldFilter > rFilters );
-
                             // XDimensionsSupplier
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >
                             SAL_CALL getDimensions(  )
@@ -188,6 +196,12 @@ public:
                                     ::com::sun::star::util::XRefreshListener >& l )
                                 throw(::com::sun::star::uno::RuntimeException);
 
+                            // XDrillDownDataSupplier
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >
+        SAL_CALL getDrillDownData(const ::com::sun::star::uno::Sequence<
+                                      ::com::sun::star::sheet::DataPilotFieldFilter >& aFilters )
+                                throw(::com::sun::star::uno::RuntimeException);
+
                             // XPropertySet
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >
                             SAL_CALL getPropertySetInfo(  )
@@ -304,7 +318,7 @@ class ScDPDimension : public cppu::WeakImplHelper5<
 {
 private:
     ScDPSource*         pSource;
-    long                nDim;
+    long                nDim;               // dimension index (== column ID)
     ScDPHierarchies*    pHierarchies;
     long                nUsedHier;
     USHORT              nFunction;          // enum GeneralFunction