Check for member visibility in the dimension code.

Change-Id: Ic3370f96c0582b7b0c80c6872ee9a55e38c2b842

sc/source/core/data/dptabres.cxx

@@ -1715,7 +1715,7 @@ void ScDPResultMember::UpdateRunningTotals( const ScDPResultMember* pRefMember,
                 if ( bHasChild && nUserSubCount > 1 )
                 {
                     aSubState.nRowSubTotalFunc = nUserPos;
-                    aSubState.eRowForce = lcl_GetForceFunc( /*pParentLevel*/GetParentLevel(), nUserPos );
+                    aSubState.eRowForce = lcl_GetForceFunc(GetParentLevel(), nUserPos);
                 }
 
                 for ( long nSubCount=0; nSubCount<nSubSize; nSubCount++ )
@@ -1725,8 +1725,9 @@ void ScDPResultMember::UpdateRunningTotals( const ScDPResultMember* pRefMember,
                     else if ( pResultData->GetColStartMeasure() == SC_DPMEASURE_ALL )
                         nMemberMeasure = SC_DPMEASURE_ALL;
 
-                    pDataRoot->UpdateRunningTotals( pRefMember, nMemberMeasure,
-                                        bHasChild, aSubState, rRunning, rTotals, *this );
+                    if (pRefMember->IsVisible())
+                        pDataRoot->UpdateRunningTotals(
+                            pRefMember, nMemberMeasure, bHasChild, aSubState, rRunning, rTotals, *this);
                 }
             }
         }
@@ -2221,8 +2222,6 @@ void ScDPDataMember::UpdateRunningTotals(
 {
     OSL_ENSURE( pRefMember == pResultMember || !pResultMember, "bla" );
 
-    if ( pRefMember->IsVisible() )  //! here or in ScDPDataDimension::UpdateRunningTotals ???
-    {
     const ScDPDataDimension* pDataChild = GetChildDimension();
     const ScDPResultDimension* pRefChild = pRefMember->GetChildDimension();
 
@@ -2595,7 +2594,6 @@ void ScDPDataMember::UpdateRunningTotals(
             pDataChild->UpdateRunningTotals( pRefChild, nMeasure,
                                             bIsSubTotalRow, rSubState, rRunning, rTotals, rRowParent );
     }
-    }
 }
 
 #if DEBUG_PIVOT_TABLE
@@ -3781,7 +3779,7 @@ void ScDPDataDimension::UpdateRunningTotals( const ScDPResultDimension* pRefDim,
         }
 
         const ScDPResultMember* pRefMember = pRefDim->GetMember(nMemberPos);
-        if ( pRefMember->IsVisible() )  //! here or in ScDPDataMember::UpdateRunningTotals ???
+        if ( pRefMember->IsVisible() )
         {
             if ( bIsDataLayout )
                 rRunning.AddColIndex( 0, 0 );
@@ -3789,8 +3787,8 @@ void ScDPDataDimension::UpdateRunningTotals( const ScDPResultDimension* pRefDim,
                 rRunning.AddColIndex( i, nSorted );
 
             ScDPDataMember* pDataMember = maMembers[nMemberPos];
-            pDataMember->UpdateRunningTotals( pRefMember, nMemberMeasure,
-                                            bIsSubTotalRow, rSubState, rRunning, rTotals, rRowParent );
+            pDataMember->UpdateRunningTotals(
+                pRefMember, nMemberMeasure, bIsSubTotalRow, rSubState, rRunning, rTotals, rRowParent);
 
             rRunning.RemoveColIndex();
         }