sc/source/core/data/column2.cxx | 2 ++ sc/source/ui/view/output2.cxx | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-)
New commits: commit 441ae3c0bce0febe37b99b43fc09f2c30ae4a4ee Author: Caolán McNamara <caolan.mcnam...@collabora.com> AuthorDate: Fri Jan 5 13:23:31 2024 +0000 Commit: Adolfo Jayme Barrientos <fit...@ubuntu.com> CommitDate: Mon Jan 8 07:15:30 2024 +0100 Resolves: tdf#158997 optimal col width too narrow to render text optimal is measured with kerning on, while text is rendered with kerning off possibly a problem since: commit 36eed54d3dfed6551fd2ad944feff7e217c56e82 Date: Tue Jul 3 15:00:26 2018 +0200 Resolves: tdf#118221 whole cell kerning default is off Change-Id: I0e6de75a89823f6ed58a74782e47feb0a44014e3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161680 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com> diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx index 38cfe9d9ee41..d7ea4924fbe6 100644 --- a/sc/source/core/data/column2.cxx +++ b/sc/source/core/data/column2.cxx @@ -283,6 +283,7 @@ tools::Long ScColumn::GetNeededSize( { Fraction aFontZoom = ( eOrient == SvxCellOrientation::Standard ) ? rZoomX : rZoomY; vcl::Font aFont; + aFont.SetKerning(FontKerning::NONE); // like ScDrawStringsVars::SetPattern // font color doesn't matter here pPattern->fillFontOnly(aFont, pDev, &aFontZoom, pCondSet, nScript); pDev->SetFont(aFont); @@ -754,6 +755,7 @@ sal_uInt16 ScColumn::GetOptimalColWidth( SCROW nRow = 0; const ScPatternAttr* pPattern = GetPattern( nRow ); vcl::Font aFont; + aFont.SetKerning(FontKerning::NONE); // like ScDrawStringsVars::SetPattern // font color doesn't matter here pPattern->fillFontOnly(aFont, pDev, &rZoomX); pDev->SetFont(aFont); diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index 07876568cb9a..13ef10025947 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -407,7 +407,9 @@ void ScDrawStringsVars::SetPattern( // There is no cell attribute for kerning, default is kerning OFF, all // kerning is stored at an EditText object that is drawn using EditEngine. - aFont.SetKerning( FontKerning::NONE); + // See also matching kerning cases in ScColumn::GetNeededSize and + // ScColumn::GetOptimalColWidth. + aFont.SetKerning(FontKerning::NONE); pDev->SetFont( aFont ); if ( pFmtDevice != pDev )