diff options
Diffstat (limited to 'svx/source/dialog')
| -rw-r--r-- | svx/source/dialog/cuicharmap.cxx | 4 | ||||
| -rw-r--r-- | svx/source/dialog/weldeditview.cxx | 18 |
2 files changed, 11 insertions, 11 deletions
diff --git a/svx/source/dialog/cuicharmap.cxx b/svx/source/dialog/cuicharmap.cxx index 84195ccd5543..964e540180c5 100644 --- a/svx/source/dialog/cuicharmap.cxx +++ b/svx/source/dialog/cuicharmap.cxx @@ -353,8 +353,8 @@ void SvxCharacterMap::insertCharToDoc(const OUString& sGlyph) sal_UCS4 cChar = sGlyph.iterateCodePoints(&o3tl::temporary(sal_Int32(0))); const SfxItemPool* pPool = m_xOutputSet->GetPool(); m_xOutputSet->Put( SfxStringItem( SID_CHARMAP, sGlyph ) ); - m_xOutputSet->Put( SvxFontItem( aFont.GetFamilyType(), aFont.GetFamilyName(), - aFont.GetStyleName(), aFont.GetPitch(), aFont.GetCharSet(), pPool->GetWhichIDFromSlotID(SID_ATTR_CHAR_FONT) ) ); + m_xOutputSet->Put( SvxFontItem( aFont.GetFamilyTypeMaybeAskConfig(), aFont.GetFamilyName(), + aFont.GetStyleName(), aFont.GetPitchMaybeAskConfig(), aFont.GetCharSet(), pPool->GetWhichIDFromSlotID(SID_ATTR_CHAR_FONT) ) ); m_xOutputSet->Put( SfxStringItem( SID_FONT_NAME, aFont.GetFamilyName() ) ); m_xOutputSet->Put( SfxInt32Item( SID_ATTR_CHAR, cChar ) ); } diff --git a/svx/source/dialog/weldeditview.cxx b/svx/source/dialog/weldeditview.cxx index 18539c449b5b..77e0971ab799 100644 --- a/svx/source/dialog/weldeditview.cxx +++ b/svx/source/dialog/weldeditview.cxx @@ -112,15 +112,15 @@ void WeldEditView::makeEditEngine() vcl::Font aAppFont(Application::GetSettings().GetStyleSettings().GetAppFont()); - pItemPool->SetUserDefaultItem(SvxFontItem(aAppFont.GetFamilyType(), aAppFont.GetFamilyName(), - u""_ustr, PITCH_DONTKNOW, RTL_TEXTENCODING_DONTKNOW, - EE_CHAR_FONTINFO)); - pItemPool->SetUserDefaultItem(SvxFontItem(aAppFont.GetFamilyType(), aAppFont.GetFamilyName(), - u""_ustr, PITCH_DONTKNOW, RTL_TEXTENCODING_DONTKNOW, - EE_CHAR_FONTINFO_CJK)); - pItemPool->SetUserDefaultItem(SvxFontItem(aAppFont.GetFamilyType(), aAppFont.GetFamilyName(), - u""_ustr, PITCH_DONTKNOW, RTL_TEXTENCODING_DONTKNOW, - EE_CHAR_FONTINFO_CTL)); + pItemPool->SetUserDefaultItem(SvxFontItem(aAppFont.GetFamilyTypeMaybeAskConfig(), + aAppFont.GetFamilyName(), u""_ustr, PITCH_DONTKNOW, + RTL_TEXTENCODING_DONTKNOW, EE_CHAR_FONTINFO)); + pItemPool->SetUserDefaultItem(SvxFontItem(aAppFont.GetFamilyTypeMaybeAskConfig(), + aAppFont.GetFamilyName(), u""_ustr, PITCH_DONTKNOW, + RTL_TEXTENCODING_DONTKNOW, EE_CHAR_FONTINFO_CJK)); + pItemPool->SetUserDefaultItem(SvxFontItem(aAppFont.GetFamilyTypeMaybeAskConfig(), + aAppFont.GetFamilyName(), u""_ustr, PITCH_DONTKNOW, + RTL_TEXTENCODING_DONTKNOW, EE_CHAR_FONTINFO_CTL)); pItemPool->SetUserDefaultItem( SvxFontHeightItem(aAppFont.GetFontHeight() * 20, 100, EE_CHAR_FONTHEIGHT)); |