#i100619# initial commit of patches from ooo-build that implement new

datapilot field popup window.

1 files changed, 18 insertions, 8 deletions

diff --git a/sc/source/filter/xml/xmldpimp.hxx b/sc/source/filter/xml/xmldpimp.hxx
index fee4e36c02e5..50dc7e6d9c0d 100644
--- a/sc/source/filter/xml/xmldpimp.hxx
+++ b/sc/source/filter/xml/xmldpimp.hxx
@@ -41,6 +41,8 @@
 #include "dpobject.hxx"
 #include "dpsave.hxx"
 
+#include <hash_set>
+
 class ScXMLImport;
 class ScDPSaveNumGroupDimension;
 class ScDPSaveGroupDimension;
@@ -79,6 +81,9 @@ public:
 
 class ScXMLDataPilotTableContext : public SvXMLImportContext
 {
+    typedef ::std::hash_set< ::rtl::OUString, ::rtl::OUStringHash > StringSet;
+    StringSet       maHiddenMemberFields;
+
     struct GrandTotalItem
     {
         ::rtl::OUString maDisplayName;
@@ -108,6 +113,10 @@ class ScXMLDataPilotTableContext : public SvXMLImportContext
     ScAddress       aFilterOutputPosition;
     ScQueryParam    aSourceQueryParam;
     ScMySourceType  nSourceType;
+    sal_uInt32      mnRowFieldCount;
+    sal_uInt32      mnColFieldCount;
+    sal_uInt32      mnPageFieldCount;
+    sal_uInt32      mnDataFieldCount;
     sal_Bool        bIsNative;
     sal_Bool        bIgnoreEmptyRows;
     sal_Bool        bIdentifyCategories;
@@ -156,7 +165,7 @@ public:
     void SetFilterSourceRange(const ScRange& aValue) { aFilterSourceRange = aValue; }
 //  void SetFilterIsCaseSensitive(const sal_Bool bValue) { aSourceQueryParam.bCaseSens = bValue; }
 //  void SetFilterSkipDuplicates(const sal_Bool bValue) { aSourceQueryParam.bDuplicate = !bValue; }
-    void AddDimension(ScDPSaveDimension* pDim);
+    void AddDimension(ScDPSaveDimension* pDim, bool bHasHiddenMember);
     void AddGroupDim(const ScDPSaveNumGroupDimension& aNumGroupDim);
     void AddGroupDim(const ScDPSaveGroupDimension& aGroupDim);
     void SetButtons();
@@ -337,12 +346,13 @@ class ScXMLDataPilotFieldContext : public SvXMLImportContext
     sal_Int32                   nGroupPart;
     sal_Int16                   nFunction;
     sal_Int16                   nOrientation;
-    sal_Bool                    bShowEmpty;
-    sal_Bool                    bSelectedPage;
-    sal_Bool                    bIsGroupField;
-    sal_Bool                    bDateValue;
-    sal_Bool                    bAutoStart;
-    sal_Bool                    bAutoEnd;
+    sal_Bool                    bShowEmpty:1;
+    sal_Bool                    bSelectedPage:1;
+    sal_Bool                    bIsGroupField:1;
+    sal_Bool                    bDateValue:1;
+    sal_Bool                    bAutoStart:1;
+    sal_Bool                    bAutoEnd:1;
+    bool                        mbHasHiddenMember:1;
 
     const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
     ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
@@ -366,8 +376,8 @@ public:
 
     void SetShowEmpty(const sal_Bool bValue) { if (pDim) pDim->SetShowEmpty(bValue); }
     void SetSubTotals(const sal_uInt16* pFunctions, const sal_Int16 nCount) { if(pDim) pDim->SetSubTotals(nCount, pFunctions); }
+    void AddMember(ScDPSaveMember* pMember);
     void SetSubTotalName(const ::rtl::OUString& rName);
-    void AddMember(ScDPSaveMember* pMember) { if (pDim) pDim->AddMember(pMember); }
     void SetFieldReference(const com::sun::star::sheet::DataPilotFieldReference& aRef) { if (pDim) pDim->SetReferenceValue(&aRef); }
     void SetAutoShowInfo(const com::sun::star::sheet::DataPilotFieldAutoShowInfo& aInfo) { if (pDim) pDim->SetAutoShowInfo(&aInfo); }
     void SetSortInfo(const com::sun::star::sheet::DataPilotFieldSortInfo& aInfo) { if (pDim) pDim->SetSortInfo(&aInfo); }