Move the dimension order calculation into ScDPSaveData.

To build the dim order map only once.

Change-Id: Ibea5cbfc4f5d335ac7fc5893cda255b06336d8c2

1 files changed, 6 insertions, 0 deletions

diff --git a/sc/inc/dpsave.hxx b/sc/inc/dpsave.hxx
index 099f4cb763c1..770349ff5ce9 100644
--- a/sc/inc/dpsave.hxx
+++ b/sc/inc/dpsave.hxx
@@ -229,6 +229,7 @@ class ScDPSaveData
 {
     typedef boost::unordered_map<OUString, size_t, OUStringHash> DupNameCountType;
 public:
+    typedef boost::unordered_map<OUString, size_t, OUStringHash> DimOrderType;
     typedef boost::ptr_vector<ScDPSaveDimension> DimsType;
 
 private:
@@ -247,6 +248,7 @@ private:
     bool mbDimensionMembersBuilt;
 
     boost::scoped_ptr<OUString> mpGrandTotalName;
+    mutable boost::scoped_ptr<DimOrderType> mpDimOrder; // dimension order for row and column dimensions, to traverse result tree.
 
 public:
     SC_DLLPUBLIC ScDPSaveData();
@@ -262,6 +264,8 @@ public:
 
     SC_DLLPUBLIC const DimsType& GetDimensions() const;
 
+    const DimOrderType& GetDimensionSortOrder() const;
+
     /**
      * Get all dimensions in a given orientation.  The order represents the
      * actual order of occurrence.  The returned list also includes data
@@ -363,6 +367,8 @@ private:
      * @return pointer to the new dimension just inserted.
      */
     ScDPSaveDimension* AppendNewDimension(const OUString& rName, bool bDataLayout);
+
+    void DimensionChanged();
 };
 
 #endif