Attachment #18415 for issue #35579

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

Lines 1329-1334 Link Here

(-)/home/sragavan/cvs/bk/ooo-build/build/OOO_1_1_2/sc/inc/global.hxx (+2 lines)
1329		1329
1330	enum ScQueryOp	1330	enum ScQueryOp
1331	{	1331	{
		1332	SC_BEGINS_WITH,
		1333	SC_ENDS_WITH,
1332	SC_EQUAL,	1334	SC_EQUAL,
1333	SC_LESS,	1335	SC_LESS,
1334	SC_GREATER,	1336	SC_GREATER,




#include "viewdata.hxx"
#include "document.hxx"
#include "scresid.hxx"
#include "docoptio.hxx"

#include "foptmgr.hxx"


							aBtnMore,
							aBtnCase,
							aBtnRegExp,
							aBtnWholeWord,
							aBtnHeader,
							aBtnUnique,
							aBtnCopyResult,

		bCopyPosOk = ( SCA_VALID == (nResult & SCA_VALID) );
	}

	/*
	  * The reg exp checkbutton read is moved up, since,
	  * for begins and ends with query we are makeing them as re query transparently
	  * Checking this later spoils the entire transparent work.
	  */
	theParam.bRegExp		= aBtnRegExp.IsChecked();

	ScDocOptions pDocOpts = pDoc->GetDocOptions();
	pDocOpts.SetMatchWholeCell(aBtnWholeWord.IsChecked());
	pDoc->SetDocOptions(pDocOpts);

	for ( USHORT i=0; i<3; i++ )
	{
		USHORT 		nField	= aFieldLbArr[i]->GetSelectEntryPos();

			}
			else
			{
				if (eOp == SC_BEGINS_WITH ) {
					String tmp ('^');
					tmp .Append(aStrVal);
					::rtl::OUString str (tmp);
					aStrVal.Assign(tmp);
					eOp = SC_EQUAL;
					theParam.bRegExp		= TRUE;
				}
				else if (eOp == SC_ENDS_WITH ) {
					aStrVal.Append (String('$'));
					eOp = SC_EQUAL;
					theParam.bRegExp		= TRUE;
				}
				*rEntry.pStr		  = aStrVal;
				rEntry.nVal			  = 0;
				rEntry.bQueryByString = TRUE;

	theParam.bByRow			= TRUE;
	theParam.bDuplicate		= !aBtnUnique.IsChecked();
	theParam.bCaseSens 		= aBtnCase.IsChecked();
	
	theParam.bDestPers		= aBtnDestPers.IsChecked();

	//	nur die drei eingestellten - alles andere zuruecksetzen

Lines 101-106 Link Here

(-)/home/sragavan/cvs/bk/ooo-build/build/OOO_1_1_2/sc/source/ui/inc/filtdlg.hxx (+2 lines)
101	CheckBox aBtnCase; \	101	CheckBox aBtnCase; \
102	CheckBox aBtnRegExp; \	102	CheckBox aBtnRegExp; \
103	CheckBox aBtnHeader; \	103	CheckBox aBtnHeader; \
		104	CheckBox aBtnWholeWord; \
104	CheckBox aBtnUnique; \	105	CheckBox aBtnUnique; \
105	CheckBox aBtnCopyResult; \	106	CheckBox aBtnCopyResult; \
106	ListBox aLbCopyArea; \	107	ListBox aLbCopyArea; \
Lines 122-127 Link Here
122	aFlOptions ( this, ScResId( FL_OPTIONS ) ), \	123	aFlOptions ( this, ScResId( FL_OPTIONS ) ), \
123	aBtnCase ( this, ScResId( BTN_CASE ) ), \	124	aBtnCase ( this, ScResId( BTN_CASE ) ), \
124	aBtnRegExp ( this, ScResId( BTN_REGEXP ) ), \	125	aBtnRegExp ( this, ScResId( BTN_REGEXP ) ), \
		126	aBtnWholeWord ( this, ScResId( BTN_MATCH) ), \
125	aBtnHeader ( this, ScResId( BTN_HEADER ) ), \	127	aBtnHeader ( this, ScResId( BTN_HEADER ) ), \
126	aBtnUnique ( this, ScResId( BTN_UNIQUE ) ), \	128	aBtnUnique ( this, ScResId( BTN_UNIQUE ) ), \
127	aBtnCopyResult ( this, ScResId( BTN_COPY_RESULT ) ), \	129	aBtnCopyResult ( this, ScResId( BTN_COPY_RESULT ) ), \

Lines 81-87 Link Here

(-)/home/sragavan/cvs/bk/ooo-build/build/OOO_1_1_2/sc/source/ui/inc/filter.hrc (-1 / +1 lines)
81	#define FT_DBAREA_LABEL 10	81	#define FT_DBAREA_LABEL 10
82	#define FT_DBAREA 11	82	#define FT_DBAREA 11
83	#define BTN_DEST_PERS 12	83	#define BTN_DEST_PERS 12
84		84	#define BTN_MATCH 13
85	// Filter:	85	// Filter:
86	#define FT_OP 20	86	#define FT_OP 20
87	#define FT_FIELD 21	87	#define FT_FIELD 21

Lines 66-72 Link Here

(-)/home/sragavan/cvs/bk/ooo-build/build/OOO_1_1_2/sc/source/ui/src/filter.src (-8 / +18 lines)
66	HelpId = SID_FILTER ;	66	HelpId = SID_FILTER ;
67	Hide = TRUE ;	67	Hide = TRUE ;
68	SVLook = TRUE ;	68	SVLook = TRUE ;
69	Size = MAP_APPFONT ( 298 , 83 ) ;	69	Size = MAP_APPFONT ( 298 , 98 ) ;
70	Text = "Standardfilter" ;	70	Text = "Standardfilter" ;
71	Text [ ENGLISH ] = "Standard Filter" ;	71	Text [ ENGLISH ] = "Standard Filter" ;
72	Text [ norwegian ] = "Standardfilter" ;	72	Text [ norwegian ] = "Standardfilter" ;
Lines 708-719 Link Here
708	};	708	};
709	stringlist [ english_us ] =	709	stringlist [ english_us ] =
710	{	710	{
711	< "=" ; Default ; > ;	711	< "Begins with" ; Default ; > ;
		712	< "Ends with" ; Default ; > ;
		713	< "Equals" ; Default ; > ;
712	< "<" ; Default ; > ;	714	< "<" ; Default ; > ;
713	< ">" ; Default ; > ;	715	< ">" ; Default ; > ;
714	< "<=" ; Default ; > ;	716	< "<=" ; Default ; > ;
715	< ">=" ; Default ; > ;	717	< ">=" ; Default ; > ;
716	< "<>" ; Default ; > ;	718	< "Not equals" ; Default ; > ;
717	< "Largest" ; Default ; > ;	719	< "Largest" ; Default ; > ;
718	< "Smallest" ; Default ; > ;	720	< "Smallest" ; Default ; > ;
719	< "Largest %" ; Default ; > ;	721	< "Largest %" ; Default ; > ;
Lines 2278-2283 Link Here
2278	Text[ zulu ] = "Isisho esi~jwayelekile";	2280	Text[ zulu ] = "Isisho esi~jwayelekile";
2279	Text[ norwegian_nynorsk ] = "~Regulært uttrykk";	2281	Text[ norwegian_nynorsk ] = "~Regulært uttrykk";
2280	};	2282	};
		2283
		2284	CheckBox BTN_MATCH
		2285	{
		2286	Pos = MAP_APPFONT ( 12 , 126 ) ;
		2287	Size = MAP_APPFONT ( 239 , 10 ) ;
		2288	Text [ english_us ] = "Search criteria must apply to ~whole cells" ;
		2289	};
		2290
