d40f2d02df
During text search, ASCII apostrophe ' (U+0027)
of the search term matches the typographic
apostrophe ’ (U+2019) of the text, too.
There was a UX regression in document editing from
commit e6fade1ce1
(tdf#38395 enable smart apostrophe replacement by default),
because Find and Replace window and Find toolbar
doesn't replace ASCII apostrophe, so the search term
hadn't matched the text (now with the automatically
replaced typographic apostrophes), as before the commit.
Regex search hasn't been modified, i.e. searching U+2019
is still necessary a search term with U+2019.
The typographic apostrophes of a search term only match
ASCII apostrophes of the text, if the search term contain
also an ASCII apostrophe, too.
Note: as a more sophisticated solution, it's possible to
add a new default transliteration option for this later.
Change-Id: I5121edbef5cf34fdd5b5f9ba3c046a06329a756a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105717
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
166 lines
6.3 KiB
C++
166 lines
6.3 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*
|
|
* This file incorporates work covered by the following license notice:
|
|
*
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed
|
|
* with this work for additional information regarding copyright
|
|
* ownership. The ASF licenses this file to you under the Apache
|
|
* License, Version 2.0 (the "License"); you may not use this file
|
|
* except in compliance with the License. You may obtain a copy of
|
|
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
*/
|
|
|
|
#ifndef INCLUDED_I18NPOOL_SOURCE_SEARCH_TEXTSEARCH_HXX
|
|
#define INCLUDED_I18NPOOL_SOURCE_SEARCH_TEXTSEARCH_HXX
|
|
|
|
#include <cppuhelper/implbase.hxx>
|
|
#include <com/sun/star/util/XTextSearch2.hpp>
|
|
#include <com/sun/star/lang/XServiceInfo.hpp>
|
|
|
|
#include <map>
|
|
#include <memory>
|
|
|
|
#include <unicode/regex.h>
|
|
#include <unicode/unistr.h>
|
|
#include <unicode/uversion.h>
|
|
|
|
namespace com::sun::star::i18n { class XBreakIterator; }
|
|
namespace com::sun::star::i18n { class XCharacterClassification; }
|
|
namespace com::sun::star::i18n { class XExtendedTransliteration; }
|
|
namespace com::sun::star::uno { class XComponentContext; }
|
|
|
|
|
|
typedef U_ICU_NAMESPACE::UnicodeString IcuUniString;
|
|
|
|
class WLevDistance;
|
|
typedef ::std::map< sal_Unicode, sal_Int32 > TextSearchJumpTable;
|
|
|
|
class TextSearch: public cppu::WeakImplHelper
|
|
<
|
|
css::util::XTextSearch2,
|
|
css::lang::XServiceInfo
|
|
>
|
|
{
|
|
osl::Mutex m_aMutex;
|
|
css::uno::Reference < css::uno::XComponentContext > m_xContext;
|
|
|
|
css::util::SearchOptions2 aSrchPara;
|
|
OUString sSrchStr;
|
|
OUString sSrchStr2;
|
|
|
|
mutable css::uno::Reference< css::i18n::XCharacterClassification > xCharClass;
|
|
|
|
css::uno::Reference< css::i18n::XExtendedTransliteration > xTranslit;
|
|
css::uno::Reference< css::i18n::XExtendedTransliteration > xTranslit2;
|
|
|
|
// define a function pointer for the different search methods
|
|
typedef css::util::SearchResult
|
|
(SAL_CALL TextSearch::*FnSrch)( const OUString& searchStr,
|
|
sal_Int32 startPos, sal_Int32 endPos );
|
|
|
|
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;
|
|
bool bIsForwardTab;
|
|
bool bUsePrimarySrchStr;
|
|
void MakeForwardTab();
|
|
void MakeForwardTab2();
|
|
void MakeBackwardTab();
|
|
void MakeBackwardTab2();
|
|
sal_Int32 GetDiff( const sal_Unicode ) const;
|
|
/// @throws css::uno::RuntimeException
|
|
css::util::SearchResult SAL_CALL
|
|
NSrchFrwrd( const OUString& searchStr,
|
|
sal_Int32 startPos, sal_Int32 endPos );
|
|
/// @throws css::uno::RuntimeException
|
|
css::util::SearchResult SAL_CALL
|
|
NSrchBkwrd( const OUString& searchStr,
|
|
sal_Int32 startPos, sal_Int32 endPos );
|
|
|
|
// Members and methods for the regular expression search
|
|
std::unique_ptr<icu::RegexMatcher> pRegexMatcher;
|
|
/// @throws css::uno::RuntimeException
|
|
css::util::SearchResult SAL_CALL
|
|
RESrchFrwrd( const OUString& searchStr,
|
|
sal_Int32 startPos, sal_Int32 endPos );
|
|
/// @throws css::uno::RuntimeException
|
|
css::util::SearchResult SAL_CALL
|
|
RESrchBkwrd( const OUString& searchStr,
|
|
sal_Int32 startPos, sal_Int32 endPos );
|
|
void RESrchPrepare( const css::util::SearchOptions2&);
|
|
|
|
// Members and methods for the "Weight Levenshtein-Distance" search
|
|
int nLimit;
|
|
std::unique_ptr<WLevDistance> pWLD;
|
|
css::uno::Reference < css::i18n::XBreakIterator > xBreak;
|
|
/// @throws css::uno::RuntimeException
|
|
css::util::SearchResult SAL_CALL
|
|
ApproxSrchFrwrd( const OUString& searchStr,
|
|
sal_Int32 startPos, sal_Int32 endPos );
|
|
/// @throws css::uno::RuntimeException
|
|
css::util::SearchResult SAL_CALL
|
|
ApproxSrchBkwrd( const OUString& searchStr,
|
|
sal_Int32 startPos, sal_Int32 endPos );
|
|
|
|
// Members and methods for the wildcard search
|
|
OUString maWildcardReversePattern;
|
|
OUString maWildcardReversePattern2;
|
|
sal_uInt32 mcWildcardEscapeChar;
|
|
bool mbWildcardAllowSubstring;
|
|
/// @throws css::uno::RuntimeException
|
|
css::util::SearchResult SAL_CALL
|
|
WildcardSrchFrwrd( const OUString& searchStr,
|
|
sal_Int32 startPos, sal_Int32 endPos );
|
|
/// @throws css::uno::RuntimeException
|
|
css::util::SearchResult SAL_CALL
|
|
WildcardSrchBkwrd( const OUString& searchStr,
|
|
sal_Int32 startPos, sal_Int32 endPos );
|
|
|
|
bool IsDelimiter( const OUString& rStr, sal_Int32 nPos ) const;
|
|
|
|
bool checkCTLStart, checkCTLEnd;
|
|
/// @throws css::uno::RuntimeException
|
|
bool isCellStart(const OUString& searchStr, sal_Int32 nPos);
|
|
|
|
public:
|
|
explicit TextSearch(
|
|
const css::uno::Reference < css::uno::XComponentContext >& rxContext );
|
|
|
|
virtual ~TextSearch() override;
|
|
|
|
// XTextSearch
|
|
virtual void SAL_CALL
|
|
setOptions( const css::util::SearchOptions& options ) override;
|
|
virtual css::util::SearchResult SAL_CALL
|
|
searchForward( const OUString& searchStr,
|
|
sal_Int32 startPos, sal_Int32 endPos ) override;
|
|
virtual css::util::SearchResult SAL_CALL
|
|
searchBackward( const OUString& searchStr,
|
|
sal_Int32 startPos, sal_Int32 endPos ) override;
|
|
|
|
// XTextSearch2
|
|
virtual void SAL_CALL
|
|
setOptions2( const css::util::SearchOptions2& options ) override;
|
|
|
|
//XServiceInfo
|
|
virtual OUString SAL_CALL getImplementationName() override;
|
|
virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
|
|
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
|
|
};
|
|
|
|
#endif
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|