Attachment 48624 Details for Bug 36181 – Patch

[patch] Patch

0001-writer-bug-correction-selected-text-was-always-repla.patch (text/plain), 4.43 KB, created by benoit.dolives on 2011-06-30 16:10:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: benoit.dolives

Created: 2011-06-30 16:10:35 UTC

Size: 4.43 KB

patch

obsolete

>From fb6b0340c819202ea3ffd74e47cc1ba17bba8dae Mon Sep 17 00:00:00 2001
>From: Dolives Benoit <benoit.dolives@gmail.com>
>Date: Fri, 1 Jul 2011 00:44:49 +0200
>Subject: [PATCH] writer: bug correction : selected text was always replaced (bugzilla 36181)
>
>When using "Find&Replace" dialog, the selected text was always replaced.
>Correction: check that the selected text is the search string, otherwise select the first occurence if any.
>---
> sw/source/ui/uiview/viewsrch.cxx |   78 ++++++++++++++++++++++++++++++++-----
> 1 files changed, 67 insertions(+), 11 deletions(-)
>
>diff --git a/sw/source/ui/uiview/viewsrch.cxx b/sw/source/ui/uiview/viewsrch.cxx
>index b3e8d6e..488e848 100644
>--- a/sw/source/ui/uiview/viewsrch.cxx
>+++ b/sw/source/ui/uiview/viewsrch.cxx
>@@ -589,18 +591,72 @@ void SwView::Replace()
>     {
>         if (GetPostItMgr()->HasActiveSidebarWin())
>             GetPostItMgr()->Replace(pSrchItem);
>-        sal_Bool bReplaced = pWrtShell->SwEditShell::Replace( pSrchItem->GetReplaceString(),
>-                                            pSrchItem->GetRegExp());
> 
>-        if( bReplaced && pReplList && pReplList->Count() && pWrtShell->HasSelection() )
>-        {
>-            SfxItemSet aReplSet( pWrtShell->GetAttrPool(),
>-                                    aTxtFmtCollSetRange );
>-            if( pReplList->Get( aReplSet ).Count() )
>-            {
>-                ::SfxToSwPageDescAttr( *pWrtShell, aReplSet );
>-                pWrtShell->SwEditShell::SetAttr( aReplSet );
>+        sal_Bool bReqReplace = true;
>+
>+        if(pWrtShell->HasSelection()){
>+            /* check that the selection has the same length as the required string */
>+            if (pWrtShell->SwCrsrShell::GetSelTxt().Len() != pSrchItem->GetSearchString().Len() ){
>+                //it differs, therefore do not replace the selection
>+                bReqReplace = false;
>+                //next call to replace will find the next matching string
>             }
>+            else{
>+                /* check that the selection match the search string*/
>+                //save state
>+                SwPosition aStartPos = (* pWrtShell->GetSwCrsr()->Start());
>+                SwPosition aEndPos = (* pWrtShell->GetSwCrsr()->End());
>+                sal_Bool   bHasSelection = pSrchItem->GetSelection();
>+                sal_uInt16 nOldCmd = pSrchItem->GetCommand();
>+
>+                //set state for checking if current selection has a match
>+                pSrchItem->SetCommand( SVX_SEARCHCMD_FIND );
>+                pSrchItem->SetSelection(true);
>+
>+                //check if it matchs
>+                SwSearchOptions aOpts( pWrtShell, pSrchItem->GetBackward() );
>+                if( ! FUNC_Search(aOpts) ){
>+
>+                    //no matching therefore should not replace selection
>+                    // => remove selection
>+
>+                    if(! pSrchItem->GetBackward() ){
>+                        (* pWrtShell->GetSwCrsr()->Start()) = aStartPos;
>+                        (* pWrtShell->GetSwCrsr()->End()) = aEndPos;
>+                    }
>+                    else{
>+                        (* pWrtShell->GetSwCrsr()->Start()) = aEndPos;
>+                        (* pWrtShell->GetSwCrsr()->End()) = aStartPos;
>+                    }
>+                    bReqReplace = false;
>+                }
>+
>+                //set back old search state
>+                pSrchItem->SetCommand( nOldCmd );
>+                pSrchItem->SetSelection(bHasSelection);
>+            }
>+        }
>+        /*
>+         * remove current selection
>+         * otherwise it is always replaced
>+         * no matter if the search string exists or not in the selection
>+         * Now the selection is removed and the next matching string is selected
>+         */
>+
>+        if( bReqReplace ){
>+
>+            sal_Bool bReplaced = pWrtShell->SwEditShell::Replace( pSrchItem->GetReplaceString(),
>+                                                                  pSrchItem->GetRegExp());
>+            if( bReplaced && pReplList && pReplList->Count() && pWrtShell->HasSelection() )
>+                {
>+                    SfxItemSet aReplSet( pWrtShell->GetAttrPool(),
>+                                         aTxtFmtCollSetRange );
>+                    if( pReplList->Get( aReplSet ).Count() )
>+                        {
>+                            ::SfxToSwPageDescAttr( *pWrtShell, aReplSet );
>+                            pWrtShell->SwEditShell::SetAttr( aReplSet );
>+                        }
>+                }
>         }
>     }
> 
>-- 
>1.7.0.4
>

Actions: View | Splinter Review

Attachments on bug 36181: 48624

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.