diff options
| author | Benjamin Ni <benjaminniri@hotmail.com> | 2015-06-12 18:09:20 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-06-29 07:48:16 +0200 |
| commit | 55ac455f2a06ef45edcd8a8a151f5ff9e39f22c5 (patch) | |
| tree | 68ecd5a56404590082fb0d9da5d62193d025d757 | |
| parent | 0fec42c21ddec905be5809f0dcea13ac7d15b7fe (diff) | |
Subformula check in formula wizard
Change-Id: I843b6886925f389ee1f351d73c6692ff3ceb3b9f
| -rw-r--r-- | formula/source/ui/dlg/formula.cxx | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index 7fcb6bd207b1..4827f9d7e092 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -597,7 +597,6 @@ bool FormulaDlg_Impl::CalcValue( const OUString& rStrExp, OUString& rStrResult ) void FormulaDlg_Impl::UpdateValues() { OUString aStrResult; - if ( CalcValue( pFuncDesc->getFormula( m_aArguments ), aStrResult ) ) m_pWndResult->SetText( aStrResult ); @@ -706,6 +705,16 @@ void FormulaDlg_Impl::MakeTree(IStructHelper* _pTree,SvTreeListEntry* pParent,Fo { _pTree->InsertEntry(aResult,pParent,STRUCT_ERROR,0,_pToken); } + else if (eOp==ocPush) + { + OUString aCellResult; + OUString aEquals(" = "); + CalcValue( "=" + aResult, aCellResult); + if (aCellResult != aResult) // cell is a formula, print subformula + _pTree->InsertEntry(aResult + aEquals + aCellResult,pParent,STRUCT_END,0,_pToken); + else + _pTree->InsertEntry(aResult,pParent,STRUCT_END,0,_pToken); + } else { _pTree->InsertEntry(aResult,pParent,STRUCT_END,0,_pToken); |