diff options
| author | Eike Rathke <erack@redhat.com> | 2017-07-11 18:23:36 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2017-07-11 18:28:32 +0200 |
| commit | 1772e5c6ecde26963f2af64680096605a7fa8545 (patch) | |
| tree | c8eacc57b9d73c8827ab51bacb219f851637bc9b /formula | |
| parent | d81cf50a6fe2d4d03b9056679758a14404a03f12 (diff) | |
Revert "loplugin:casttovoid"
This reverts commit ff10bc47abe0b04480c9fb5db025afbb5e402b4b.
commit ff10bc47abe0b04480c9fb5db025afbb5e402b4b
Date: Tue Jul 11 10:24:51 2017 +0200
loplugin:casttovoid
...as introduced with f6574be0e375e215e6f21830b9e09d77d01b5097
"FormulaDlg_Impl::MakeTree: pass down current function/operator token: In
preparation of better argument evaluation."
That (void)pFuncToken was there to not break the build with unused parameter..
and all work in progress.
Commit actually using pFuncToken follows immediately, I'm just too lazy
to resolve the merge conflict for an already ready patch.
Change-Id: I572c3087a1cca9efa217e1e1818192d251e3345d
Diffstat (limited to 'formula')
| -rw-r--r-- | formula/source/ui/dlg/formula.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index 9e66f7e663fb..bf24fcd1342d 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -622,7 +622,7 @@ bool FormulaDlg_Impl::CalcStruct( const OUString& rStrExp, bool bForceRecalcStru } -void FormulaDlg_Impl::MakeTree( StructPage* _pTree, SvTreeListEntry* pParent, const FormulaToken* /*pFuncToken*/, +void FormulaDlg_Impl::MakeTree( StructPage* _pTree, SvTreeListEntry* pParent, const FormulaToken* pFuncToken, const FormulaToken* _pToken, long Count ) { if ( _pToken != nullptr && Count > 0 ) @@ -716,6 +716,7 @@ void FormulaDlg_Impl::MakeTree( StructPage* _pTree, SvTreeListEntry* pParent, co /* TODO: this should depend on parameter classification, if * a scalar value is expected matrix should not be forced. * */ + (void)pFuncToken; bool bForceMatrix = (!m_pBtnMatrix->IsChecked() && (_pToken->GetType() == svDoubleRef || _pToken->GetType() == svExternalDoubleRef)); OUString aCellResult; |