ooo-build r14145 - in trunk: . patches/dev300

[kyoshida svn gnome org]

Author: kyoshida
Date: Tue Sep 30 00:14:30 2008
New Revision: 14145
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14145&view=rev

Log:
2008-09-29  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/calc-dp-filtered-range-fix.diff: fixed a regression 
	where a data pilot table was not being created on a filtered range 
	(i#94281).

	* patches/dev300/apply: apply the new patch.


Added:
   trunk/patches/dev300/calc-dp-filtered-range-fix.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Sep 30 00:14:30 2008
@@ -800,6 +800,9 @@
 # drill-down sheet & also reduce memory use on cache tables.
 calc-dp-drilldown-hidden-items.diff i#93918, i#93998, kohei
 
+# fix regression that prevents data pilot from being created on a filtered range.
+calc-dp-filtered-range-fix.diff, i#94281, kohei
+
 [ CalcFixes < ooo300-m3 ]
 # Fix a regression on filtering by page field.
 calc-fix-datapilot-date-filter.diff, i#90022, kohei

Added: trunk/patches/dev300/calc-dp-filtered-range-fix.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/calc-dp-filtered-range-fix.diff	Tue Sep 30 00:14:30 2008
@@ -0,0 +1,14 @@
+diff --git sc/source/ui/view/cellsh2.cxx sc/source/ui/view/cellsh2.cxx
+index d2e5e61..554cdf9 100644
+--- sc/source/ui/view/cellsh2.cxx
++++ sc/source/ui/view/cellsh2.cxx
+@@ -737,7 +737,8 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
+ 						{
+ 							//!	use database ranges (select before type dialog?)
+ 							ScRange aRange;
+-							if ( GetViewData()->GetSimpleArea( aRange ) == SC_MARK_SIMPLE )
++                            ScMarkType eType = GetViewData()->GetSimpleArea(aRange);
++                            if ( (eType & SC_MARK_SIMPLE) == SC_MARK_SIMPLE )
+ 							{
+ 								BOOL bOK = TRUE;
+ 								if ( pDoc->HasSubTotalCells( aRange ) )