[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sc/source

[Markus Mohrhard]

 sc/source/ui/view/viewfun2.cxx |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 728d6cea85e68a563822b6017707a98085a7058c
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Fri Jun 7 06:41:14 2013 +0200

    only reset marked area when using find/replace all, fdo#53106
    
    Change-Id: I151db5db7bcdf5295e1f67423de8926250ae8ea3
    Reviewed-on: https://gerrit.libreoffice.org/4185
    Reviewed-by: Kohei Yoshida <kohei.yoshida at suse.de>
    Tested-by: Kohei Yoshida <kohei.yoshida at suse.de>

diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 590e134..2a02c94 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -1647,12 +1647,15 @@ void ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem,
                                         aUndoStr, pUndoDoc.release(), pSearchItem ) );
             }
 
-            rMark.ResetMark();
-            for (size_t i = 0, n = aMatchedRanges.size(); i < n; ++i)
+            if (nCommand == SVX_SEARCHCMD_FIND_ALL || nCommand == SVX_SEARCHCMD_REPLACE_ALL)
             {
-                const ScRange& r = *aMatchedRanges[i];
-                if (r.aStart.Tab() == nTab)
-                    rMark.SetMultiMarkArea(r);
+                rMark.ResetMark();
+                for (size_t i = 0, n = aMatchedRanges.size(); i < n; ++i)
+                {
+                    const ScRange& r = *aMatchedRanges[i];
+                    if (r.aStart.Tab() == nTab)
+                        rMark.SetMultiMarkArea(r);
+                }
             }
 
             break;                  // break 'while (TRUE)'