ooo-build r11628 - in trunk: . patches/src680
- From: kyoshida svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r11628 - in trunk: . patches/src680
- Date: Tue, 19 Feb 2008 05:01:03 +0000 (GMT)
Author: kyoshida
Date: Tue Feb 19 05:01:02 2008
New Revision: 11628
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11628&view=rev
Log:
2008-02-18 Kohei Yoshida <kyoshida novell com>
* patches/src680/sc-datapilot-dynamic-range.diff: final change that has
been committed in the upstream.
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 Tue Feb 19 05:01:02 2008
@@ -1,7 +1,12 @@
-diff -urp --exclude=CVS sc.clean/source/ui/dbgui/fieldwnd.cxx sc/source/ui/dbgui/fieldwnd.cxx
---- sc.clean/source/ui/dbgui/fieldwnd.cxx 2008-02-05 11:16:56.000000000 -0500
-+++ sc/source/ui/dbgui/fieldwnd.cxx 2008-02-13 12:26:03.000000000 -0500
-@@ -644,7 +644,7 @@ void ScDPFieldWindow::DelField( size_t n
+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 @@
void ScDPFieldWindow::ClearFields()
{
@@ -10,9 +15,14 @@
{
com::sun::star::uno::Reference < com::sun::star::accessibility::XAccessible > xTempAcc = xAccessible;
if (!xTempAcc.is() && pAccessible)
-diff -urp --exclude=CVS sc.clean/source/ui/dbgui/pivot.hrc sc/source/ui/dbgui/pivot.hrc
---- sc.clean/source/ui/dbgui/pivot.hrc 2008-02-05 11:16:56.000000000 -0500
-+++ sc/source/ui/dbgui/pivot.hrc 2008-02-13 17:26:28.000000000 -0500
+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
@@ -71,6 +71,10 @@
#define BTN_FILTER 29
#define BTN_DRILLDOWN 30
@@ -24,10 +34,15 @@
#define PIVOTSTR_SUM 1
#define PIVOTSTR_COUNT 2
#define PIVOTSTR_AVG 3
-diff -urp --exclude=CVS sc.clean/source/ui/dbgui/pivot.src sc/source/ui/dbgui/pivot.src
---- sc.clean/source/ui/dbgui/pivot.src 2008-02-05 11:16:56.000000000 -0500
-+++ sc/source/ui/dbgui/pivot.src 2008-02-14 09:52:45.000000000 -0500
-@@ -163,7 +163,7 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT
+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 @@
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
MapUnit = MAP_APPFONT ;
@@ -36,25 +51,18 @@
};
Window WND_FIELD
{
-@@ -183,9 +183,50 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT
+@@ -183,17 +183,42 @@
Text [ en-US ] = "Result" ;
Hide = TRUE ;
};
+- FixedText FT_OUTAREA
+
+ FixedText FT_INAREA
-+ {
-+ Pos = MAP_APPFONT ( 12 , 203 ) ;
-+ Size = MAP_APPFONT ( 59 , 8 ) ;
-+ Hide = TRUE ;
+ {
+ Pos = MAP_APPFONT ( 12 , 203 ) ;
+ Size = MAP_APPFONT ( 59 , 8 ) ;
+ Hide = TRUE ;
+ Text [ en-US ] = "Selection from" ;
-+ Text[ de ] = "Auswahl aus";
-+ Text[ es ] = "SelecciÃn de";
-+ Text[ fr ] = "SÃlection à partir de";
-+ Text[ it ] = "Seleziona da";
-+ Text[ ja ] = "éæå";
-+ Text[ pt-BR ] = "SeleÃÃo de ";
-+ Text[ zh-CN ] = "éæèå";
-+ Text[ zh-TW ] = "ééäæ";
+ };
+ Edit ED_INAREA
+ {
@@ -70,25 +78,16 @@
+ Size = MAP_APPFONT ( 13 , 15 ) ;
+ TabStop = TRUE ;
+ Hide = TRUE ;
-+ QuickHelpText [ de ] = "Verkleinern" ;
+ QuickHelpText [ en-US ] = "Shrink" ;
-+ QuickHelpText[ es ] = "Reducir";
-+ QuickHelpText[ fr ] = "Comprimer";
-+ QuickHelpText[ it ] = "Comprimi";
-+ QuickHelpText[ ja ] = "çå";
-+ QuickHelpText[ pt-BR ] = "Diminuir";
-+ QuickHelpText[ zh-CN ] = "æç";
-+ QuickHelpText[ zh-TW ] = "çå";
+ };
+
- FixedText FT_OUTAREA
- {
-- Pos = MAP_APPFONT ( 12 , 203 ) ;
++ FixedText FT_OUTAREA
++ {
+ Pos = MAP_APPFONT ( 12 , 221 ) ;
- Size = MAP_APPFONT ( 59 , 8 ) ;
- Hide = TRUE ;
++ Size = MAP_APPFONT ( 59 , 8 ) ;
++ Hide = TRUE ;
Text [ en-US ] = "Results to" ;
-@@ -193,7 +234,7 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT
+ };
ListBox LB_OUTAREA
{
Border = TRUE ;
@@ -97,7 +96,7 @@
Size = MAP_APPFONT ( 75 , 90 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
-@@ -202,14 +243,14 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT
+@@ -202,14 +227,14 @@
Edit ED_OUTAREA
{
Border = TRUE ;
@@ -114,7 +113,7 @@
Size = MAP_APPFONT ( 13 , 15 ) ;
TabStop = TRUE ;
Hide = TRUE ;
-@@ -217,7 +258,7 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT
+@@ -217,7 +242,7 @@
};
CheckBox BTN_IGNEMPTYROWS
{
@@ -123,7 +122,7 @@
Size = MAP_APPFONT ( 124 , 10 ) ;
TabStop = TRUE ;
Hide = TRUE ;
-@@ -225,7 +266,7 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT
+@@ -225,7 +250,7 @@
};
CheckBox BTN_DETECTCAT
{
@@ -132,7 +131,7 @@
Size = MAP_APPFONT ( 124 , 10 ) ;
TabStop = TRUE ;
Hide = TRUE ;
-@@ -233,7 +274,7 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT
+@@ -233,7 +258,7 @@
};
CheckBox BTN_TOTALCOL
{
@@ -141,7 +140,7 @@
Size = MAP_APPFONT ( 124 , 10 ) ;
TabStop = TRUE ;
Hide = TRUE ;
-@@ -241,7 +282,7 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT
+@@ -241,7 +266,7 @@
};
CheckBox BTN_TOTALROW
{
@@ -150,7 +149,7 @@
Size = MAP_APPFONT ( 124 , 10 ) ;
TabStop = TRUE ;
Hide = TRUE ;
-@@ -249,7 +290,7 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT
+@@ -249,7 +274,7 @@
};
CheckBox BTN_FILTER
{
@@ -159,7 +158,7 @@
Size = MAP_APPFONT ( 124 , 10 ) ;
TabStop = TRUE ;
Hide = TRUE ;
-@@ -257,7 +298,7 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT
+@@ -257,7 +282,7 @@
};
CheckBox BTN_DRILLDOWN
{
@@ -168,10 +167,14 @@
Size = MAP_APPFONT ( 124 , 10 ) ;
TabStop = TRUE ;
Hide = TRUE ;
-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-15 14:45:23.000000000 -0500
+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
@@ -41,6 +41,7 @@
//----------------------------------------------------------------------------
@@ -188,7 +191,7 @@
#include "scmod.hxx"
#include "sc.hrc" //CHINA001
-@@ -125,6 +127,11 @@ ScDPLayoutDlg::ScDPLayoutDlg( SfxBinding
+@@ -125,6 +127,11 @@
aFtInfo ( this, ScResId( FT_INFO ) ),
aFlAreas ( this, ScResId( FL_OUTPUT ) ),
@@ -200,7 +203,7 @@
aLbOutPos ( this, ScResId( LB_OUTAREA ) ),
aFtOutArea ( this, ScResId( FT_OUTAREA ) ),
aEdOutPos ( this, ScResId( ED_OUTAREA ) ),
-@@ -148,6 +155,8 @@ ScDPLayoutDlg::ScDPLayoutDlg( SfxBinding
+@@ -148,6 +155,8 @@
bIsDrag ( FALSE ),
@@ -209,7 +212,7 @@
eLastActiveType ( TYPE_SELECT ),
nOffset ( 0 ),
//
-@@ -209,6 +218,10 @@ void __EXPORT ScDPLayoutDlg::Init()
+@@ -209,6 +218,10 @@
for ( USHORT i = 0; i < FUNC_COUNT; ++i )
aFuncNameArr.push_back( String( ScResId( i + 1 ) ) );
@@ -220,7 +223,7 @@
aBtnMore.AddWindow( &aFtOutArea );
aBtnMore.AddWindow( &aLbOutPos );
aBtnMore.AddWindow( &aEdOutPos );
-@@ -219,7 +232,6 @@ void __EXPORT ScDPLayoutDlg::Init()
+@@ -219,7 +232,6 @@
aBtnMore.AddWindow( &aBtnTotalRow );
aBtnMore.AddWindow( &aBtnFilter );
aBtnMore.AddWindow( &aBtnDrillDown );
@@ -228,7 +231,7 @@
aBtnMore.SetClickHdl( LINK( this, ScDPLayoutDlg, MoreClickHdl ) );
{
-@@ -237,31 +249,35 @@ void __EXPORT ScDPLayoutDlg::Init()
+@@ -237,31 +249,35 @@
aRowArr.resize( MAX_FIELDS );
aDataArr.resize( MAX_FIELDS );
@@ -244,23 +247,20 @@
- 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();
-- }
-- else
-- aSlider.Hide();
+ ScRange inRange;
+ String inString;
+ if (xDlgDPObject->GetSheetDesc())
-+ {
+ {
+- aSlider.SetEndScrollHdl( LINK( this, ScDPLayoutDlg, ScrollHdl ) );
+- aSlider.Show();
+ aEdInPos.Enable();
+ aRbInPos.Enable();
+ aOldRange = xDlgDPObject->GetSheetDesc()->aSourceRange;
-+ aOldRange.Format( inString, STD_FORMAT, pDoc);
++ aOldRange.Format( inString, SCR_ABS_3D, pDoc);
+ aEdInPos.SetText(inString);
-+ }
-+ else
+ }
+ else
+- aSlider.Hide();
+ {
+ /* Data is not reachable, so could be a remote database */
+ aEdInPos.Disable();
@@ -283,7 +283,7 @@
if ( pViewData && pDoc )
{
-@@ -480,6 +496,27 @@ void ScDPLayoutDlg::InitFocus()
+@@ -480,6 +496,27 @@
aWndSelect.GrabFocus();
}
@@ -311,7 +311,7 @@
//----------------------------------------------------------------------------
-@@ -1314,23 +1351,78 @@ BOOL ScDPLayoutDlg::GetPivotArrays( P
+@@ -1314,22 +1351,78 @@
return bFit;
}
@@ -337,6 +337,7 @@
+ inSheet.aSourceRange = aNewRange;
+ xDlgDPObject->SetSheetDesc(inSheet);
+ xDlgDPObject->InvalidateSource();
++ xDlgDPObject->FillOldParam( thePivotData, FALSE );
+ xDlgDPObject->FillLabelData(thePivotData);
+
+ pTabViewShell->SetDialogDPObject(xDlgDPObject.get());
@@ -371,26 +372,23 @@
{
- if ( bRefInputMode )
- {
-- if ( rRef.aStart != rRef.aEnd )
++ if ( !bRefInputMode || !pEditActive )
++ return;
++
+ if ( rRef.aStart != rRef.aEnd )
- RefInputStart( &aEdOutPos );
-/*
- ScAddress aAdr( nStartCol, nStartRow, nStartTab );
- aAdr.PutInOrder( ScAddress( nEndCol, nEndRow, nEndTab ) );
-*/
-- String aRefStr;
-- rRef.aStart.Format( aRefStr, STD_FORMAT, pDocP );
-- aEdOutPos.SetRefString( aRefStr );
-- }
-+ if ( !bRefInputMode || !pEditActive )
-+ return;
-+
-+ if ( rRef.aStart != rRef.aEnd )
+ RefInputStart( pEditActive );
+
+ if ( pEditActive == &aEdInPos )
+ {
-+ String aRefStr;
-+ rRef.Format( aRefStr, STD_FORMAT, pDocP, pDocP->GetAddressConvention() );
+ String aRefStr;
+- rRef.aStart.Format( aRefStr, STD_FORMAT, pDocP );
+- aEdOutPos.SetRefString( aRefStr );
++ rRef.Format( aRefStr, SCR_ABS_3D, pDocP, pDocP->GetAddressConvention() );
+ pEditActive->SetRefString( aRefStr );
+ }
+ else if ( pEditActive == &aEdOutPos )
@@ -398,37 +396,30 @@
+ String aRefStr;
+ rRef.aStart.Format( aRefStr, STD_FORMAT, pDocP, pDocP->GetAddressConvention() );
+ pEditActive->SetRefString( aRefStr );
-+ }
+ }
}
-
-@@ -1340,8 +1432,13 @@ void ScDPLayoutDlg::SetActive()
+@@ -1340,7 +1433,12 @@
{
if ( bRefInputMode )
{
- aEdOutPos.GrabFocus();
-- EdModifyHdl( NULL );
+ if ( pEditActive )
+ pEditActive->GrabFocus();
+
+ if ( pEditActive == &aEdInPos )
+ EdInModifyHdl( NULL );
+ else if ( pEditActive == &aEdOutPos )
-+ EdModifyHdl( NULL );
+ EdModifyHdl( NULL );
}
else
- {
-@@ -1497,12 +1594,15 @@ IMPL_LINK( ScDPLayoutDlg, OkHdl, OKButto
+@@ -1497,12 +1595,11 @@
//----------------------------------------------------------------------------
-IMPL_LINK_INLINE_START( ScDPLayoutDlg, CancelHdl, CancelButton *, EMPTYARG )
+IMPL_LINK( ScDPLayoutDlg, CancelHdl, CancelButton *, EMPTYARG )
{
-+ ScSheetSourceDesc inSheet = *xDlgDPObject->GetSheetDesc();
-+ inSheet.aSourceRange = aOldRange;
-+ xDlgDPObject->SetSheetDesc(inSheet);
-+ xDlgDPObject->InvalidateSource();
Close();
return 0;
}
@@ -436,13 +427,10 @@
//----------------------------------------------------------------------------
-@@ -1514,9 +1614,18 @@ IMPL_LINK( ScDPLayoutDlg, MoreClickHdl,
+@@ -1514,9 +1611,18 @@
bRefInputMode = TRUE;
//@BugID 54702 Enablen/Disablen nur noch in Basisklasse
//SFX_APPWINDOW->Enable();
-- aEdOutPos.Enable();
-- aEdOutPos.GrabFocus();
-- aRbOutPos.Enable();
+ if ( aEdInPos.IsEnabled() )
+ {
+ aEdInPos.Enable();
@@ -451,14 +439,15 @@
+ }
+ else
+ {
-+ aEdOutPos.Enable();
-+ aEdOutPos.GrabFocus();
+ aEdOutPos.Enable();
+ aEdOutPos.GrabFocus();
+- aRbOutPos.Enable();
+ aEdOutPos.Enable();
+ }
}
else
{
-@@ -1557,6 +1666,13 @@ IMPL_LINK( ScDPLayoutDlg, EdModifyHdl, E
+@@ -1557,6 +1663,13 @@
}
@@ -472,7 +461,7 @@
//----------------------------------------------------------------------------
IMPL_LINK( ScDPLayoutDlg, SelAreaHdl, ListBox *, EMPTYARG )
-@@ -1610,4 +1726,16 @@ IMPL_LINK( ScDPLayoutDlg, ScrollHdl, Scr
+@@ -1610,4 +1723,16 @@
return 0;
}
@@ -489,11 +478,15 @@
+ return 0;
+}
-Only in sc/source/ui/dbgui: pvlaydlg.cxx.orig
-diff -urp --exclude=CVS sc.clean/source/ui/inc/pvlaydlg.hxx sc/source/ui/inc/pvlaydlg.hxx
---- sc.clean/source/ui/inc/pvlaydlg.hxx 2008-02-05 11:16:55.000000000 -0500
-+++ sc/source/ui/inc/pvlaydlg.hxx 2008-02-14 16:42:01.000000000 -0500
-@@ -143,10 +143,18 @@ private:
+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 @@
FixedInfo aFtInfo;
FixedLine aFlAreas;
@@ -512,7 +505,7 @@
CheckBox aBtnIgnEmptyRows;
CheckBox aBtnDetectCat;
CheckBox aBtnTotalCol;
-@@ -169,6 +177,8 @@ private:
+@@ -169,6 +177,8 @@
size_t nDnDFromIndex;
BOOL bIsDrag;
@@ -521,7 +514,7 @@
Rectangle aRectPage;
Rectangle aRectRow;
Rectangle aRectCol;
-@@ -187,6 +197,7 @@ private:
+@@ -187,6 +197,7 @@
ScDPFuncDataVec aDataArr;
ScDPObjectPtr xDlgDPObject;
@@ -529,7 +522,7 @@
ScPivotParam thePivotData;
ScViewData* pViewData;
ScDocument* pDoc;
-@@ -198,6 +209,7 @@ private:
+@@ -198,6 +209,7 @@
void InitWndSelect ( LabelData** ppLabelArr, long nLabels );
void InitWnd ( PivotField* pArr, long nCount, ScDPFieldType eType );
void InitFocus ();
@@ -537,7 +530,7 @@
void CalcWndSizes ();
Point DlgPos2WndPos ( const Point& rPt, Window& rWnd );
ScDPLabelData* GetLabelData ( SCsCOL nCol, size_t* pPos = NULL );
-@@ -221,14 +233,19 @@ private:
+@@ -221,14 +233,19 @@
USHORT& rColCount,
USHORT& rRowCount,
USHORT& rDataCount );
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
