Cleaned up more header include silliness.

7 files changed, 33 insertions, 18 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;
diff --git a/sc/source/core/data/dpcachetable.cxx b/sc/source/core/data/dpcachetable.cxx
index ae9ca7615f01..db0bcb417a11 100644
--- a/sc/source/core/data/dpcachetable.cxx
+++ b/sc/source/core/data/dpcachetable.cxx
@@ -35,6 +35,7 @@
 #include "dpobject.hxx"
 #include "queryparam.hxx"
 #include "queryentry.hxx"
+#include "dpitemdata.hxx"
 
 #include <com/sun/star/i18n/LocaleDataItem.hpp>
 #include <com/sun/star/sdbc/DataType.hpp>
diff --git a/sc/source/core/data/dptablecache.cxx b/sc/source/core/data/dptablecache.cxx
index e81d3a52f2f3..07b942fe5994 100644
--- a/sc/source/core/data/dptablecache.cxx
+++ b/sc/source/core/data/dptablecache.cxx
@@ -36,6 +36,7 @@
 #include "dpobject.hxx"
 #include "globstr.hrc"
 #include "docoptio.hxx"
+#include "dpitemdata.hxx"
 
 #include <rtl/math.hxx>
 #include <unotools/textsearch.hxx>
@@ -223,6 +224,7 @@ bool ScDPCache::operator== ( const ScDPCache& r ) const
 ScDPCache::ScDPCache(ScDocument* pDoc) :
     mpDoc( pDoc ),
     mnColumnCount ( 0 ),
+    mpAdditionalData(new ScDPItemDataPool),
     mbDisposing(false)
 {
 }
@@ -682,7 +684,7 @@ SCROW ScDPCache::GetItemDataId(sal_uInt16 nDim, SCROW nRow, bool bRepeatIfEmpty)
 const ScDPItemData* ScDPCache::GetItemDataById(long nDim, SCROW nId) const
 {
     if ( nId >= GetRowCount()  )
-        return maAdditionalData.getData( nId - GetRowCount() );
+        return mpAdditionalData->getData(nId - GetRowCount());
 
     if (  (size_t)nId >= maTableDataValues[nDim].size() || nDim >= mnColumnCount  || nId < 0  )
         return NULL;
@@ -799,7 +801,7 @@ SCROW ScDPCache::GetIdByItemData(long nDim, const String& sItemData ) const
     }
 
     ScDPItemData rData ( sItemData );
-    return  GetRowCount() +maAdditionalData.getDataId(rData);
+    return GetRowCount() + mpAdditionalData->getDataId(rData);
 }
 
 SCROW ScDPCache::GetIdByItemData( long nDim, const ScDPItemData& rData  ) const
@@ -812,12 +814,12 @@ SCROW ScDPCache::GetIdByItemData( long nDim, const ScDPItemData& rData  ) const
                 return i;
         }
     }
-    return  GetRowCount() + maAdditionalData.getDataId(rData);
+    return GetRowCount() + mpAdditionalData->getDataId(rData);
 }
 
 SCROW ScDPCache::GetAdditionalItemID( const ScDPItemData& rData ) const
 {
-    return GetRowCount() + maAdditionalData.insertData( rData );
+    return GetRowCount() + mpAdditionalData->insertData(rData);
 }
 
 
diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx
index 114aa1512109..51dd43dd78be 100644
--- a/sc/source/core/data/dptabres.cxx
+++ b/sc/source/core/data/dptabres.cxx
@@ -31,21 +31,23 @@
 
 // INCLUDE ---------------------------------------------------------------
 
-#include <osl/diagnose.h>
-#include <rtl/math.hxx>
-#include <rtl/strbuf.hxx>
+#include "dptabres.hxx"
 
 #include "dptabdat.hxx"
-#include "dptabres.hxx"
 #include "dptabsrc.hxx"
 #include "global.hxx"
 #include "subtotal.hxx"
 #include "globstr.hrc"
 #include "datauno.hxx"      // ScDataUnoConversion
+#include "dpitemdata.hxx"
 
 #include "document.hxx"     // for DumpState only!
 #include "stlalgorithm.hxx"
 
+#include <osl/diagnose.h>
+#include <rtl/math.hxx>
+#include <rtl/strbuf.hxx>
+
 #include <math.h>
 #include <float.h>          //! Test !!!
 #include <algorithm>
diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx
index 199e457dea61..1be890943046 100644
--- a/sc/source/core/data/dptabsrc.cxx
+++ b/sc/source/core/data/dptabsrc.cxx
@@ -32,6 +32,8 @@
 
 // INCLUDE ---------------------------------------------------------------
 
+#include "dptabsrc.hxx"
+
 #include <algorithm>
 #include <vector>
 #include <set>
@@ -49,13 +51,13 @@
 #include "patattr.hxx"
 #include "cell.hxx"
 
-#include "dptabsrc.hxx"
 #include "dptabres.hxx"
 #include "dptabdat.hxx"
 #include "global.hxx"
 #include "datauno.hxx"      // ScDataUnoConversion
 #include "miscuno.hxx"
 #include "unonames.hxx"
+#include "dpitemdata.hxx"
 
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/sheet/DataPilotFieldFilter.hpp>