viewsrch.cxx (4d7c9de0) viewsrch.cxx (8ef2f12b)
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 321 unchanged lines hidden (view full) ---

330 else
331 pWrtShell->SttDoc();
332 }
333
334 bExtra = sal_False;
335 sal_uLong nFound;
336
337 { //Scope for SwWait-Object
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 321 unchanged lines hidden (view full) ---

330 else
331 pWrtShell->SttDoc();
332 }
333
334 bExtra = sal_False;
335 sal_uLong nFound;
336
337 { //Scope for SwWait-Object
338 SwWait aWait( *GetDocShell(), sal_True );
338 SwWait aWait( *GetDocShell(), true );
339 pWrtShell->StartAllAction();
340 nFound = FUNC_Search( aOpts );
341 pWrtShell->EndAllAction();
342 }
343 rReq.SetReturnValue(SfxBoolItem(nSlot, nFound != 0 && ULONG_MAX != nFound));
344 if( !nFound )
345 {
346 if( !bApi )

--- 127 unchanged lines hidden (view full) ---

474 // aus 'Suche alle'
475 pWrtShell->StartAllAction();
476 pWrtShell->Push();
477 // falls in selektierten Bereichen gesucht werden soll, duerfen sie
478 // nicht aufgehoben werden
479 if (!pSrchItem->GetSelection())
480 (pWrtShell->*pWrtShell->fnKillSel)(0, sal_False);
481
339 pWrtShell->StartAllAction();
340 nFound = FUNC_Search( aOpts );
341 pWrtShell->EndAllAction();
342 }
343 rReq.SetReturnValue(SfxBoolItem(nSlot, nFound != 0 && ULONG_MAX != nFound));
344 if( !nFound )
345 {
346 if( !bApi )

--- 127 unchanged lines hidden (view full) ---

474 // aus 'Suche alle'
475 pWrtShell->StartAllAction();
476 pWrtShell->Push();
477 // falls in selektierten Bereichen gesucht werden soll, duerfen sie
478 // nicht aufgehoben werden
479 if (!pSrchItem->GetSelection())
480 (pWrtShell->*pWrtShell->fnKillSel)(0, sal_False);
481
482 SwWait *pWait = new SwWait( *GetDocShell(), sal_True );
482 SwWait *pWait = new SwWait( *GetDocShell(), true );
483 if( FUNC_Search( aOpts ) )
484 {
485 bFound = sal_True;
486 if(pWrtShell->IsSelFrmMode())
487 {
488 pWrtShell->UnSelectFrm();
489 pWrtShell->LeaveSelFrmMode();
490 }

--- 50 unchanged lines hidden (view full) ---

541 ).Execute() )
542 {
543 bFound = sal_False;
544 pWrtShell->Pop();
545 return sal_False;
546 }
547 pWrtShell->StartAllAction();
548 pWrtShell->Pop(sal_False);
483 if( FUNC_Search( aOpts ) )
484 {
485 bFound = sal_True;
486 if(pWrtShell->IsSelFrmMode())
487 {
488 pWrtShell->UnSelectFrm();
489 pWrtShell->LeaveSelFrmMode();
490 }

--- 50 unchanged lines hidden (view full) ---

541 ).Execute() )
542 {
543 bFound = sal_False;
544 pWrtShell->Pop();
545 return sal_False;
546 }
547 pWrtShell->StartAllAction();
548 pWrtShell->Pop(sal_False);
549 pWait = new SwWait( *GetDocShell(), sal_True );
549 pWait = new SwWait( *GetDocShell(), true );
550
551 sal_Bool bSrchBkwrd = DOCPOS_START == aOpts.eEnd;
552
553 aOpts.eEnd = bSrchBkwrd ? DOCPOS_START : DOCPOS_END;
554 aOpts.eStart = bSrchBkwrd ? DOCPOS_END : DOCPOS_START;
555
556 if (bHasSrchInOther)
557 {

--- 15 unchanged lines hidden (view full) ---

573 InfoBox( pParentWindow, SW_RES(MSG_NOT_FOUND)).Execute();
574 }
575 return bFound = sal_False;
576}
577
578
579sal_Bool SwView::SearchAll(sal_uInt16* pFound)
580{
550
551 sal_Bool bSrchBkwrd = DOCPOS_START == aOpts.eEnd;
552
553 aOpts.eEnd = bSrchBkwrd ? DOCPOS_START : DOCPOS_END;
554 aOpts.eStart = bSrchBkwrd ? DOCPOS_END : DOCPOS_START;
555
556 if (bHasSrchInOther)
557 {

--- 15 unchanged lines hidden (view full) ---

573 InfoBox( pParentWindow, SW_RES(MSG_NOT_FOUND)).Execute();
574 }
575 return bFound = sal_False;
576}
577
578
579sal_Bool SwView::SearchAll(sal_uInt16* pFound)
580{
581 SwWait aWait( *GetDocShell(), sal_True );
581 SwWait aWait( *GetDocShell(), true );
582 pWrtShell->StartAllAction();
583
584 SwSearchOptions aOpts( pWrtShell, pSrchItem->GetBackward() );
585
586 if (!pSrchItem->GetSelection())
587 {
588 // bestehende Selektionen aufheben,
589 // wenn nicht in selektierten Bereichen gesucht werden soll

--- 12 unchanged lines hidden (view full) ---

602
603 pWrtShell->EndAllAction();
604 return bFound;
605}
606
607
608void SwView::Replace()
609{
582 pWrtShell->StartAllAction();
583
584 SwSearchOptions aOpts( pWrtShell, pSrchItem->GetBackward() );
585
586 if (!pSrchItem->GetSelection())
587 {
588 // bestehende Selektionen aufheben,
589 // wenn nicht in selektierten Bereichen gesucht werden soll

--- 12 unchanged lines hidden (view full) ---

602
603 pWrtShell->EndAllAction();
604 return bFound;
605}
606
607
608void SwView::Replace()
609{
610 SwWait aWait( *GetDocShell(), sal_True );
610 SwWait aWait( *GetDocShell(), true );
611
612 pWrtShell->StartAllAction();
613
614 if( pSrchItem->GetPattern() ) // Vorlagen?
615 {
616 SwRewriter aRewriter;
617 aRewriter.AddRule(UNDO_ARG1, pSrchItem->GetSearchString());
618 aRewriter.AddRule(UNDO_ARG2, SW_RES(STR_YIELDS));

--- 229 unchanged lines hidden --- 		611
612 pWrtShell->StartAllAction();
613
614 if( pSrchItem->GetPattern() ) // Vorlagen?
615 {
616 SwRewriter aRewriter;
617 aRewriter.AddRule(UNDO_ARG1, pSrchItem->GetSearchString());
618 aRewriter.AddRule(UNDO_ARG2, SW_RES(STR_YIELDS));

--- 229 unchanged lines hidden ---