[ooo-build-commit] patches/dev300

[Tor Lillqvist]

 patches/dev300/calc-dp-hide-list-menu.diff |   40 +++++++++++++----------------
 1 file changed, 18 insertions(+), 22 deletions(-)

New commits:
commit 5d2b27b2fd17db1d1ab5c56e28815fbf1d1126d9
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Sep 7 14:08:32 2009 +0300

    Adapt calc-dp-hide-list-menu.diff to dev300-m57

diff --git a/patches/dev300/calc-dp-hide-list-menu.diff b/patches/dev300/calc-dp-hide-list-menu.diff
index a438ddb..3c35626 100644
--- a/patches/dev300/calc-dp-hide-list-menu.diff
+++ b/patches/dev300/calc-dp-hide-list-menu.diff
@@ -206,8 +206,6 @@ index a64dd1c..b2d6e50 100644
  
  //	die 1000 Namen des Calc...
  //	Clipboard-Namen sind jetzt in so3/soapp.hxx
-diff --git sc/inc/pivot.hxx sc/inc/pivot.hxx
-index 042a10d..c548f04 100644
 --- sc/inc/pivot.hxx
 +++ sc/inc/pivot.hxx
 @@ -53,6 +53,7 @@
@@ -219,8 +217,8 @@ index 042a10d..c548f04 100644
  class SubTotal;
  #include "collect.hxx"
 @@ -80,7 +81,9 @@ class ScUserListData;
- class ScMultipleReadHeader;
- class ScMultipleWriteHeader;
+ class ScDocument;
+ class ScUserListData;
  class ScProgress;
 -struct LabelData;
 +struct ScDPLabelData;
@@ -242,7 +240,7 @@ index 042a10d..c548f04 100644
 @@ -126,10 +128,8 @@ struct ScPivotParam
      ScPivotParam&   operator=       ( const ScPivotParam& r );
      BOOL            operator==      ( const ScPivotParam& r ) const;
-     void            Clear           ();
+ //UNUSED2009-05 void            Clear           ();
 -    void            ClearLabelData  ();
      void            ClearPivotArrays();
 -    void            SetLabelData    ( LabelData**   ppLabArr,
@@ -895,8 +893,6 @@ index 9fbeb09..53abf3e 100644
  								{
  									pInfo->pBackground = ScGlobal::GetButtonBrushItem();
  									pThisRowInfo->bEmptyBack = FALSE;
-diff --git sc/source/core/data/global2.cxx sc/source/core/data/global2.cxx
-index 58b43e2..6272574 100644
 --- sc/source/core/data/global2.cxx
 +++ sc/source/core/data/global2.cxx
 @@ -56,6 +56,7 @@
@@ -942,26 +938,26 @@ index 58b43e2..6272574 100644
  
  //------------------------------------------------------------------------
 @@ -864,26 +863,10 @@ void __EXPORT ScPivotParam::Clear()
- 	nTab = 0;
- 	bIgnoreEmptyRows = bDetectCategories = FALSE;
- 	bMakeTotalCol = bMakeTotalRow = TRUE;
--	ClearLabelData();
- 	ClearPivotArrays();
-+    maLabelArray.clear();
- }
+ //UNUSED2009-05     nTab = 0;
+ //UNUSED2009-05     bIgnoreEmptyRows = bDetectCategories = FALSE;
+ //UNUSED2009-05     bMakeTotalCol = bMakeTotalRow = TRUE;
+-//UNUSED2009-05     ClearLabelData();
+ //UNUSED2009-05     ClearPivotArrays();
++//UNUSED2009-05     maLabelArray.clear();
+ //UNUSED2009-05 }
  
 -//------------------------------------------------------------------------
 -
 -void __EXPORT ScPivotParam::ClearLabelData()
 -{
--	if ( (nLabels > 0) && ppLabelArr )
--	{
--		for ( SCSIZE i=0; i<nLabels; i++ )
--			delete ppLabelArr[i];
--		delete [] ppLabelArr;
--		ppLabelArr = NULL;
--		nLabels = 0;
--	}
+-    if ( (nLabels > 0) && ppLabelArr )
+-    {
+-        for ( SCSIZE i=0; i<nLabels; i++ )
+-            delete ppLabelArr[i];
+-        delete [] ppLabelArr;
+-        ppLabelArr = NULL;
+-        nLabels = 0;
+-    }
 -}
 -
 -//------------------------------------------------------------------------