diff options
| author | Caolán McNamara <caolan.mcnamara@collabora.com> | 2024-01-05 13:23:31 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolan.mcnamara@collabora.com> | 2024-01-05 17:49:02 +0100 |
| commit | 1bcb7d4bdaecaf37353e37fe09373189e62d69dd (patch) | |
| tree | bdabe6c7e74dbe25b0a98986964b84e4dac308ad /sc | |
| parent | 788eb8e7b37373bd5d2c078a2a833c4357165178 (diff) | |
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/+/161666
Tested-by: Jenkins
Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/core/data/column2.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/view/output2.cxx | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx index 5464c9b31f04..2ab310d25722 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 70c2f1904c7d..d5e87a66d3d0 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 ) |