tdf#145868 sd replace: if search changes, restart find/replace

REPLACE is really a replaceAndFind instead of a findAndReplace.
Thus, when you changed your search parameter and did a replace,
it replaced the previously searched for item, and then found the
first instance of the new search parameter.
That of course is just wrong.

So make sure to verify that the previous search
matches the current search competely.
However, that doesn't mean that the entire searchItem matches,
since we don't want to restart the search just
because the replace parameter changed.

In my testing, this wasn't an issue for REPLACE_ALL.
So the only time we need to worry about the last search
result is in a replace once situation.

P.S. This commit exposed that mpSearchItem can point
to a destructed SvxSearchItem, so this patches unit test
will crash if the other 7.4 commit is missing.

Change-Id: I7be14d64534018718145c6ac5f8629ff5f2e5611
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129385
Tested-by: Jenkins
Reviewed-by: Justin Luth <jluth@mail.com>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>

1 files changed, 16 insertions, 5 deletions

diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx
index 24a46e28bd0b..1554f55efd3e 100644
--- a/svl/source/items/srchitem.cxx
+++ b/svl/source/items/srchitem.cxx
@@ -235,12 +235,13 @@ SvxSearchItem* SvxSearchItem::Clone( SfxItemPool *) const
 }
 
 //! used below
-static bool equalsWithoutLocale( const i18nutil::SearchOptions2& rItem1, const i18nutil::SearchOptions2& rItem2 )
+static bool equalsWithoutLocaleOrReplace(const i18nutil::SearchOptions2& rItem1,
+                                         const i18nutil::SearchOptions2& rItem2)
 {
     return rItem1.algorithmType         == rItem2.algorithmType &&
            rItem1.searchFlag            == rItem2.searchFlag    &&
            rItem1.searchString          == rItem2.searchString  &&
-           rItem1.replaceString         == rItem2.replaceString &&
+           //rItem1.replaceString       == rItem2.replaceString &&
            //rItem1.Locale              == rItem2.Locale        &&
            rItem1.changedChars          == rItem2.changedChars  &&
            rItem1.deletedChars          == rItem2.deletedChars  &&
@@ -255,8 +256,18 @@ bool SvxSearchItem::operator==( const SfxPoolItem& rItem ) const
 {
     assert(SfxPoolItem::operator==(rItem));
     const SvxSearchItem &rSItem = static_cast<const SvxSearchItem &>(rItem);
-    return ( m_nCommand       == rSItem.m_nCommand )        &&
-           ( m_bBackward      == rSItem.m_bBackward )       &&
+    return equalsIgnoring(rSItem, /*bIgnoreReplace=*/false, /*bIgnoreCommand=*/false);
+}
+
+bool SvxSearchItem::equalsIgnoring(const SvxSearchItem& rSItem, bool bIgnoreReplace,
+                                   bool bIgnoreCommand) const
+{
+    if (!bIgnoreReplace && m_aSearchOpt.replaceString != rSItem.m_aSearchOpt.replaceString)
+        return false;
+    if (!bIgnoreCommand && m_nCommand != rSItem.m_nCommand)
+        return false;
+
+    return ( m_bBackward      == rSItem.m_bBackward )       &&
            ( m_bPattern       == rSItem.m_bPattern )        &&
            ( m_bContent       == rSItem.m_bContent )        &&
            ( m_eFamily        == rSItem.m_eFamily )         &&
@@ -267,7 +278,7 @@ bool SvxSearchItem::operator==( const SfxPoolItem& rItem ) const
            ( m_nCellType      == rSItem.m_nCellType )       &&
            ( m_nAppFlag       == rSItem.m_nAppFlag )        &&
            ( m_bAsianOptions  == rSItem.m_bAsianOptions )   &&
-           ( equalsWithoutLocale(m_aSearchOpt,rSItem.m_aSearchOpt )) &&
+           ( equalsWithoutLocaleOrReplace(m_aSearchOpt, rSItem.m_aSearchOpt )) &&
            ( m_bNotes         == rSItem.m_bNotes );
 }