INTEGRATION: CWS koheidatapilot01 (1.12.112); FILE MERGED

2008/04/25 20:59:22 kohei 1.12.112.7: RESYNC: (1.13-1.14); FILE MERGED
2007/12/04 16:51:09 kohei 1.12.112.6: RESYNC: (1.12-1.13); FILE MERGED
2007/12/04 06:06:26 kohei 1.12.112.5: more code change to totally replace ScDPPositionData with its UNO equivalent & some more code cleanups.
2007/11/08 18:03:19 kohei 1.12.112.4: implemented UNO's getPositionData method & expose dimension counts via DataSource properties.
2007/11/05 19:40:30 kohei 1.12.112.3: Don't show drill-down data when a cell outside the data field area is activated.
2007/11/03 18:09:28 kohei 1.12.112.2: implemented getOutputRangeByType() and fixed interface querying issue with XDataPilotTable2.
2007/10/29 17:44:39 kohei 1.12.112.1: initial checkin

1 files changed, 21 insertions, 8 deletions

diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx
index 5ae81f318de7..0e5dcff76052 100644
--- a/sc/inc/dpobject.hxx
+++ b/sc/inc/dpobject.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: dpobject.hxx,v $
- * $Revision: 1.14 $
+ * $Revision: 1.15 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -40,6 +40,12 @@
 
 //------------------------------------------------------------------
 
+namespace com { namespace sun { namespace star { namespace sheet {
+
+    struct DataPilotTablePositionData;
+    struct DataPilotTableHeaderData;
+
+}}}}
 
 namespace com { namespace sun { namespace star { namespace sheet {
     struct DataPilotFieldFilter;
@@ -49,7 +55,6 @@ class Rectangle;
 class SvStream;
 class ScDPSaveData;
 class ScDPOutput;
-struct ScDPPositionData;
 class ScMultipleReadHeader;
 class ScMultipleWriteHeader;
 class ScPivot;
@@ -60,7 +65,7 @@ struct ScSheetSourceDesc;
 class StrCollection;
 class TypedStrCollection;
 struct PivotField;
-
+class ScDPCacheTable;
 
 struct ScDPServiceDesc
 {
@@ -124,6 +129,7 @@ public:
 
     void                Output();
     ScRange             GetNewOutputRange( BOOL& rOverflow );
+    const ScRange       GetOutputRangeByType( sal_Int32 nType );
 
     void                SetSaveData(const ScDPSaveData& rData);
     ScDPSaveData*       GetSaveData() const     { return pSaveData; }
@@ -157,7 +163,7 @@ public:
     String              GetDimName( long nDim, BOOL& rIsDataLayout );
     BOOL                IsDuplicated( long nDim );
     long                GetDimCount();
-    void                GetPositionData( ScDPPositionData& rData, const ScAddress& rPos );
+    void                GetHeaderPositionData(const ScAddress& rPos, ::com::sun::star::sheet::DataPilotTableHeaderData& rData);
     long                GetHeaderDim( const ScAddress& rPos, USHORT& rOrient );
     BOOL                GetHeaderDrag( const ScAddress& rPos, BOOL bMouseLeft, BOOL bMouseTop,
                                         long nDragDim,
@@ -174,7 +180,7 @@ public:
 
     void                FillPageList( TypedStrCollection& rStrings, long nField );
 
-    void                ToggleDetails( ScDPPositionData& rElemDesc, ScDPObject* pDestObj );
+    void                ToggleDetails(const ::com::sun::star::sheet::DataPilotTableHeaderData& rElemDesc, ScDPObject* pDestObj);
 
     BOOL                StoreOld(SvStream& rStream, ScMultipleWriteHeader& rHdr ) const;
     BOOL                StoreNew(SvStream& rStream, ScMultipleWriteHeader& rHdr ) const;
@@ -205,9 +211,16 @@ public:
     BOOL                RefsEqual( const ScDPObject& r ) const;
     void                WriteRefsTo( ScDPObject& r ) const;
 
-    bool                GetDataFieldPositionData(
-                            ::std::vector< ::com::sun::star::sheet::DataPilotFieldFilter >& rFilters,
-                            const ScAddress& rPos);
+    void                GetPositionData(const ScAddress& rPos, ::com::sun::star::sheet::DataPilotTablePositionData& rPosData);
+
+    bool                GetDataFieldPositionData(const ScAddress& rPos,
+                                                 ::com::sun::star::uno::Sequence<
+                                                    ::com::sun::star::sheet::DataPilotFieldFilter >& rFilters);
+
+    void                GetDrillDownData(const ScAddress& rPos,
+                                         ::com::sun::star::uno::Sequence<
+                                            ::com::sun::star::uno::Sequence<
+                                                ::com::sun::star::uno::Any > >& rTableData);
 
     // apply drop-down attribute, initialize nHeaderRows, without accessing the source
     // (button attribute must be present)