tdf#152396: Carry the font style name into the layout font

EditEngine dropped the SvxFontItem style name when building the layout
font, so the typographic subfamily never reached font matching. Without
it, say, font width, chosen could not be resolved.

Change-Id: Ib7a7cc9b051be14467ddac42b4e5458b5c0327c7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/207295
Tested-by: Jenkins
Reviewed-by: Khaled Hosny <khaled@libreoffice.org>
This commit is contained in:
Khaled Hosny
2026-06-26 09:32:45 +02:00
committed by Khaled Hosny
parent 0291262da0
commit 0e88e104a8
3 changed files with 3 additions and 0 deletions
+1
View File
@@ -89,6 +89,7 @@ void EditCharAttribFont::SetFont( SvxFont& rFont, OutputDevice* )
const SvxFontItem& rAttr = static_cast<const SvxFontItem&>(*GetItem());
rFont.SetFamilyName( rAttr.GetFamilyName() );
rFont.SetStyleName( rAttr.GetStyleName() );
rFont.SetFamily( rAttr.GetFamily() );
rFont.SetPitch( rAttr.GetPitch() );
rFont.SetCharSet( rAttr.GetCharSet() );
+1
View File
@@ -3283,6 +3283,7 @@ void CreateFont( SvxFont& rFont, const SfxItemSet& rSet, bool bSearchInParent, S
{
const SvxFontItem& rFontItem = static_cast<const SvxFontItem&>(rSet.Get( nWhich_FontInfo ));
rFont.SetFamilyName( rFontItem.GetFamilyName() );
rFont.SetStyleName( rFontItem.GetStyleName() );
rFont.SetFamily( rFontItem.GetFamily() );
rFont.SetPitch( rFontItem.GetPitch() );
rFont.SetCharSet( rFontItem.GetCharSet() );
+1
View File
@@ -2889,6 +2889,7 @@ void ImpEditEngine::SeekCursor( ContentNode* pNode, sal_Int32 nPos, SvxFont& rFo
{
const SvxFontItem& rFontItem = static_cast<const SvxFontItem&>(pNode->GetContentAttribs().GetItem( GetScriptItemId( EE_CHAR_FONTINFO, nScriptType ) ));
rFont.SetFamilyName( rFontItem.GetFamilyName() );
rFont.SetStyleName( rFontItem.GetStyleName() );
rFont.SetFamily( rFontItem.GetFamily() );
rFont.SetPitch( rFontItem.GetPitch() );
rFont.SetCharSet( rFontItem.GetCharSet() );