Attachment #70127 for issue #108087

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




#define MID_SEARCH_CELLTYPE             2
#define MID_SEARCH_ROWDIRECTION         3
#define MID_SEARCH_ALLTABLES            4
#define MID_SEARCH_SEARCHFILTERED       5
#define MID_SEARCH_BACKWARD             6 
#define MID_SEARCH_PATTERN              7 
#define MID_SEARCH_CONTENT              8 
#define MID_SEARCH_ASIANOPTIONS         9 
#define MID_SEARCH_ALGORITHMTYPE        10
#define MID_SEARCH_FLAGS                11
#define MID_SEARCH_SEARCHSTRING         12
#define MID_SEARCH_REPLACESTRING        13
#define MID_SEARCH_LOCALE               14
#define MID_SEARCH_CHANGEDCHARS         15
#define MID_SEARCH_DELETEDCHARS         16
#define MID_SEARCH_INSERTEDCHARS        17
#define MID_SEARCH_TRANSLITERATEFLAGS   18
#define MID_SEARCH_COMMAND              19


#endif

Lines 73-78 class SVL_DLLPUBLIC SvxSearchItem : Link Here

(-)svl/inc/svl/srchitem.hxx (+4 lines)
73	sal_uInt16 nAppFlag; // Fuer welche Applikation ist der Dialog ueberhaupt	73	sal_uInt16 nAppFlag; // Fuer welche Applikation ist der Dialog ueberhaupt
74	sal_Bool bRowDirection; // Suchrichtung Zeilenweise/Spaltenweise	74	sal_Bool bRowDirection; // Suchrichtung Zeilenweise/Spaltenweise
75	sal_Bool bAllTables; // in alle Tabellen suchen	75	sal_Bool bAllTables; // in alle Tabellen suchen
		76	sal_Bool bSearchFiltered; // search filtered cells.
76		77
77	// Writer-spezifisch	78	// Writer-spezifisch
78	sal_Bool bNotes;	79	sal_Bool bNotes;
Lines 142-147 public: Link Here
142	sal_Bool IsAllTables() const { return bAllTables; }	143	sal_Bool IsAllTables() const { return bAllTables; }
143	void SetAllTables(sal_Bool bNew) { bAllTables = bNew; }	144	void SetAllTables(sal_Bool bNew) { bAllTables = bNew; }
144		145
		146	sal_Bool IsSearchFiltered() const { return bSearchFiltered; }
		147	void SetSearchFiltered(sal_Bool b) { bSearchFiltered = b; }
		148
145	sal_uInt16 GetCellType() const { return nCellType; }	149	sal_uInt16 GetCellType() const { return nCellType; }
146	void SetCellType(sal_uInt16 nNewCellType) { nCellType = nNewCellType; }	150	void SetCellType(sal_uInt16 nNewCellType) { nCellType = nNewCellType; }
147		151





#define CFG_ROOT_NODE       "Office.Common/SearchOptions"

#define SRCH_PARAMS         12
#define SRCH_PARA_OPTIONS   "Options"
#define SRCH_PARA_FAMILY    "Family"
#define SRCH_PARA_COMMAND   "Command"

