tdf#152737: Fix off-by-one errors
Regressions from:
commit 718af940435ae9d2ac90374e5880ecb38e96252c
Author: Khaled Hosny <khaled@aliftype.com>
Date: Fri Dec 16 00:10:34 2022 +0200
tdf#152533: Improve script handling in font preview
and:
commit bfecacb2487ba9470600e6f64056d9b1816ee96b
Author: Khaled Hosny <khaled@aliftype.com>
Date: Thu Dec 15 22:51:54 2022 +0200
tdf#152460: Improve script handling in style previews
Change-Id: I7b12f5accbd65459d724676efb7bec947a7faaa0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144880
Tested-by: Jenkins
Reviewed-by: خالد حسني <khaled@aliftype.com>
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index 0712bbe..de39993 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -250,7 +250,9 @@ void FontPrevWin_Impl::CheckScript()
for (sal_Int32 i = 1; i <= maScriptText.getLength(); i++)
{
auto aNextScript = aEditEngine.GetScriptType({ 0, i, 0, i });
if (aNextScript != aScript || i == maScriptText.getLength())
if (aNextScript != aScript)
maScriptChanges.emplace_back(aScript, i - 1);
else if (i == maScriptText.getLength())
maScriptChanges.emplace_back(aScript, i);
aScript = aNextScript;
}
diff --git a/svx/source/styles/CommonStylePreviewRenderer.cxx b/svx/source/styles/CommonStylePreviewRenderer.cxx
index 9ddf3cf..0ca34ab 100644
--- a/svx/source/styles/CommonStylePreviewRenderer.cxx
+++ b/svx/source/styles/CommonStylePreviewRenderer.cxx
@@ -418,7 +418,9 @@ void CommonStylePreviewRenderer::CheckScript()
for (sal_Int32 i = 1; i <= maScriptText.getLength(); i++)
{
auto aNextScript = aEditEngine.GetScriptType({ 0, i, 0, i });
if (aNextScript != aScript || i == maScriptText.getLength())
if (aNextScript != aScript)
maScriptChanges.emplace_back(aScript, i - 1);
else if (i == maScriptText.getLength())
maScriptChanges.emplace_back(aScript, i);
aScript = aNextScript;
}