[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sc/source

[Caolán McNamara]

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

New commits:
commit 42e3ad2ef6e0add0c61165e3374d9021043ef1e4
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jul 28 11:53:46 2017 +0100

    ofz: survive missing macro support
    
    Change-Id: Ica9c66fe09f7340f76f62e536527dc63b3735d90
    (cherry picked from commit aa529a1957fce324c500753039ae7766b8dcf6a6)
    Reviewed-on: https://gerrit.libreoffice.org/40522
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index b5d15641d897..278f69f42f19 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -3338,6 +3338,9 @@ bool ScCompiler::IsMacro( const OUString& rName )
         return false;
     }
 
+    if (!pObj)
+        return false;
+
     // ODFF recommends to store user-defined functions prefixed with "USER.",
     // use only unprefixed name if encountered. BASIC doesn't allow '.' in a
     // function name so a function "USER.FOO" could not exist, and macro check