GNOME.org
 

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

Author: kyoshida
Date: Tue Jan 27 06:20:17 2009
New Revision: 15162
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15162&view=rev

Log:
2009-01-27  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/sc-datapilot-dynamic-range-m38.diff:
	* patches/dev300/sc-datapilot-dynamic-range.diff:
	* patches/dev300/apply: adjusted for dev300-m39.



Added:
   trunk/patches/dev300/sc-datapilot-dynamic-range-m38.diff
      - copied unchanged from r15157, /trunk/patches/dev300/sc-datapilot-dynamic-range.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/sc-datapilot-dynamic-range.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Jan 27 06:20:17 2009
@@ -747,6 +747,12 @@
 # Autofill doesnt fill filtered rows bxc 62499
 sc-filters-fill-fix.diff, jody
 
+[ CalcFixes <= dev300-m38 ]
+# Support modification of data source range in DataPilot after table output has
+# been generated.
+sc-datapilot-dynamic-range-m38.diff, i#23658, kohei
+
+[ CalcFixes > dev300-m38 ]
 # Support modification of data source range in DataPilot after table output has
 # been generated.
 sc-datapilot-dynamic-range.diff, i#23658, kohei

Modified: trunk/patches/dev300/sc-datapilot-dynamic-range.diff
==============================================================================
--- trunk/patches/dev300/sc-datapilot-dynamic-range.diff	(original)
+++ trunk/patches/dev300/sc-datapilot-dynamic-range.diff	Tue Jan 27 06:20:17 2009
@@ -1,7 +1,8 @@
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/ui/dbgui/fieldwnd.cxx sc/source/ui/dbgui/fieldwnd.cxx
---- sc.clean/source/ui/dbgui/fieldwnd.cxx	2008-05-23 19:00:55.000000000 -0400
-+++ sc/source/ui/dbgui/fieldwnd.cxx	2008-05-23 19:08:04.000000000 -0400
-@@ -632,7 +632,7 @@ void ScDPFieldWindow::DelField( size_t n
+diff --git sc/source/ui/dbgui/fieldwnd.cxx sc/source/ui/dbgui/fieldwnd.cxx
+index 607c295..acb6094 100644
+--- sc/source/ui/dbgui/fieldwnd.cxx
++++ sc/source/ui/dbgui/fieldwnd.cxx
+@@ -632,7 +632,7 @@ void ScDPFieldWindow::DelField( size_t nDelIndex )
  
  void ScDPFieldWindow::ClearFields()
  {
@@ -10,10 +11,10 @@
  	{
          com::sun::star::uno::Reference < com::sun::star::accessibility::XAccessible > xTempAcc = xAccessible;
          if (!xTempAcc.is() && pAccessible)
-Only in sc/source/ui/dbgui: fieldwnd.cxx.orig
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/ui/dbgui/pivot.hrc sc/source/ui/dbgui/pivot.hrc
---- sc.clean/source/ui/dbgui/pivot.hrc	2008-05-23 19:00:55.000000000 -0400
-+++ sc/source/ui/dbgui/pivot.hrc	2008-05-23 19:08:04.000000000 -0400
+diff --git sc/source/ui/dbgui/pivot.hrc sc/source/ui/dbgui/pivot.hrc
+index 4dea022..d142eb3 100644
+--- sc/source/ui/dbgui/pivot.hrc
++++ sc/source/ui/dbgui/pivot.hrc
 @@ -66,6 +66,10 @@
  #define BTN_FILTER              29
  #define BTN_DRILLDOWN           30
@@ -25,10 +26,10 @@
  #define PIVOTSTR_SUM			1
  #define PIVOTSTR_COUNT			2
  #define PIVOTSTR_AVG			3
-Only in sc/source/ui/dbgui: pivot.hrc.orig
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/ui/dbgui/pivot.src sc/source/ui/dbgui/pivot.src
---- sc.clean/source/ui/dbgui/pivot.src	2008-05-23 19:00:55.000000000 -0400
-+++ sc/source/ui/dbgui/pivot.src	2008-05-23 19:08:04.000000000 -0400
+diff --git sc/source/ui/dbgui/pivot.src sc/source/ui/dbgui/pivot.src
+index 78d5cf0..324cc37 100644
+--- sc/source/ui/dbgui/pivot.src
++++ sc/source/ui/dbgui/pivot.src
 @@ -158,7 +158,7 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT
          Size = MAP_APPFONT ( 50 , 14 ) ;
  		TabStop = TRUE ;
@@ -154,10 +155,10 @@
          Size = MAP_APPFONT ( 124 , 10 ) ;
          TabStop = TRUE ;
          Hide = TRUE ;
-Only in sc/source/ui/dbgui: pivot.src.orig
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/ui/dbgui/pvlaydlg.cxx sc/source/ui/dbgui/pvlaydlg.cxx
---- sc.clean/source/ui/dbgui/pvlaydlg.cxx	2008-05-23 19:00:55.000000000 -0400
-+++ sc/source/ui/dbgui/pvlaydlg.cxx	2008-05-23 19:14:05.000000000 -0400
+diff --git sc/source/ui/dbgui/pvlaydlg.cxx sc/source/ui/dbgui/pvlaydlg.cxx
+index 087f6e2..2cb2e8b 100644
+--- sc/source/ui/dbgui/pvlaydlg.cxx
++++ sc/source/ui/dbgui/pvlaydlg.cxx
 @@ -36,6 +36,7 @@
  //----------------------------------------------------------------------------
  
@@ -174,7 +175,7 @@
  #include "scmod.hxx"
  
  #include "sc.hrc" //CHINA001
-@@ -120,6 +122,11 @@ ScDPLayoutDlg::ScDPLayoutDlg( SfxBinding
+@@ -120,6 +122,11 @@ ScDPLayoutDlg::ScDPLayoutDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pPar
  		aFtInfo			( this, ScResId( FT_INFO ) ),
  
          aFlAreas        ( this, ScResId( FL_OUTPUT ) ),
@@ -186,7 +187,7 @@
  		aLbOutPos		( this, ScResId( LB_OUTAREA ) ),
  		aFtOutArea		( this, ScResId( FT_OUTAREA ) ),
  		aEdOutPos		( this, ScResId( ED_OUTAREA ) ),
-@@ -143,6 +150,8 @@ ScDPLayoutDlg::ScDPLayoutDlg( SfxBinding
+@@ -143,6 +150,8 @@ ScDPLayoutDlg::ScDPLayoutDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pPar
  
  		bIsDrag			( FALSE ),
  
@@ -230,13 +231,12 @@
 -    aSlider.SetRange( Range( 0, static_cast<long>(((thePivotData.nLabels+LINE_SIZE-1)/LINE_SIZE)*LINE_SIZE) ) );
 -
 -	if ( thePivotData.nLabels > PAGE_SIZE )
--	{
--        aSlider.SetEndScrollHdl( LINK( this, ScDPLayoutDlg, ScrollHdl ) );
--		aSlider.Show();
 +    ScRange inRange;
 +    String inString;
 +    if (xDlgDPObject->GetSheetDesc())
-+	{
+ 	{
+-        aSlider.SetEndScrollHdl( LINK( this, ScDPLayoutDlg, ScrollHdl ) );
+-		aSlider.Show();
 +        aEdInPos.Enable();
 +        aRbInPos.Enable();
 +        aOldRange = xDlgDPObject->GetSheetDesc()->aSourceRange;
@@ -295,7 +295,7 @@
  
  //----------------------------------------------------------------------------
  
-@@ -1309,23 +1346,79 @@ BOOL ScDPLayoutDlg::GetPivotArrays(    P
+@@ -1309,23 +1346,79 @@ BOOL ScDPLayoutDlg::GetPivotArrays(    PivotField*  pPageArr,
  	return bFit;
  }
  
@@ -400,7 +400,7 @@
  		EdModifyHdl( NULL );
  	}
  	else
-@@ -1374,7 +1472,7 @@ IMPL_LINK( ScDPLayoutDlg, OkHdl, OKButto
+@@ -1374,7 +1472,7 @@ IMPL_LINK( ScDPLayoutDlg, OkHdl, OKButton *, EMPTYARG )
  	String		aOutPosStr( aEdOutPos.GetText() );
  	ScAddress	aAdrDest;
  	BOOL		bToNewTable = (aLbOutPos.GetSelectEntryPos() == 1);
@@ -409,7 +409,7 @@
  
  	if (   bToNewTable
  		|| ( (aOutPosStr.Len() > 0) && (SCA_VALID == (nResult & SCA_VALID)) ) )
-@@ -1492,12 +1590,11 @@ IMPL_LINK( ScDPLayoutDlg, OkHdl, OKButto
+@@ -1507,12 +1605,11 @@ IMPL_LINK( ScDPLayoutDlg, OkHdl, OKButton *, EMPTYARG )
  
  //----------------------------------------------------------------------------
  
@@ -423,7 +423,7 @@
  
  
  //----------------------------------------------------------------------------
-@@ -1509,9 +1606,18 @@ IMPL_LINK( ScDPLayoutDlg, MoreClickHdl, 
+@@ -1524,9 +1621,18 @@ IMPL_LINK( ScDPLayoutDlg, MoreClickHdl, MoreButton *, EMPTYARG )
  		bRefInputMode = TRUE;
  		//@BugID 54702 Enablen/Disablen nur noch in Basisklasse
  		//SFX_APPWINDOW->Enable();
@@ -443,7 +443,7 @@
  	}
  	else
  	{
-@@ -1528,7 +1634,7 @@ IMPL_LINK( ScDPLayoutDlg, MoreClickHdl, 
+@@ -1543,7 +1649,7 @@ IMPL_LINK( ScDPLayoutDlg, MoreClickHdl, MoreButton *, EMPTYARG )
  IMPL_LINK( ScDPLayoutDlg, EdModifyHdl, Edit *, EMPTYARG )
  {
  	String	theCurPosStr = aEdOutPos.GetText();
@@ -452,7 +452,7 @@
  
  	if ( SCA_VALID == (nResult & SCA_VALID) )
  	{
-@@ -1552,6 +1658,13 @@ IMPL_LINK( ScDPLayoutDlg, EdModifyHdl, E
+@@ -1567,6 +1673,13 @@ IMPL_LINK( ScDPLayoutDlg, EdModifyHdl, Edit *, EMPTYARG )
  }
  
  
@@ -466,7 +466,7 @@
  //----------------------------------------------------------------------------
  
  IMPL_LINK( ScDPLayoutDlg, SelAreaHdl, ListBox *, EMPTYARG )
-@@ -1605,4 +1718,16 @@ IMPL_LINK( ScDPLayoutDlg, ScrollHdl, Scr
+@@ -1620,4 +1733,16 @@ IMPL_LINK( ScDPLayoutDlg, ScrollHdl, ScrollBar *, EMPTYARG )
  	return 0;
  }
  
@@ -483,11 +483,11 @@
 +	return 0;
 +}
  
-Only in sc/source/ui/dbgui: pvlaydlg.cxx.orig
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/ui/inc/pvlaydlg.hxx sc/source/ui/inc/pvlaydlg.hxx
---- sc.clean/source/ui/inc/pvlaydlg.hxx	2008-05-23 19:00:53.000000000 -0400
-+++ sc/source/ui/inc/pvlaydlg.hxx	2008-05-23 19:08:04.000000000 -0400
-@@ -129,10 +129,18 @@ private:
+diff --git sc/source/ui/inc/pvlaydlg.hxx sc/source/ui/inc/pvlaydlg.hxx
+index 1f6f132..c188394 100644
+--- sc/source/ui/inc/pvlaydlg.hxx
++++ sc/source/ui/inc/pvlaydlg.hxx
+@@ -129,6 +129,13 @@ private:
      FixedInfo               aFtInfo;
  
      FixedLine               aFlAreas;
@@ -500,13 +500,8 @@
 +    // DP output location
      ListBox                 aLbOutPos;
      FixedText               aFtOutArea;
-     ScRefEdit               aEdOutPos;
-     ScRefButton             aRbOutPos;
-+
-     CheckBox                aBtnIgnEmptyRows;
-     CheckBox                aBtnDetectCat;
-     CheckBox                aBtnTotalCol;
-@@ -155,6 +163,8 @@ private:
+     formula::RefEdit               aEdOutPos;
+@@ -155,6 +162,8 @@ private:
      size_t                  nDnDFromIndex;
      BOOL                    bIsDrag;
  
@@ -515,7 +510,7 @@
      Rectangle               aRectPage;
      Rectangle               aRectRow;
      Rectangle               aRectCol;
-@@ -173,6 +183,7 @@ private:
+@@ -173,6 +182,7 @@ private:
      ScDPFuncDataVec         aDataArr;
  
      ScDPObjectPtr           xDlgDPObject;
@@ -523,7 +518,7 @@
      ScPivotParam            thePivotData;
      ScViewData*             pViewData;
      ScDocument*             pDoc;
-@@ -184,6 +195,7 @@ private:
+@@ -184,6 +194,7 @@ private:
      void                    InitWndSelect   ( LabelData** ppLabelArr, long nLabels );
      void                    InitWnd         ( PivotField* pArr, long nCount, ScDPFieldType eType );
      void                    InitFocus       ();
@@ -531,7 +526,7 @@
      void                    CalcWndSizes    ();
      Point                   DlgPos2WndPos   ( const Point& rPt, Window& rWnd );
      ScDPLabelData*          GetLabelData    ( SCsCOL nCol, size_t* pPos = NULL );
-@@ -207,14 +219,19 @@ private:
+@@ -207,14 +218,19 @@ private:
                                                USHORT&       rColCount,
                                                USHORT&       rRowCount,
                                                USHORT&       rDataCount );
@@ -551,4 +546,3 @@
  };
  
  
-Only in sc/source/ui/inc: pvlaydlg.hxx.orig
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]