summaryrefslogtreecommitdiff
path: root/i18npool
diff options
context:
space:
mode:
Diffstat (limited to 'i18npool')
-rw-r--r--i18npool/qa/cppunit/test_textsearch.cxx115
-rw-r--r--i18npool/source/search/textsearch.cxx30
-rw-r--r--i18npool/source/search/textsearch.hxx3
3 files changed, 148 insertions, 0 deletions
diff --git a/i18npool/qa/cppunit/test_textsearch.cxx b/i18npool/qa/cppunit/test_textsearch.cxx
index 3d157e2cbdb4..51e6a11bfc83 100644
--- a/i18npool/qa/cppunit/test_textsearch.cxx
+++ b/i18npool/qa/cppunit/test_textsearch.cxx
@@ -38,11 +38,13 @@ public:
void testICU();
void testSearches();
void testWildcardSearch();
+ void testApostropheSearch();
CPPUNIT_TEST_SUITE(TestTextSearch);
CPPUNIT_TEST(testICU);
CPPUNIT_TEST(testSearches);
CPPUNIT_TEST(testWildcardSearch);
+ CPPUNIT_TEST(testApostropheSearch);
CPPUNIT_TEST_SUITE_END();
private:
uno::Reference<util::XTextSearch> m_xSearch;
@@ -265,6 +267,119 @@ void TestTextSearch::testWildcardSearch()
CPPUNIT_ASSERT((aRes.startOffset[0] == 6) && (aRes.endOffset[0] == 0));
}
+void TestTextSearch::testApostropheSearch()
+{
+ // A) find typographic apostrophes also by using ASCII apostrophe in searchString
+ OUString str( u"It\u2019s an apostrophe." );
+ sal_Int32 startPos = 0, endPos = str.getLength();
+
+ // set options
+ util::SearchOptions aOptions;
+ aOptions.algorithmType = util::SearchAlgorithms_ABSOLUTE;
+ aOptions.searchFlag = util::SearchFlags::ALL_IGNORE_CASE;
+ aOptions.searchString = "'";
+ m_xSearch->setOptions( aOptions );
+
+ util::SearchResult aRes;
+
+ // search forward
+ aRes = m_xSearch->searchForward( str, startPos, endPos );
+ // This was 0.
+ CPPUNIT_ASSERT( aRes.subRegExpressions > 0 );
+ CPPUNIT_ASSERT_EQUAL( static_cast<sal_Int32>(2), aRes.startOffset[0] );
+ CPPUNIT_ASSERT_EQUAL( static_cast<sal_Int32>(3), aRes.endOffset[0] );
+
+ // search backwards
+ aRes = m_xSearch->searchBackward( str, endPos, startPos );
+ // This was 0.
+ CPPUNIT_ASSERT( aRes.subRegExpressions > 0 );
+ CPPUNIT_ASSERT_EQUAL( static_cast<sal_Int32>(3), aRes.startOffset[0] );
+ CPPUNIT_ASSERT_EQUAL( static_cast<sal_Int32>(2), aRes.endOffset[0] );
+
+ // check with transliteration
+ aOptions.transliterateFlags = static_cast<int>(TransliterationFlags::IGNORE_CASE
+ | TransliterationFlags::IGNORE_WIDTH);
+ m_xSearch->setOptions(aOptions);
+
+ // search forward
+ aRes = m_xSearch->searchForward( str, startPos, endPos );
+ // This was 0.
+ CPPUNIT_ASSERT( aRes.subRegExpressions > 0 );
+ CPPUNIT_ASSERT_EQUAL( static_cast<sal_Int32>(2), aRes.startOffset[0] );
+ CPPUNIT_ASSERT_EQUAL( static_cast<sal_Int32>(3), aRes.endOffset[0] );
+
+ // search backwards
+ aRes = m_xSearch->searchBackward( str, endPos, startPos );
+ // This was 0.
+ CPPUNIT_ASSERT( aRes.subRegExpressions > 0 );
+ CPPUNIT_ASSERT_EQUAL( static_cast<sal_Int32>(3), aRes.startOffset[0] );
+ CPPUNIT_ASSERT_EQUAL( static_cast<sal_Int32>(2), aRes.endOffset[0] );
+
+ // B) search ASCII apostrophe in a text with ASCII apostrophes
+ str = str.replace(u'\u2019', '\'');
+
+ // search forward
+ aRes = m_xSearch->searchForward( str, startPos, endPos );
+ CPPUNIT_ASSERT( aRes.subRegExpressions > 0 );
+ CPPUNIT_ASSERT_EQUAL( static_cast<sal_Int32>(2), aRes.startOffset[0] );
+ CPPUNIT_ASSERT_EQUAL( static_cast<sal_Int32>(3), aRes.endOffset[0] );
+
+ // search backwards
+ aRes = m_xSearch->searchBackward( str, endPos, startPos );
+ CPPUNIT_ASSERT( aRes.subRegExpressions > 0 );
+ CPPUNIT_ASSERT_EQUAL( static_cast<sal_Int32>(3), aRes.startOffset[0] );
+ CPPUNIT_ASSERT_EQUAL( static_cast<sal_Int32>(2), aRes.endOffset[0] );
+
+ // C) search typographic apostrophe in a text with ASCII apostrophes (no result)
+ aOptions.searchString = OUString(u"\u2019");
+ m_xSearch->setOptions( aOptions );
+
+ aRes = m_xSearch->searchForward( str, startPos, endPos );
+ CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0), aRes.subRegExpressions);
+
+ aRes = m_xSearch->searchBackward( str, endPos, startPos );
+ CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0), aRes.subRegExpressions);
+
+ // D) search typographic apostrophe in a text with typographic apostrophes
+ str = str.replace('\'', u'\u2019');
+
+ // search forward
+ aRes = m_xSearch->searchForward( str, startPos, endPos );
+ CPPUNIT_ASSERT( aRes.subRegExpressions > 0 );
+ CPPUNIT_ASSERT_EQUAL( static_cast<sal_Int32>(2), aRes.startOffset[0] );
+ CPPUNIT_ASSERT_EQUAL( static_cast<sal_Int32>(3), aRes.endOffset[0] );
+
+ // search backwards
+ aRes = m_xSearch->searchBackward( str, endPos, startPos );
+ CPPUNIT_ASSERT( aRes.subRegExpressions > 0 );
+ CPPUNIT_ASSERT_EQUAL( static_cast<sal_Int32>(3), aRes.startOffset[0] );
+ CPPUNIT_ASSERT_EQUAL( static_cast<sal_Int32>(2), aRes.endOffset[0] );
+
+ // E) search mixed apostrophes in a text with mixed apostrophes:
+ aOptions.searchString = OUString(u"'\u2019");
+ m_xSearch->setOptions( aOptions );
+ str = u"test: \u2019'";
+
+ // search forward
+ aRes = m_xSearch->searchForward( str, startPos, str.getLength());
+ CPPUNIT_ASSERT( aRes.subRegExpressions > 0 );
+
+ // search backwards
+ aRes = m_xSearch->searchBackward( str, str.getLength(), startPos );
+ CPPUNIT_ASSERT( aRes.subRegExpressions > 0 );
+
+ // F) search mixed apostrophes in a text with ASCII apostrophes:
+ str = u"test: ''";
+
+ // search forward
+ aRes = m_xSearch->searchForward( str, startPos, str.getLength());
+ CPPUNIT_ASSERT( aRes.subRegExpressions > 0 );
+
+ // search backwards
+ aRes = m_xSearch->searchBackward( str, str.getLength(), startPos );
+ CPPUNIT_ASSERT( aRes.subRegExpressions > 0 );
+}
+
void TestTextSearch::setUp()
{
BootstrapFixtureBase::setUp();
diff --git a/i18npool/source/search/textsearch.cxx b/i18npool/source/search/textsearch.cxx
index 8c9e802a7d71..dcb31762e6c2 100644
--- a/i18npool/source/search/textsearch.cxx
+++ b/i18npool/source/search/textsearch.cxx
@@ -127,6 +127,8 @@ void TextSearch::setOptions2( const SearchOptions2& rOptions )
maWildcardReversePattern.clear();
maWildcardReversePattern2.clear();
TransliterationFlags transliterateFlags = static_cast<TransliterationFlags>(aSrchPara.transliterateFlags);
+ bSearchApostrophe = false;
+ bool bReplaceApostrophe = false;
if (aSrchPara.AlgorithmType2 == SearchAlgorithms2::REGEXP)
{
// RESrchPrepare will consider aSrchPara.transliterateFlags when
@@ -137,6 +139,11 @@ void TextSearch::setOptions2( const SearchOptions2& rOptions )
// match is not case-altered, leave case-(in)sensitive to regex engine.
transliterateFlags &= ~TransliterationFlags::IGNORE_CASE;
}
+ else if ( aSrchPara.searchString.indexOf('\'') > - 1 )
+ {
+ bSearchApostrophe = true;
+ bReplaceApostrophe = aSrchPara.searchString.indexOf(u'\u2019') > -1;
+ }
// Create Transliteration class
if( isSimpleTrans( transliterateFlags) )
@@ -214,6 +221,9 @@ void TextSearch::setOptions2( const SearchOptions2& rOptions )
checkCTLEnd = (xBreak.is() && (xBreak->getScriptType(sSrchStr,
sSrchStr.getLength()-1) == ScriptType::COMPLEX));
+ if ( bReplaceApostrophe )
+ sSrchStr = sSrchStr.replace(u'\u2019', '\'');
+
// Take the new SearchOptions2::AlgorithmType2 field and ignore
// SearchOptions::algorithmType
switch( aSrchPara.AlgorithmType2)
@@ -312,6 +322,10 @@ SearchResult TextSearch::searchForward( const OUString& searchStr, sal_Int32 sta
OUString in_str(searchStr);
+ // in non-regex mode, allow searching typographical apostrophe with the ASCII one
+ // to avoid regression after using automatic conversion to U+2019 during typing in Writer
+ bool bReplaceApostrophe = bSearchApostrophe && in_str.indexOf(u'\u2019') > -1;
+
bUsePrimarySrchStr = true;
if ( xTranslit.is() )
@@ -341,6 +355,9 @@ SearchResult TextSearch::searchForward( const OUString& searchStr, sal_Int32 sta
css::uno::Sequence<sal_Int32> offset(nInEndPos - nInStartPos);
in_str = xTranslit->transliterate(searchStr, nInStartPos, nInEndPos - nInStartPos, offset);
+ if ( bReplaceApostrophe )
+ in_str = in_str.replace(u'\u2019', '\'');
+
// JP 20.6.2001: also the start and end positions must be corrected!
sal_Int32 newStartPos =
(startPos == 0) ? 0 : FindPosInSeq_Impl( offset, startPos );
@@ -382,6 +399,9 @@ SearchResult TextSearch::searchForward( const OUString& searchStr, sal_Int32 sta
}
else
{
+ if ( bReplaceApostrophe )
+ in_str = in_str.replace(u'\u2019', '\'');
+
sres = (this->*fnForward)( in_str, startPos, endPos );
}
@@ -437,6 +457,10 @@ SearchResult TextSearch::searchBackward( const OUString& searchStr, sal_Int32 st
OUString in_str(searchStr);
+ // in non-regex mode, allow searching typographical apostrophe with the ASCII one
+ // to avoid regression after using automatic conversion to U+2019 during typing in Writer
+ bool bReplaceApostrophe = bSearchApostrophe && in_str.indexOf(u'\u2019') > -1;
+
bUsePrimarySrchStr = true;
if ( xTranslit.is() )
@@ -445,6 +469,9 @@ SearchResult TextSearch::searchBackward( const OUString& searchStr, sal_Int32 st
css::uno::Sequence<sal_Int32> offset(startPos - endPos);
in_str = xTranslit->transliterate( searchStr, endPos, startPos - endPos, offset );
+ if ( bReplaceApostrophe )
+ in_str = in_str.replace(u'\u2019', '\'');
+
// JP 20.6.2001: also the start and end positions must be corrected!
sal_Int32 const newStartPos = (startPos < searchStr.getLength())
? FindPosInSeq_Impl( offset, startPos )
@@ -490,6 +517,9 @@ SearchResult TextSearch::searchBackward( const OUString& searchStr, sal_Int32 st
}
else
{
+ if ( bReplaceApostrophe )
+ in_str = in_str.replace(u'\u2019', '\'');
+
sres = (this->*fnBackward)( in_str, startPos, endPos );
}
diff --git a/i18npool/source/search/textsearch.hxx b/i18npool/source/search/textsearch.hxx
index 80bcf3ca960d..5b3dcd05179e 100644
--- a/i18npool/source/search/textsearch.hxx
+++ b/i18npool/source/search/textsearch.hxx
@@ -68,6 +68,9 @@ class TextSearch: public cppu::WeakImplHelper
FnSrch fnForward;
FnSrch fnBackward;
+ // to fix UX regression, U+0027 matches also U+2019 in non-regex search
+ bool bSearchApostrophe;
+
// Members and methods for the normal (Boyer-Moore) search
std::unique_ptr<TextSearchJumpTable> pJumpTable;
std::unique_ptr<TextSearchJumpTable> pJumpTable2;
generated by cgit (git 2.34.1) at 2024-06-03 14:08:31 +0000