sb118: merged in DEV300_m76

sc/inc/dptablecache.hxx

@@ -47,6 +47,8 @@
 
 class ScDPTableDataCache;
 class TypedStrData;
+struct ScQueryParam;
+
 // --------------------------------------------------------------------
 //
 //  base class ScDPTableData to allow implementation with tabular data

sc/source/core/data/dpcachetable.cxx

@@ -214,7 +214,7 @@ void ScDPCacheTable::fillTable(  const ScQueryParam& rQuery, BOOL* pSpecial,
     // during this call, for this method may be called from the interpretation
     // of GETPIVOTDATA, which disables nested formula interpretation without
     // increasing the macro level.
-    MacroInterpretIncrementer aMacroInc(pDoc);
+    MacroInterpretIncrementer aMacroInc(GetCache()->GetDoc());
 
     if ( mpCache == NULL )
         InitNoneCache( NULL );

sc/source/core/data/dptablecache.cxx

@@ -37,6 +37,7 @@
 #include "globstr.hrc"
 
 #include <rtl/math.hxx>
+#include "queryparam.hxx"
 #include "dpglobal.hxx"
 
 #include "docoptio.hxx" //for ValidQuery

sc/source/core/data/scdpoutputimpl.cxx

@@ -34,7 +34,7 @@
 // INCLUDE ---------------------------------------------------------------
 #include "scdpoutputimpl.hxx"
 #include "scitems.hxx"
-#include <svx/boxitem.hxx>
+#include <editeng/boxitem.hxx>
 // -----------------------------------------------------------------------
 
 namespace