vcl/source/gdi/CommonSalLayout.cxx | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 499e3a738a4bd2df70d2bc3e1d0708b9dae0ae14
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Wed Jan 13 20:48:29 2021 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Thu Jan 14 07:35:05 2021 +0100
Use o3tl::temporary in one more call to OUString::iterateCodePoints
...similar to 0701aca589b819b845d08ea60263ad89718cfd7f "Use o3tl::temporary
in
calls to OUString::iterateCodePoints", after
6ce3e7b615193f610add5428d2157f31600dec52 "Verify o3tl::temporary of a copied
lvalue works as expected" has been covered
Change-Id: I6a21acb0d1a6436ea57d670a2922778034edd4df
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109248
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/vcl/source/gdi/CommonSalLayout.cxx
b/vcl/source/gdi/CommonSalLayout.cxx
index 998e07169c51..7f557c73b314 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -25,6 +25,7 @@
#include <sallayout.hxx>
+#include <o3tl/temporary.hxx>
#include <sal/log.hxx>
#include <unotools/configmgr.hxx>
#include <vcl/unohelp.hxx>
@@ -555,8 +556,8 @@ bool GenericSalLayout::LayoutText(ImplLayoutArgs& rArgs,
const SalLayoutGlyphs*
if (bInCluster)
nGlyphFlags |= GlyphItemFlags::IS_IN_CLUSTER;
- sal_Int32 indexUtf16 = nCharPos;
- sal_UCS4 aChar = rArgs.mrStr.iterateCodePoints(&indexUtf16, 0);
+ sal_UCS4 aChar
+ =
rArgs.mrStr.iterateCodePoints(&o3tl::temporary(sal_Int32(nCharPos)), 0);
if (u_getIntPropertyValue(aChar, UCHAR_GENERAL_CATEGORY) ==
U_NON_SPACING_MARK)
nGlyphFlags |= GlyphItemFlags::IS_DIACRITIC;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
