[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/source

[Libreoffice Gerrit user]

 sc/source/filter/oox/defnamesbuffer.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 115add85ea9e16623a3580e3343499d0ff444a45
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Fri Sep 28 21:01:14 2012 +0200

    vba procedures and macro names will result in crash, fdo#55174
    
    Change-Id: I23073ecc56482670d185b39452a7d8b9d6eb38c8
    Signed-off-by: Noel Power <noel.power at suse.com>

diff --git a/sc/source/filter/oox/defnamesbuffer.cxx b/sc/source/filter/oox/defnamesbuffer.cxx
index 2cf0c00..8cdbcc4 100644
--- a/sc/source/filter/oox/defnamesbuffer.cxx
+++ b/sc/source/filter/oox/defnamesbuffer.cxx
@@ -426,6 +426,10 @@ DefinedName::getTokens()
 
 void DefinedName::convertFormula()
 {
+    // macro function or vba procedure
+    if(!mpScRangeData)
+        return;
+
     // convert and set formula of the defined name
     if ( getFilterType() == FILTER_OOXML )
     {