ooo-build r15088 - in branches/ooo-build-3-0-1: . patches/dev300

[pmladek svn gnome org]

Author: pmladek
Date: Fri Jan 16 12:51:48 2009
New Revision: 15088
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15088&view=rev

Log:
2009-01-16  Petr Mladek  <pmladek suse cz>

	* patches/dev300/calc-dp-drilldown-hidden-items.diff: 
	* patches/dev300/calc-dp-custom-names-sc.diff: fix to apply correctly;
	  there was "#if OLD_PIVOT_IMPLEMENTATION" in one diff and the
	  corresponding "#endif" in the second experimental diff



Modified:
   branches/ooo-build-3-0-1/ChangeLog
   branches/ooo-build-3-0-1/patches/dev300/calc-dp-custom-names-sc.diff
   branches/ooo-build-3-0-1/patches/dev300/calc-dp-drilldown-hidden-items.diff

Modified: branches/ooo-build-3-0-1/patches/dev300/calc-dp-custom-names-sc.diff
==============================================================================
--- branches/ooo-build-3-0-1/patches/dev300/calc-dp-custom-names-sc.diff	(original)
+++ branches/ooo-build-3-0-1/patches/dev300/calc-dp-custom-names-sc.diff	Fri Jan 16 12:51:48 2009
@@ -510,6 +510,14 @@
  void ScDPCollection::DeleteOnTab( SCTAB nTab )
  {
      USHORT nPos = 0;
+@@ -2825,6 +2786,7 @@
+ //------------------------------------------------------------------------
+ //	convert old pivot tables into new datapilot tables
+ 
++#if OLD_PIVOT_IMPLEMENTATION
+ void ScDPCollection::ConvertOldTables( ScPivotCollection& rOldColl )
+ {
+ 	//	convert old pivot tables into new datapilot tables
 @@ -2835,7 +2796,7 @@ void ScDPCollection::ConvertOldTables( ScPivotCollection& rOldColl )
  	}
  	rOldColl.FreeAll();

Modified: branches/ooo-build-3-0-1/patches/dev300/calc-dp-drilldown-hidden-items.diff
==============================================================================
--- branches/ooo-build-3-0-1/patches/dev300/calc-dp-drilldown-hidden-items.diff	(original)
+++ branches/ooo-build-3-0-1/patches/dev300/calc-dp-drilldown-hidden-items.diff	Fri Jan 16 12:51:48 2009
@@ -1034,7 +1034,7 @@
  }
  
  DataObject* ScDPCollection::Clone() const
-@@ -2716,9 +2761,66 @@ void ScDPCollection::EnsureNames()
+@@ -2716,6 +2761,62 @@ void ScDPCollection::EnsureNames()
  			((ScDPObject*)At(i))->SetName( CreateNewName() );
  }
  
@@ -1097,10 +1097,6 @@
  //------------------------------------------------------------------------
  //	convert old pivot tables into new datapilot tables
  
-+#if OLD_PIVOT_IMPLEMENTATION
- void ScDPCollection::ConvertOldTables( ScPivotCollection& rOldColl )
- {
- 	//	convert old pivot tables into new datapilot tables
 diff --git sc/source/core/data/dpsdbtab.cxx sc/source/core/data/dpsdbtab.cxx
 index 5ac8d6d..e8d0509 100644
 --- sc/source/core/data/dpsdbtab.cxx