diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-01-11 12:16:52 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-01-11 12:16:52 +0000 |
| commit | 44fba77c8d991637daf9a5cc1bacc55b595f5d57 (patch) | |
| tree | d35513a9ad951fa9d24bf71a91b1e0cd094085f1 /sc | |
| parent | 8fcc09ec68022b0d12350223d4338ee33b97982c (diff) | |
INTEGRATION: CWS sb19 (1.23.20); FILE MERGED
2004/12/09 04:43:50 sb 1.23.20.3: RESYNC: (1.24-1.27); FILE MERGED
2004/10/28 15:24:37 sb 1.23.20.2: RESYNC: (1.23-1.24); FILE MERGED
2004/10/27 07:31:47 mba 1.23.20.1: #110407#: remove static BaseURL
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/excel/xiescher.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index 389db174f7bc..db53ecf34a50 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xiescher.cxx,v $ * - * $Revision: 1.29 $ + * $Revision: 1.30 $ * - * last change: $Author: rt $ $Date: 2005-01-11 12:38:53 $ + * last change: $Author: rt $ $Date: 2005-01-11 13:16:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1376,7 +1376,7 @@ XclImpObjData* XclImpEscherObjList::FindObjData( ULONG nStrmPos ) const XclImpDffManager::XclImpDffManager( const XclImpRoot& rRoot, XclImpObjectManager& rObjManager, long nOffsDgg, SvStream* pStData, SdrModel* pSdrModel, long nApplicationScale ) : - SvxMSDffManager( rObjManager.GetEscherStream(), nOffsDgg, pStData, pSdrModel, nApplicationScale, COL_DEFAULT, 24, 0, &rRoot.GetTracer().GetBaseTracer() ), + SvxMSDffManager( rObjManager.GetEscherStream(), rRoot.GetBasePath(), nOffsDgg, pStData, pSdrModel, nApplicationScale, COL_DEFAULT, 24, 0, &rRoot.GetTracer().GetBaseTracer() ), XclImpRoot( rRoot ), mrObjManager( rObjManager ), mnOleImpFlags( 0 ) @@ -1848,6 +1848,7 @@ void XclImpObjectManager::ReadTxo( XclImpStream& rStrm ) XclImpDffManager& XclImpObjectManager::GetDffManager() { + //TODO/MBA: needs to be fixed! if( !mxDffManager.get() ) mxDffManager.reset( new XclImpDffManager( GetRoot(), *this, 0, 0, GetDoc().GetDrawLayer(), 1440 ) ); return *mxDffManager; |