[Libreoffice-commits] core.git: sc/source

[Caolán McNamara]

 sc/source/core/tool/compiler.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 157bef79c1af5520d04a8389fa66d2e193998529
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Oct 23 09:56:05 2017 +0100

    ofz: avoid config
    
    Change-Id: I1fa1c2cb9c755822c2a80453ac3f0424f2c91ffe

diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 21142d23b610..acee51f38879 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -30,6 +30,7 @@
 #include <sal/macros.h>
 #include <tools/solar.h>
 #include <unotools/charclass.hxx>
+#include <unotools/configmgr.hxx>
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/sheet/FormulaOpCodeMapEntry.hpp>
 #include <com/sun/star/sheet/FormulaLanguage.hpp>
@@ -4144,7 +4145,7 @@ bool ScCompiler::NextNewToken( bool bInArray )
     if ( cSymbol[0] < 128 )
     {
         bMayBeFuncName = rtl::isAsciiAlpha( cSymbol[0] );
-        if (!bMayBeFuncName && (cSymbol[0] == '_' && cSymbol[1] == '_') )
+        if (!bMayBeFuncName && (cSymbol[0] == '_' && cSymbol[1] == '_') && !utl::ConfigManager::IsAvoidConfig())
         {
             SvtMiscOptions aOpt;
             bMayBeFuncName = aOpt.IsExperimentalMode();