dev/null |binary
i18npool/source/search/textsearch.cxx | 4 ++--
sw/qa/extras/uiwriter/uiwriter2.cxx | 32 --------------------------------
3 files changed, 2 insertions(+), 34 deletions(-)
New commits:
commit e73c3942de474004b04c1d538c89354183d44ae9
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Wed Aug 25 19:38:50 2021 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Thu Aug 26 00:39:48 2021 +0200
tdf#144089: Revert "tdf#137737 i18n search: don't expand start/end with
regex ^ or $"
This reverts commit a511bffd67a9cebfdc878766581ac08c79d7ff51.
Reason for revert: See https://gerrit.libreoffice.org/c/core/+/120981
Change-Id: If8a445448976a9963f76623d3d968b8d5e3d74dd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120990
Tested-by: Xisco Fauli <xiscofa...@libreoffice.org>
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/i18npool/source/search/textsearch.cxx
b/i18npool/source/search/textsearch.cxx
index e6ddd93c5be6..dcb31762e6c2 100644
--- a/i18npool/source/search/textsearch.cxx
+++ b/i18npool/source/search/textsearch.cxx
@@ -333,7 +333,7 @@ SearchResult TextSearch::searchForward( const OUString&
searchStr, sal_Int32 sta
// apply normal transliteration (1<->1, 1<->0)
sal_Int32 nInStartPos = startPos;
- if (pRegexMatcher && startPos > 0 &&
!aSrchPara.searchString.startsWith("^"))
+ if (pRegexMatcher && startPos > 0)
{
// tdf#89665, tdf#75806: An optimization to avoid transliterating
the whole string, yet
// transliterate enough of the leading text to allow sensible
look-behind assertions.
@@ -345,7 +345,7 @@ SearchResult TextSearch::searchForward( const OUString&
searchStr, sal_Int32 sta
nInStartPos -= std::min(nMaxLeadingLen, startPos);
}
sal_Int32 nInEndPos = endPos;
- if (pRegexMatcher && endPos < searchStr.getLength() &&
!aSrchPara.searchString.endsWith("$"))
+ if (pRegexMatcher && endPos < searchStr.getLength())
{
// tdf#65038: ditto for look-ahead assertions
const sal_Int32 nMaxTrailingLen =
aSrchPara.searchString.endsWith(")") ? 100 : 3;
diff --git a/sw/qa/extras/uiwriter/data/tdf137737_FindReplace.docx
b/sw/qa/extras/uiwriter/data/tdf137737_FindReplace.docx
deleted file mode 100644
index 42914ce3feaa..000000000000
Binary files a/sw/qa/extras/uiwriter/data/tdf137737_FindReplace.docx and
/dev/null differ
diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index c3ad147713bf..70d63e36871a 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -48,7 +48,6 @@
#include <xmloff/odffields.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/dispatch.hxx>
-#include <svl/srchitem.hxx>
#include <svl/stritem.hxx>
#include <comphelper/lok.hxx>
#include <comphelper/scopeguard.hxx>
@@ -4002,37 +4001,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf118311)
assertXPath(pXmlDoc, "//page[1]//body/tab", 0);
}
-CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf137737_FindReplace)
-{
- createSwDoc(DATA_DIRECTORY, "tdf137737_FindReplace.docx");
-
- // Replace straight quotes with something (opening quotes in real life,
but X is adequate here)
- uno::Sequence<beans::PropertyValue>
aArgs(comphelper::InitPropertySequence({
- { "SearchItem.SearchString", uno::makeAny(OUString("^\"")) },
- { "SearchItem.ReplaceString", uno::makeAny(OUString("X")) },
- { "SearchItem.Command",
uno::makeAny(static_cast<sal_Int16>(SvxSearchCmd::REPLACE)) },
- { "SearchItem.AlgorithmType", uno::makeAny(static_cast<sal_Int16>(1))
}, //REGEX
- { "SearchItem.AlgorithmType2", uno::makeAny(static_cast<sal_Int16>(2))
}, //REGEX
- }));
- // Find the first match.
- dispatchCommand(mxComponent, ".uno:ExecuteSearch", aArgs);
- // Replace the first match.
- dispatchCommand(mxComponent, ".uno:ExecuteSearch", aArgs);
-
- // Replace straight quotes with something (closing quotes in real life)
- aArgs[0].Value <<= OUString("\"$");
- dispatchCommand(mxComponent, ".uno:ExecuteSearch", aArgs);
- dispatchCommand(mxComponent, ".uno:ExecuteSearch", aArgs);
-
- //Finding the searched string via XReplaceable
- uno::Reference<util::XReplaceable> xReplace(mxComponent, uno::UNO_QUERY);
- uno::Reference<util::XReplaceDescriptor> xReplaceDes =
xReplace->createReplaceDescriptor();
- xReplaceDes->setSearchString("\"");
- //There should not be any straight quotes left.
- uno::Reference<container::XIndexAccess>
xIndex(xReplace->findAll(xReplaceDes));
- CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xIndex->getCount());
-}
-
CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testRedlineTableRowDeletion)
{
// load a 1-row table, and delete the row with enabled change tracking:
