[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - vcl/source
Stephan Bergmann (via logerrit)
logerrit at kemper.freedesktop.org
Wed Mar 10 14:29:42 UTC 2021
vcl/source/font/font.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 907e5fa4fe13efb26fc0dc3e5ead611da734daaa
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Feb 18 08:39:45 2021 +0100
Commit: Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Wed Mar 10 15:29:03 2021 +0100
Fix an OUString construction
...introduced with 9d161857f1d4afcb772b477455797a2da0e47a9b "tdf#127471 correct
EMF/WMF im/export for scaled font"
Change-Id: I2b807e102ca7f71a61794f511dee302c7e509026
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111095
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
(cherry picked from commit e0f2256b90fb30a5a7858f93c168d9da12061e70)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112221
Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>
diff --git a/vcl/source/font/font.cxx b/vcl/source/font/font.cxx
index 4017a5347e75..45a2222b6ff4 100644
--- a/vcl/source/font/font.cxx
+++ b/vcl/source/font/font.cxx
@@ -388,7 +388,7 @@ tools::Long Font::GetOrCalculateAverageFontWidth() const
aUnscaledFont.SetAverageFontWidth(0);
pVirDev->SetFont(aUnscaledFont);
const double fAverageFontWidth(
- pVirDev->GetTextWidth(OUString(aArray.data())) / static_cast<double>(nSize));
+ pVirDev->GetTextWidth(OUString(aArray.data(), nSize)) / static_cast<double>(nSize));
const_cast<Font*>(this)->mpImplFont->SetCalculatedAverageFontWidth(basegfx::fround(fAverageFontWidth));
}
More information about the Libreoffice-commits
mailing list