diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-05-14 11:31:33 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-05-14 13:15:11 -0400 |
| commit | a921d38ad4ee087355945b9a544d1957987f308f (patch) | |
| tree | 800f7490741c7f7bb7ca06915b32d33338a12fea /formula | |
| parent | 69a7e7440cdafbaeddd344f61cc5dfe54750d509 (diff) | |
No more SetCompileForFAP(). Use respective flag setting methods instead.
Change-Id: Ib2256ebac8a7e63e7e24fb35d13d47b811bd8e19
Diffstat (limited to 'formula')
| -rw-r--r-- | formula/source/core/api/FormulaCompiler.cxx | 9 | ||||
| -rw-r--r-- | formula/source/ui/dlg/formula.cxx | 4 |
2 files changed, 9 insertions, 4 deletions
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx index 59839b4cc2b7..2e066af8d01d 100644 --- a/formula/source/core/api/FormulaCompiler.cxx +++ b/formula/source/core/api/FormulaCompiler.cxx @@ -980,12 +980,15 @@ sal_uInt16 FormulaCompiler::GetErrorConstant( const OUString& rName ) const return nError; } -void FormulaCompiler::SetCompileForFAP( bool bVal ) +void FormulaCompiler::EnableJumpCommandReorder( bool bEnable ) { - mbJumpCommandReorder = !bVal; - mbStopOnError = !bVal; + mbJumpCommandReorder = bEnable; } +void FormulaCompiler::EnableStopOnError( bool bEnable ) +{ + mbStopOnError = bEnable; +} void FormulaCompiler::AppendErrorConstant( OUStringBuffer& rBuffer, sal_uInt16 nError ) const { diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index 11d36ccc7ca7..3247f2a8dfcd 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -740,7 +740,9 @@ void FormulaDlg_Impl::UpdateTokenArray( const OUString& rStrExp) } // if ( pTokens && nLen == m_aTokenList.getLength() ) FormulaCompiler aCompiler(*m_pTokenArray.get()); - aCompiler.SetCompileForFAP(true); // #i101512# special handling is needed + // #i101512# Disable special handling of jump commands. + aCompiler.EnableJumpCommandReorder(false); + aCompiler.EnableStopOnError(false); aCompiler.CompileTokenArray(); } |