2281	CheckBox BTN_HEADER	2291	CheckBox BTN_HEADER
2282	{	2292	{
2283	Hide = TRUE ;	2293	Hide = TRUE ;
Lines 2458-2464 Link Here
2458	{	2468	{
2459	Border = TRUE ;	2469	Border = TRUE ;
2460	Hide = TRUE ;	2470	Hide = TRUE ;
2461	Pos = MAP_APPFONT ( 21 , 126 ) ;	2471	Pos = MAP_APPFONT ( 21 , 138 ) ;
2462	Size = MAP_APPFONT ( 90 , 90 ) ;	2472	Size = MAP_APPFONT ( 90 , 90 ) ;
2463	TabStop = TRUE ;	2473	TabStop = TRUE ;
2464	DropDown = TRUE ;	2474	DropDown = TRUE ;
Lines 2467-2473 Link Here
2467	{	2477	{
2468	Border = TRUE ;	2478	Border = TRUE ;
2469	Hide = TRUE ;	2479	Hide = TRUE ;
2470	Pos = MAP_APPFONT ( 115 , 126 ) ;	2480	Pos = MAP_APPFONT ( 115 , 138 ) ;
2471	Size = MAP_APPFONT ( 104 , 12 ) ;	2481	Size = MAP_APPFONT ( 104 , 12 ) ;
2472	TabStop = TRUE ;	2482	TabStop = TRUE ;
2473	};	2483	};
Lines 2475-2481 Link Here
2475	{	2485	{
2476	QuickHelpText = "Verkleinern" ;	2486	QuickHelpText = "Verkleinern" ;
2477	QuickHelpText [ ENGLISH ] = "Shrink" ;	2487	QuickHelpText [ ENGLISH ] = "Shrink" ;
2478	Pos = MAP_APPFONT ( 221 , 126 ) ;	2488	Pos = MAP_APPFONT ( 221 , 138 ) ;
2479	Size = MAP_APPFONT ( 12 , 12 ) ;	2489	Size = MAP_APPFONT ( 12 , 12 ) ;
2480	TabStop = FALSE ;	2490	TabStop = FALSE ;
2481	QuickHelpText [ english_us ] = "Shrink" ;	2491	QuickHelpText [ english_us ] = "Shrink" ;
Lines 2605-2611 Link Here
2605	FixedText FT_DBAREA_LABEL	2615	FixedText FT_DBAREA_LABEL
2606	{	2616	{
2607	Hide = TRUE ;	2617	Hide = TRUE ;
2608	Pos = MAP_APPFONT ( 6 , 144 ) ;	2618	Pos = MAP_APPFONT ( 6 , 156 ) ;
2609	Size = MAP_APPFONT ( 58 , 8 ) ;	2619	Size = MAP_APPFONT ( 58 , 8 ) ;
2610	Text = "Datenbereich:" ;	2620	Text = "Datenbereich:" ;
2611	Text [ ENGLISH ] = "Data area:" ;	2621	Text [ ENGLISH ] = "Data area:" ;
Lines 3204-3213 Link Here
3204	Text [ danish ] = "dummy" ;	3214	Text [ danish ] = "dummy" ;
3205	Text [ french ] = "factice" ;	3215	Text [ french ] = "factice" ;
3206	Text [ swedish ] = "dummy" ;	3216	Text [ swedish ] = "dummy" ;
		3217	Left = TRUE ;
3207	Text [ dutch ] = "dummy" ;	3218	Text [ dutch ] = "dummy" ;
3208	Text [ spanish ] = "Texto ejemplo" ;	3219	Text [ spanish ] = "Texto ejemplo" ;
3209	Text [ english_us ] = "dummy" ;	3220	Text [ english_us ] = "dummy" ;
3210	Left = TRUE ;
3211	Text[ chinese_simplified ] = "æ ·æ¬";	3221	Text[ chinese_simplified ] = "æ ·æ¬";
3212	Text[ russian ] = "ôèêòèâíûé";	3222	Text[ russian ] = "ôèêòèâíûé";
3213	Text[ polish ] = "Zalepka";	3223	Text[ polish ] = "Zalepka";




#include "dbcolect.hxx"
#include "viewdata.hxx"
#include "document.hxx"
#include "docoptio.hxx"

#define _FOPTMGR_CXX
#include "foptmgr.hxx"

		rStrNoName		( refStrNoName ),
		rStrUndefined	( refStrUndefined )
{
	Init(FALSE);
}

ScFilterOptionsMgr::ScFilterOptionsMgr(
								Dialog*				ptrDlg,
								ScViewData*			ptrViewData,
								const ScQueryParam&	refQueryData,
								MoreButton&			refBtnMore,
								CheckBox&			refBtnCase,
								CheckBox&			refBtnRegExp,
								CheckBox&			refBtnWholeWord,								
								CheckBox&			refBtnHeader,
								CheckBox&			refBtnUnique,
								CheckBox&			refBtnCopyResult,
								CheckBox&			refBtnDestPers,
								ListBox&			refLbCopyArea,
								Edit&				refEdCopyArea,
								ScRefButton&		refRbCopyArea,
								FixedText&			refFtDbAreaLabel,
								FixedInfo&			refFtDbArea,
                                FixedLine&          refFlOptions,
								const String&		refStrNoName,
								const String&		refStrUndefined )

	:	pDlg			( ptrDlg ),
		pViewData		( ptrViewData ),
		pDoc			( ptrViewData ? ptrViewData->GetDocument() : NULL ),
		rQueryData		( refQueryData ),
		rBtnMore		( refBtnMore ),
		rBtnCase		( refBtnCase ),
		rBtnRegExp		( refBtnRegExp ),
		rBtnWholeWord      ( refBtnWholeWord),
		rBtnHeader		( refBtnHeader ),
		rBtnUnique		( refBtnUnique ),
		rBtnCopyResult	( refBtnCopyResult ),
		rBtnDestPers	( refBtnDestPers ),
		rLbCopyPos		( refLbCopyArea ),
		rEdCopyPos		( refEdCopyArea ),
		rRbCopyPos		( refRbCopyArea ),
		rFtDbAreaLabel	( refFtDbAreaLabel ),
		rFtDbArea		( refFtDbArea ),
        rFlOptions      ( refFlOptions ),
		rStrNoName		( refStrNoName ),
		rStrUndefined	( refStrUndefined )
{
	Init(TRUE);
}

//----------------------------------------------------------------------------



//----------------------------------------------------------------------------

void ScFilterOptionsMgr::Init(BOOL param)
{
	DBG_ASSERT( pViewData && pDoc, "Init failed :-/" );



	rBtnMore.AddWindow( &rBtnCase );
	rBtnMore.AddWindow( &rBtnRegExp );
	if (param)
		rBtnMore.AddWindow(&rBtnWholeWord);	
	rBtnMore.AddWindow( &rBtnHeader );
	rBtnMore.AddWindow( &rBtnUnique );
	rBtnMore.AddWindow( &rBtnCopyResult );

	rBtnMore.AddWindow( &rRbCopyPos );
	rBtnMore.AddWindow( &rFtDbAreaLabel );
	rBtnMore.AddWindow( &rFtDbArea );
       rBtnMore.AddWindow( &rFlOptions );


	rBtnCase	.Check( rQueryData.bCaseSens );
	rBtnHeader	.Check( rQueryData.bHasHeader );
	rBtnRegExp	.Check( rQueryData.bRegExp );
	rBtnUnique	.Check( !rQueryData.bDuplicate );
	if (param) {
		BOOL	bMatchWholeCell = pDoc->GetDocOptions().IsMatchWholeCell();
		rBtnWholeWord.Check(bMatchWholeCell);
	}
	
	if ( pViewData && pDoc )
	{
		String			theAreaStr;

	}
	else
		rEdCopyPos.SetText( EMPTY_STRING );
	rFtDbArea.SetPosPixel(Point(158,331));
}






                                FixedLine&          refFlOptions,
								const String&		refStrNoName,
								const String&		refStrUndefined );
			ScFilterOptionsMgr( Dialog*				ptrDlg,
								ScViewData*			ptrViewData,
								const ScQueryParam&	refQueryData,
								MoreButton&			refBtnMore,
								CheckBox&			refBtnCase,
								CheckBox&			refBtnRegExp,
								CheckBox&			refBtnWholeWord,
								CheckBox&			refBtnHeader,
								CheckBox&			refBtnUnique,
								CheckBox&			refBtnCopyResult,
								CheckBox&			refBtnDestPers,
								ListBox&			refLbCopyArea,
								Edit&				refEdCopyArea,
								ScRefButton&		refRbCopyArea,
								FixedText&			refFtDbAreaLabel,
								FixedInfo&			refFtDbArea,
                                FixedLine&          refFlOptions,
								const String&		refStrNoName,
								const String&		refStrUndefined );
			
			~ScFilterOptionsMgr();

	BOOL	VerifyPosStr ( const String& rPosStr ) const;


	MoreButton&		rBtnMore;
	CheckBox&		rBtnCase;
	CheckBox&		rBtnWholeWord;
	CheckBox&		rBtnRegExp;
	CheckBox&		rBtnHeader;
	CheckBox&		rBtnUnique;


#ifdef _FOPTMGR_CXX
private:
	void Init(BOOL param);

	// Handler:
	DECL_LINK( EdPosModifyHdl,		Edit* );

Return to issue 35579

Lines 83-88 Link Here

(-)/home/sragavan/cvs/bk/ooo-build/build/OOO_1_1_2/sc/source/ui/dbgui/filtdlg.cxx (-1 / +27 lines)
83	#include "viewdata.hxx"	83	#include "viewdata.hxx"
84	#include "document.hxx"	84	#include "document.hxx"
85	#include "scresid.hxx"	85	#include "scresid.hxx"
		86	#include "docoptio.hxx"
86		87
87	#include "foptmgr.hxx"	88	#include "foptmgr.hxx"
88		89
Lines 219-224 Link Here
219	aBtnMore,	220	aBtnMore,
220	aBtnCase,	221	aBtnCase,
221	aBtnRegExp,	222	aBtnRegExp,
		223	aBtnWholeWord,
222	aBtnHeader,	224	aBtnHeader,
223	aBtnUnique,	225	aBtnUnique,
224	aBtnCopyResult,	226	aBtnCopyResult,
Lines 573-578 Link Here
573	bCopyPosOk = ( SCA_VALID == (nResult & SCA_VALID) );	575	bCopyPosOk = ( SCA_VALID == (nResult & SCA_VALID) );
574	}	576	}
575		577
		578	/*
		579	* The reg exp checkbutton read is moved up, since,
		580	* for begins and ends with query we are makeing them as re query transparently
		581	* Checking this later spoils the entire transparent work.
		582	*/
		583	theParam.bRegExp = aBtnRegExp.IsChecked();
		584
		585	ScDocOptions pDocOpts = pDoc->GetDocOptions();
		586	pDocOpts.SetMatchWholeCell(aBtnWholeWord.IsChecked());
		587	pDoc->SetDocOptions(pDocOpts);
		588
576	for ( USHORT i=0; i<3; i++ )	589	for ( USHORT i=0; i<3; i++ )
577	{	590	{
578	USHORT nField = aFieldLbArr[i]->GetSelectEntryPos();	591	USHORT nField = aFieldLbArr[i]->GetSelectEntryPos();
Lines 606-611 Link Here
606	}	619	}
607	else	620	else
608	{	621	{
		622	if (eOp == SC_BEGINS_WITH ) {
		623	String tmp ('^');
		624	tmp .Append(aStrVal);
		625	::rtl::OUString str (tmp);
		626	aStrVal.Assign(tmp);
		627	eOp = SC_EQUAL;
		628	theParam.bRegExp = TRUE;
		629	}
		630	else if (eOp == SC_ENDS_WITH ) {
		631	aStrVal.Append (String('$'));
		632	eOp = SC_EQUAL;
		633	theParam.bRegExp = TRUE;
		634	}
609	*rEntry.pStr = aStrVal;	635	*rEntry.pStr = aStrVal;
610	rEntry.nVal = 0;	636	rEntry.nVal = 0;
611	rEntry.bQueryByString = TRUE;	637	rEntry.bQueryByString = TRUE;
Lines 642-648 Link Here
642	theParam.bByRow = TRUE;	668	theParam.bByRow = TRUE;
643	theParam.bDuplicate = !aBtnUnique.IsChecked();	669	theParam.bDuplicate = !aBtnUnique.IsChecked();
644	theParam.bCaseSens = aBtnCase.IsChecked();	670	theParam.bCaseSens = aBtnCase.IsChecked();
645	theParam.bRegExp = aBtnRegExp.IsChecked();	671
646	theParam.bDestPers = aBtnDestPers.IsChecked();	672	theParam.bDestPers = aBtnDestPers.IsChecked();
647		673
648	// nur die drei eingestellten - alles andere zuruecksetzen	674	// nur die drei eingestellten - alles andere zuruecksetzen

Lines 76-81 Link Here

(-)/home/sragavan/cvs/bk/ooo-build/build/OOO_1_1_2/sc/source/ui/dbgui/foptmgr.cxx (-4 / +57 lines)
76	#include "dbcolect.hxx"	76	#include "dbcolect.hxx"
77	#include "viewdata.hxx"	77	#include "viewdata.hxx"
78	#include "document.hxx"	78	#include "document.hxx"
		79	#include "docoptio.hxx"
79		80
80	#define _FOPTMGR_CXX	81	#define _FOPTMGR_CXX
81	#include "foptmgr.hxx"	82	#include "foptmgr.hxx"
Lines 123-131 Link Here
123	rStrNoName ( refStrNoName ),	124	rStrNoName ( refStrNoName ),
124	rStrUndefined ( refStrUndefined )	125	rStrUndefined ( refStrUndefined )
125	{	126	{
126	Init();	127	Init(FALSE);
127	}	128	}
128		129
		130	ScFilterOptionsMgr::ScFilterOptionsMgr(
		131	Dialog* ptrDlg,
		132	ScViewData* ptrViewData,
		133	const ScQueryParam& refQueryData,
		134	MoreButton& refBtnMore,
		135	CheckBox& refBtnCase,
		136	CheckBox& refBtnRegExp,
		137	CheckBox& refBtnWholeWord,
		138	CheckBox& refBtnHeader,
		139	CheckBox& refBtnUnique,
		140	CheckBox& refBtnCopyResult,
		141	CheckBox& refBtnDestPers,
		142	ListBox& refLbCopyArea,
		143	Edit& refEdCopyArea,
		144	ScRefButton& refRbCopyArea,
		145	FixedText& refFtDbAreaLabel,
		146	FixedInfo& refFtDbArea,
		147	FixedLine& refFlOptions,
		148	const String& refStrNoName,
		149	const String& refStrUndefined )
		150
		151	: pDlg ( ptrDlg ),
		152	pViewData ( ptrViewData ),
		153	pDoc ( ptrViewData ? ptrViewData->GetDocument() : NULL ),
		154	rQueryData ( refQueryData ),
		155	rBtnMore ( refBtnMore ),
		156	rBtnCase ( refBtnCase ),
		157	rBtnRegExp ( refBtnRegExp ),
		158	rBtnWholeWord ( refBtnWholeWord),
		159	rBtnHeader ( refBtnHeader ),
		160	rBtnUnique ( refBtnUnique ),
		161	rBtnCopyResult ( refBtnCopyResult ),
		162	rBtnDestPers ( refBtnDestPers ),
		163	rLbCopyPos ( refLbCopyArea ),
		164	rEdCopyPos ( refEdCopyArea ),
		165	rRbCopyPos ( refRbCopyArea ),
		166	rFtDbAreaLabel ( refFtDbAreaLabel ),
		167	rFtDbArea ( refFtDbArea ),
		168	rFlOptions ( refFlOptions ),
		169	rStrNoName ( refStrNoName ),
		170	rStrUndefined ( refStrUndefined )
		171	{
		172	Init(TRUE);
		173	}
129		174
130	//----------------------------------------------------------------------------	175	//----------------------------------------------------------------------------
131		176
Lines 141-147 Link Here
141		186
142	//----------------------------------------------------------------------------	187	//----------------------------------------------------------------------------
143		188
144	void ScFilterOptionsMgr::Init()	189	void ScFilterOptionsMgr::Init(BOOL param)
145	{	190	{
146	DBG_ASSERT( pViewData && pDoc, "Init failed :-/" );	191	DBG_ASSERT( pViewData && pDoc, "Init failed :-/" );
147		192
Lines 151-156 Link Here
151		196
152	rBtnMore.AddWindow( &rBtnCase );	197	rBtnMore.AddWindow( &rBtnCase );
153	rBtnMore.AddWindow( &rBtnRegExp );	198	rBtnMore.AddWindow( &rBtnRegExp );
		199	if (param)
		200	rBtnMore.AddWindow(&rBtnWholeWord);
154	rBtnMore.AddWindow( &rBtnHeader );	201	rBtnMore.AddWindow( &rBtnHeader );
155	rBtnMore.AddWindow( &rBtnUnique );	202	rBtnMore.AddWindow( &rBtnUnique );
156	rBtnMore.AddWindow( &rBtnCopyResult );	203	rBtnMore.AddWindow( &rBtnCopyResult );
Lines 160-172 Link Here
160	rBtnMore.AddWindow( &rRbCopyPos );	207	rBtnMore.AddWindow( &rRbCopyPos );
161	rBtnMore.AddWindow( &rFtDbAreaLabel );	208	rBtnMore.AddWindow( &rFtDbAreaLabel );
162	rBtnMore.AddWindow( &rFtDbArea );	209	rBtnMore.AddWindow( &rFtDbArea );
163	rBtnMore.AddWindow( &rFlOptions );	210	rBtnMore.AddWindow( &rFlOptions );
		211
164		212
165	rBtnCase .Check( rQueryData.bCaseSens );	213	rBtnCase .Check( rQueryData.bCaseSens );
166	rBtnHeader .Check( rQueryData.bHasHeader );	214	rBtnHeader .Check( rQueryData.bHasHeader );
167	rBtnRegExp .Check( rQueryData.bRegExp );	215	rBtnRegExp .Check( rQueryData.bRegExp );
168	rBtnUnique .Check( !rQueryData.bDuplicate );	216	rBtnUnique .Check( !rQueryData.bDuplicate );
169		217	if (param) {
		218	BOOL bMatchWholeCell = pDoc->GetDocOptions().IsMatchWholeCell();
		219	rBtnWholeWord.Check(bMatchWholeCell);
		220	}
		221
170	if ( pViewData && pDoc )	222	if ( pViewData && pDoc )
171	{	223	{
172	String theAreaStr;	224	String theAreaStr;
Lines 266-271 Link Here
266	}	318	}
267	else	319	else
268	rEdCopyPos.SetText( EMPTY_STRING );	320	rEdCopyPos.SetText( EMPTY_STRING );
		321	rFtDbArea.SetPosPixel(Point(158,331));
269	}	322	}
270		323
271		324