diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-01-13 12:09:22 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-01-13 12:09:22 +0000 |
| commit | f79944144dc1cf4a71171d96c7ab5cee40e3fdbb (patch) | |
| tree | c509a5a5f649436f2fcfbe91c47c9b453f3c2793 /formula/source | |
| parent | 17ae03fba98ddcffaca401f3f4b224cbc684ce16 (diff) | |
#i10000#: fix merge conflicts (CWS frmdlg)
Diffstat (limited to 'formula/source')
| -rw-r--r-- | formula/source/core/api/FormulaCompiler.cxx | 2 | ||||
| -rw-r--r-- | formula/source/core/api/token.cxx | 6 | ||||
| -rw-r--r-- | formula/source/ui/dlg/structpg.hxx | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx index e4382e349afe..a4840802192f 100644 --- a/formula/source/core/api/FormulaCompiler.cxx +++ b/formula/source/core/api/FormulaCompiler.cxx @@ -511,6 +511,7 @@ DBG_NAME(FormulaCompiler) FormulaCompiler::FormulaCompiler(FormulaTokenArray& _rArr) : pArr( &_rArr ), + pExternalRef(NULL), pStack( NULL ), nRecursion(0), nNumFmt( NUMBERFORMAT_UNDEFINED ), @@ -526,6 +527,7 @@ FormulaCompiler::FormulaCompiler(FormulaTokenArray& _rArr) FormulaCompiler::FormulaCompiler() : pArr( NULL ), + pExternalRef(NULL), pStack( NULL ), nRecursion(0), nNumFmt( NUMBERFORMAT_UNDEFINED ), diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx index 8a9615752daf..021eb651e5ac 100644 --- a/formula/source/core/api/token.cxx +++ b/formula/source/core/api/token.cxx @@ -276,7 +276,7 @@ FormulaJumpToken::~FormulaJumpToken() } -bool FormulaTokenArray::AddFormulaToken(const sheet::FormulaToken& _aToken) +bool FormulaTokenArray::AddFormulaToken(const sheet::FormulaToken& _aToken,ExternalReferenceHelper* /*_pRef*/) { bool bError = false; const OpCode eOpCode = static_cast<OpCode>(_aToken.OpCode); //! assuming equal values for the moment @@ -325,13 +325,13 @@ bool FormulaTokenArray::AddFormulaToken(const sheet::FormulaToken& _aToken) } // switch ( eClass ) return bError; } -bool FormulaTokenArray::Fill(const uno::Sequence< sheet::FormulaToken >& _aSequence) +bool FormulaTokenArray::Fill(const uno::Sequence< sheet::FormulaToken >& _aSequence,ExternalReferenceHelper* _pRef) { bool bError = false; const sal_Int32 nCount = _aSequence.getLength(); for (sal_Int32 nPos=0; nPos<nCount; nPos++) { - bError |= AddFormulaToken( _aSequence[nPos] ); + bError |= AddFormulaToken( _aSequence[nPos] ,_pRef); } return bError; } diff --git a/formula/source/ui/dlg/structpg.hxx b/formula/source/ui/dlg/structpg.hxx index 1d9c7b0281d0..06d6a5ad9579 100644 --- a/formula/source/ui/dlg/structpg.hxx +++ b/formula/source/ui/dlg/structpg.hxx @@ -96,6 +96,8 @@ private: DECL_LINK( SelectHdl, SvTreeListBox* ); + using Window::GetParent; + protected: IFormulaToken* GetFunctionEntry(SvLBoxEntry* pEntry); |