diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-11-09 14:03:36 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-11-09 14:03:36 +0000 |
| commit | 8d99e28beb780bc01d1a799990542d676fa26df9 (patch) | |
| tree | 2e8e9796601756d875bc4275a7e4be2b5c45bf4e /sc | |
| parent | d0a6fb1779c1b9ae32f6be89fa67f502732e98b1 (diff) | |
INTEGRATION: CWS dr27 (1.12.18); FILE MERGED
2004/11/04 15:38:07 dr 1.12.18.3: #110618# #i3724# #i25653# new formula export, step 20: unsupported functions
2004/10/21 14:29:41 dr 1.12.18.2: RESYNC: (1.12-1.13); FILE MERGED
2004/10/01 11:07:27 dr 1.12.18.1: #110618# #i3724# #i25653# new formula export, step 1: new infrastructure
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/excel/xeroot.cxx | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/sc/source/filter/excel/xeroot.cxx b/sc/source/filter/excel/xeroot.cxx index 3cd629e4dfd2..d298de33bbd0 100644 --- a/sc/source/filter/excel/xeroot.cxx +++ b/sc/source/filter/excel/xeroot.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xeroot.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: obo $ $Date: 2004-10-18 15:14:52 $ + * last change: $Author: rt $ $Date: 2004-11-09 15:03:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -73,16 +73,15 @@ #include <svtools/saveopt.hxx> #endif -#ifndef SC_ADDINCOL_HXX -#include "addincol.hxx" -#endif - #ifndef SC_XLTRACER_HXX #include "xltracer.hxx" #endif #ifndef SC_XEHELPER_HXX #include "xehelper.hxx" #endif +#ifndef SC_XEFORMULA_HXX +#include "xeformula.hxx" +#endif #ifndef SC_XELINK_HXX #include "xelink.hxx" #endif @@ -123,6 +122,7 @@ XclExpRoot::XclExpRoot( XclExpRootData& rExpRootData ) : mrExpData.mxXFBfr.reset( new XclExpXFBuffer( GetRoot() ) ); mrExpData.mxTabInfo.reset( new XclExpTabInfo( GetRoot() ) ); mrExpData.mxLinkMgr.reset( new XclExpLinkManager( GetRoot() ) ); + mrExpData.mxFmlaComp.reset( new XclExpFormulaCompiler( GetRoot() ) ); // initialization of objects needing complete root data mrExpData.mxProgress->Initialize(); @@ -171,6 +171,11 @@ XclExpLinkManager& XclExpRoot::GetLinkManager() const return *mrExpData.mxLinkMgr; } +XclExpFormulaCompiler& XclExpRoot::GetFormulaCompiler() const +{ + return *mrExpData.mxFmlaComp; +} + XclExpPivotTableManager& XclExpRoot::GetPivotTableManager() const { if( !mrExpData.mxPTableMgr.get() ) @@ -178,14 +183,6 @@ XclExpPivotTableManager& XclExpRoot::GetPivotTableManager() const return *mrExpData.mxPTableMgr; } -String XclExpRoot::GetXclAddInName( const String& rScName ) const -{ - String aXclName; - if( ScGlobal::GetAddInCollection()->GetExcelName( rScName, GetUILanguage(), aXclName ) ) - return aXclName; - return rScName; -} - bool XclExpRoot::CheckCellAddress( const ScAddress& rPos ) const { return XclRoot::CheckCellAddress( rPos, GetXclMaxPos() ); |