datapilotperf: merge with DEV300_m71

1 files changed, 4 insertions, 2 deletions

diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx
index 4b4756a04aeb..075f983a22b3 100644
--- a/sc/inc/dptabres.hxx
+++ b/sc/inc/dptabres.hxx
@@ -31,7 +31,7 @@
 #ifndef SC_DPTABRES_HXX
 #define SC_DPTABRES_HXX
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <tools/string.hxx>
 #include <com/sun/star/sheet/MemberResult.hpp>
 #include <com/sun/star/sheet/DataResult.hpp>
@@ -41,6 +41,7 @@
 #include <hash_map>
 #include <hash_set>
 #include <vector>
+#include <memory>
 
 namespace com { namespace sun { namespace star { namespace sheet {
     struct DataPilotFieldReference;
@@ -331,7 +332,7 @@ public:
 
     long                GetMeasureCount() const     { return nMeasCount; }
     ScSubTotalFunc      GetMeasureFunction(long nMeasure) const;
-    String              GetMeasureString(long nMeasure, BOOL bForce, ScSubTotalFunc eForceFunc) const;
+    String              GetMeasureString(long nMeasure, BOOL bForce, ScSubTotalFunc eForceFunc, bool& rbTotalResult) const;
     String              GetMeasureDimensionName(long nMeasure) const;
     const ::com::sun::star::sheet::DataPilotFieldReference& GetMeasureRefVal(long nMeasure) const;
     USHORT              GetMeasureRefOrient(long nMeasure) const;
@@ -361,6 +362,7 @@ public:
     ResultMembers* GetDimResultMembers( long nDim , ScDPDimension* pDim , ScDPLevel*   pLevel) const ;
 
 // End Comments
+    const ScDPSource*   GetSource() const;
 };