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

[Kohei Yoshida]

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

New commits:
commit d05e3e6f6892a2f0c138e75c909e3a6a2f0784a8
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sun Jan 8 04:32:06 2012 +0100

    return early on error in ScInterpreter::GetDBParam, fdo#44442
    
    Signed-off-by: Kohei Yoshida <kohei.yoshida at suse.com>

diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 8121344..3614896 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -6187,6 +6187,9 @@ ScDBQueryParamBase* ScInterpreter::GetDBParams( sal_Bool& rMissingField )
                 SetError( errIllegalParameter );
         }
 
+        if (nGlobalError)
+            return NULL;
+
         auto_ptr<ScDBRangeBase> pDBRef( PopDBDoubleRef() );
 
         if (nGlobalError || !pDBRef.get())