#define SRCH_PARA_APPFLAG   "AppFlag"
#define SRCH_PARA_ROWDIR    "RowDirection"
#define SRCH_PARA_ALLTABLES "AllTables"
#define SRCH_PARA_SEARCHFILTERED "SearchFiltered"
#define SRCH_PARA_BACKWARD  "Backward"
#define SRCH_PARA_PATTERN   "Pattern"
#define SRCH_PARA_CONTENT   "Content"

    nAppFlag		( SVX_SEARCHAPP_WRITER ),
    bRowDirection	( sal_True ),
    bAllTables		( sal_False ),
    bSearchFiltered   ( sal_False ),
    bNotes			( sal_False),
    bBackward		( sal_False ),
    bPattern		( sal_False ),

    nAppFlag		( rItem.nAppFlag ),
    bRowDirection	( rItem.bRowDirection ),
    bAllTables		( rItem.bAllTables ),
    bSearchFiltered   ( rItem.bSearchFiltered ),
    bNotes			( rItem.bNotes),
    bBackward		( rItem.bBackward ),
    bPattern		( rItem.bPattern ),

           ( eFamily 		== rSItem.eFamily )			&&
           ( bRowDirection 	== rSItem.bRowDirection )	&&
           ( bAllTables 	== rSItem.bAllTables )		&&
           ( bSearchFiltered  == rSItem.bSearchFiltered )   &&
           ( nCellType 		== rSItem.nCellType )		&&
           ( nAppFlag 		== rSItem.nAppFlag )		&&
           ( bAsianOptions	== rSItem.bAsianOptions )	&&

            aSeq[5].Value <<= bRowDirection;
            aSeq[6].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SRCH_PARA_ALLTABLES ));
            aSeq[6].Value <<= bAllTables;
            aSeq[6].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SRCH_PARA_SEARCHFILTERED ));
            aSeq[6].Value <<= bSearchFiltered;
            aSeq[7].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SRCH_PARA_BACKWARD ));
            aSeq[7].Value <<= bBackward;
            aSeq[8].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SRCH_PARA_PATTERN ));

            rVal <<= (sal_Bool) bRowDirection; break;
        case MID_SEARCH_ALLTABLES:
            rVal <<= (sal_Bool) bAllTables; break;
        case MID_SEARCH_SEARCHFILTERED:
            rVal <<= (sal_Bool) bSearchFiltered; break;
        case MID_SEARCH_BACKWARD:
            rVal <<= (sal_Bool) bBackward; break;
        case MID_SEARCH_PATTERN:

                        if ( ( aSeq[i].Value >>= bAllTables ) == sal_True )
                            ++nConvertedCount;
                    }
                    else if ( aSeq[i].Name.equalsAscii( SRCH_PARA_SEARCHFILTERED ) )
                    {
                        if ( ( aSeq[i].Value >>= bSearchFiltered ) == sal_True )
                            ++nConvertedCount;
                    }
                    else if ( aSeq[i].Name.equalsAscii( SRCH_PARA_BACKWARD ) )
                    {
                        if ( ( aSeq[i].Value >>= bBackward ) == sal_True )

            bRet = (rVal >>= bRowDirection); break;
        case MID_SEARCH_ALLTABLES:
            bRet = (rVal >>= bAllTables); break;
        case MID_SEARCH_SEARCHFILTERED:
            bRet = (rVal >>= bSearchFiltered); break;
        case MID_SEARCH_BACKWARD:
            bRet = (rVal >>= bBackward); break;
        case MID_SEARCH_PATTERN:

Return to issue 108087

Lines 49-68 Link Here

(-)svl/inc/svl/memberid.hrc (-14 / +15 lines)
49	#define MID_SEARCH_CELLTYPE 2	49	#define MID_SEARCH_CELLTYPE 2
50	#define MID_SEARCH_ROWDIRECTION 3	50	#define MID_SEARCH_ROWDIRECTION 3
51	#define MID_SEARCH_ALLTABLES 4	51	#define MID_SEARCH_ALLTABLES 4
52	#define MID_SEARCH_BACKWARD 5	52	#define MID_SEARCH_SEARCHFILTERED 5
53	#define MID_SEARCH_PATTERN 6	53	#define MID_SEARCH_BACKWARD 6
54	#define MID_SEARCH_CONTENT 7	54	#define MID_SEARCH_PATTERN 7
55	#define MID_SEARCH_ASIANOPTIONS 8	55	#define MID_SEARCH_CONTENT 8
56	#define MID_SEARCH_ALGORITHMTYPE 9	56	#define MID_SEARCH_ASIANOPTIONS 9
57	#define MID_SEARCH_FLAGS 10	57	#define MID_SEARCH_ALGORITHMTYPE 10
58	#define MID_SEARCH_SEARCHSTRING 11	58	#define MID_SEARCH_FLAGS 11
59	#define MID_SEARCH_REPLACESTRING 12	59	#define MID_SEARCH_SEARCHSTRING 12
60	#define MID_SEARCH_LOCALE 13	60	#define MID_SEARCH_REPLACESTRING 13
61	#define MID_SEARCH_CHANGEDCHARS 14	61	#define MID_SEARCH_LOCALE 14
62	#define MID_SEARCH_DELETEDCHARS 15	62	#define MID_SEARCH_CHANGEDCHARS 15
63	#define MID_SEARCH_INSERTEDCHARS 16	63	#define MID_SEARCH_DELETEDCHARS 16
64	#define MID_SEARCH_TRANSLITERATEFLAGS 17	64	#define MID_SEARCH_INSERTEDCHARS 17
65	#define MID_SEARCH_COMMAND 18	65	#define MID_SEARCH_TRANSLITERATEFLAGS 18
		66	#define MID_SEARCH_COMMAND 19
66		67
67		68
68	#endif	69	#endif

Lines 51-57 using namespace com::sun::star::util; Link Here

(-)svl/source/items/srchitem.cxx (-1 / +16 lines)
51		51
52	#define CFG_ROOT_NODE "Office.Common/SearchOptions"	52	#define CFG_ROOT_NODE "Office.Common/SearchOptions"
53		53
54	#define SRCH_PARAMS 11	54	#define SRCH_PARAMS 12
55	#define SRCH_PARA_OPTIONS "Options"	55	#define SRCH_PARA_OPTIONS "Options"
56	#define SRCH_PARA_FAMILY "Family"	56	#define SRCH_PARA_FAMILY "Family"
57	#define SRCH_PARA_COMMAND "Command"	57	#define SRCH_PARA_COMMAND "Command"
Lines 59-64 using namespace com::sun::star::util; Link Here
59	#define SRCH_PARA_APPFLAG "AppFlag"	59	#define SRCH_PARA_APPFLAG "AppFlag"
60	#define SRCH_PARA_ROWDIR "RowDirection"	60	#define SRCH_PARA_ROWDIR "RowDirection"
61	#define SRCH_PARA_ALLTABLES "AllTables"	61	#define SRCH_PARA_ALLTABLES "AllTables"
		62	#define SRCH_PARA_SEARCHFILTERED "SearchFiltered"
62	#define SRCH_PARA_BACKWARD "Backward"	63	#define SRCH_PARA_BACKWARD "Backward"
63	#define SRCH_PARA_PATTERN "Pattern"	64	#define SRCH_PARA_PATTERN "Pattern"
64	#define SRCH_PARA_CONTENT "Content"	65	#define SRCH_PARA_CONTENT "Content"
Lines 124-129 SvxSearchItem::SvxSearchItem( const sal_uInt16 nId ) : Link Here
124	nAppFlag ( SVX_SEARCHAPP_WRITER ),	125	nAppFlag ( SVX_SEARCHAPP_WRITER ),
125	bRowDirection ( sal_True ),	126	bRowDirection ( sal_True ),
126	bAllTables ( sal_False ),	127	bAllTables ( sal_False ),
		128	bSearchFiltered ( sal_False ),
127	bNotes ( sal_False),	129	bNotes ( sal_False),
128	bBackward ( sal_False ),	130	bBackward ( sal_False ),
129	bPattern ( sal_False ),	131	bPattern ( sal_False ),
Lines 201-206 SvxSearchItem::SvxSearchItem( const SvxSearchItem& rItem ) : Link Here
201	nAppFlag ( rItem.nAppFlag ),	203	nAppFlag ( rItem.nAppFlag ),
202	bRowDirection ( rItem.bRowDirection ),	204	bRowDirection ( rItem.bRowDirection ),
203	bAllTables ( rItem.bAllTables ),	205	bAllTables ( rItem.bAllTables ),
		206	bSearchFiltered ( rItem.bSearchFiltered ),
204	bNotes ( rItem.bNotes),	207	bNotes ( rItem.bNotes),
205	bBackward ( rItem.bBackward ),	208	bBackward ( rItem.bBackward ),
206	bPattern ( rItem.bPattern ),	209	bPattern ( rItem.bPattern ),
Lines 250-255 int SvxSearchItem::operator==( const SfxPoolItem& rItem ) const Link Here
250	( eFamily == rSItem.eFamily ) &&	253	( eFamily == rSItem.eFamily ) &&
251	( bRowDirection == rSItem.bRowDirection ) &&	254	( bRowDirection == rSItem.bRowDirection ) &&
252	( bAllTables == rSItem.bAllTables ) &&	255	( bAllTables == rSItem.bAllTables ) &&
		256	( bSearchFiltered == rSItem.bSearchFiltered ) &&
253	( nCellType == rSItem.nCellType ) &&	257	( nCellType == rSItem.nCellType ) &&
254	( nAppFlag == rSItem.nAppFlag ) &&	258	( nAppFlag == rSItem.nAppFlag ) &&
255	( bAsianOptions == rSItem.bAsianOptions ) &&	259	( bAsianOptions == rSItem.bAsianOptions ) &&
Lines 443-448 sal_Bool SvxSearchItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMember Link Here
443	aSeq[5].Value <<= bRowDirection;	447	aSeq[5].Value <<= bRowDirection;
444	aSeq[6].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SRCH_PARA_ALLTABLES ));	448	aSeq[6].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SRCH_PARA_ALLTABLES ));
445	aSeq[6].Value <<= bAllTables;	449	aSeq[6].Value <<= bAllTables;
		450	aSeq[6].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SRCH_PARA_SEARCHFILTERED ));
		451	aSeq[6].Value <<= bSearchFiltered;
