ooo-build r12268 - in branches/ooo-build-2-4: . patches/src680

[kyoshida svn gnome org]

Author: kyoshida
Date: Tue Apr 22 05:23:41 2008
New Revision: 12268
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12268&view=rev

Log:
2008-04-22  Kohei Yoshida  <kyoshida novell com>

	* patches/src680/sc-calc-datapilot-drilldown-empty-pagefield.diff: fixed
	a regression where selecting the page field value to an empty string
	shows all, instead of filtering for the empty values.  The latter is the
	correct behavior.

	* patches/src680/apply: apply the patch.


Added:
   branches/ooo-build-2-4/patches/src680/sc-calc-datapilot-drilldown-empty-pagefield.diff
Modified:
   branches/ooo-build-2-4/ChangeLog
   branches/ooo-build-2-4/patches/src680/apply

Modified: branches/ooo-build-2-4/patches/src680/apply
==============================================================================
--- branches/ooo-build-2-4/patches/src680/apply	(original)
+++ branches/ooo-build-2-4/patches/src680/apply	Tue Apr 22 05:23:41 2008
@@ -1868,6 +1868,7 @@
 SectionIssue => i#57030, i#83250, i#84349
 sc-calc-datapilot-drilldown.diff
 offapi-calc-datapilot-drilldown.diff
+sc-calc-datapilot-drilldown-empty-pagefield.diff
 
 [ SharedWorksheets ]
 SectionOwner => jholesov

Added: branches/ooo-build-2-4/patches/src680/sc-calc-datapilot-drilldown-empty-pagefield.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-2-4/patches/src680/sc-calc-datapilot-drilldown-empty-pagefield.diff	Tue Apr 22 05:23:41 2008
@@ -0,0 +1,29 @@
+Index: source/core/data/dpcachetable.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/core/data/Attic/dpcachetable.cxx,v
+retrieving revision 1.1.2.10
+diff -u -r1.1.2.10 dpcachetable.cxx
+--- sc/source/core/data/dpcachetable.cxx	17 Apr 2008 13:11:10 -0000	1.1.2.10
++++ sc/source/core/data/dpcachetable.cxx	22 Apr 2008 05:17:20 -0000
+@@ -430,15 +430,17 @@
+         for (; itr != itrEnd; ++itr)
+         {
+             ScDPDimension* pDim = *itr;
++            if (!pDim->HasSelectedPage())
++                // 'show all' is selected.
++                continue;
++
+             ScDPCacheTable::Cell aDimCell = getSelectedDimension(pDim);
+             
+             sal_Int32 nCol = pDim->GetDimension();
+             const Cell& rCell = rRow[nCol];
+-            if (aDimCell.mnStrId != ScSharedStringTable::EMPTY && aDimCell.mnStrId != rCell.mnStrId)
++            if (aDimCell.mnStrId != rCell.mnStrId)
+             {
+-                // Selected page dimension value does not match the current value.  Skip it 
+-                // (note: when the selected page dimension value is empty, '- all -' is 
+-                // selected.
++                // Selected page dimension value does not match the current value.  Skip it.
+                 maRowsVisible[nRow] = false;
+                 break;
+             }