Cleaned up more header include silliness.

3 files changed, 17 insertions, 9 deletions

diff --git a/sc/inc/dpgroup.hxx b/sc/inc/dpgroup.hxx
index 8f698288faa3..bf7bea0ba723 100644
--- a/sc/inc/dpgroup.hxx
+++ b/sc/inc/dpgroup.hxx
@@ -35,6 +35,7 @@
 
 #include "dptabdat.hxx"
 #include "scdllapi.h"
+#include "dpitemdata.hxx"
 
 class ScDocument;
 class SvNumberFormatter;
diff --git a/sc/inc/dptablecache.hxx b/sc/inc/dptablecache.hxx
index 54304f65071e..8934af6d259f 100644
--- a/sc/inc/dptablecache.hxx
+++ b/sc/inc/dptablecache.hxx
@@ -30,7 +30,6 @@
 #define SC_DPTABLECACHE_HXX
 
 #include "global.hxx"
-#include "dpitemdata.hxx"
 
 #include <svl/zforlist.hxx>
 
@@ -38,17 +37,22 @@
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XRowSet.hpp>
 
-#include <vector>
+#include <boost/noncopyable.hpp>
+#include <boost/scoped_ptr.hpp>
 #include <boost/ptr_container/ptr_vector.hpp>
 
+#include <vector>
+
 struct ScQueryParam;
 class ScDPObject;
+class ScDPItemDataPool;
+class ScDPItemData;
 
 /**
  * This class represents the cached data part of the datapilot cache table
  * implementation.
  */
-class SC_DLLPUBLIC ScDPCache
+class SC_DLLPUBLIC ScDPCache : boost::noncopyable
 {
 public:
     typedef ::boost::ptr_vector<ScDPItemData>           DataListType;
@@ -93,7 +97,7 @@ private:
     DataListType maLabelNames;    // Stores dimension names.
     std::vector<bool> mbEmptyRow; // Keeps track of empty rows.
 
-    mutable ScDPItemDataPool    maAdditionalData;
+    boost::scoped_ptr<ScDPItemDataPool> mpAdditionalData;
 
     bool mbDisposing;
 
diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx
index f5c10a21810d..80e77cca99c7 100644
--- a/sc/inc/dptabres.hxx
+++ b/sc/inc/dptabres.hxx
@@ -29,17 +29,20 @@
 #ifndef SC_DPTABRES_HXX
 #define SC_DPTABRES_HXX
 
+#include "global.hxx"
+#include "dpcachetable.hxx"
+
 #include <svl/svarray.hxx>
 #include <tools/string.hxx>
 #include <com/sun/star/sheet/MemberResult.hpp>
 #include <com/sun/star/sheet/DataResult.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
-#include "global.hxx"       // enum ScSubTotalFunc
-#include "dpcachetable.hxx"
+
 #include <boost/unordered_map.hpp>
 #include <boost/unordered_set.hpp>
 #include <vector>
 #include <memory>
+#include <map>
 
 namespace com { namespace sun { namespace star { namespace sheet {
     struct DataPilotFieldReference;
@@ -499,9 +502,9 @@ typedef std::vector<ScDPDataMember*> ScDPDataMembers;
 
 class ScDPResultDimension
 {
-public :
-    typedef std::vector <ScDPResultMember *>                           MemberArray;
-    typedef std::map < SCROW , ScDPResultMember *> MemberHash;
+public:
+    typedef std::vector<ScDPResultMember*>     MemberArray;
+    typedef std::map<SCROW, ScDPResultMember*> MemberHash;
 private:
         const ScDPResultData*   pResultData;
     MemberArray             maMemberArray;