summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Glazunov <vg@openoffice.org>2010-04-01 16:52:08 +0200
committerVladimir Glazunov <vg@openoffice.org>2010-04-01 16:52:08 +0200
commit464b494e0b298c87757f177ad92c2c99bf0cb77c (patch)
tree4433dc03940ee92d80f4d6519df55751b5640889
parent82b0b58859ab47ed143e737f3eb9d894cf7b1bd5 (diff)
#i10000# some catch-up fixesooo/DEV300_m76
-rw-r--r--sc/inc/dptablecache.hxx2
-rw-r--r--sc/source/core/data/dpcachetable.cxx2
-rwxr-xr-xsc/source/core/data/dptablecache.cxx1
-rw-r--r--sc/source/core/data/scdpoutputimpl.cxx2
4 files changed, 5 insertions, 2 deletions
diff --git a/sc/inc/dptablecache.hxx b/sc/inc/dptablecache.hxx
index 576ec4ce8..202ab64f0 100644
--- a/sc/inc/dptablecache.hxx
+++ b/sc/inc/dptablecache.hxx
@@ -47,6 +47,8 @@
class ScDPTableDataCache;
class TypedStrData;
+struct ScQueryParam;
+
// --------------------------------------------------------------------
//
// base class ScDPTableData to allow implementation with tabular data
diff --git a/sc/source/core/data/dpcachetable.cxx b/sc/source/core/data/dpcachetable.cxx
index 6c1d1513a..1a7f7248e 100644
--- a/sc/source/core/data/dpcachetable.cxx
+++ b/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 );
diff --git a/sc/source/core/data/dptablecache.cxx b/sc/source/core/data/dptablecache.cxx
index f042c90b6..41ec468eb 100755
--- a/sc/source/core/data/dptablecache.cxx
+++ b/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
diff --git a/sc/source/core/data/scdpoutputimpl.cxx b/sc/source/core/data/scdpoutputimpl.cxx
index bdf116cf0..b780768b9 100644
--- a/sc/source/core/data/scdpoutputimpl.cxx
+++ b/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