diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-07-10 12:42:26 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-07-10 12:42:26 +0000 |
| commit | c86cb0a8be988cdbe7309ef1f66a8ab0dee5c76d (patch) | |
| tree | 6825e80b11a470124e7ae43be771ccb407c7fa47 /sc/source/filter/excel/xiroot.cxx | |
| parent | 6e73431778ca129ec4bbd020fde0c50ef1e1a5f1 (diff) | |
INTEGRATION: CWS dr48 (1.18.46); FILE MERGED
2006/05/10 16:59:35 dr 1.18.46.1: #i63105# backport changes from CWS chart2mst3
Diffstat (limited to 'sc/source/filter/excel/xiroot.cxx')
| -rw-r--r-- | sc/source/filter/excel/xiroot.cxx | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/sc/source/filter/excel/xiroot.cxx b/sc/source/filter/excel/xiroot.cxx index 840df193a73c..7918a5c31328 100644 --- a/sc/source/filter/excel/xiroot.cxx +++ b/sc/source/filter/excel/xiroot.cxx @@ -4,9 +4,9 @@ * * $RCSfile: xiroot.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: obo $ $Date: 2006-03-22 12:02:33 $ + * last change: $Author: obo $ $Date: 2006-07-10 13:42:26 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -44,6 +44,9 @@ #ifndef SC_XLTRACER_HXX #include "xltracer.hxx" #endif +#ifndef SC_XIFORMULA_HXX +#include "xiformula.hxx" +#endif #ifndef SC_XILINK_HXX #include "xilink.hxx" #endif @@ -91,6 +94,7 @@ XclImpRoot::XclImpRoot( XclImpRootData& rImpRootData ) : mrImpData( rImpRootData ) { mrImpData.mxAddrConv.reset( new XclImpAddressConverter( GetRoot() ) ); + mrImpData.mxFmlaComp.reset( new XclImpFormulaCompiler( GetRoot() ) ); mrImpData.mxPalette.reset( new XclImpPalette( GetRoot() ) ); mrImpData.mxFontBfr.reset( new XclImpFontBuffer( GetRoot() ) ); mrImpData.mxNumFmtBfr.reset( new XclImpNumFmtBuffer( GetRoot() ) ); @@ -98,13 +102,13 @@ XclImpRoot::XclImpRoot( XclImpRootData& rImpRootData ) : mrImpData.mxXFRangeBfr.reset( new XclImpXFRangeBuffer( GetRoot() ) ); mrImpData.mxTabInfo.reset( new XclImpTabInfo ); mrImpData.mxNameMgr.reset( new XclImpNameManager( GetRoot() ) ); + mrImpData.mxObjMgr.reset( new XclImpObjectManager( GetRoot() ) ); if( GetBiff() == EXC_BIFF8 ) { mrImpData.mxLinkMgr.reset( new XclImpLinkManager( GetRoot() ) ); mrImpData.mxSst.reset( new XclImpSst( GetRoot() ) ); mrImpData.mxCondFmtMgr.reset( new XclImpCondFormatManager( GetRoot() ) ); - mrImpData.mxObjMgr.reset( new XclImpObjectManager( GetRoot() ) ); // TODO still in old RootData (deleted by RootData) GetOldRoot().pAutoFilterBuffer = new XclImpAutoFilterBuffer; mrImpData.mxWebQueryBfr.reset( new XclImpWebQueryBuffer( GetRoot() ) ); @@ -135,7 +139,12 @@ XclImpAddressConverter& XclImpRoot::GetAddressConverter() const return *mrImpData.mxAddrConv; } -ExcelToSc& XclImpRoot::GetFmlaConverter() const +XclImpFormulaCompiler& XclImpRoot::GetFormulaCompiler() const +{ + return *mrImpData.mxFmlaComp; +} + +ExcelToSc& XclImpRoot::GetOldFmlaConverter() const { // TODO still in old RootData return *GetOldRoot().pFmlaConverter; @@ -202,7 +211,6 @@ XclImpLinkManager& XclImpRoot::GetLinkManager() const XclImpObjectManager& XclImpRoot::GetObjectManager() const { - DBG_ASSERT( mrImpData.mxObjMgr.is(), "XclImpRoot::GetObjectManager - invalid call, wrong BIFF" ); return *mrImpData.mxObjMgr; } |