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

From: kyoshida svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r11913 - in trunk: . patches/src680
Date: Sat, 15 Mar 2008 04:50:22 +0000 (GMT)
Author: kyoshida
Date: Sat Mar 15 04:50:22 2008
New Revision: 11913
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11913&view=rev

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

	* patches/src680/sc-datapilot-dynamic-range.diff: fixed a regression
	that caused the output range format in the datapilot layout dialog to
	mis-behave when the XL-style formula syntax option is on.  For now, we
	still need to use OOo style address because the XL style parser still
	has some issues.


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	Sat Mar 15 04:50:22 2008
@@ -1,12 +1,7 @@
-Index: sc/source/ui/dbgui/fieldwnd.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/ui/dbgui/fieldwnd.cxx,v
-retrieving revision 1.19
-retrieving revision 1.19.290.1
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.19 -r1.19.290.1
---- sc/source/ui/dbgui/fieldwnd.cxx	27 Feb 2007 13:02:48 -0000	1.19
-+++ sc/source/ui/dbgui/fieldwnd.cxx	18 Feb 2008 18:47:16 -0000	1.19.290.1
-@@ -644,7 +644,7 @@
+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-03-03 11:24:49.000000000 -0500
++++ sc/source/ui/dbgui/fieldwnd.cxx	2008-03-15 00:34:49.000000000 -0400
+@@ -644,7 +644,7 @@ void ScDPFieldWindow::DelField( size_t n
  
  void ScDPFieldWindow::ClearFields()
  {
@@ -15,14 +10,9 @@
  	{
          com::sun::star::uno::Reference < com::sun::star::accessibility::XAccessible > xTempAcc = xAccessible;
          if (!xTempAcc.is() && pAccessible)
-Index: sc/source/ui/dbgui/pivot.hrc
-===================================================================
-RCS file: /cvs/sc/sc/source/ui/dbgui/pivot.hrc,v
-retrieving revision 1.7
-retrieving revision 1.7.660.1
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.7 -r1.7.660.1
---- sc/source/ui/dbgui/pivot.hrc	8 Sep 2005 20:39:01 -0000	1.7
-+++ sc/source/ui/dbgui/pivot.hrc	18 Feb 2008 18:47:16 -0000	1.7.660.1
+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-03-03 11:24:49.000000000 -0500
++++ sc/source/ui/dbgui/pivot.hrc	2008-03-15 00:34:49.000000000 -0400
 @@ -71,6 +71,10 @@
  #define BTN_FILTER              29
  #define BTN_DRILLDOWN           30
@@ -34,15 +24,10 @@
  #define PIVOTSTR_SUM			1
  #define PIVOTSTR_COUNT			2
  #define PIVOTSTR_AVG			3
-Index: sc/source/ui/dbgui/pivot.src
-===================================================================
-RCS file: /cvs/sc/sc/source/ui/dbgui/pivot.src,v
-retrieving revision 1.59
-retrieving revision 1.59.262.1
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.59 -r1.59.262.1
---- sc/source/ui/dbgui/pivot.src	19 Apr 2007 16:27:18 -0000	1.59
-+++ sc/source/ui/dbgui/pivot.src	18 Feb 2008 18:47:16 -0000	1.59.262.1
-@@ -163,7 +163,7 @@
+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-03-03 11:24:49.000000000 -0500
++++ sc/source/ui/dbgui/pivot.src	2008-03-15 00:34:49.000000000 -0400
+@@ -163,7 +163,7 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT
          Size = MAP_APPFONT ( 50 , 14 ) ;
  		TabStop = TRUE ;
  		MapUnit = MAP_APPFONT ;
@@ -51,7 +36,7 @@
  	};
  	Window WND_FIELD
  	{
-@@ -183,17 +183,42 @@
+@@ -183,17 +183,42 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT
  		Text [ en-US ] = "Result" ;
  		Hide = TRUE ;
  	};
@@ -96,7 +81,7 @@
          Size = MAP_APPFONT ( 75 , 90 ) ;
  		TabStop = TRUE ;
  		DropDown = TRUE ;
-@@ -202,14 +227,14 @@
+@@ -202,14 +227,14 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT
  	Edit ED_OUTAREA
  	{
  		Border = TRUE ;
@@ -113,7 +98,7 @@
  		Size = MAP_APPFONT ( 13 , 15 ) ;
          TabStop = TRUE ;
          Hide = TRUE ;
-@@ -217,7 +242,7 @@
+@@ -217,7 +242,7 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT
  	};
  	CheckBox BTN_IGNEMPTYROWS
  	{
@@ -122,7 +107,7 @@
          Size = MAP_APPFONT ( 124 , 10 ) ;
  		TabStop = TRUE ;
  		Hide = TRUE ;
-@@ -225,7 +250,7 @@
+@@ -225,7 +250,7 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT
  	};
  	CheckBox BTN_DETECTCAT
  	{
@@ -131,7 +116,7 @@
          Size = MAP_APPFONT ( 124 , 10 ) ;
  		TabStop = TRUE ;
  		Hide = TRUE ;
-@@ -233,7 +258,7 @@
+@@ -233,7 +258,7 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT
  	};
  	CheckBox BTN_TOTALCOL
  	{
@@ -140,7 +125,7 @@
          Size = MAP_APPFONT ( 124 , 10 ) ;
  		TabStop = TRUE ;
  		Hide = TRUE ;
-@@ -241,7 +266,7 @@
+@@ -241,7 +266,7 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT
  	};
  	CheckBox BTN_TOTALROW
  	{
@@ -149,7 +134,7 @@
          Size = MAP_APPFONT ( 124 , 10 ) ;
  		TabStop = TRUE ;
  		Hide = TRUE ;
-@@ -249,7 +274,7 @@
+@@ -249,7 +274,7 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT
  	};
      CheckBox BTN_FILTER
      {
@@ -158,7 +143,7 @@
          Size = MAP_APPFONT ( 124 , 10 ) ;
          TabStop = TRUE ;
          Hide = TRUE ;
-@@ -257,7 +282,7 @@
+@@ -257,7 +282,7 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT
      };
      CheckBox BTN_DRILLDOWN
      {
@@ -167,14 +152,9 @@
          Size = MAP_APPFONT ( 124 , 10 ) ;
          TabStop = TRUE ;
          Hide = TRUE ;
-Index: sc/source/ui/dbgui/pvlaydlg.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/ui/dbgui/pvlaydlg.cxx,v
-retrieving revision 1.27
-retrieving revision 1.27.92.1
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.27 -r1.27.92.1
---- sc/source/ui/dbgui/pvlaydlg.cxx	20 Nov 2007 17:41:39 -0000	1.27
-+++ sc/source/ui/dbgui/pvlaydlg.cxx	18 Feb 2008 18:47:16 -0000	1.27.92.1
+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-03-03 11:24:49.000000000 -0500
++++ sc/source/ui/dbgui/pvlaydlg.cxx	2008-03-15 00:35:30.000000000 -0400
 @@ -41,6 +41,7 @@
  //----------------------------------------------------------------------------
  
@@ -191,7 +171,7 @@
  #include "scmod.hxx"
  
  #include "sc.hrc" //CHINA001
-@@ -125,6 +127,11 @@
+@@ -125,6 +127,11 @@ ScDPLayoutDlg::ScDPLayoutDlg( SfxBinding
  		aFtInfo			( this, ScResId( FT_INFO ) ),
  
          aFlAreas        ( this, ScResId( FL_OUTPUT ) ),
@@ -203,7 +183,7 @@
  		aLbOutPos		( this, ScResId( LB_OUTAREA ) ),
  		aFtOutArea		( this, ScResId( FT_OUTAREA ) ),
  		aEdOutPos		( this, ScResId( ED_OUTAREA ) ),
-@@ -148,6 +155,8 @@
+@@ -148,6 +155,8 @@ ScDPLayoutDlg::ScDPLayoutDlg( SfxBinding
  
  		bIsDrag			( FALSE ),
  
@@ -212,7 +192,7 @@
          eLastActiveType ( TYPE_SELECT ),
  		nOffset			( 0 ),
  		//
-@@ -209,6 +218,10 @@
+@@ -209,6 +218,10 @@ void __EXPORT ScDPLayoutDlg::Init()
      for ( USHORT i = 0; i < FUNC_COUNT; ++i )
          aFuncNameArr.push_back( String( ScResId( i + 1 ) ) );
  
@@ -223,7 +203,7 @@
  	aBtnMore.AddWindow( &aFtOutArea );
  	aBtnMore.AddWindow( &aLbOutPos );
  	aBtnMore.AddWindow( &aEdOutPos );
-@@ -219,7 +232,6 @@
+@@ -219,7 +232,6 @@ void __EXPORT ScDPLayoutDlg::Init()
  	aBtnMore.AddWindow( &aBtnTotalRow );
      aBtnMore.AddWindow( &aBtnFilter );
      aBtnMore.AddWindow( &aBtnDrillDown );
@@ -231,7 +211,7 @@
      aBtnMore.SetClickHdl( LINK( this, ScDPLayoutDlg, MoreClickHdl ) );
  
  	{
-@@ -237,31 +249,35 @@
+@@ -237,31 +249,35 @@ void __EXPORT ScDPLayoutDlg::Init()
      aRowArr.resize( MAX_FIELDS );
      aDataArr.resize( MAX_FIELDS );
  
@@ -247,12 +227,13 @@
 -    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;
@@ -283,7 +264,7 @@
  
  	if ( pViewData && pDoc )
  	{
-@@ -480,6 +496,27 @@
+@@ -480,6 +496,27 @@ void ScDPLayoutDlg::InitFocus()
          aWndSelect.GrabFocus();
  }
  
@@ -311,7 +292,7 @@
  
  //----------------------------------------------------------------------------
  
-@@ -1314,22 +1351,78 @@
+@@ -1314,22 +1351,78 @@ BOOL ScDPLayoutDlg::GetPivotArrays(    P
  	return bFit;
  }
  
@@ -388,18 +369,18 @@
  		String aRefStr;
 -        rRef.aStart.Format( aRefStr, STD_FORMAT, pDocP );
 -		aEdOutPos.SetRefString( aRefStr );
-+        rRef.Format( aRefStr, SCR_ABS_3D, pDocP, pDocP->GetAddressConvention() );
++        rRef.Format( aRefStr, SCR_ABS_3D, pDocP, ScAddress::CONV_OOO );
 +        pEditActive->SetRefString( aRefStr );
 +    }
 +    else if ( pEditActive == &aEdOutPos )
 +    {
 +        String aRefStr;
-+        rRef.aStart.Format( aRefStr, STD_FORMAT, pDocP, pDocP->GetAddressConvention() );
++        rRef.aStart.Format( aRefStr, STD_FORMAT, pDocP, ScAddress::CONV_OOO );
 +        pEditActive->SetRefString( aRefStr );
  	}
  }
  
-@@ -1340,7 +1433,12 @@
+@@ -1340,7 +1433,12 @@ void ScDPLayoutDlg::SetActive()
  {
  	if ( bRefInputMode )
  	{
@@ -413,7 +394,7 @@
  		EdModifyHdl( NULL );
  	}
  	else
-@@ -1497,12 +1595,11 @@
+@@ -1497,12 +1595,11 @@ IMPL_LINK( ScDPLayoutDlg, OkHdl, OKButto
  
  //----------------------------------------------------------------------------
  
@@ -427,7 +408,7 @@
  
  
  //----------------------------------------------------------------------------
-@@ -1514,9 +1611,18 @@
+@@ -1514,9 +1611,18 @@ IMPL_LINK( ScDPLayoutDlg, MoreClickHdl, 
  		bRefInputMode = TRUE;
  		//@BugID 54702 Enablen/Disablen nur noch in Basisklasse
  		//SFX_APPWINDOW->Enable();
@@ -447,7 +428,7 @@
  	}
  	else
  	{
-@@ -1557,6 +1663,13 @@
+@@ -1557,6 +1663,13 @@ IMPL_LINK( ScDPLayoutDlg, EdModifyHdl, E
  }
  
  
@@ -461,7 +442,7 @@
  //----------------------------------------------------------------------------
  
  IMPL_LINK( ScDPLayoutDlg, SelAreaHdl, ListBox *, EMPTYARG )
-@@ -1610,4 +1723,16 @@
+@@ -1610,4 +1723,16 @@ IMPL_LINK( ScDPLayoutDlg, ScrollHdl, Scr
  	return 0;
  }
  
@@ -478,15 +459,10 @@
 +	return 0;
 +}
  
-Index: sc/source/ui/inc/pvlaydlg.hxx
-===================================================================
-RCS file: /cvs/sc/sc/source/ui/inc/pvlaydlg.hxx,v
-retrieving revision 1.11
-retrieving revision 1.11.632.1
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.11 -r1.11.632.1
---- sc/source/ui/inc/pvlaydlg.hxx	21 Oct 2005 12:04:24 -0000	1.11
-+++ sc/source/ui/inc/pvlaydlg.hxx	18 Feb 2008 18:47:17 -0000	1.11.632.1
-@@ -143,10 +143,18 @@
+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-03-03 11:24:45.000000000 -0500
++++ sc/source/ui/inc/pvlaydlg.hxx	2008-03-15 00:34:49.000000000 -0400
+@@ -143,10 +143,18 @@ private:
      FixedInfo               aFtInfo;
  
      FixedLine               aFlAreas;
@@ -505,7 +481,7 @@
      CheckBox                aBtnIgnEmptyRows;
      CheckBox                aBtnDetectCat;
      CheckBox                aBtnTotalCol;
-@@ -169,6 +177,8 @@
+@@ -169,6 +177,8 @@ private:
      size_t                  nDnDFromIndex;
      BOOL                    bIsDrag;
  
@@ -514,7 +490,7 @@
      Rectangle               aRectPage;
      Rectangle               aRectRow;
      Rectangle               aRectCol;
-@@ -187,6 +197,7 @@
+@@ -187,6 +197,7 @@ private:
      ScDPFuncDataVec         aDataArr;
  
      ScDPObjectPtr           xDlgDPObject;
@@ -522,7 +498,7 @@
      ScPivotParam            thePivotData;
      ScViewData*             pViewData;
      ScDocument*             pDoc;
-@@ -198,6 +209,7 @@
+@@ -198,6 +209,7 @@ private:
      void                    InitWndSelect   ( LabelData** ppLabelArr, long nLabels );
      void                    InitWnd         ( PivotField* pArr, long nCount, ScDPFieldType eType );
      void                    InitFocus       ();
@@ -530,7 +506,7 @@
      void                    CalcWndSizes    ();
      Point                   DlgPos2WndPos   ( const Point& rPt, Window& rWnd );
      ScDPLabelData*          GetLabelData    ( SCsCOL nCol, size_t* pPos = NULL );
-@@ -221,14 +233,19 @@
+@@ -221,14 +233,19 @@ private:
                                                USHORT&       rColCount,
                                                USHORT&       rRowCount,
                                                USHORT&       rDataCount );
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]