[ooo-build-commit] Branch 'ooo/OOO320' - sc/source

[Jan Holesovsky]

 sc/source/core/data/cell2.cxx |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit a9723cee98e94763dfb445fc99d619240ab5976a
Author: Oliver Bolte <obo at openoffice.org>
Date:   Mon Jan 4 12:10:04 2010 +0000

    CWS-TOOLING: integrate CWS calc32stopper7
    2009-12-17 18:28:31 +0100 er  r277827 : #i107741# HasRefListExpressibleAsOneReference is supposed to detect one reference, really do so

diff --git a/sc/source/core/data/cell2.cxx b/sc/source/core/data/cell2.cxx
index 5bcc5f5..5f0b95c 100644
--- a/sc/source/core/data/cell2.cxx
+++ b/sc/source/core/data/cell2.cxx
@@ -679,6 +679,14 @@ ScFormulaCell::HasRefListExpressibleAsOneReference(ScRange& rRange) const
        Union of these references must form one range and their
        intersection must be empty set.
     */
+
+    // Detect the simple case of exactly one reference in advance without all 
+    // overhead.
+    // #i107741# Doing so actually makes outlines using SUBTOTAL(x;reference) 
+    // work again, where the function does not have only references.
+    if (HasOneReference( rRange))
+        return true;
+
     pCode->Reset();
     // Get first reference, if any
     ScToken* const pFirstReference(