diff options
| author | Vladimir Glazunov <vg@openoffice.org> | 2010-04-01 16:52:08 +0200 |
|---|---|---|
| committer | Vladimir Glazunov <vg@openoffice.org> | 2010-04-01 16:52:08 +0200 |
| commit | 6a30f2a3025a9db27d1230d9498570964cd74e3f (patch) | |
| tree | a21d843b2e74afc08849a7a5d786b6bfe4daa56a | |
| parent | 56357e8ac33235cd467715901b2ee7830871e3af (diff) | |
#i10000# some catch-up fixes
Notes
split repo tag: calc_ooo/DEV300_m76
| -rw-r--r-- | sc/inc/dptablecache.hxx | 2 | ||||
| -rw-r--r-- | sc/source/core/data/dpcachetable.cxx | 2 | ||||
| -rwxr-xr-x | sc/source/core/data/dptablecache.cxx | 1 | ||||
| -rw-r--r-- | sc/source/core/data/scdpoutputimpl.cxx | 2 |
4 files changed, 5 insertions, 2 deletions
diff --git a/sc/inc/dptablecache.hxx b/sc/inc/dptablecache.hxx index 7b637bf04d6f..953c793093be 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 cfd29b6bbe98..ad5e921cb278 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 a9761295a6d4..42090e5203a2 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 205c80f19c71..6a667806e097 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 |