CWS-TOOLING: integrate CWS koheidatapilot02

2008-11-24 15:34:25 +0100 kohei  r264231 : modified ScViewData::IsMultiMarked() to treat simple-filtered areas as simple-marked areas,
for backword compatibility.  Simple-filtered areas are not multi-marked areas.
2008-11-07 20:38:51 +0100 kohei  r263485 : more unused methods in the header without definitions.
2008-11-07 20:26:25 +0100 kohei  r263484 : removed more unused methods.
2008-11-07 19:40:39 +0100 kohei  r263481 : removed unused methods based on Caolan's callcatcher output on m35.
2008-11-06 19:32:22 +0100 kohei  r263405 : CWS-TOOLING: rebase CWS koheidatapilot02 to trunk@263288 (milestone: DEV300:m35)
2008-10-06 15:18:57 +0200 kohei  r262062 : #i94619# allow XDataPilotTable interface to be queried again.  Patch submitted by
Noel Power.
2008-10-01 21:49:39 +0200 kohei  r262020 : #i90402# don't insert drill-down sheet when the document is in read-only mode.
2008-10-01 03:03:19 +0200 kohei  r261982 : #i93918# exclude hidden items and items that are excluded due to
ranks (i.e. top X items).
#i93998# reduce memory consumption of datapilot cache tables by
pooling cache table cell data & use null pointers to represent
empty cells.
2008-09-30 23:35:14 +0200 kohei  r261981 : #i92378# keep the layout dialog open when the destination range is not empty
and the user has decided to cancel data pilot creation.
2008-09-30 23:14:55 +0200 kohei  r261980 : #i94281# fixed a regression where the data pilot layout dialog fails to
appear on a filtered cell range.

1 files changed, 10 insertions, 5 deletions

diff --git a/sc/inc/dptabdat.hxx b/sc/inc/dptabdat.hxx
index 3545c90ccbee..90953d8c3b4f 100644
--- a/sc/inc/dptabdat.hxx
+++ b/sc/inc/dptabdat.hxx
@@ -46,6 +46,7 @@ namespace com { namespace sun { namespace star { namespace sheet {
 }}}}
 
 class TypedStrCollection;
+class ScSimpleSharedString;
 
 // -----------------------------------------------------------------------
 
@@ -112,6 +113,7 @@ class ScDPDimension;
 class ScDPLevel;
 class ScDPInitState;
 class ScDPResultMember;
+class ScDocument;
 
 class ScDPTableData
 {
@@ -120,6 +122,7 @@ class ScDPTableData
     long    nLastHier;
     long    nLastLevel;
     long    nLastRet;
+    ScSimpleSharedString& mrSharedString;
 
 public:
 
@@ -146,7 +149,7 @@ public:
         CalcInfo();
     };
 
-                ScDPTableData();
+                ScDPTableData(ScDocument* pDoc);
     virtual     ~ScDPTableData();
 
     long        GetDatePart( long nDateVal, long nHierarchy, long nLevel );
@@ -165,11 +168,11 @@ public:
 
     virtual bool                    IsRepeatIfEmpty();
 
-    virtual void                    CreateCacheTable();
-    virtual void                    FilterCacheTable(const ::std::vector<ScDPCacheTable::Criterion>& rCriteria);
+    virtual void                    CreateCacheTable() = 0;
+    virtual void                    FilterCacheTable(const ::std::vector<ScDPCacheTable::Criterion>& rCriteria) = 0;
     virtual void                    GetDrillDownData(const ::std::vector<ScDPCacheTable::Criterion>& rCriteria,
-                                                     ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& rData);
-    virtual void                    CalcResults(CalcInfo& rInfo, bool bAutoShow);
+                                                     ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& rData) = 0;
+    virtual void                    CalcResults(CalcInfo& rInfo, bool bAutoShow) = 0;
     virtual const ScDPCacheTable&   GetCacheTable() const = 0;
 
                                     // overloaded in ScDPGroupTableData:
@@ -181,6 +184,8 @@ public:
     virtual BOOL                    HasCommonElement( const ScDPItemData& rFirstData, long nFirstIndex,
                                                       const ScDPItemData& rSecondData, long nSecondIndex ) const;
 
+    ScSimpleSharedString&           GetSharedString();
+
 protected:
     /** This structure stores vector arrays that hold intermediate data for
         each row during cache table iteration. */