From a921d38ad4ee087355945b9a544d1957987f308f Mon Sep 17 00:00:00 2001
From: Kohei Yoshida <kohei.yoshida@collabora.com>
Date: Wed, 14 May 2014 11:31:33 -0400
Subject: No more SetCompileForFAP().  Use respective flag setting methods
 instead.

Change-Id: Ib2256ebac8a7e63e7e24fb35d13d47b811bd8e19
---
 formula/source/core/api/FormulaCompiler.cxx | 9 ++++++---
 formula/source/ui/dlg/formula.cxx           | 4 +++-
 2 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'formula')

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();
 }
 
-- 
cgit