ooo-build r11598 - in trunk: . patches/src680

[kyoshida svn gnome org]

Author: kyoshida
Date: Fri Feb 15 18:13:36 2008
New Revision: 11598
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11598&view=rev

Log:
2008-02-15  Kohei Yoshida  <kyoshida novell com>

	* patches/src680/sc-datapilot-dynamic-range.diff: no need to fill the
	old parameters from the existing (and outdated) DataPilot output.


Modified:
   trunk/ChangeLog
   trunk/patches/src680/sc-datapilot-dynamic-range.diff

Modified: trunk/patches/src680/sc-datapilot-dynamic-range.diff
==============================================================================
--- trunk/patches/src680/sc-datapilot-dynamic-range.diff	(original)
+++ trunk/patches/src680/sc-datapilot-dynamic-range.diff	Fri Feb 15 18:13:36 2008
@@ -171,7 +171,7 @@
 Only in sc/source/ui/dbgui: pivot.src~
 diff -urp --exclude=CVS sc.clean/source/ui/dbgui/pvlaydlg.cxx sc/source/ui/dbgui/pvlaydlg.cxx
 --- sc.clean/source/ui/dbgui/pvlaydlg.cxx	2008-02-05 11:16:56.000000000 -0500
-+++ sc/source/ui/dbgui/pvlaydlg.cxx	2008-02-14 17:14:03.000000000 -0500
++++ sc/source/ui/dbgui/pvlaydlg.cxx	2008-02-15 12:21:37.000000000 -0500
 @@ -41,6 +41,7 @@
  //----------------------------------------------------------------------------
  
@@ -311,7 +311,7 @@
  
  //----------------------------------------------------------------------------
  
-@@ -1314,23 +1351,79 @@ BOOL ScDPLayoutDlg::GetPivotArrays(    P
+@@ -1314,23 +1351,78 @@ BOOL ScDPLayoutDlg::GetPivotArrays(    P
  	return bFit;
  }
  
@@ -337,7 +337,6 @@
 +    inSheet.aSourceRange = aNewRange;
 +    xDlgDPObject->SetSheetDesc(inSheet);
 +    xDlgDPObject->InvalidateSource();
-+    xDlgDPObject->FillOldParam(thePivotData, true);
 +    xDlgDPObject->FillLabelData(thePivotData);
 +
 +    pTabViewShell->SetDialogDPObject(xDlgDPObject.get());
@@ -403,7 +402,7 @@
  }
  
  
-@@ -1340,8 +1433,13 @@ void ScDPLayoutDlg::SetActive()
+@@ -1340,8 +1432,13 @@ void ScDPLayoutDlg::SetActive()
  {
  	if ( bRefInputMode )
  	{
@@ -419,7 +418,7 @@
  	}
  	else
  	{
-@@ -1497,12 +1595,17 @@ IMPL_LINK( ScDPLayoutDlg, OkHdl, OKButto
+@@ -1497,12 +1594,16 @@ IMPL_LINK( ScDPLayoutDlg, OkHdl, OKButto
  
  //----------------------------------------------------------------------------
  
@@ -430,7 +429,6 @@
 +    inSheet.aSourceRange = aOldRange;
 +    xDlgDPObject->SetSheetDesc(inSheet);
 +    xDlgDPObject->InvalidateSource();
-+    xDlgDPObject->FillOldParam(thePivotData, true);
 +    xDlgDPObject->FillLabelData(thePivotData);
  	Close();
  	return 0;
@@ -439,7 +437,7 @@
  
  
  //----------------------------------------------------------------------------
-@@ -1514,9 +1617,18 @@ IMPL_LINK( ScDPLayoutDlg, MoreClickHdl, 
+@@ -1514,9 +1615,18 @@ IMPL_LINK( ScDPLayoutDlg, MoreClickHdl, 
  		bRefInputMode = TRUE;
  		//@BugID 54702 Enablen/Disablen nur noch in Basisklasse
  		//SFX_APPWINDOW->Enable();
@@ -461,7 +459,7 @@
  	}
  	else
  	{
-@@ -1557,6 +1669,13 @@ IMPL_LINK( ScDPLayoutDlg, EdModifyHdl, E
+@@ -1557,6 +1667,13 @@ IMPL_LINK( ScDPLayoutDlg, EdModifyHdl, E
  }
  
  
@@ -475,7 +473,7 @@
  //----------------------------------------------------------------------------
  
  IMPL_LINK( ScDPLayoutDlg, SelAreaHdl, ListBox *, EMPTYARG )
-@@ -1610,4 +1729,16 @@ IMPL_LINK( ScDPLayoutDlg, ScrollHdl, Scr
+@@ -1610,4 +1727,16 @@ IMPL_LINK( ScDPLayoutDlg, ScrollHdl, Scr
  	return 0;
  }