INTEGRATION: CWS koheidatapilot01 (1.8.112); FILE MERGED

2008/04/25 20:59:13 kohei 1.8.112.7: RESYNC: (1.9-1.10); FILE MERGED
2007/12/04 06:06:26 kohei 1.8.112.6: more code change to totally replace ScDPPositionData with its UNO equivalent & some more code cleanups.
2007/12/04 04:29:00 kohei 1.8.112.5: some API method re-name & associated changes.
2007/11/09 02:12:08 kohei 1.8.112.4: renamed one method & some minor code change to make more use of cache table.
2007/11/08 18:03:19 kohei 1.8.112.3: implemented UNO's getPositionData method & expose dimension counts via DataSource properties.
2007/11/03 18:09:28 kohei 1.8.112.2: implemented getOutputRangeByType() and fixed interface querying issue with XDataPilotTable2.
2007/10/29 17:44:39 kohei 1.8.112.1: initial checkin

1 files changed, 16 insertions, 17 deletions

diff --git a/sc/inc/dpoutput.hxx b/sc/inc/dpoutput.hxx
index 91c6f47fa3d1..fe77233261b1 100644
--- a/sc/inc/dpoutput.hxx
+++ b/sc/inc/dpoutput.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: dpoutput.hxx,v $
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -35,13 +35,17 @@
 #include <com/sun/star/sheet/DataResult.hpp>
 #include <com/sun/star/sheet/MemberResult.hpp>
 #include <com/sun/star/sheet/GeneralFunction.hpp>
+#include <com/sun/star/sheet/DataPilotOutputRangeType.hpp>
+
 #include "global.hxx"
 #include "address.hxx"
 
+#include "dpcachetable.hxx"
 #include <vector>
 
 namespace com { namespace sun { namespace star { namespace sheet {
     struct DataPilotFieldFilter;
+    struct DataPilotTablePositionData;
 }}}}
 
 class Rectangle;
@@ -52,19 +56,6 @@ class StrCollection;
 struct ScDPOutLevelData;
 
 
-
-
-struct ScDPPositionData
-{
-    long    nDimension;
-    long    nHierarchy;
-    long    nLevel;
-    long    nFlags;
-    String  aMemberName;
-
-    ScDPPositionData() { nDimension = nHierarchy = nLevel = -1; nFlags = 0; }   // invalid
-};
-
 struct ScDPGetPivotDataField
 {
     String maFieldName;
@@ -104,12 +95,15 @@ private:
             com::sun::star::sheet::DataResult> > aData;
     BOOL                    bResultsError;
     String                  aDataDescription;
+
+    // Number format related parameters
     UINT32*                 pColNumFmt;
     UINT32*                 pRowNumFmt;
     long                    nColFmtCount;
     long                    nRowFmtCount;
     UINT32                  nSingleNumFmt;
 
+    // Output geometry related parameters
     BOOL                    bSizesValid;
     BOOL                    bSizeOverflow;
     long                    nColCount;
@@ -133,6 +127,11 @@ private:
                                 BOOL bFrame = TRUE );
     void            CalcSizes();
 
+    /** Query which sub-area of the table the cell is in. See
+        css.sheet.DataPilotTablePositionType for the interpretation of the
+        return value. */
+    sal_Int32       GetPositionType(const ScAddress& rPos);
+
 public:
                     ScDPOutput( ScDocument* pD,
                                 const com::sun::star::uno::Reference<
@@ -143,15 +142,15 @@ public:
     void            SetPosition( const ScAddress& rPos );
 
     void            Output();           //! Refresh?
-    ScRange         GetOutputRange();
+    ScRange         GetOutputRange( sal_Int32 nRegionType = ::com::sun::star::sheet::DataPilotOutputRangeType::WHOLE );
     long            GetHeaderRows();
     BOOL            HasError();         // range overflow or exception from source
 
-    void            GetPositionData( ScDPPositionData& rData, const ScAddress& rPos );
+    void            GetPositionData(const ScAddress& rPos, ::com::sun::star::sheet::DataPilotTablePositionData& rPosData);
 
     /** Get filtering criteria based on the position of the cell within data
         field region. */
-    bool            GetDataFieldPositionData(::std::vector< ::com::sun::star::sheet::DataPilotFieldFilter >& rFilters, const ScAddress& rPos);
+    bool            GetDataResultPositionData(::std::vector< ::com::sun::star::sheet::DataPilotFieldFilter >& rFilters, const ScAddress& rPos);
 
     BOOL            GetPivotData( ScDPGetPivotDataField& rTarget, /* returns result */
                                   const std::vector< ScDPGetPivotDataField >& rFilters );