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

[Eike Rathke]

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

New commits:
commit 2c84287f151f14a4a6204fef30546414cf3d27f8
Author: Eike Rathke <erack at redhat.com>
Date:   Fri May 10 18:13:07 2013 +0200

    resolved fdo#64384 check subtotal row filtered also for single reference
    
    (cherry picked from commit 3c2d0acc871057573fe9ab45b8161fce70190e80)
    
    Conflicts:
    	sc/source/core/tool/interpr1.cxx
    
    Change-Id: Ic00b9135021f2c5f76755efbe88fc1f12e655320
    Reviewed-on: https://gerrit.libreoffice.org/3848
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index f645ec7..32f3a36 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -3703,6 +3703,10 @@ double ScInterpreter::IterateParameters( ScIterFunc eFunc, bool bTextAsZero )
                         ++nCount;
                     break;
                 }
+                if (glSubTotal && pDok->RowFiltered( aAdr.Row(), aAdr.Tab()))
+                {
+                    break;
+                }
                 ScBaseCell* pCell = GetCell( aAdr );
                 if ( pCell )
                 {