ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

cool#1125 Reduce cost of spell checking in writer

Browse Source 
Loading a new CharClass for each NextWord() call can add up.

Change-Id: Ie15f2adcd4c603074320b49d5c0276f558aab3e9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182919
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Tested-by: Jenkins
This commit is contained in:
Noel Grandin
2025-03-14 18:02:10 +01:00
committed by Caolán McNamara
parent 7aff1587cd
commit 3c7156da00
2 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/inc/swscanner.hxx
+4
View File
@@ -22,8 +22,10 @@
#include <i18nlangtag/lang.h>
#include "modeltoviewhelper.hxx"
#include <unotools/charclass.hxx>
#include <functional>
#include <optional>
class SwTextNode;
@@ -43,6 +45,8 @@ class SwScanner
sal_Int32 m_nBegin;
sal_Int32 m_nLength;
sal_Int32 m_nOverriddenDashCount;
// caches the CharClass for m_aCurrentLang, which can be expensive to repeatedly retrieve
std::optional<CharClass> moCharClass;
LanguageType m_aCurrentLang;
sal_uInt16 m_nWordType;
bool m_bClip;
sw/source/core/txtnode/txtedt.cxx
+17 -8
View File
@@ -35,7 +35,6 @@
#include <osl/diagnose.h>
#include <officecfg/Office/Writer.hxx>
#include <unotools/transliterationwrapper.hxx>
#include <unotools/charclass.hxx>
#include <sal/log.hxx>
#include <swmodule.hxx>
#include <splargs.hxx>
@@ -778,15 +777,21 @@ SwScanner::SwScanner(std::function<LanguageType(sal_Int32, sal_Int32, bool)> aGe
assert(m_aPreDashReplacementText.getLength() == m_aText.getLength());
LanguageType aNewLang;
if ( m_pLanguage )
{
m_aCurrentLang = *m_pLanguage;
aNewLang = *m_pLanguage;
}
else
{
ModelToViewHelper::ModelPosition aModelBeginPos =
m_ModelToView.ConvertToModelPosition( m_nBegin );
m_aCurrentLang = m_pGetLangOfChar(aModelBeginPos.mnPos, 0, true);
aNewLang = m_pGetLangOfChar(aModelBeginPos.mnPos, 0, true);
}
if (m_aCurrentLang != aNewLang)
{
m_aCurrentLang = aNewLang;
moCharClass.reset();
}
}
@@ -855,8 +860,6 @@ bool SwScanner::NextWord()
m_nBegin = m_nBegin + m_nLength;
Boundary aBound;
std::optional<CharClass> xLocalCharClass;
while ( true )
{
// skip non-letter characters:
@@ -869,13 +872,19 @@ bool SwScanner::NextWord()
const sal_uInt16 nNextScriptType = g_pBreakIt->GetBreakIter()->getScriptType( m_aText, m_nBegin );
ModelToViewHelper::ModelPosition aModelBeginPos =
m_ModelToView.ConvertToModelPosition( m_nBegin );
m_aCurrentLang = m_pGetLangOfChar(aModelBeginPos.mnPos, nNextScriptType, false);
LanguageType aNewLang = m_pGetLangOfChar(aModelBeginPos.mnPos, nNextScriptType, false);
if (aNewLang != m_aCurrentLang)
{
m_aCurrentLang = aNewLang;
moCharClass.reset();
}
}
if ( m_nWordType != i18n::WordType::WORD_COUNT )
{
xLocalCharClass.emplace(LanguageTag( g_pBreakIt->GetLocale( m_aCurrentLang ) ));
if ( xLocalCharClass->isLetterNumeric(OUString(m_aText[m_nBegin])) )
if (!moCharClass)
moCharClass.emplace(LanguageTag( g_pBreakIt->GetLocale( m_aCurrentLang ) ));
if ( moCharClass->isLetterNumeric(OUString(m_aText[m_nBegin])) )
break;
}
else