diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-08-11 08:52:39 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-08-11 08:52:39 +0000 |
| commit | b22ea0f74cb7cc72f9de44e351de08e0a08b90eb (patch) | |
| tree | 4ee226a192876c4fa1b8c2383f64087f75ecc338 /sc/source/filter/excel/xepivot.cxx | |
| parent | a3e4ca340ef54fba6bfb9d9b40ced937900e02d5 (diff) | |
INTEGRATION: CWS encryption (1.2.72); FILE MERGED
2004/07/15 08:56:59 dr 1.2.72.3: #i10000# merge error
2004/07/14 15:54:40 dr 1.2.72.2: #i10000# merge error
2004/07/14 14:17:49 dr 1.2.72.1: #i10000# merge conflicts
Diffstat (limited to 'sc/source/filter/excel/xepivot.cxx')
| -rw-r--r-- | sc/source/filter/excel/xepivot.cxx | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx index bea67c4fa045..48806bf03b9e 100644 --- a/sc/source/filter/excel/xepivot.cxx +++ b/sc/source/filter/excel/xepivot.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xepivot.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: hr $ $Date: 2004-08-03 12:44:29 $ + * last change: $Author: obo $ $Date: 2004-08-11 09:52:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -120,9 +120,6 @@ #include "xelink.hxx" #endif -#include "root.hxx" -extern const sal_Char* pPivotCacheStorageName; - using ::com::sun::star::sheet::DataPilotFieldOrientation; using ::com::sun::star::sheet::DataPilotFieldOrientation_HIDDEN; using ::com::sun::star::sheet::DataPilotFieldOrientation_ROW; @@ -905,12 +902,8 @@ void XclExpPivotCache::WriteDconref( XclExpStream& rStrm ) const void XclExpPivotCache::WriteCacheStream() { - if( !mpRD->pPivotCacheStorage ) - mpRD->pPivotCacheStorage = - GetRootStorage()->OpenStorage( - String::CreateFromAscii(pPivotCacheStorageName), STREAM_STD_WRITE ); - SvStorageStreamRef xSvStrm = mpRD->pPivotCacheStorage->OpenStream( - ScfTools::GetHexStr( maPCInfo.mnStrmId ), STREAM_READWRITE | STREAM_TRUNC ); + SvStorageRef xSvStrg = OpenStorage( EXC_STORAGE_PTCACHE ); + SvStorageStreamRef xSvStrm = OpenStream( xSvStrg, ScfTools::GetHexStr( maPCInfo.mnStrmId ) ); if( xSvStrm.Is() ) { XclExpStream aStrm( *xSvStrm, GetRoot() ); |