Attachment #51516 for issue #23658

View | Details | Raw Unified | Return to issue 23658
Collapse All | Expand All

Lines 644-650 void ScDPFieldWindow::DelField( size_t n Link Here

(-)sc.clean/source/ui/dbgui/fieldwnd.cxx (-1 / +1 lines)
644		644
645	void ScDPFieldWindow::ClearFields()	645	void ScDPFieldWindow::ClearFields()
646	{	646	{
647	if( eType == TYPE_SELECT )	647	if( eType == TYPE_SELECT \|\| eType == TYPE_PAGE \|\| eType == TYPE_COL \|\| eType == TYPE_ROW \|\| eType == TYPE_DATA)
648	{	648	{
649	com::sun::star::uno::Reference < com::sun::star::accessibility::XAccessible > xTempAcc = xAccessible;	649	com::sun::star::uno::Reference < com::sun::star::accessibility::XAccessible > xTempAcc = xAccessible;
650	if (!xTempAcc.is() && pAccessible)	650	if (!xTempAcc.is() && pAccessible)

Lines 71-76 Link Here

(-)sc.clean/source/ui/dbgui/pivot.hrc (+4 lines)
71	#define BTN_FILTER 29	71	#define BTN_FILTER 29
72	#define BTN_DRILLDOWN 30	72	#define BTN_DRILLDOWN 30
73		73
		74	#define FT_INAREA 40
		75	#define RB_INAREA 41
		76	#define ED_INAREA 42
		77
74	#define PIVOTSTR_SUM 1	78	#define PIVOTSTR_SUM 1
75	#define PIVOTSTR_COUNT 2	79	#define PIVOTSTR_COUNT 2
76	#define PIVOTSTR_AVG 3	80	#define PIVOTSTR_AVG 3




        Size = MAP_APPFONT ( 50 , 14 ) ;
		TabStop = TRUE ;
		MapUnit = MAP_APPFONT ;
        Delta = 90 ;
	};
	Window WND_FIELD
	{

		Text [ en-US ] = "Result" ;
		Hide = TRUE ;
	};

    FixedText FT_INAREA
    {
        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
    {
        Border = TRUE ;
        Pos = MAP_APPFONT ( 73 , 201 ) ;
        Size = MAP_APPFONT ( 100 , 12 ) ;
        TabStop = TRUE ;
        Hide = TRUE ;
    };
    ImageButton RB_INAREA
    {
        Pos = MAP_APPFONT ( 177 , 200 ) ;
        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 , 221 ) ;
        Size = MAP_APPFONT ( 59 , 8 ) ;
		Hide = TRUE ;
		Text [ en-US ] = "Results to" ;

	ListBox LB_OUTAREA
	{
		Border = TRUE ;
        Pos = MAP_APPFONT ( 73 , 219 ) ;
        Size = MAP_APPFONT ( 75 , 90 ) ;
		TabStop = TRUE ;
		DropDown = TRUE ;

	Edit ED_OUTAREA
	{
		Border = TRUE ;
        Pos = MAP_APPFONT ( 152 , 219 ) ;
        Size = MAP_APPFONT ( 100 , 12 ) ;
		TabStop = TRUE ;
		Hide = TRUE ;
	};
	ImageButton RB_OUTAREA
	{
        Pos = MAP_APPFONT ( 256 , 218 ) ;
		Size = MAP_APPFONT ( 13 , 15 ) ;
        TabStop = TRUE ;
        Hide = TRUE ;

	};
	CheckBox BTN_IGNEMPTYROWS
	{
        Pos = MAP_APPFONT ( 12 , 237 ) ;
        Size = MAP_APPFONT ( 124 , 10 ) ;
		TabStop = TRUE ;
		Hide = TRUE ;

	};
	CheckBox BTN_DETECTCAT
	{
        Pos = MAP_APPFONT ( 142 , 237 ) ;
        Size = MAP_APPFONT ( 124 , 10 ) ;
		TabStop = TRUE ;
		Hide = TRUE ;

	};
	CheckBox BTN_TOTALCOL
	{
        Pos = MAP_APPFONT ( 12 , 251 ) ;
        Size = MAP_APPFONT ( 124 , 10 ) ;
		TabStop = TRUE ;
		Hide = TRUE ;

	};
	CheckBox BTN_TOTALROW
	{
        Pos = MAP_APPFONT ( 142 , 251 ) ;
        Size = MAP_APPFONT ( 124 , 10 ) ;
		TabStop = TRUE ;
		Hide = TRUE ;

	};
    CheckBox BTN_FILTER
    {
        Pos = MAP_APPFONT ( 12 , 265 ) ;
        Size = MAP_APPFONT ( 124 , 10 ) ;
        TabStop = TRUE ;
        Hide = TRUE ;

    };
    CheckBox BTN_DRILLDOWN
    {
        Pos = MAP_APPFONT ( 142 , 265 ) ;
        Size = MAP_APPFONT ( 124 , 10 ) ;
        TabStop = TRUE ;
        Hide = TRUE ;

Lines 41-46 Link Here

(-)sc.clean/source/ui/dbgui/pvlaydlg.cxx (-18 / +134 lines)
41	//----------------------------------------------------------------------------	41	//----------------------------------------------------------------------------
42		42
43	#include "pvlaydlg.hxx"	43	#include "pvlaydlg.hxx"
		44	#include "dbdocfun.hxx"
44		45
45	#include <sfx2/dispatch.hxx>	46	#include <sfx2/dispatch.hxx>
46	#include <vcl/msgbox.hxx>	47	#include <vcl/msgbox.hxx>
Lines 61-66 Link Here
61	#include "pivot.hrc"	62	#include "pivot.hrc"
62	#include "dpobject.hxx"	63	#include "dpobject.hxx"
63	#include "dpsave.hxx"	64	#include "dpsave.hxx"
		65	#include "dpshttab.hxx"
64	#include "scmod.hxx"	66	#include "scmod.hxx"
65		67
66	#include "sc.hrc" //CHINA001	68	#include "sc.hrc" //CHINA001
Lines 125-130 ScDPLayoutDlg::ScDPLayoutDlg( SfxBinding Link Here
125	aFtInfo ( this, ScResId( FT_INFO ) ),	127	aFtInfo ( this, ScResId( FT_INFO ) ),
126		128
127	aFlAreas ( this, ScResId( FL_OUTPUT ) ),	129	aFlAreas ( this, ScResId( FL_OUTPUT ) ),
		130
		131	aFtInArea ( this, ScResId( FT_INAREA) ),
		132	aEdInPos ( this, ScResId( ED_INAREA) ),
		133	aRbInPos ( this, ScResId( RB_INAREA ), &aEdInPos ),
		134
128	aLbOutPos ( this, ScResId( LB_OUTAREA ) ),	135	aLbOutPos ( this, ScResId( LB_OUTAREA ) ),
129	aFtOutArea ( this, ScResId( FT_OUTAREA ) ),	136	aFtOutArea ( this, ScResId( FT_OUTAREA ) ),
130	aEdOutPos ( this, ScResId( ED_OUTAREA ) ),	137	aEdOutPos ( this, ScResId( ED_OUTAREA ) ),
Lines 148-153 ScDPLayoutDlg::ScDPLayoutDlg( SfxBinding Link Here
148		155
149	bIsDrag ( FALSE ),	156	bIsDrag ( FALSE ),
150		157
		158	pEditActive ( NULL ),
		159
151	eLastActiveType ( TYPE_SELECT ),	160	eLastActiveType ( TYPE_SELECT ),
152	nOffset ( 0 ),	161	nOffset ( 0 ),
153	//	162	//
Lines 209-214 void __EXPORT ScDPLayoutDlg::Init() Link Here
209	for ( USHORT i = 0; i < FUNC_COUNT; ++i )	218	for ( USHORT i = 0; i < FUNC_COUNT; ++i )
210	aFuncNameArr.push_back( String( ScResId( i + 1 ) ) );	219	aFuncNameArr.push_back( String( ScResId( i + 1 ) ) );
211		220
		221	aBtnMore.AddWindow( &aFlAreas );
		222	aBtnMore.AddWindow( &aFtInArea );
		223	aBtnMore.AddWindow( &aEdInPos );
		224	aBtnMore.AddWindow( &aRbInPos );
212	aBtnMore.AddWindow( &aFtOutArea );	225	aBtnMore.AddWindow( &aFtOutArea );
213	aBtnMore.AddWindow( &aLbOutPos );	226	aBtnMore.AddWindow( &aLbOutPos );
214	aBtnMore.AddWindow( &aEdOutPos );	227	aBtnMore.AddWindow( &aEdOutPos );
Lines 219-225 void __EXPORT ScDPLayoutDlg::Init() Link Here
219	aBtnMore.AddWindow( &aBtnTotalRow );	232	aBtnMore.AddWindow( &aBtnTotalRow );
220	aBtnMore.AddWindow( &aBtnFilter );	233	aBtnMore.AddWindow( &aBtnFilter );
221	aBtnMore.AddWindow( &aBtnDrillDown );	234	aBtnMore.AddWindow( &aBtnDrillDown );
222	aBtnMore.AddWindow( &aFlAreas );
223	aBtnMore.SetClickHdl( LINK( this, ScDPLayoutDlg, MoreClickHdl ) );	235	aBtnMore.SetClickHdl( LINK( this, ScDPLayoutDlg, MoreClickHdl ) );
224		236
225	{	237	{
Lines 237-242 void __EXPORT ScDPLayoutDlg::Init() Link Here
237	aRowArr.resize( MAX_FIELDS );	249	aRowArr.resize( MAX_FIELDS );
238	aDataArr.resize( MAX_FIELDS );	250	aDataArr.resize( MAX_FIELDS );
239		251
		252	ScRange inRange;
		253	String inString;
		254	if (xDlgDPObject->GetSheetDesc())
		255	{
		256	aEdInPos.Enable();
		257	aRbInPos.Enable();
		258	inRange = xDlgDPObject->GetSheetDesc()->aSourceRange;
		259	inRange.Format( inString, STD_FORMAT, pDoc);
		260	aEdInPos.SetText(inString);
		261	}
		262	else
		263	{
		264	/* Data is not reachable, so could be a remote database */
		265	aEdInPos.Disable();
		266	aRbInPos.Disable();
		267	}
		268
240	InitWndSelect( thePivotData.ppLabelArr, static_cast<long>(thePivotData.nLabels) );	269	InitWndSelect( thePivotData.ppLabelArr, static_cast<long>(thePivotData.nLabels) );
241	InitWnd( thePivotData.aPageArr, static_cast<long>(thePivotData.nPageCount), TYPE_PAGE );	270	InitWnd( thePivotData.aPageArr, static_cast<long>(thePivotData.nPageCount), TYPE_PAGE );
242	InitWnd( thePivotData.aColArr, static_cast<long>(thePivotData.nColCount), TYPE_COL );	271	InitWnd( thePivotData.aColArr, static_cast<long>(thePivotData.nColCount), TYPE_COL );
Lines 260-267 void __EXPORT ScDPLayoutDlg::Init() Link Here
260		289
261	aLbOutPos .SetSelectHdl( LINK( this, ScDPLayoutDlg, SelAreaHdl ) );	290	aLbOutPos .SetSelectHdl( LINK( this, ScDPLayoutDlg, SelAreaHdl ) );
262	aEdOutPos .SetModifyHdl( LINK( this, ScDPLayoutDlg, EdModifyHdl ) );	291	aEdOutPos .SetModifyHdl( LINK( this, ScDPLayoutDlg, EdModifyHdl ) );
		292	aEdInPos .SetModifyHdl( LINK( this, ScDPLayoutDlg, EdInModifyHdl ) );
263	aBtnOk .SetClickHdl ( LINK( this, ScDPLayoutDlg, OkHdl ) );	293	aBtnOk .SetClickHdl ( LINK( this, ScDPLayoutDlg, OkHdl ) );
264	aBtnCancel.SetClickHdl ( LINK( this, ScDPLayoutDlg, CancelHdl ) );	294	aBtnCancel.SetClickHdl ( LINK( this, ScDPLayoutDlg, CancelHdl ) );
		295	Link aLink = LINK( this, ScDPLayoutDlg, GetFocusHdl );
		296	if ( aEdInPos.IsEnabled() )
		297	// Once disabled it will never get enabled, so no need to handle focus.
		298	aEdInPos.SetGetFocusHdl( aLink );
		299	aEdOutPos.SetGetFocusHdl( aLink );
265		300
266	if ( pViewData && pDoc )	301	if ( pViewData && pDoc )
267	{	302	{
Lines 1314-1336 BOOL ScDPLayoutDlg::GetPivotArrays( P Link Here
1314	return bFit;	1349	return bFit;
1315	}	1350	}
1316		1351
		1352	bool ScDPLayoutDlg::UpdateSrcRange()
		1353	{
		1354	String theCurPosStr = aEdInPos.GetText();
		1355	USHORT nResult = ScRange().Parse(theCurPosStr, pDoc);
		1356
		1357	if ( SCA_VALID != (nResult & SCA_VALID) )
		1358	// invalid source range.
		1359	return false;
		1360
		1361	ScRefAddress start, end;
		1362	ConvertDoubleRef(pDoc, theCurPosStr, 1, start, end);
		1363	ScRange aNewRange(start.GetAddress(), end.GetAddress());
		1364	ScSheetSourceDesc inSheet = *xDlgDPObject->GetSheetDesc();
		1365
		1366	if (inSheet.aSourceRange == aNewRange)
		1367	// new range is identical to the current range. Nothing to do.
		1368	return true;
		1369
		1370	ScTabViewShell * pTabViewShell = pViewData->GetViewShell();
		1371	inSheet.aSourceRange = aNewRange;
		1372	xDlgDPObject->SetSheetDesc(inSheet);
		1373	xDlgDPObject->InvalidateSource();
		1374	xDlgDPObject->Output();
		1375	xDlgDPObject->SetAlive(true); // needed to get structure information
		1376	xDlgDPObject->FillOldParam(thePivotData, true);
		1377	xDlgDPObject->FillLabelData(thePivotData);
		1378
		1379	pTabViewShell->SetDialogDPObject(xDlgDPObject.get());
		1380	aLabelDataArr.clear();
		1381	aWndSelect.ClearFields();
		1382	aWndData.ClearFields();
		1383	aWndRow.ClearFields();
		1384	aWndCol.ClearFields();
		1385	aWndPage.ClearFields();
		1386
		1387	return true;
		1388	}
1317		1389
1318	//----------------------------------------------------------------------------	1390	//----------------------------------------------------------------------------
1319		1391
1320	void ScDPLayoutDlg::SetReference( const ScRange& rRef, ScDocument* pDocP )	1392	void ScDPLayoutDlg::SetReference( const ScRange& rRef, ScDocument* pDocP )
1321	{	1393	{
1322	if ( bRefInputMode )	1394	if ( !bRefInputMode \|\| !pEditActive )
1323	{	1395	return;
1324	if ( rRef.aStart != rRef.aEnd )	1396
1325	RefInputStart( &aEdOutPos );	1397	if ( rRef.aStart != rRef.aEnd )
1326	/*	1398	RefInputStart( pEditActive );
1327	ScAddress aAdr( nStartCol, nStartRow, nStartTab );	1399
1328	aAdr.PutInOrder( ScAddress( nEndCol, nEndRow, nEndTab ) );	1400	if ( pEditActive == &aEdInPos )
1329	*/	1401	{
1330	String aRefStr;	1402	String aRefStr;
1331	rRef.aStart.Format( aRefStr, STD_FORMAT, pDocP );	1403	rRef.Format( aRefStr, STD_FORMAT, pDocP, pDocP->GetAddressConvention() );
1332	aEdOutPos.SetRefString( aRefStr );	1404	pEditActive->SetRefString( aRefStr );
1333	}	1405	}
		1406	else if ( pEditActive == &aEdOutPos )
		1407	{
		1408	String aRefStr;
		1409	rRef.aStart.Format( aRefStr, STD_FORMAT, pDocP, pDocP->GetAddressConvention() );
		1410	pEditActive->SetRefString( aRefStr );
		1411	}
1334	}	1412	}
1335		1413
1336		1414
Lines 1340-1347 void ScDPLayoutDlg::SetActive() Link Here
1340	{	1418	{
1341	if ( bRefInputMode )	1419	if ( bRefInputMode )
1342	{	1420	{
1343	aEdOutPos.GrabFocus();	1421	if ( pEditActive )
1344	EdModifyHdl( NULL );	1422	pEditActive->GrabFocus();
		1423
		1424	if ( pEditActive == &aEdInPos )
		1425	EdInModifyHdl( NULL );
		1426	else if ( pEditActive == &aEdOutPos )
		1427	EdModifyHdl( NULL );
1345	}	1428	}
1346	else	1429	else
1347	{	1430	{
Lines 1384-1389 IMPL_LINK( ScDPLayoutDlg, OkHdl, OKButto Link Here
1384	if ( bToNewTable	1467	if ( bToNewTable
1385	\|\| ( (aOutPosStr.Len() > 0) && (SCA_VALID == (nResult & SCA_VALID)) ) )	1468	\|\| ( (aOutPosStr.Len() > 0) && (SCA_VALID == (nResult & SCA_VALID)) ) )
1386	{	1469	{
		1470	if (!UpdateSrcRange())
		1471	{
		1472	ErrorBox( this, WinBits(WB_OK \| WB_DEF_OK), ScGlobal::GetRscString(STR_INVALID_TABREF) ).Execute();
		1473	aEdInPos.GrabFocus();
		1474	return 0;
		1475	}
1387	//@BugID 54702 Enablen/Disablen nur noch in Basisklasse	1476	//@BugID 54702 Enablen/Disablen nur noch in Basisklasse
1388	//SFX_APPWINDOW->Enable();	1477	//SFX_APPWINDOW->Enable();
1389		1478
Lines 1514-1522 IMPL_LINK( ScDPLayoutDlg, MoreClickHdl, Link Here
1514	bRefInputMode = TRUE;	1603	bRefInputMode = TRUE;
1515	//@BugID 54702 Enablen/Disablen nur noch in Basisklasse	1604	//@BugID 54702 Enablen/Disablen nur noch in Basisklasse
1516	//SFX_APPWINDOW->Enable();	1605	//SFX_APPWINDOW->Enable();
1517	aEdOutPos.Enable();	1606	if ( aEdInPos.IsEnabled() )
1518	aEdOutPos.GrabFocus();	1607	{
1519	aRbOutPos.Enable();	1608	aEdInPos.Enable();
		1609	aEdInPos.GrabFocus();
		1610	aEdInPos.Enable();
		1611	}
		1612	else
		1613	{
		1614	aEdOutPos.Enable();
		1615	aEdOutPos.GrabFocus();
		1616	aEdOutPos.Enable();
		1617	}
1520	}	1618	}
1521	else	1619	else
1522	{	1620	{
Lines 1557-1562 IMPL_LINK( ScDPLayoutDlg, EdModifyHdl, E Link Here
1557	}	1655	}
1558		1656
1559		1657
		1658	IMPL_LINK( ScDPLayoutDlg, EdInModifyHdl, Edit *, EMPTYARG )
		1659	{
		1660	return 0;
		1661	}
		1662
		1663
1560	//----------------------------------------------------------------------------	1664	//----------------------------------------------------------------------------
1561		1665
1562	IMPL_LINK( ScDPLayoutDlg, SelAreaHdl, ListBox *, EMPTYARG )	1666	IMPL_LINK( ScDPLayoutDlg, SelAreaHdl, ListBox *, EMPTYARG )
Lines 1610-1613 IMPL_LINK( ScDPLayoutDlg, ScrollHdl, Scr Link Here
1610	return 0;	1714	return 0;
1611	}	1715	}
1612		1716
		1717	//----------------------------------------------------------------------------
		1718
		1719	IMPL_LINK( ScDPLayoutDlg, GetFocusHdl, Control*, pCtrl )
		1720	{
		1721	pEditActive = NULL;
		1722	if ( pCtrl == &aEdInPos )
		1723	pEditActive = &aEdInPos;
		1724	else if ( pCtrl == &aEdOutPos )
		1725	pEditActive = &aEdOutPos;
		1726
		1727	return 0;
		1728	}
1613		1729

Lines 143-152 private: Link Here

(-)sc.clean/source/ui/inc/pvlaydlg.hxx (+15 lines)
143	FixedInfo aFtInfo;	143	FixedInfo aFtInfo;
144		144
145	FixedLine aFlAreas;	145	FixedLine aFlAreas;
		146
		147	// DP source selection
		148	FixedText aFtInArea;
		149	ScRefEdit aEdInPos;
		150	ScRefButton aRbInPos;
		151
		152	// DP output location
146	ListBox aLbOutPos;	153	ListBox aLbOutPos;
147	FixedText aFtOutArea;	154	FixedText aFtOutArea;
148	ScRefEdit aEdOutPos;	155	ScRefEdit aEdOutPos;
149	ScRefButton aRbOutPos;	156	ScRefButton aRbOutPos;
		157
150	CheckBox aBtnIgnEmptyRows;	158	CheckBox aBtnIgnEmptyRows;
151	CheckBox aBtnDetectCat;	159	CheckBox aBtnDetectCat;
152	CheckBox aBtnTotalCol;	160	CheckBox aBtnTotalCol;
Lines 169-174 private: Link Here
169	size_t nDnDFromIndex;	177	size_t nDnDFromIndex;
170	BOOL bIsDrag;	178	BOOL bIsDrag;
171		179
		180	ScRefEdit* pEditActive;
		181
172	Rectangle aRectPage;	182	Rectangle aRectPage;
173	Rectangle aRectRow;	183	Rectangle aRectRow;
174	Rectangle aRectCol;	184	Rectangle aRectCol;
Lines 221-234 private: Link Here
221	USHORT& rColCount,	231	USHORT& rColCount,
222	USHORT& rRowCount,	232	USHORT& rRowCount,
223	USHORT& rDataCount );	233	USHORT& rDataCount );
		234
		235	bool UpdateSrcRange();
		236
224	// Handler	237	// Handler
225	DECL_LINK( ClickHdl, PushButton * );	238	DECL_LINK( ClickHdl, PushButton * );
226	DECL_LINK( ScrollHdl, ScrollBar * );	239	DECL_LINK( ScrollHdl, ScrollBar * );
227	DECL_LINK( SelAreaHdl, ListBox * );	240	DECL_LINK( SelAreaHdl, ListBox * );
228	DECL_LINK( MoreClickHdl, MoreButton * );	241	DECL_LINK( MoreClickHdl, MoreButton * );
229	DECL_LINK( EdModifyHdl, Edit * );	242	DECL_LINK( EdModifyHdl, Edit * );
		243	DECL_LINK( EdInModifyHdl, Edit * );
230	DECL_LINK( OkHdl, OKButton * );	244	DECL_LINK( OkHdl, OKButton * );
231	DECL_LINK( CancelHdl, CancelButton * );	245	DECL_LINK( CancelHdl, CancelButton * );
		246	DECL_LINK( GetFocusHdl, Control* );
232	};	247	};
233		248
234		249

Return to issue 23658

Lines 163-169 ModelessDialog RID_SCDLG_PIVOT_LAYOUT Link Here

(-)sc.clean/source/ui/dbgui/pivot.src (-11 / +52 lines)
163	Size = MAP_APPFONT ( 50 , 14 ) ;	163	Size = MAP_APPFONT ( 50 , 14 ) ;
164	TabStop = TRUE ;	164	TabStop = TRUE ;
165	MapUnit = MAP_APPFONT ;	165	MapUnit = MAP_APPFONT ;
166	Delta = 73 ;	166	Delta = 90 ;
167	};	167	};
168	Window WND_FIELD	168	Window WND_FIELD
169	{	169	{
Lines 183-191 ModelessDialog RID_SCDLG_PIVOT_LAYOUT Link Here
183	Text [ en-US ] = "Result" ;	183	Text [ en-US ] = "Result" ;
184	Hide = TRUE ;	184	Hide = TRUE ;
185	};	185	};
		186
		187	FixedText FT_INAREA
		188	{
		189	Pos = MAP_APPFONT ( 12 , 203 ) ;
		190	Size = MAP_APPFONT ( 59 , 8 ) ;
		191	Hide = TRUE ;
		192	Text [ en-US ] = "Selection from" ;
		193	Text[ de ] = "Auswahl aus";
		194	Text[ es ] = "Selección de";
		195	Text[ fr ] = "Sélection à partir de";
		196	Text[ it ] = "Seleziona da";
		197	Text[ ja ] = "選択元";
		198	Text[ pt-BR ] = "Seleção de ";
		199	Text[ zh-CN ] = "选择范围";
		200	Text[ zh-TW ] = "選項來源";
		201	};
		202	Edit ED_INAREA
		203	{
		204	Border = TRUE ;
		205	Pos = MAP_APPFONT ( 73 , 201 ) ;
		206	Size = MAP_APPFONT ( 100 , 12 ) ;
		207	TabStop = TRUE ;
		208	Hide = TRUE ;
		209	};
		210	ImageButton RB_INAREA
		211	{
		212	Pos = MAP_APPFONT ( 177 , 200 ) ;
		213	Size = MAP_APPFONT ( 13 , 15 ) ;
		214	TabStop = TRUE ;
		215	Hide = TRUE ;
		216	QuickHelpText [ de ] = "Verkleinern" ;
		217	QuickHelpText [ en-US ] = "Shrink" ;
		218	QuickHelpText[ es ] = "Reducir";
		219	QuickHelpText[ fr ] = "Comprimer";
		220	QuickHelpText[ it ] = "Comprimi";
		221	QuickHelpText[ ja ] = "縮小";
		222	QuickHelpText[ pt-BR ] = "Diminuir";
		223	QuickHelpText[ zh-CN ] = "收缩";
		224	QuickHelpText[ zh-TW ] = "縮小";
		225	};
		226
186	FixedText FT_OUTAREA	227	FixedText FT_OUTAREA
187	{	228	{
188	Pos = MAP_APPFONT ( 12 , 203 ) ;	229	Pos = MAP_APPFONT ( 12 , 221 ) ;
189	Size = MAP_APPFONT ( 59 , 8 ) ;	230	Size = MAP_APPFONT ( 59 , 8 ) ;
190	Hide = TRUE ;	231	Hide = TRUE ;
191	Text [ en-US ] = "Results to" ;	232	Text [ en-US ] = "Results to" ;
Lines 193-199 ModelessDialog RID_SCDLG_PIVOT_LAYOUT Link Here
193	ListBox LB_OUTAREA	234	ListBox LB_OUTAREA
194	{	235	{
195	Border = TRUE ;	236	Border = TRUE ;
196	Pos = MAP_APPFONT ( 73 , 201 ) ;	237	Pos = MAP_APPFONT ( 73 , 219 ) ;
197	Size = MAP_APPFONT ( 75 , 90 ) ;	238	Size = MAP_APPFONT ( 75 , 90 ) ;
198	TabStop = TRUE ;	239	TabStop = TRUE ;
199	DropDown = TRUE ;	240	DropDown = TRUE ;
Lines 202-215 ModelessDialog RID_SCDLG_PIVOT_LAYOUT Link Here
202	Edit ED_OUTAREA	243	Edit ED_OUTAREA
203	{	244	{
204	Border = TRUE ;	245	Border = TRUE ;
205	Pos = MAP_APPFONT ( 152 , 201 ) ;	246	Pos = MAP_APPFONT ( 152 , 219 ) ;
206	Size = MAP_APPFONT ( 100 , 12 ) ;	247	Size = MAP_APPFONT ( 100 , 12 ) ;
207	TabStop = TRUE ;	248	TabStop = TRUE ;
208	Hide = TRUE ;	249	Hide = TRUE ;
209	};	250	};
210	ImageButton RB_OUTAREA	251	ImageButton RB_OUTAREA
211	{	252	{
212	Pos = MAP_APPFONT ( 256 , 200 ) ;	253	Pos = MAP_APPFONT ( 256 , 218 ) ;
213	Size = MAP_APPFONT ( 13 , 15 ) ;	254	Size = MAP_APPFONT ( 13 , 15 ) ;
214	TabStop = TRUE ;	255	TabStop = TRUE ;
215	Hide = TRUE ;	256	Hide = TRUE ;
Lines 217-223 ModelessDialog RID_SCDLG_PIVOT_LAYOUT Link Here
217	};	258	};
218	CheckBox BTN_IGNEMPTYROWS	259	CheckBox BTN_IGNEMPTYROWS
219	{	260	{
220	Pos = MAP_APPFONT ( 12 , 219 ) ;	261	Pos = MAP_APPFONT ( 12 , 237 ) ;
221	Size = MAP_APPFONT ( 124 , 10 ) ;	262	Size = MAP_APPFONT ( 124 , 10 ) ;
222	TabStop = TRUE ;	263	TabStop = TRUE ;
223	Hide = TRUE ;	264	Hide = TRUE ;
Lines 225-231 ModelessDialog RID_SCDLG_PIVOT_LAYOUT Link Here
225	};	266	};
226	CheckBox BTN_DETECTCAT	267	CheckBox BTN_DETECTCAT
227	{	268	{
228	Pos = MAP_APPFONT ( 142 , 219 ) ;	269	Pos = MAP_APPFONT ( 142 , 237 ) ;
229	Size = MAP_APPFONT ( 124 , 10 ) ;	270	Size = MAP_APPFONT ( 124 , 10 ) ;
230	TabStop = TRUE ;	271	TabStop = TRUE ;
231	Hide = TRUE ;	272	Hide = TRUE ;
Lines 233-239 ModelessDialog RID_SCDLG_PIVOT_LAYOUT Link Here
233	};	274	};
234	CheckBox BTN_TOTALCOL	275	CheckBox BTN_TOTALCOL
235	{	276	{
236	Pos = MAP_APPFONT ( 12 , 233 ) ;	277	Pos = MAP_APPFONT ( 12 , 251 ) ;
237	Size = MAP_APPFONT ( 124 , 10 ) ;	278	Size = MAP_APPFONT ( 124 , 10 ) ;
238	TabStop = TRUE ;	279	TabStop = TRUE ;
239	Hide = TRUE ;	280	Hide = TRUE ;
Lines 241-247 ModelessDialog RID_SCDLG_PIVOT_LAYOUT Link Here
241	};	282	};
242	CheckBox BTN_TOTALROW	283	CheckBox BTN_TOTALROW
243	{	284	{
244	Pos = MAP_APPFONT ( 142 , 233 ) ;	285	Pos = MAP_APPFONT ( 142 , 251 ) ;
245	Size = MAP_APPFONT ( 124 , 10 ) ;	286	Size = MAP_APPFONT ( 124 , 10 ) ;
246	TabStop = TRUE ;	287	TabStop = TRUE ;
247	Hide = TRUE ;	288	Hide = TRUE ;
Lines 249-255 ModelessDialog RID_SCDLG_PIVOT_LAYOUT Link Here
249	};	290	};
250	CheckBox BTN_FILTER	291	CheckBox BTN_FILTER
251	{	292	{
252	Pos = MAP_APPFONT ( 12 , 247 ) ;	293	Pos = MAP_APPFONT ( 12 , 265 ) ;
253	Size = MAP_APPFONT ( 124 , 10 ) ;	294	Size = MAP_APPFONT ( 124 , 10 ) ;
254	TabStop = TRUE ;	295	TabStop = TRUE ;
255	Hide = TRUE ;	296	Hide = TRUE ;
Lines 257-263 ModelessDialog RID_SCDLG_PIVOT_LAYOUT Link Here
257	};	298	};
258	CheckBox BTN_DRILLDOWN	299	CheckBox BTN_DRILLDOWN
259	{	300	{
260	Pos = MAP_APPFONT ( 142 , 247 ) ;	301	Pos = MAP_APPFONT ( 142 , 265 ) ;
261	Size = MAP_APPFONT ( 124 , 10 ) ;	302	Size = MAP_APPFONT ( 124 , 10 ) ;
262	TabStop = TRUE ;	303	TabStop = TRUE ;
263	Hide = TRUE ;	304	Hide = TRUE ;