ooo-build r14589 - in branches/opensuse-11-1: . patches/dev300

[kyoshida svn gnome org]

Author: kyoshida
Date: Tue Nov 25 01:06:36 2008
New Revision: 14589
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14589&view=rev

Log:
2008-11-24  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/calc-dp-filtered-range-fix.diff: updated the patch to 
	fix additional regression; the 'Star' menu for datapilot was disabled
	when selected area was filtered.


Modified:
   branches/opensuse-11-1/ChangeLog
   branches/opensuse-11-1/patches/dev300/calc-dp-filtered-range-fix.diff

Modified: branches/opensuse-11-1/patches/dev300/calc-dp-filtered-range-fix.diff
==============================================================================
--- branches/opensuse-11-1/patches/dev300/calc-dp-filtered-range-fix.diff	(original)
+++ branches/opensuse-11-1/patches/dev300/calc-dp-filtered-range-fix.diff	Tue Nov 25 01:06:36 2008
@@ -12,3 +12,17 @@
  							{
  								BOOL bOK = TRUE;
  								if ( pDoc->HasSubTotalCells( aRange ) )
+diff --git sc/source/ui/view/viewdata.cxx sc/source/ui/view/viewdata.cxx
+index a16efb5..0dd53be 100644
+--- sc/source/ui/view/viewdata.cxx
++++ sc/source/ui/view/viewdata.cxx
+@@ -774,7 +774,8 @@ BOOL ScViewData::IsMultiMarked()
+     // and taking filtered in simple area marks into account.
+ 
+     ScRange aDummy;
+-    return GetSimpleArea( aDummy) != SC_MARK_SIMPLE;
++    ScMarkType eType = GetSimpleArea(aDummy);
++    return (eType & SC_MARK_SIMPLE) != SC_MARK_SIMPLE;
+ }
+ 
+ void ScViewData::SetFillMode( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow )