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

[Stephan Bergmann]

 basic/source/comp/exprtree.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 1f6b082388c7e1eaa668f02008488b317c0d4988
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Sep 9 10:50:55 2015 +0200

    Fix previous commit
    
    ...4b4a7c0d87eb580272aba0777c9021789025bdc0 "Revert a fix that can never have
    worked in the first place?"---which presumably did work after all, as Noel
    thankfully pointed out to me,
    <http://lists.freedesktop.org/archives/libreoffice/2015-September/070193.html>
    "Re: [Libreoffice-commits] core.git: basic/source 'Revert a fix that can never
    have worked in the first place?'"
    
    Change-Id: I411bfaacbfebf50589290c6a3040d0300c256439

diff --git a/basic/source/comp/exprtree.cxx b/basic/source/comp/exprtree.cxx
index 8b22257..53dcfc5 100644
--- a/basic/source/comp/exprtree.cxx
+++ b/basic/source/comp/exprtree.cxx
@@ -215,7 +215,8 @@ SbiExprNode* SbiExpression::Term( const KeywordSymbolInfo* pKeywordSymbolInfo )
         return new SbiExprNode( aSym );
     }
     // no keywords allowed from here on!
-    if( SbiTokenizer::IsKwd( eTok ) )
+    if( SbiTokenizer::IsKwd( eTok )
+        && (!pParser->IsCompatible() || eTok != INPUT) )
     {
         pParser->Error( ERRCODE_BASIC_SYNTAX );
         bError = true;