446	aSeq[7].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SRCH_PARA_BACKWARD ));	452	aSeq[7].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SRCH_PARA_BACKWARD ));
447	aSeq[7].Value <<= bBackward;	453	aSeq[7].Value <<= bBackward;
448	aSeq[8].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SRCH_PARA_PATTERN ));	454	aSeq[8].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SRCH_PARA_PATTERN ));
Lines 464-469 sal_Bool SvxSearchItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMember Link Here
464	rVal <<= (sal_Bool) bRowDirection; break;	470	rVal <<= (sal_Bool) bRowDirection; break;
465	case MID_SEARCH_ALLTABLES:	471	case MID_SEARCH_ALLTABLES:
466	rVal <<= (sal_Bool) bAllTables; break;	472	rVal <<= (sal_Bool) bAllTables; break;
		473	case MID_SEARCH_SEARCHFILTERED:
		474	rVal <<= (sal_Bool) bSearchFiltered; break;
467	case MID_SEARCH_BACKWARD:	475	case MID_SEARCH_BACKWARD:
468	rVal <<= (sal_Bool) bBackward; break;	476	rVal <<= (sal_Bool) bBackward; break;
469	case MID_SEARCH_PATTERN:	477	case MID_SEARCH_PATTERN:
Lines 563-568 sal_Bool SvxSearchItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMe Link Here
563	if ( ( aSeq[i].Value >>= bAllTables ) == sal_True )	571	if ( ( aSeq[i].Value >>= bAllTables ) == sal_True )
564	++nConvertedCount;	572	++nConvertedCount;
565	}	573	}
		574	else if ( aSeq[i].Name.equalsAscii( SRCH_PARA_SEARCHFILTERED ) )
		575	{
		576	if ( ( aSeq[i].Value >>= bSearchFiltered ) == sal_True )
		577	++nConvertedCount;
		578	}
566	else if ( aSeq[i].Name.equalsAscii( SRCH_PARA_BACKWARD ) )	579	else if ( aSeq[i].Name.equalsAscii( SRCH_PARA_BACKWARD ) )
567	{	580	{
568	if ( ( aSeq[i].Value >>= bBackward ) == sal_True )	581	if ( ( aSeq[i].Value >>= bBackward ) == sal_True )
Lines 599-604 sal_Bool SvxSearchItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMe Link Here
599	bRet = (rVal >>= bRowDirection); break;	612	bRet = (rVal >>= bRowDirection); break;
600	case MID_SEARCH_ALLTABLES:	613	case MID_SEARCH_ALLTABLES:
601	bRet = (rVal >>= bAllTables); break;	614	bRet = (rVal >>= bAllTables); break;
		615	case MID_SEARCH_SEARCHFILTERED:
		616	bRet = (rVal >>= bSearchFiltered); break;
602	case MID_SEARCH_BACKWARD:	617	case MID_SEARCH_BACKWARD:
603	bRet = (rVal >>= bBackward); break;	618	bRet = (rVal >>= bBackward); break;
604	case MID_SEARCH_PATTERN:	619	case MID_SEARCH_PATTERN: