fdo#66655: Get GETPIVOTDATA to work again.

1) Compare data field name as it is displayed in the table output.
2) In the result tree, store field member names as strings as displayed
in the table output, instead of as ScDPItemData.

GETPIVOTDATA operates on displayed cell values and do textural comparison.
There is no use storing ScDPItemData which screws up value lookup in
the result tree.

Change-Id: I31bc03a6800f4fadf2ba1180d1958354d43e8a07

4 files changed, 13 insertions, 5 deletions

diff --git a/sc/inc/datauno.hxx b/sc/inc/datauno.hxx
index 2acde1871cb9..a2562c21f7bf 100644
--- a/sc/inc/datauno.hxx
+++ b/sc/inc/datauno.hxx
@@ -68,7 +68,6 @@ typedef boost::ptr_vector<XDBRefreshListenerRef> XDBRefreshListenerArr_Impl;
 class ScDataUnoConversion
 {
 public:
-    static ScSubTotalFunc   GeneralToSubTotal( com::sun::star::sheet::GeneralFunction eSummary );
     static com::sun::star::sheet::GeneralFunction SubTotalToGeneral( ScSubTotalFunc eSubTotal );
 };
 
diff --git a/sc/inc/dpresfilter.hxx b/sc/inc/dpresfilter.hxx
index bde3c02cb55e..be84b8c83c2d 100644
--- a/sc/inc/dpresfilter.hxx
+++ b/sc/inc/dpresfilter.hxx
@@ -24,7 +24,7 @@ namespace com { namespace sun { namespace star { namespace sheet {
 struct ScDPResultFilter
 {
     OUString maDimName;
-    ScDPItemData maValue;
+    OUString maValue;
 
     bool mbHasValue:1;
     bool mbDataLayout:1;
@@ -55,7 +55,7 @@ private:
 
     struct MemberNode;
     struct DimensionNode;
-    typedef std::map<ScDPItemData, MemberNode*> MembersType;
+    typedef std::map<OUString, MemberNode*> MembersType;
     typedef std::map<OUString, DimensionNode*> DimensionsType;
 
     struct DimensionNode : boost::noncopyable
diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx
index cab2da82d9f7..30fc21224dfe 100644
--- a/sc/inc/dptabres.hxx
+++ b/sc/inc/dptabres.hxx
@@ -380,6 +380,8 @@ public:
                                         ScDPInitState& rInitState);
     void CheckShowEmpty( bool bShow = false );
     OUString GetName() const;
+    OUString GetDisplayName() const;
+
     void                FillItemData( ScDPItemData& rData ) const;
     bool IsValid() const;
     bool IsVisible() const;
diff --git a/sc/inc/dputil.hxx b/sc/inc/dputil.hxx
index 425d33301ed2..294ca97b6339 100644
--- a/sc/inc/dputil.hxx
+++ b/sc/inc/dputil.hxx
@@ -7,11 +7,14 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef __SC_DPUTIL_HXX__
-#define __SC_DPUTIL_HXX__
+#ifndef SC_DPUTIL_HXX
+#define SC_DPUTIL_HXX
 
 #include "rtl/ustring.hxx"
 #include "scdllapi.h"
+#include "global.hxx"
+
+#include <com/sun/star/sheet/GeneralFunction.hpp>
 
 class SvNumberFormatter;
 struct ScDPNumGroupInfo;
@@ -38,6 +41,10 @@ public:
     static sal_Int32 getDatePartValue(
         double fValue, const ScDPNumGroupInfo& rInfo, sal_Int32 nDatePart,
         SvNumberFormatter* pFormatter);
+
+    static OUString getDisplayedMeasureName(const OUString& rName, ScSubTotalFunc eFunc);
+
+    static ScSubTotalFunc toSubTotalFunc(com::sun::star::sheet::GeneralFunction eGenFunc);
 };
 
 #endif