diff options
54 files changed, 259 insertions, 240 deletions
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index f35739649684..06c7573095b2 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -1237,7 +1237,7 @@ void EditorWindow::ImplSetFont() get_value_or( OUString() ) ); if ( sFontName.isEmpty() ) { - vcl::Font aTmpFont( OutputDevice::GetDefaultFont( DEFAULTFONT_FIXED, Application::GetSettings().GetUILanguageTag().getLanguageType(), 0 , this ) ); + vcl::Font aTmpFont( OutputDevice::GetDefaultFont( DefaultFontType::FIXED, Application::GetSettings().GetUILanguageTag().getLanguageType(), 0 , this ) ); sFontName = aTmpFont.GetName(); } Size aFontSize(0, officecfg::Office::Common::Font::SourceViewFont::FontHeight::get()); diff --git a/chart2/source/tools/CharacterProperties.cxx b/chart2/source/tools/CharacterProperties.cxx index f35495b35782..4fc88a266626 100644 --- a/chart2/source/tools/CharacterProperties.cxx +++ b/chart2/source/tools/CharacterProperties.cxx @@ -407,11 +407,11 @@ void CharacterProperties::AddDefaultsToMap( using namespace ::com::sun::star::i18n::ScriptType; LanguageType nLang; nLang = MsLangId::resolveSystemLanguageByScriptType(LanguageTag::convertToLanguageType( aDefaultLocale, false), LATIN); - vcl::Font aFont = OutputDevice::GetDefaultFont( DEFAULTFONT_LATIN_SPREADSHEET, nLang, DEFAULTFONT_FLAGS_ONLYONE, 0 ); + vcl::Font aFont = OutputDevice::GetDefaultFont( DefaultFontType::LATIN_SPREADSHEET, nLang, DEFAULTFONT_FLAGS_ONLYONE, 0 ); nLang = MsLangId::resolveSystemLanguageByScriptType(LanguageTag::convertToLanguageType( aDefaultLocale_CJK, false), ASIAN); - vcl::Font aFontCJK = OutputDevice::GetDefaultFont( DEFAULTFONT_CJK_SPREADSHEET, nLang, DEFAULTFONT_FLAGS_ONLYONE, 0 ); + vcl::Font aFontCJK = OutputDevice::GetDefaultFont( DefaultFontType::CJK_SPREADSHEET, nLang, DEFAULTFONT_FLAGS_ONLYONE, 0 ); nLang = MsLangId::resolveSystemLanguageByScriptType(LanguageTag::convertToLanguageType( aDefaultLocale_CTL, false), COMPLEX); - vcl::Font aFontCTL = OutputDevice::GetDefaultFont( DEFAULTFONT_CTL_SPREADSHEET, nLang, DEFAULTFONT_FLAGS_ONLYONE, 0 ); + vcl::Font aFontCTL = OutputDevice::GetDefaultFont( DefaultFontType::CTL_SPREADSHEET, nLang, DEFAULTFONT_FLAGS_ONLYONE, 0 ); ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_FONT_NAME, OUString( aFont.GetName() ) ); ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_FONT_STYLE_NAME, OUString(aFont.GetStyleName()) ); diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 20fcbcfd33b8..42dbdb5885e0 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -2063,7 +2063,7 @@ IMPL_LINK( OfaQuoteTabPage, QuoteHdl, PushButton*, pBtn ) nMode = DBL_END; // start character selection dialog ScopedVclPtrInstance< SvxCharacterMap > pMap( this, true ); - pMap->SetCharFont( OutputDevice::GetDefaultFont(DEFAULTFONT_LATIN_TEXT, + pMap->SetCharFont( OutputDevice::GetDefaultFont(DefaultFontType::LATIN_TEXT, LANGUAGE_ENGLISH_US, DEFAULTFONT_FLAGS_ONLYONE, 0 )); pMap->SetText(nMode < SGL_END ? m_sStartQuoteDlg : m_sEndQuoteDlg ); sal_UCS4 cDlg; diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 2af50a74dd08..3ea60fcdf19e 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -2410,7 +2410,7 @@ void SvxNumberingPreview::Paint( vcl::RenderContext& /*rRenderContext*/, cons // the whole height mustn't be used for a single level sal_uInt16 nYStep = sal::static_int_cast< sal_uInt16 >((aSize.Height() - 6)/ (pActNum->GetLevelCount() > 1 ? pActNum->GetLevelCount() : 5)); aStdFont = OutputDevice::GetDefaultFont( - DEFAULTFONT_UI_SANS, MsLangId::getSystemLanguage(), DEFAULTFONT_FLAGS_ONLYONE); + DefaultFontType::UI_SANS, MsLangId::getSystemLanguage(), DEFAULTFONT_FLAGS_ONLYONE); aStdFont.SetColor(aTextColor); aStdFont.SetFillColor(aBackColor); diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx index 77036352e97d..91fb5ddcb371 100644 --- a/dbaccess/source/ui/control/sqledit.cxx +++ b/dbaccess/source/ui/control/sqledit.cxx @@ -237,7 +237,7 @@ void OSqlEdit::ImplSetFont() get_value_or( OUString() ) ); if ( sFontName.isEmpty() ) { - vcl::Font aTmpFont( OutputDevice::GetDefaultFont( DEFAULTFONT_FIXED, Application::GetSettings().GetUILanguageTag().getLanguageType(), 0 , this ) ); + vcl::Font aTmpFont( OutputDevice::GetDefaultFont( DefaultFontType::FIXED, Application::GetSettings().GetUILanguageTag().getLanguageType(), 0 , this ) ); sFontName = aTmpFont.GetName(); } Size aFontSize( diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx index a05a3f88c9de..f2f39c812b1d 100644 --- a/dbaccess/source/ui/misc/TokenWriter.cxx +++ b/dbaccess/source/ui/misc/TokenWriter.cxx @@ -321,7 +321,7 @@ void ODatabaseImportExport::initialize() if ( m_aFont.Name.isEmpty() ) { vcl::Font aApplicationFont = OutputDevice::GetDefaultFont( - DEFAULTFONT_SANS_UNICODE, + DefaultFontType::SANS_UNICODE, Application::GetSettings().GetUILanguageTag().getLanguageType(), DEFAULTFONT_FLAGS_ONLYONE ); diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 65ffa8fec570..4f556d2bfe70 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -133,7 +133,7 @@ OSelectionBrowseBox::OSelectionBrowseBox( vcl::Window* pParent ) // switch off triState of ::com::sun::star::form::CheckBox m_pVisibleCell->GetBox().EnableTriState( false ); - vcl::Font aTitleFont = OutputDevice::GetDefaultFont( DEFAULTFONT_SANS_UNICODE,Window::GetSettings().GetLanguageTag().getLanguageType(),DEFAULTFONT_FLAGS_ONLYONE); + vcl::Font aTitleFont = OutputDevice::GetDefaultFont( DefaultFontType::SANS_UNICODE,Window::GetSettings().GetLanguageTag().getLanguageType(),DEFAULTFONT_FLAGS_ONLYONE); aTitleFont.SetSize(Size(0, 6)); SetTitleFont(aTitleFont); diff --git a/editeng/source/editeng/eehtml.cxx b/editeng/source/editeng/eehtml.cxx index 2ef23c72046c..bf4fae4375e3 100644 --- a/editeng/source/editeng/eehtml.cxx +++ b/editeng/source/editeng/eehtml.cxx @@ -652,7 +652,7 @@ void EditHTMLParser::ImpSetStyleSheet( sal_uInt16 nHLevel ) // Choose a proportional Font for Pre if ( nHLevel == STYLE_PRE ) { - vcl::Font aFont = OutputDevice::GetDefaultFont( DEFAULTFONT_FIXED, LANGUAGE_SYSTEM, 0 ); + vcl::Font aFont = OutputDevice::GetDefaultFont( DefaultFontType::FIXED, LANGUAGE_SYSTEM, 0 ); SvxFontItem aFontItem( aFont.GetFamily(), aFont.GetName(), OUString(), aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO ); aItems.Put( aFontItem ); diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx index b86a5a64ce37..006d6f265cb4 100644 --- a/editeng/source/items/bulitem.cxx +++ b/editeng/source/items/bulitem.cxx @@ -203,7 +203,7 @@ SfxPoolItem* SvxBulletItem::Create( SvStream& rStrm, sal_uInt16 /*nVersion*/ ) c void SvxBulletItem::SetDefaultFont_Impl() { - aFont = OutputDevice::GetDefaultFont( DEFAULTFONT_FIXED, LANGUAGE_SYSTEM, 0 ); + aFont = OutputDevice::GetDefaultFont( DefaultFontType::FIXED, LANGUAGE_SYSTEM, 0 ); aFont.SetAlign( ALIGN_BOTTOM); aFont.SetTransparent( true ); } diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index db11b63772b9..629eec483836 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -3505,14 +3505,14 @@ void GetDefaultFonts( SvxFontItem& rLatin, SvxFontItem& rAsian, SvxFontItem& rCo static struct { - sal_uInt16 nFontType; + DefaultFontType nFontType; sal_uInt16 nLanguage; } aOutTypeArr[ nItemCnt ] = { - { DEFAULTFONT_LATIN_TEXT, LANGUAGE_ENGLISH_US }, - { DEFAULTFONT_CJK_TEXT, LANGUAGE_ENGLISH_US }, - { DEFAULTFONT_CTL_TEXT, LANGUAGE_ARABIC_SAUDI_ARABIA } + { DefaultFontType::LATIN_TEXT, LANGUAGE_ENGLISH_US }, + { DefaultFontType::CJK_TEXT, LANGUAGE_ENGLISH_US }, + { DefaultFontType::CTL_TEXT, LANGUAGE_ARABIC_SAUDI_ARABIA } }; SvxFontItem* aItemArr[ nItemCnt ] = { &rLatin, &rAsian, &rComplex }; diff --git a/include/unotools/fontcfg.hxx b/include/unotools/fontcfg.hxx index 0b8368885cf7..faca9825c967 100644 --- a/include/unotools/fontcfg.hxx +++ b/include/unotools/fontcfg.hxx @@ -32,6 +32,8 @@ #include <unordered_set> #include <vector> +enum class DefaultFontType; + // DEFAULT - Default-Font like Andale Sans UI, Palace Script, Albany, Thorndale, Cumberland, ... // STANDARD - Standard-Font like Arial, Times, Courier, ... // NORMAL - normal Font for writing text like Arial, Verdana, Arial Narrow, Trebuchet, Times, Courier, ... @@ -123,7 +125,7 @@ class UNOTOOLS_DLLPUBLIC DefaultFontConfiguration static DefaultFontConfiguration& get(); - OUString getDefaultFont( const LanguageTag& rLanguageTag, int nType ) const; + OUString getDefaultFont( const LanguageTag& rLanguageTag, DefaultFontType nType ) const; OUString getUserInterfaceFont( const LanguageTag& rLanguageTag ) const; }; diff --git a/include/unotools/fontdefs.hxx b/include/unotools/fontdefs.hxx index 763f7bf995af..37d78cefd45a 100644 --- a/include/unotools/fontdefs.hxx +++ b/include/unotools/fontdefs.hxx @@ -63,29 +63,32 @@ public: }; // Default-Font -#define DEFAULTFONT_SANS_UNICODE ((sal_uInt16)1) -#define DEFAULTFONT_SANS ((sal_uInt16)2) -#define DEFAULTFONT_SERIF ((sal_uInt16)3) -#define DEFAULTFONT_FIXED ((sal_uInt16)4) -#define DEFAULTFONT_SYMBOL ((sal_uInt16)5) -#define DEFAULTFONT_UI_SANS ((sal_uInt16)1000) -#define DEFAULTFONT_UI_FIXED ((sal_uInt16)1001) -#define DEFAULTFONT_LATIN_TEXT ((sal_uInt16)2000) -#define DEFAULTFONT_LATIN_PRESENTATION ((sal_uInt16)2001) -#define DEFAULTFONT_LATIN_SPREADSHEET ((sal_uInt16)2002) -#define DEFAULTFONT_LATIN_HEADING ((sal_uInt16)2003) -#define DEFAULTFONT_LATIN_DISPLAY ((sal_uInt16)2004) -#define DEFAULTFONT_LATIN_FIXED ((sal_uInt16)2005) -#define DEFAULTFONT_CJK_TEXT ((sal_uInt16)3000) -#define DEFAULTFONT_CJK_PRESENTATION ((sal_uInt16)3001) -#define DEFAULTFONT_CJK_SPREADSHEET ((sal_uInt16)3002) -#define DEFAULTFONT_CJK_HEADING ((sal_uInt16)3003) -#define DEFAULTFONT_CJK_DISPLAY ((sal_uInt16)3004) -#define DEFAULTFONT_CTL_TEXT ((sal_uInt16)4000) -#define DEFAULTFONT_CTL_PRESENTATION ((sal_uInt16)4001) -#define DEFAULTFONT_CTL_SPREADSHEET ((sal_uInt16)4002) -#define DEFAULTFONT_CTL_HEADING ((sal_uInt16)4003) -#define DEFAULTFONT_CTL_DISPLAY ((sal_uInt16)4004) +enum class DefaultFontType +{ + SANS_UNICODE = 1, + SANS = 2, + SERIF = 3, + FIXED = 4, + SYMBOL = 5, + UI_SANS = 1000, + UI_FIXED = 1001, + LATIN_TEXT = 2000, + LATIN_PRESENTATION = 2001, + LATIN_SPREADSHEET = 2002, + LATIN_HEADING = 2003, + LATIN_DISPLAY = 2004, + LATIN_FIXED = 2005, + CJK_TEXT = 3000, + CJK_PRESENTATION = 3001, + CJK_SPREADSHEET = 3002, + CJK_HEADING = 3003, + CJK_DISPLAY = 3004, + CTL_TEXT = 4000, + CTL_PRESENTATION = 4001, + CTL_SPREADSHEET = 4002, + CTL_HEADING = 4003, + CTL_DISPLAY = 4004, +}; UNOTOOLS_DLLPUBLIC OUString GetNextFontToken( const OUString& rTokenStr, sal_Int32& rIndex ); diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 4259258ad133..ea284f2764cf 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -1221,7 +1221,7 @@ public: static void RemoveFontSubstitute( sal_uInt16 n ); static sal_uInt16 GetFontSubstituteCount(); - static vcl::Font GetDefaultFont( sal_uInt16 nType, + static vcl::Font GetDefaultFont( DefaultFontType nType, LanguageType eLang, sal_uLong nFlags, const OutputDevice* pOutDev = NULL ); diff --git a/reportdesign/source/core/api/ReportComponent.cxx b/reportdesign/source/core/api/ReportComponent.cxx index 38189bf41d77..2d73e1550e08 100644 --- a/reportdesign/source/core/api/ReportComponent.cxx +++ b/reportdesign/source/core/api/ReportComponent.cxx @@ -55,9 +55,9 @@ void lcl_getDefaultFonts( vcl::Font& rLatinFont, vcl::Font& rCJKFont, vcl::Font& if (MsLangId::isKorean(eUiLanguage)) eLatin = eUiLanguage; - rLatinFont = OutputDevice::GetDefaultFont( DEFAULTFONT_LATIN_PRESENTATION, eLatin, DEFAULTFONT_FLAGS_ONLYONE ); - rCJKFont = OutputDevice::GetDefaultFont( DEFAULTFONT_CJK_PRESENTATION, _eCJK, DEFAULTFONT_FLAGS_ONLYONE ); - rCTLFont = OutputDevice::GetDefaultFont( DEFAULTFONT_CTL_PRESENTATION, _eCTL, DEFAULTFONT_FLAGS_ONLYONE ) ; + rLatinFont = OutputDevice::GetDefaultFont( DefaultFontType::LATIN_PRESENTATION, eLatin, DEFAULTFONT_FLAGS_ONLYONE ); + rCJKFont = OutputDevice::GetDefaultFont( DefaultFontType::CJK_PRESENTATION, _eCJK, DEFAULTFONT_FLAGS_ONLYONE ); + rCTLFont = OutputDevice::GetDefaultFont( DefaultFontType::CTL_PRESENTATION, _eCTL, DEFAULTFONT_FLAGS_ONLYONE ) ; } OFormatProperties::OFormatProperties() :nAlign(style::ParagraphAdjust_LEFT) diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx index 7a9009b64499..0588f1f090a6 100644 --- a/sc/source/core/data/docpool.cxx +++ b/sc/source/core/data/docpool.cxx @@ -196,7 +196,7 @@ ScDocumentPool::ScDocumentPool( SfxItemPool* pSecPool) pSecondary ( pSecPool ) { // latin font from GetDefaultFonts is not used, DEFAULTFONT_LATIN_SPREADSHEET instead - vcl::Font aStdFont = OutputDevice::GetDefaultFont( DEFAULTFONT_LATIN_SPREADSHEET, LANGUAGE_ENGLISH_US, + vcl::Font aStdFont = OutputDevice::GetDefaultFont( DefaultFontType::LATIN_SPREADSHEET, LANGUAGE_ENGLISH_US, DEFAULTFONT_FLAGS_ONLYONE ); SvxFontItem* pStdFont = new SvxFontItem( aStdFont.GetFamily(), aStdFont.GetName(), aStdFont.GetStyleName(), diff --git a/sc/source/core/data/stlpool.cxx b/sc/source/core/data/stlpool.cxx index 7788fa32f94f..abd00b567114 100644 --- a/sc/source/core/data/stlpool.cxx +++ b/sc/source/core/data/stlpool.cxx @@ -197,7 +197,7 @@ void ScStyleSheetPool::CopyStdStylesFrom( ScStyleSheetPool* pSrcPool ) CopyStyleFrom( pSrcPool, SCSTR(STR_STYLENAME_REPORT), SFX_STYLE_FAMILY_PAGE ); } -static void lcl_CheckFont( SfxItemSet& rSet, LanguageType eLang, sal_uInt16 nFontType, sal_uInt16 nItemId ) +static void lcl_CheckFont( SfxItemSet& rSet, LanguageType eLang, DefaultFontType nFontType, sal_uInt16 nItemId ) { if ( eLang != LANGUAGE_NONE && eLang != LANGUAGE_DONTKNOW && eLang != LANGUAGE_SYSTEM ) { @@ -260,9 +260,9 @@ void ScStyleSheetPool::CreateStandardStyles() if (MsLangId::isKorean(eUiLanguage)) eLatin = eUiLanguage; - lcl_CheckFont( *pSet, eLatin, DEFAULTFONT_LATIN_SPREADSHEET, ATTR_FONT ); - lcl_CheckFont( *pSet, eCjk, DEFAULTFONT_CJK_SPREADSHEET, ATTR_CJK_FONT ); - lcl_CheckFont( *pSet, eCtl, DEFAULTFONT_CTL_SPREADSHEET, ATTR_CTL_FONT ); + lcl_CheckFont( *pSet, eLatin, DefaultFontType::LATIN_SPREADSHEET, ATTR_FONT ); + lcl_CheckFont( *pSet, eCjk, DefaultFontType::CJK_SPREADSHEET, ATTR_CJK_FONT ); + lcl_CheckFont( *pSet, eCtl, DefaultFontType::CTL_SPREADSHEET, ATTR_CTL_FONT ); // #i55300# default CTL font size for Thai has to be larger // #i59408# The 15 point size causes problems with row heights, so no different diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx index c68a4f65239d..387835005893 100644 --- a/sc/source/core/tool/autoform.cxx +++ b/sc/source/core/tool/autoform.cxx @@ -822,19 +822,19 @@ ScAutoFormat::ScAutoFormat() : // default font, default height vcl::Font aStdFont = OutputDevice::GetDefaultFont( - DEFAULTFONT_LATIN_SPREADSHEET, LANGUAGE_ENGLISH_US, DEFAULTFONT_FLAGS_ONLYONE ); + DefaultFontType::LATIN_SPREADSHEET, LANGUAGE_ENGLISH_US, DEFAULTFONT_FLAGS_ONLYONE ); SvxFontItem aFontItem( aStdFont.GetFamily(), aStdFont.GetName(), aStdFont.GetStyleName(), aStdFont.GetPitch(), aStdFont.GetCharSet(), ATTR_FONT ); aStdFont = OutputDevice::GetDefaultFont( - DEFAULTFONT_CJK_SPREADSHEET, LANGUAGE_ENGLISH_US, DEFAULTFONT_FLAGS_ONLYONE ); + DefaultFontType::CJK_SPREADSHEET, LANGUAGE_ENGLISH_US, DEFAULTFONT_FLAGS_ONLYONE ); SvxFontItem aCJKFontItem( aStdFont.GetFamily(), aStdFont.GetName(), aStdFont.GetStyleName(), aStdFont.GetPitch(), aStdFont.GetCharSet(), ATTR_CJK_FONT ); aStdFont = OutputDevice::GetDefaultFont( - DEFAULTFONT_CTL_SPREADSHEET, LANGUAGE_ENGLISH_US, DEFAULTFONT_FLAGS_ONLYONE ); + DefaultFontType::CTL_SPREADSHEET, LANGUAGE_ENGLISH_US, DEFAULTFONT_FLAGS_ONLYONE ); SvxFontItem aCTLFontItem( aStdFont.GetFamily(), aStdFont.GetName(), aStdFont.GetStyleName(), aStdFont.GetPitch(), aStdFont.GetCharSet(), ATTR_CTL_FONT ); diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx index 34ac173756ca..766ab71cd62d 100644 --- a/sc/source/ui/dbgui/csvgrid.cxx +++ b/sc/source/ui/dbgui/csvgrid.cxx @@ -226,7 +226,7 @@ void ScCsvGrid::InitColors() void ScCsvGrid::InitFonts() { - maMonoFont = OutputDevice::GetDefaultFont( DEFAULTFONT_FIXED, LANGUAGE_ENGLISH_US, 0 ); + maMonoFont = OutputDevice::GetDefaultFont( DefaultFontType::FIXED, LANGUAGE_ENGLISH_US, 0 ); maMonoFont.SetSize( Size( maMonoFont.GetSize().Width(), maHeaderFont.GetSize().Height() ) ); /* *** Set edit engine defaults *** diff --git a/sc/source/ui/sidebar/CellLineStyleValueSet.cxx b/sc/source/ui/sidebar/CellLineStyleValueSet.cxx index 800c8b3ddc69..c3fdeb5986f5 100644 --- a/sc/source/ui/sidebar/CellLineStyleValueSet.cxx +++ b/sc/source/ui/sidebar/CellLineStyleValueSet.cxx @@ -80,7 +80,7 @@ void CellLineStyleValueSet::UserDraw( const UserDrawEvent& rUDEvt ) Color aOldColor = pDev->GetLineColor(); Color aOldFillColor = pDev->GetFillColor(); - vcl::Font aFont(OutputDevice::GetDefaultFont(DEFAULTFONT_UI_SANS, MsLangId::getSystemLanguage(), DEFAULTFONT_FLAGS_ONLYONE)); + vcl::Font aFont(OutputDevice::GetDefaultFont(DefaultFontType::UI_SANS, MsLangId::getSystemLanguage(), DEFAULTFONT_FLAGS_ONLYONE)); Size aSize = aFont.GetSize(); aSize.Height() = nRectHeight*3/5; aFont.SetSize( aSize ); diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index 09ef8c72638c..6d190ec4071a 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -1762,7 +1762,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) nOptions |= i18n::TextConversionOption::CHARACTER_BY_CHARACTER; vcl::Font aTargetFont = OutputDevice::GetDefaultFont( - DEFAULTFONT_CJK_SPREADSHEET, + DefaultFontType::CJK_SPREADSHEET, eTargetLang, DEFAULTFONT_FLAGS_ONLYONE ); ScConversionParam aConvParam( SC_CONVERSION_CHINESE_TRANSL, eSourceLang, eTargetLang, aTargetFont, nOptions, false ); diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index fcc4d88211ab..43faa83c1265 100644 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -1298,9 +1298,9 @@ void SdDrawDocument::getDefaultFonts( vcl::Font& rLatinFont, vcl::Font& rCJKFont if (MsLangId::isKorean(eUiLanguage)) eLatin = eUiLanguage; - rLatinFont = OutputDevice::GetDefaultFont( DEFAULTFONT_LATIN_PRESENTATION, eLatin, DEFAULTFONT_FLAGS_ONLYONE ); - rCJKFont = OutputDevice::GetDefaultFont( DEFAULTFONT_CJK_PRESENTATION, GetLanguage( EE_CHAR_LANGUAGE_CJK ), DEFAULTFONT_FLAGS_ONLYONE ); - rCTLFont = OutputDevice::GetDefaultFont( DEFAULTFONT_CTL_PRESENTATION, GetLanguage( EE_CHAR_LANGUAGE_CTL ), DEFAULTFONT_FLAGS_ONLYONE ) ; + rLatinFont = OutputDevice::GetDefaultFont( DefaultFontType::LATIN_PRESENTATION, eLatin, DEFAULTFONT_FLAGS_ONLYONE ); + rCJKFont = OutputDevice::GetDefaultFont( DefaultFontType::CJK_PRESENTATION, GetLanguage( EE_CHAR_LANGUAGE_CJK ), DEFAULTFONT_FLAGS_ONLYONE ); + rCTLFont = OutputDevice::GetDefaultFont( DefaultFontType::CTL_PRESENTATION, GetLanguage( EE_CHAR_LANGUAGE_CTL ), DEFAULTFONT_FLAGS_ONLYONE ) ; } /* converts the given western font height to a corresponding ctl font height, depending on the system language */ diff --git a/sd/source/ui/func/fuhhconv.cxx b/sd/source/ui/func/fuhhconv.cxx index 4721b49e9dfd..ad5fd9bfa1bc 100644 --- a/sd/source/ui/func/fuhhconv.cxx +++ b/sd/source/ui/func/fuhhconv.cxx @@ -242,7 +242,7 @@ void FuHangulHanjaConversion::StartChineseConversion() nOptions = nOptions | i18n::TextConversionOption::CHARACTER_BY_CHARACTER; vcl::Font aTargetFont = OutputDevice::GetDefaultFont( - DEFAULTFONT_CJK_PRESENTATION, + DefaultFontType::CJK_PRESENTATION, nTargetLang, DEFAULTFONT_FLAGS_ONLYONE ); StartConversion( nSourceLang, nTargetLang, &aTargetFont, nOptions, false ); diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx index 0df3b852583a..4439d73975d5 100644 --- a/sd/source/ui/presenter/PresenterTextView.cxx +++ b/sd/source/ui/presenter/PresenterTextView.cxx @@ -285,19 +285,19 @@ EditEngine* PresenterTextView::Implementation::CreateEditEngine() struct FontDta { sal_Int16 nFallbackLang; sal_Int16 nLang; - sal_uInt16 nFontType; + DefaultFontType nFontType; sal_uInt16 nFontInfoId; } aTable[3] = { // info to get western font to be used { LANGUAGE_ENGLISH_US, LANGUAGE_NONE, - DEFAULTFONT_SERIF, EE_CHAR_FONTINFO }, + DefaultFontType::SERIF, EE_CHAR_FONTINFO }, // info to get CJK font to be used { LANGUAGE_JAPANESE, LANGUAGE_NONE, - DEFAULTFONT_CJK_TEXT, EE_CHAR_FONTINFO_CJK }, + DefaultFontType::CJK_TEXT, EE_CHAR_FONTINFO_CJK }, // info to get CTL font to be used { LANGUAGE_ARABIC_SAUDI_ARABIA, LANGUAGE_NONE, - DEFAULTFONT_CTL_TEXT, EE_CHAR_FONTINFO_CTL } + DefaultFontType::CTL_TEXT, EE_CHAR_FONTINFO_CTL } }; aTable[0].nLang = MsLangId::resolveSystemLanguageByScriptType(aOpt.nDefaultLanguage, ::com::sun::star::i18n::ScriptType::LATIN); aTable[1].nLang = MsLangId::resolveSystemLanguageByScriptType(aOpt.nDefaultLanguage_CJK, ::com::sun::star::i18n::ScriptType::ASIAN); diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index db4ab7a4a619..c5cda61d264c 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -138,7 +138,7 @@ OutlineView::OutlineView( DrawDocShell& rDocSh, vcl::Window* pWindow, OutlineVie | tools::EventMultiplexerEvent::EID_PAGE_ORDER); LanguageType eLang = mrOutliner.GetDefaultLanguage(); - maPageNumberFont = OutputDevice::GetDefaultFont( DEFAULTFONT_SANS_UNICODE, eLang, 0 ); + maPageNumberFont = OutputDevice::GetDefaultFont( DefaultFontType::SANS_UNICODE, eLang, 0 ); maPageNumberFont.SetHeight( 500 ); maBulletFont.SetColor( COL_AUTO ); @@ -1720,7 +1720,7 @@ IMPL_LINK(OutlineView, PaintingFirstLineHdl, PaintFirstLineInfo*, pInfo) LanguageType eLang = rEditEngine.GetDefaultLanguage(); Point aTextPos( aImagePos.X() - aOffset.Width(), pInfo->mrStartPos.Y() ); - vcl::Font aNewFont( OutputDevice::GetDefaultFont( DEFAULTFONT_SANS_UNICODE, eLang, 0 ) ); + vcl::Font aNewFont( OutputDevice::GetDefaultFont( DefaultFontType::SANS_UNICODE, eLang, 0 ) ); aNewFont.SetSize( aFontSz ); aNewFont.SetVertical( bVertical ); aNewFont.SetOrientation( bVertical ? 2700 : 0 ); diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx index 0ff0caa9b55f..986e109d6ef1 100644 --- a/starmath/source/document.cxx +++ b/starmath/source/document.cxx @@ -314,19 +314,19 @@ void SetEditEngineDefaultFonts(SfxItemPool &rEditEngineItemPool) struct FontDta { sal_Int16 nFallbackLang; sal_Int16 nLang; - sal_uInt16 nFontType; + DefaultFontType nFontType; sal_uInt16 nFontInfoId; } aTable[3] = { // info to get western font to be used { LANGUAGE_ENGLISH_US, LANGUAGE_NONE, - DEFAULTFONT_FIXED, EE_CHAR_FONTINFO }, + DefaultFontType::FIXED, EE_CHAR_FONTINFO }, // info to get CJK font to be used { LANGUAGE_JAPANESE, LANGUAGE_NONE, - DEFAULTFONT_CJK_TEXT, EE_CHAR_FONTINFO_CJK }, + DefaultFontType::CJK_TEXT, EE_CHAR_FONTINFO_CJK }, // info to get CTL font to be used { LANGUAGE_ARABIC_SAUDI_ARABIA, LANGUAGE_NONE, - DEFAULTFONT_CTL_TEXT, EE_CHAR_FONTINFO_CTL } + DefaultFontType::CTL_TEXT, EE_CHAR_FONTINFO_CTL } }; aTable[0].nLang = aOpt.nDefaultLanguage; aTable[1].nLang = aOpt.nDefaultLanguage_CJK; diff --git a/starmath/source/format.cxx b/starmath/source/format.cxx index 76007fc2b08c..870a8282342e 100644 --- a/starmath/source/format.cxx +++ b/starmath/source/format.cxx @@ -25,15 +25,15 @@ // Latin default-fonts -static const sal_uInt16 aLatinDefFnts[FNT_END] = +static const DefaultFontType aLatinDefFnts[FNT_END] = { - DEFAULTFONT_SERIF, // FNT_VARIABLE - DEFAULTFONT_SERIF, // FNT_FUNCTION - DEFAULTFONT_SERIF, // FNT_NUMBER - DEFAULTFONT_SERIF, // FNT_TEXT - DEFAULTFONT_SERIF, // FNT_SERIF - DEFAULTFONT_SANS, // FNT_SANS - DEFAULTFONT_FIXED // FNT_FIXED + DefaultFontType::SERIF, // FNT_VARIABLE + DefaultFontType::SERIF, // FNT_FUNCTION + DefaultFontType::SERIF, // FNT_NUMBER + DefaultFontType::SERIF, // FNT_TEXT + DefaultFontType::SERIF, // FNT_SERIF + DefaultFontType::SANS, // FNT_SANS + DefaultFontType::FIXED // FNT_FIXED //OpenSymbol, // FNT_MATH }; @@ -41,28 +41,28 @@ static const sal_uInt16 aLatinDefFnts[FNT_END] = //! we use non-asian fonts for variables, functions and numbers since they //! look better and even in asia only latin letters will be used for those. //! At least that's what I was told... -static const sal_uInt16 aCJKDefFnts[FNT_END] = +static const DefaultFontType aCJKDefFnts[FNT_END] = { - DEFAULTFONT_SERIF, // FNT_VARIABLE - DEFAULTFONT_SERIF, // FNT_FUNCTION - DEFAULTFONT_SERIF, // FNT_NUMBER - DEFAULTFONT_CJK_TEXT, // FNT_TEXT - DEFAULTFONT_CJK_TEXT, // FNT_SERIF - DEFAULTFONT_CJK_DISPLAY, // FNT_SANS - DEFAULTFONT_CJK_TEXT // FNT_FIXED + DefaultFontType::SERIF, // FNT_VARIABLE + DefaultFontType::SERIF, // FNT_FUNCTION + DefaultFontType::SERIF, // FNT_NUMBER + DefaultFontType::CJK_TEXT, // FNT_TEXT + DefaultFontType::CJK_TEXT, // FNT_SERIF + DefaultFontType::CJK_DISPLAY, // FNT_SANS + DefaultFontType::CJK_TEXT // FNT_FIXED //OpenSymbol, // FNT_MATH }; // CTL default-fonts -static const sal_uInt16 aCTLDefFnts[FNT_END] = +static const DefaultFontType aCTLDefFnts[FNT_END] = { - DEFAULTFONT_CTL_TEXT, // FNT_VARIABLE - DEFAULTFONT_CTL_TEXT, // FNT_FUNCTION - DEFAULTFONT_CTL_TEXT, // FNT_NUMBER - DEFAULTFONT_CTL_TEXT, // FNT_TEXT - DEFAULTFONT_CTL_TEXT, // FNT_SERIF - DEFAULTFONT_CTL_TEXT, // FNT_SANS - DEFAULTFONT_CTL_TEXT // FNT_FIXED + DefaultFontType::CTL_TEXT, // FNT_VARIABLE + DefaultFontType::CTL_TEXT, // FNT_FUNCTION + DefaultFontType::CTL_TEXT, // FNT_NUMBER + DefaultFontType::CTL_TEXT, // FNT_TEXT + DefaultFontType::CTL_TEXT, // FNT_SERIF + DefaultFontType::CTL_TEXT, // FNT_SANS + DefaultFontType::CTL_TEXT // FNT_FIXED //OpenSymbol, // FNT_MATH }; @@ -76,7 +76,7 @@ OUString GetDefaultFontName( LanguageType nLang, sal_uInt16 nIdent ) return OUString(FNTNAME_MATH); else { - const sal_uInt16 *pTable; + const DefaultFontType *pTable; switch ( SvtLanguageOptions::GetScriptTypeOfLanguage( nLang ) ) { case SvtScriptType::LATIN : pTable = aLatinDefFnts; break; diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx index bf6c0c018b93..d713e76139bc 100644 --- a/svx/source/dialog/dialcontrol.cxx +++ b/svx/source/dialog/dialcontrol.cxx @@ -432,7 +432,7 @@ void DialControl::Init( const Size& rWinSize ) vcl::Font aDefaultSize = GetFont(); vcl::Font aFont( OutputDevice::GetDefaultFont( - DEFAULTFONT_UI_SANS, Application::GetSettings().GetUILanguageTag().getLanguageType(), DEFAULTFONT_FLAGS_ONLYONE ) ); + DefaultFontType::UI_SANS, Application::GetSettings().GetUILanguageTag().getLanguageType(), DEFAULTFONT_FLAGS_ONLYONE ) ); aFont.SetHeight(aDefaultSize.GetHeight()); Init( rWinSize, aFont ); diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx index 4615a0cc57f4..57a4d6d44215 100644 --- a/svx/source/dialog/svxbmpnumvalueset.cxx +++ b/svx/source/dialog/svxbmpnumvalueset.cxx @@ -155,7 +155,7 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) Color aOldColor = pDev->GetLineColor(); pDev->SetLineColor(aTextColor); vcl::Font aFont(OutputDevice::GetDefaultFont( - DEFAULTFONT_UI_SANS, MsLangId::getSystemLanguage(), DEFAULTFONT_FLAGS_ONLYONE)); + DefaultFontType::UI_SANS, MsLangId::getSystemLanguage(), DEFAULTFONT_FLAGS_ONLYONE)); Size aSize = aFont.GetSize(); diff --git a/svx/source/dialog/swframeexample.cxx b/svx/source/dialog/swframeexample.cxx index 5a48a357bbed..1facb436df9c 100644 --- a/svx/source/dialog/swframeexample.cxx +++ b/svx/source/dialog/swframeexample.cxx @@ -159,7 +159,7 @@ void SvxSwFrameExample::InitAllRects_Impl() if (nAnchor == TextContentAnchorType_AS_CHARACTER || nAnchor == TextContentAnchorType_AT_CHARACTER) { vcl::Font aFont = OutputDevice::GetDefaultFont( - DEFAULTFONT_LATIN_TEXT, Application::GetSettings().GetLanguageTag().getLanguageType(), + DefaultFontType::LATIN_TEXT, Application::GetSettings().GetLanguageTag().getLanguageType(), DEFAULTFONT_FLAGS_ONLYONE, this ); aFont.SetColor( m_aTxtCol ); aFont.SetFillColor( m_aBgCol ); diff --git a/svx/source/form/fmcontrollayout.cxx b/svx/source/form/fmcontrollayout.cxx index 9bcafa7ffba3..5ecc273cd9bd 100644 --- a/svx/source/form/fmcontrollayout.cxx +++ b/svx/source/form/fmcontrollayout.cxx @@ -184,7 +184,7 @@ namespace svxform } // retrieve a default font for this locale, and set it at the control - vcl::Font aFont = OutputDevice::GetDefaultFont( DEFAULTFONT_SANS, LanguageTag::convertToLanguageType( aDocumentCharLocale ), DEFAULTFONT_FLAGS_ONLYONE ); + vcl::Font aFont = OutputDevice::GetDefaultFont( DefaultFontType::SANS, LanguageTag::convertToLanguageType( aDocumentCharLocale ), DEFAULTFONT_FLAGS_ONLYONE ); FontDescriptor aFontDesc = VCLUnoHelper::CreateFontDescriptor( aFont ); _rxModel->setPropertyValue( OUString( "FontDescriptor" ), diff --git a/svx/source/sidebar/line/LineWidthValueSet.cxx b/svx/source/sidebar/line/LineWidthValueSet.cxx index 532a11cdd9c5..db6ac1b17fbb 100644 --- a/svx/source/sidebar/line/LineWidthValueSet.cxx +++ b/svx/source/sidebar/line/LineWidthValueSet.cxx @@ -116,7 +116,7 @@ void LineWidthValueSet::UserDraw( const UserDrawEvent& rUDEvt ) Color aOldColor = pDev->GetLineColor(); Color aOldFillColor = pDev->GetFillColor(); - vcl::Font aFont(OutputDevice::GetDefaultFont(DEFAULTFONT_UI_SANS, MsLangId::getSystemLanguage(), DEFAULTFONT_FLAGS_ONLYONE)); + vcl::Font aFont(OutputDevice::GetDefaultFont(DefaultFontType::UI_SANS, MsLangId::getSystemLanguage(), DEFAULTFONT_FLAGS_ONLYONE)); Size aSize = aFont.GetSize(); aSize.Height() = nRectHeight*3/5; aFont.SetSize( aSize ); diff --git a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx index d6d96b6f4dbc..ab47fbb752d0 100644 --- a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx +++ b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx @@ -153,7 +153,7 @@ void ValueSetWithTextControl::UserDraw( const UserDrawEvent& rUDEvt ) const long nRectHeight = aRect.GetHeight(); const Point aBLPos = aRect.TopLeft(); - vcl::Font aFont(OutputDevice::GetDefaultFont(DEFAULTFONT_UI_SANS, MsLangId::getSystemLanguage(), DEFAULTFONT_FLAGS_ONLYONE)); + vcl::Font aFont(OutputDevice::GetDefaultFont(DefaultFontType::UI_SANS, MsLangId::getSystemLanguage(), DEFAULTFONT_FLAGS_ONLYONE)); { Size aSize = aFont.GetSize(); aSize.Height() = (nRectHeight*4)/9; diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx index 8e5a830d6177..f6f7662081b5 100644 --- a/svx/source/svdraw/svdetc.cxx +++ b/svx/source/svdraw/svdetc.cxx @@ -386,7 +386,7 @@ bool GetDraftFillColor(const SfxItemSet& rSet, Color& rCol) } SdrEngineDefaults::SdrEngineDefaults(): - aFontName( OutputDevice::GetDefaultFont( DEFAULTFONT_SERIF, LANGUAGE_SYSTEM, DEFAULTFONT_FLAGS_ONLYONE ).GetName() ), + aFontName( OutputDevice::GetDefaultFont( DefaultFontType::SERIF, LANGUAGE_SYSTEM, DEFAULTFONT_FLAGS_ONLYONE ).GetName() ), eFontFamily(FAMILY_ROMAN), aFontColor(COL_AUTO), nFontHeight(847), // 847/100mm = ca. 24 Point diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index 65754a6c4286..588000854fbb 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -717,7 +717,7 @@ void SdrModel::SetTextDefaults( SfxItemPool* pItemPool, sal_uIntPtr nDefTextHgt sal_uInt16 nLanguage(Application::GetSettings().GetLanguageTag().getLanguageType()); // get DEFAULTFONT_LATIN_TEXT and set at pool as dynamic default - vcl::Font aFont(OutputDevice::GetDefaultFont(DEFAULTFONT_LATIN_TEXT, nLanguage, DEFAULTFONT_FLAGS_ONLYONE, 0)); + vcl::Font aFont(OutputDevice::GetDefaultFont(DefaultFontType::LATIN_TEXT, nLanguage, DEFAULTFONT_FLAGS_ONLYONE, 0)); aSvxFontItem.SetFamily(aFont.GetFamily()); aSvxFontItem.SetFamilyName(aFont.GetName()); aSvxFontItem.SetStyleName(OUString()); @@ -726,7 +726,7 @@ void SdrModel::SetTextDefaults( SfxItemPool* pItemPool, sal_uIntPtr nDefTextHgt pItemPool->SetPoolDefaultItem(aSvxFontItem); // get DEFAULTFONT_CJK_TEXT and set at pool as dynamic default - vcl::Font aFontCJK(OutputDevice::GetDefaultFont(DEFAULTFONT_CJK_TEXT, nLanguage, DEFAULTFONT_FLAGS_ONLYONE, 0)); + vcl::Font aFontCJK(OutputDevice::GetDefaultFont(DefaultFontType::CJK_TEXT, nLanguage, DEFAULTFONT_FLAGS_ONLYONE, 0)); aSvxFontItemCJK.SetFamily( aFontCJK.GetFamily()); aSvxFontItemCJK.SetFamilyName(aFontCJK.GetName()); aSvxFontItemCJK.SetStyleName(OUString()); @@ -735,7 +735,7 @@ void SdrModel::SetTextDefaults( SfxItemPool* pItemPool, sal_uIntPtr nDefTextHgt pItemPool->SetPoolDefaultItem(aSvxFontItemCJK); // get DEFAULTFONT_CTL_TEXT and set at pool as dynamic default - vcl::Font aFontCTL(OutputDevice::GetDefaultFont(DEFAULTFONT_CTL_TEXT, nLanguage, DEFAULTFONT_FLAGS_ONLYONE, 0)); + vcl::Font aFontCTL(OutputDevice::GetDefaultFont(DefaultFontType::CTL_TEXT, nLanguage, DEFAULTFONT_FLAGS_ONLYONE, 0)); aSvxFontItemCTL.SetFamily(aFontCTL.GetFamily()); aSvxFontItemCTL.SetFamilyName(aFontCTL.GetName()); aSvxFontItemCTL.SetStyleName(OUString()); diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 43c1aa31c855..ac66106d7078 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -896,7 +896,7 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextS pMtf->Pause(true); vcl::Font aFontMerk(pOut->GetFont()); - vcl::Font aTmpFont( OutputDevice::GetDefaultFont( DEFAULTFONT_SERIF, LANGUAGE_SYSTEM, DEFAULTFONT_FLAGS_ONLYONE ) ); + vcl::Font aTmpFont( OutputDevice::GetDefaultFont( DefaultFontType::SERIF, LANGUAGE_SYSTEM, DEFAULTFONT_FLAGS_ONLYONE ) ); aTmpFont.SetSize(Size(0,100)); pOut->SetFont(aTmpFont); diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx b/sw/source/core/doc/DocumentStylePoolManager.cxx index f415ca6fc1df..3276b9f4db46 100644 --- a/sw/source/core/doc/DocumentStylePoolManager.cxx +++ b/sw/source/core/doc/DocumentStylePoolManager.cxx @@ -102,7 +102,7 @@ namespace return nWidth - nLeft - nRight; } - static void lcl_SetDfltFont( sal_uInt16 nFntType, SfxItemSet& rSet ) + static void lcl_SetDfltFont( DefaultFontType nFntType, SfxItemSet& rSet ) { static struct { sal_uInt16 nResLngId; @@ -125,17 +125,17 @@ namespace } } - static void lcl_SetDfltFont( sal_uInt16 nLatinFntType, sal_uInt16 nCJKFntType, - sal_uInt16 nCTLFntType, SfxItemSet& rSet ) + static void lcl_SetDfltFont( DefaultFontType nLatinFntType, DefaultFontType nCJKFntType, + DefaultFontType nCTLFntType, SfxItemSet& rSet ) { static struct { sal_uInt16 nResLngId; sal_uInt16 nResFntId; - sal_uInt16 nFntType; + DefaultFontType nFntType; } aArr[ 3 ] = { - { RES_CHRATR_LANGUAGE, RES_CHRATR_FONT, 0 }, - { RES_CHRATR_CJK_LANGUAGE, RES_CHRATR_CJK_FONT, 0 }, - { RES_CHRATR_CTL_LANGUAGE, RES_CHRATR_CTL_FONT, 0 } + { RES_CHRATR_LANGUAGE, RES_CHRATR_FONT, static_cast<DefaultFontType>(0) }, + { RES_CHRATR_CJK_LANGUAGE, RES_CHRATR_CJK_FONT, static_cast<DefaultFontType>(0) }, + { RES_CHRATR_CTL_LANGUAGE, RES_CHRATR_CTL_FONT, static_cast<DefaultFontType>(0) } }; aArr[0].nFntType = nLatinFntType; aArr[1].nFntType = nCJKFntType; @@ -172,8 +172,8 @@ namespace if( bHTMLMode ) { - lcl_SetDfltFont( DEFAULTFONT_LATIN_TEXT, DEFAULTFONT_CJK_TEXT, - DEFAULTFONT_CTL_TEXT, rSet ); + lcl_SetDfltFont( DefaultFontType::LATIN_TEXT, DefaultFontType::CJK_TEXT, + DefaultFontType::CTL_TEXT, rSet ); } if( pColl ) @@ -424,28 +424,42 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool case RES_POOLCOLL_HEADLINE_BASE: // Base headline { - static const sal_uInt16 aFntInit[] = { - DEFAULTFONT_LATIN_HEADING, RES_CHRATR_FONT, - RES_CHRATR_LANGUAGE, LANGUAGE_ENGLISH_US, - DEFAULTFONT_CJK_HEADING, RES_CHRATR_CJK_FONT, - RES_CHRATR_CJK_LANGUAGE, LANGUAGE_ENGLISH_US, - DEFAULTFONT_CTL_HEADING, RES_CHRATR_CTL_FONT, - RES_CHRATR_CTL_LANGUAGE, LANGUAGE_ARABIC_SAUDI_ARABIA, - 0 + static const sal_uInt16 aFontWhich[] = + { RES_CHRATR_FONT, + RES_CHRATR_CJK_FONT, + RES_CHRATR_CTL_FONT + }; + static const sal_uInt16 aLangTypes[] = + { + RES_CHRATR_LANGUAGE, + RES_CHRATR_CJK_LANGUAGE, + RES_CHRATR_CTL_LANGUAGE + }; + static const sal_uInt16 aLangs[] = + { + LANGUAGE_ENGLISH_US, + LANGUAGE_ENGLISH_US, + LANGUAGE_ARABIC_SAUDI_ARABIA + }; + static const DefaultFontType nFontTypes[] = + { + DefaultFontType::LATIN_HEADING, + DefaultFontType::CJK_HEADING, + DefaultFontType::CTL_HEADING }; - for( const sal_uInt16* pArr = aFntInit; *pArr; pArr += 4 ) + for( int i = 0; i < 3; ++i ) { - sal_uInt16 nLng = static_cast<const SvxLanguageItem&>(m_rDoc.GetDefault( *(pArr+2) )).GetLanguage(); + sal_uInt16 nLng = static_cast<const SvxLanguageItem&>(m_rDoc.GetDefault( aLangTypes[i] )).GetLanguage(); if( LANGUAGE_DONTKNOW == nLng ) - nLng = *(pArr+3); + nLng = aLangs[i]; - vcl::Font aFnt( OutputDevice::GetDefaultFont( *pArr, + vcl::Font aFnt( OutputDevice::GetDefaultFont( nFontTypes[i], nLng, DEFAULTFONT_FLAGS_ONLYONE ) ); aSet.Put( SvxFontItem( aFnt.GetFamily(), aFnt.GetName(), OUString(), aFnt.GetPitch(), - aFnt.GetCharSet(), *(pArr+1) )); + aFnt.GetCharSet(), aFontWhich[i] )); } SvxFontHeightItem aFntSize( PT_14, 100, RES_CHRATR_FONTSIZE ); @@ -978,7 +992,7 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool case RES_POOLCOLL_HTML_PRE: { - ::lcl_SetDfltFont( DEFAULTFONT_FIXED, aSet ); + ::lcl_SetDfltFont( DefaultFontType::FIXED, aSet ); // WORKAROUND: Set PRE to 10pt SetAllScriptItem( aSet, SvxFontHeightItem(PT_10, 100, RES_CHRATR_FONTSIZE) ); @@ -1233,7 +1247,7 @@ SwFmt* DocumentStylePoolManager::GetFmtFromPool( sal_uInt16 nId ) case RES_POOLCHR_HTML_KEYBOARD: case RES_POOLCHR_HTML_TELETYPE: { - ::lcl_SetDfltFont( DEFAULTFONT_FIXED, aSet ); + ::lcl_SetDfltFont( DefaultFontType::FIXED, aSet ); } break; case RES_POOLCHR_VERT_NUM: diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx index ea8b4ab9d4cc..c99dd5f9bbbc 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -610,7 +610,7 @@ static void lcl_html_setFixedFontProperty( const uno::Reference< beans::XPropertySet >& rPropSet ) { vcl::Font aFixedFont( OutputDevice::GetDefaultFont( - DEFAULTFONT_FIXED, LANGUAGE_ENGLISH_US, + DefaultFontType::FIXED, LANGUAGE_ENGLISH_US, DEFAULTFONT_FLAGS_ONLYONE ) ); Any aTmp; aTmp <<= OUString( aFixedFont.GetName() ); diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx index d11447bf8a28..add3ced7b37c 100644 --- a/sw/source/filter/html/htmlforw.cxx +++ b/sw/source/filter/html/htmlforw.cxx @@ -1076,7 +1076,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, !static_cast<const OUString*>(aTmp.getValue())->isEmpty() ) { vcl::Font aFixedFont( OutputDevice::GetDefaultFont( - DEFAULTFONT_FIXED, LANGUAGE_ENGLISH_US, + DefaultFontType::FIXED, LANGUAGE_ENGLISH_US, DEFAULTFONT_FLAGS_ONLYONE ) ); OUString aFName( *static_cast<OUString const *>(aTmp.getValue()) ); if( !bEdit || aFName != aFixedFont.GetName() ) diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 3186484c52a4..9d5e019b17ef 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -2311,11 +2311,11 @@ void SwRedlineOptionsTabPage::InitFontStyle(SvxFontPrevWindow& rExampleWin) SvxFont& rCJKFont = rExampleWin.GetCJKFont(); SvxFont& rCTLFont = rExampleWin.GetCTLFont(); - vcl::Font aFont( OutputDevice::GetDefaultFont( DEFAULTFONT_SERIF, eLangType, + vcl::Font aFont( OutputDevice::GetDefaultFont( DefaultFontType::SERIF, eLangType, DEFAULTFONT_FLAGS_ONLYONE, &rExampleWin ) ); - vcl::Font aCJKFont( OutputDevice::GetDefaultFont( DEFAULTFONT_CJK_TEXT, eLangType, + vcl::Font aCJKFont( OutputDevice::GetDefaultFont( DefaultFontType::CJK_TEXT, eLangType, DEFAULTFONT_FLAGS_ONLYONE, &rExampleWin ) ); - vcl::Font aCTLFont( OutputDevice::GetDefaultFont( DEFAULTFONT_CTL_TEXT, eLangType, + vcl::Font aCTLFont( OutputDevice::GetDefaultFont( DefaultFontType::CTL_TEXT, eLangType, DEFAULTFONT_FLAGS_ONLYONE, &rExampleWin ) ); const Size aDefSize( 0, 12 ); aFont.SetSize( aDefSize ); diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx index c80791318e9c..588e190dbe8f 100644 --- a/sw/source/ui/dialog/ascfldlg.cxx +++ b/sw/source/ui/dialog/ascfldlg.cxx @@ -204,7 +204,7 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( vcl::Window* pParent, SwDocShell& rDocSh, if( aOpt.GetFontName().isEmpty() ) { LanguageType eLang = aOpt.GetLanguage(); - vcl::Font aTmpFont(OutputDevice::GetDefaultFont(DEFAULTFONT_FIXED, eLang, DEFAULTFONT_FLAGS_ONLYONE, pPrt)); + vcl::Font aTmpFont(OutputDevice::GetDefaultFont(DefaultFontType::FIXED, eLang, DEFAULTFONT_FLAGS_ONLYONE, pPrt)); aOpt.SetFontName(aTmpFont.GetName()); } diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index 679cdcbeedc6..38fa785ef4b9 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -954,7 +954,7 @@ void NumberingPreview::Paint( vcl::RenderContext& /*rRenderContext*/, const Rect const long nYStep = (aSize.Height() - 6)/ MAXLEVEL; long nYStart = 4; aStdFont = OutputDevice::GetDefaultFont( - DEFAULTFONT_UI_SANS, GetAppLanguage(), + DefaultFontType::UI_SANS, GetAppLanguage(), DEFAULTFONT_FLAGS_ONLYONE, this ); // #101524# OJ aStdFont.SetColor( SwViewOption::GetFontColor() ); diff --git a/sw/source/uibase/app/docshini.cxx b/sw/source/uibase/app/docshini.cxx index c6fd4d17f3a8..7ea0063b9655 100644 --- a/sw/source/uibase/app/docshini.cxx +++ b/sw/source/uibase/app/docshini.cxx @@ -143,30 +143,30 @@ bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor ) SfxPrinter* pPrt = m_pDoc->getIDocumentDeviceAccess().getPrinter( false ); OUString sEntry; - sal_uInt16 aFontWhich[] = + static const sal_uInt16 aFontWhich[] = { RES_CHRATR_FONT, RES_CHRATR_CJK_FONT, RES_CHRATR_CTL_FONT }; - sal_uInt16 aFontHeightWhich[] = + static const sal_uInt16 aFontHeightWhich[] = { RES_CHRATR_FONTSIZE, RES_CHRATR_CJK_FONTSIZE, RES_CHRATR_CTL_FONTSIZE }; - sal_uInt16 aFontIds[] = + static const sal_uInt16 aFontIds[] = { FONT_STANDARD, FONT_STANDARD_CJK, FONT_STANDARD_CTL }; - sal_uInt16 nFontTypes[] = + static const DefaultFontType nFontTypes[] = { - DEFAULTFONT_LATIN_TEXT, - DEFAULTFONT_CJK_TEXT, - DEFAULTFONT_CTL_TEXT + DefaultFontType::LATIN_TEXT, + DefaultFontType::CJK_TEXT, + DefaultFontType::CTL_TEXT }; - sal_uInt16 aLangTypes[] = + static const sal_uInt16 aLangTypes[] = { RES_CHRATR_LANGUAGE, RES_CHRATR_CJK_LANGUAGE, diff --git a/sw/source/uibase/config/fontcfg.cxx b/sw/source/uibase/config/fontcfg.cxx index 53971f9aede6..949b43bcb06c 100644 --- a/sw/source/uibase/config/fontcfg.cxx +++ b/sw/source/uibase/config/fontcfg.cxx @@ -226,32 +226,32 @@ bool SwStdFontConfig::IsFontDefault(sal_uInt16 nFontType) const OUString SwStdFontConfig::GetDefaultFor(sal_uInt16 nFontType, LanguageType eLang) { - sal_uInt16 nFontId; + DefaultFontType nFontId; switch( nFontType ) { case FONT_OUTLINE : - nFontId = DEFAULTFONT_LATIN_HEADING; + nFontId = DefaultFontType::LATIN_HEADING; break; case FONT_OUTLINE_CJK : - nFontId = DEFAULTFONT_CJK_HEADING; + nFontId = DefaultFontType::CJK_HEADING; break; case FONT_OUTLINE_CTL : - nFontId = DEFAULTFONT_CTL_HEADING; + nFontId = DefaultFontType::CTL_HEADING; break; case FONT_STANDARD_CJK: case FONT_LIST_CJK : case FONT_CAPTION_CJK : case FONT_INDEX_CJK : - nFontId = DEFAULTFONT_CJK_TEXT; + nFontId = DefaultFontType::CJK_TEXT; break; case FONT_STANDARD_CTL: case FONT_LIST_CTL : case FONT_CAPTION_CTL : case FONT_INDEX_CTL : - nFontId = DEFAULTFONT_CTL_TEXT; + nFontId = DefaultFontType::CTL_TEXT; break; default: - nFontId = DEFAULTFONT_LATIN_TEXT; + nFontId = DefaultFontType::LATIN_TEXT; } vcl::Font aFont = OutputDevice::GetDefaultFont(nFontId, eLang, DEFAULTFONT_FLAGS_ONLYONE); return aFont.GetName(); diff --git a/sw/source/uibase/docvw/srcedtw.cxx b/sw/source/uibase/docvw/srcedtw.cxx index b6776f23456e..9f9bc20b5e38 100644 --- a/sw/source/uibase/docvw/srcedtw.cxx +++ b/sw/source/uibase/docvw/srcedtw.cxx @@ -962,10 +962,10 @@ void SwSrcEditWindow::SetFont() if(lcl_GetLanguagesForEncoding(eSourceEncoding, aLanguages)) { //TODO: check for multiple languages - aFont = OutputDevice::GetDefaultFont(DEFAULTFONT_FIXED, aLanguages[0], 0, this); + aFont = OutputDevice::GetDefaultFont(DefaultFontType::FIXED, aLanguages[0], 0, this); } else - aFont = OutputDevice::GetDefaultFont(DEFAULTFONT_SANS_UNICODE, + aFont = OutputDevice::GetDefaultFont(DefaultFontType::SANS_UNICODE, Application::GetSettings().GetLanguageTag().getLanguageType(), 0, this); sFontName = aFont.GetName(); } diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx index d2c7b17b4bc8..7a4f003eb4ab 100644 --- a/sw/source/uibase/shells/annotsh.cxx +++ b/sw/source/uibase/shells/annotsh.cxx @@ -1284,7 +1284,7 @@ void SwAnnotationShell::ExecLingu(SfxRequest &rReq) if( !bCommonTerms ) nOptions = nOptions | i18n::TextConversionOption::CHARACTER_BY_CHARACTER; - vcl::Font aTargetFont = OutputDevice::GetDefaultFont( DEFAULTFONT_CJK_TEXT, + vcl::Font aTargetFont = OutputDevice::GetDefaultFont( DefaultFontType::CJK_TEXT, nTargetLang, DEFAULTFONT_FLAGS_ONLYONE ); pOLV->StartTextConversion( nSourceLang, nTargetLang, &aTargetFont, nOptions, false, false ); diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx index 96d5ea10b9e8..cb11915ca6c6 100644 --- a/sw/source/uibase/shells/drwtxtsh.cxx +++ b/sw/source/uibase/shells/drwtxtsh.cxx @@ -359,7 +359,7 @@ void SwDrawTextShell::ExecDrawLingu(SfxRequest &rReq) if(!bCommonTerms) nOptions = nOptions | i18n::TextConversionOption::CHARACTER_BY_CHARACTER; - vcl::Font aTargetFont = OutputDevice::GetDefaultFont(DEFAULTFONT_CJK_TEXT, nTargetLang, DEFAULTFONT_FLAGS_ONLYONE); + vcl::Font aTargetFont = OutputDevice::GetDefaultFont(DefaultFontType::CJK_TEXT, nTargetLang, DEFAULTFONT_FLAGS_ONLYONE); pOutlinerView->StartTextConversion(nSourceLang, nTargetLang, &aTargetFont, nOptions, false, false); } diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx index 7193b042f2f1..669d7e3fb178 100644 --- a/sw/source/uibase/uiview/viewling.cxx +++ b/sw/source/uibase/uiview/viewling.cxx @@ -164,7 +164,7 @@ void SwView::ExecLingu(SfxRequest &rReq) if( !bCommonTerms ) nOptions = nOptions | i18n::TextConversionOption::CHARACTER_BY_CHARACTER; - vcl::Font aTargetFont = OutputDevice::GetDefaultFont( DEFAULTFONT_CJK_TEXT, + vcl::Font aTargetFont = OutputDevice::GetDefaultFont( DefaultFontType::CJK_TEXT, nTargetLang, DEFAULTFONT_FLAGS_ONLYONE ); // disallow formatting, updating the view, ... while diff --git a/unotools/source/config/fontcfg.cxx b/unotools/source/config/fontcfg.cxx index 60ae20a67228..d7933a9cfe28 100644 --- a/unotools/source/config/fontcfg.cxx +++ b/unotools/source/config/fontcfg.cxx @@ -51,33 +51,33 @@ using namespace com::sun::star::configuration; * DefaultFontConfiguration */ -static const char* getKeyType( int nKeyType ) +static const char* getKeyType( DefaultFontType nKeyType ) { switch( nKeyType ) { - case DEFAULTFONT_CJK_DISPLAY: return "CJK_DISPLAY"; - case DEFAULTFONT_CJK_HEADING: return "CJK_HEADING"; - case DEFAULTFONT_CJK_PRESENTATION: return "CJK_PRESENTATION"; - case DEFAULTFONT_CJK_SPREADSHEET: return "CJK_SPREADSHEET"; - case DEFAULTFONT_CJK_TEXT: return "CJK_TEXT"; - case DEFAULTFONT_CTL_DISPLAY: return "CTL_DISPLAY"; - case DEFAULTFONT_CTL_HEADING: return "CTL_HEADING"; - case DEFAULTFONT_CTL_PRESENTATION: return "CTL_PRESENTATION"; - case DEFAULTFONT_CTL_SPREADSHEET: return "CTL_SPREADSHEET"; - case DEFAULTFONT_CTL_TEXT: return "CTL_TEXT"; - case DEFAULTFONT_FIXED: return "FIXED"; - case DEFAULTFONT_LATIN_DISPLAY: return "LATIN_DISPLAY"; - case DEFAULTFONT_LATIN_FIXED: return "LATIN_FIXED"; - case DEFAULTFONT_LATIN_HEADING: return "LATIN_HEADING"; - case DEFAULTFONT_LATIN_PRESENTATION: return "LATIN_PRESENTATION"; - case DEFAULTFONT_LATIN_SPREADSHEET: return "LATIN_SPREADSHEET"; - case DEFAULTFONT_LATIN_TEXT: return "LATIN_TEXT"; - case DEFAULTFONT_SANS: return "SANS"; - case DEFAULTFONT_SANS_UNICODE: return "SANS_UNICODE"; - case DEFAULTFONT_SERIF: return "SERIF"; - case DEFAULTFONT_SYMBOL: return "SYMBOL"; - case DEFAULTFONT_UI_FIXED: return "UI_FIXED"; - case DEFAULTFONT_UI_SANS: return "UI_SANS"; + case DefaultFontType::CJK_DISPLAY: return "CJK_DISPLAY"; + case DefaultFontType::CJK_HEADING: return "CJK_HEADING"; + case DefaultFontType::CJK_PRESENTATION: return "CJK_PRESENTATION"; + case DefaultFontType::CJK_SPREADSHEET: return "CJK_SPREADSHEET"; + case DefaultFontType::CJK_TEXT: return "CJK_TEXT"; + case DefaultFontType::CTL_DISPLAY: return "CTL_DISPLAY"; + case DefaultFontType::CTL_HEADING: return "CTL_HEADING"; + case DefaultFontType::CTL_PRESENTATION: return "CTL_PRESENTATION"; + case DefaultFontType::CTL_SPREADSHEET: return "CTL_SPREADSHEET"; + case DefaultFontType::CTL_TEXT: return "CTL_TEXT"; + case DefaultFontType::FIXED: return "FIXED"; + case DefaultFontType::LATIN_DISPLAY: return "LATIN_DISPLAY"; + case DefaultFontType::LATIN_FIXED: return "LATIN_FIXED"; + case DefaultFontType::LATIN_HEADING: return "LATIN_HEADING"; + case DefaultFontType::LATIN_PRESENTATION: return "LATIN_PRESENTATION"; + case DefaultFontType::LATIN_SPREADSHEET: return "LATIN_SPREADSHEET"; + case DefaultFontType::LATIN_TEXT: return "LATIN_TEXT"; + case DefaultFontType::SANS: return "SANS"; + case DefaultFontType::SANS_UNICODE: return "SANS_UNICODE"; + case DefaultFontType::SERIF: return "SERIF"; + case DefaultFontType::SYMBOL: return "SYMBOL"; + case DefaultFontType::UI_FIXED: return "UI_FIXED"; + case DefaultFontType::UI_SANS: return "UI_SANS"; default: OSL_FAIL( "unmatched type" ); return ""; @@ -209,7 +209,7 @@ OUString DefaultFontConfiguration::tryLocale( const OUString& rBcp47, const OUSt return aRet; } -OUString DefaultFontConfiguration::getDefaultFont( const LanguageTag& rLanguageTag, int nType ) const +OUString DefaultFontConfiguration::getDefaultFont( const LanguageTag& rLanguageTag, DefaultFontType nType ) const { OUString aType = OUString::createFromAscii( getKeyType( nType ) ); // Try the simple cases first without constructing fallbacks. @@ -246,7 +246,7 @@ OUString DefaultFontConfiguration::getUserInterfaceFont( const LanguageTag& rLan if( aLanguageTag.isSystemLocale() ) aLanguageTag = SvtSysLocale().GetUILanguageTag(); - OUString aUIFont = getDefaultFont( aLanguageTag, DEFAULTFONT_UI_SANS ); + OUString aUIFont = getDefaultFont( aLanguageTag, DefaultFontType::UI_SANS ); if( !aUIFont.isEmpty() ) return aUIFont; diff --git a/vcl/qa/cppunit/complextext.cxx b/vcl/qa/cppunit/complextext.cxx index 0c666c356a93..126a5fb84ebd 100644 --- a/vcl/qa/cppunit/complextext.cxx +++ b/vcl/qa/cppunit/complextext.cxx @@ -49,7 +49,7 @@ void VclComplexTextTest::testArabic() OutputDevice *pOutDev = static_cast< OutputDevice * >( pWin.get() ); vcl::Font aFont = OutputDevice::GetDefaultFont( - DEFAULTFONT_CTL_SPREADSHEET, + DefaultFontType::CTL_SPREADSHEET, LANGUAGE_ARABIC_SAUDI_ARABIA, DEFAULTFONT_FLAGS_ONLYONE, 0 ); pOutDev->SetFont( aFont ); diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx index e8d27ae769eb..078baf113186 100644 --- a/vcl/source/app/dbggui.cxx +++ b/vcl/source/app/dbggui.cxx @@ -404,7 +404,7 @@ DbgInfoDialog::DbgInfoDialog( vcl::Window* pParent, bool bHelpText ) : if ( !bHelpText ) { - vcl::Font aFont = GetDefaultFont( DEFAULTFONT_FIXED, LANGUAGE_ENGLISH_US, 0 ); + vcl::Font aFont = GetDefaultFont( DefaultFontType::FIXED, LANGUAGE_ENGLISH_US, 0 ); aFont.SetHeight( 8 ); aFont.SetPitch( PITCH_FIXED ); maListBox->SetControlFont( aFont ); diff --git a/vcl/source/font/PhysicalFontCollection.cxx b/vcl/source/font/PhysicalFontCollection.cxx index eed3367e3c9d..6266591695b9 100644 --- a/vcl/source/font/PhysicalFontCollection.cxx +++ b/vcl/source/font/PhysicalFontCollection.cxx @@ -900,23 +900,23 @@ PhysicalFontFamily* PhysicalFontCollection::FindDefaultFont() const // UNICODE, SANSSERIF, SERIF or FIXED default font lists const utl::DefaultFontConfiguration& rDefaults = utl::DefaultFontConfiguration::get(); LanguageTag aLanguageTag( OUString( "en")); - OUString aFontname = rDefaults.getDefaultFont( aLanguageTag, DEFAULTFONT_SANS_UNICODE ); + OUString aFontname = rDefaults.getDefaultFont( aLanguageTag, DefaultFontType::SANS_UNICODE ); PhysicalFontFamily* pFoundData = ImplFindByTokenNames( aFontname ); if( pFoundData ) return pFoundData; - aFontname = rDefaults.getDefaultFont( aLanguageTag, DEFAULTFONT_SANS ); + aFontname = rDefaults.getDefaultFont( aLanguageTag, DefaultFontType::SANS ); pFoundData = ImplFindByTokenNames( aFontname ); if( pFoundData ) return pFoundData; - aFontname = rDefaults.getDefaultFont( aLanguageTag, DEFAULTFONT_SERIF ); + aFontname = rDefaults.getDefaultFont( aLanguageTag, DefaultFontType::SERIF ); pFoundData = ImplFindByTokenNames( aFontname ); if( pFoundData ) return pFoundData; - aFontname = rDefaults.getDefaultFont( aLanguageTag, DEFAULTFONT_FIXED ); + aFontname = rDefaults.getDefaultFont( aLanguageTag, DefaultFontType::FIXED ); pFoundData = ImplFindByTokenNames( aFontname ); if( pFoundData ) return pFoundData; @@ -1199,7 +1199,7 @@ PhysicalFontFamily* PhysicalFontCollection::ImplFindByFont( FontSelectPattern& r if( rFSD.IsSymbolFont() ) { LanguageTag aDefaultLanguageTag( OUString( "en")); - aSearchName = utl::DefaultFontConfiguration::get().getDefaultFont( aDefaultLanguageTag, DEFAULTFONT_SYMBOL ); + aSearchName = utl::DefaultFontConfiguration::get().getDefaultFont( aDefaultLanguageTag, DefaultFontType::SYMBOL ); PhysicalFontFamily* pFoundData = ImplFindByTokenNames( aSearchName ); if( pFoundData ) return pFoundData; diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx index 61dadc4e52dc..2d9dd97cde74 100644 --- a/vcl/source/outdev/font.cxx +++ b/vcl/source/outdev/font.cxx @@ -772,7 +772,7 @@ void ImplFontSubstitute( OUString& rFontName ) } //hidpi TODO: This routine has hard-coded font-sizes that break places such as DialControl -vcl::Font OutputDevice::GetDefaultFont( sal_uInt16 nType, LanguageType eLang, +vcl::Font OutputDevice::GetDefaultFont( DefaultFontType nType, LanguageType eLang, sal_uLong nFlags, const OutputDevice* pOutDev ) { if (!pOutDev) // default is NULL @@ -797,48 +797,48 @@ vcl::Font OutputDevice::GetDefaultFont( sal_uInt16 nType, LanguageType eLang, switch ( nType ) { - case DEFAULTFONT_SANS_UNICODE: - case DEFAULTFONT_UI_SANS: + case DefaultFontType::SANS_UNICODE: + case DefaultFontType::UI_SANS: aFont.SetFamily( FAMILY_SWISS ); break; - case DEFAULTFONT_SANS: - case DEFAULTFONT_LATIN_HEADING: - case DEFAULTFONT_LATIN_SPREADSHEET: - case DEFAULTFONT_LATIN_DISPLAY: + case DefaultFontType::SANS: + case DefaultFontType::LATIN_HEADING: + case DefaultFontType::LATIN_SPREADSHEET: + case DefaultFontType::LATIN_DISPLAY: aFont.SetFamily( FAMILY_SWISS ); break; - case DEFAULTFONT_SERIF: - case DEFAULTFONT_LATIN_TEXT: - case DEFAULTFONT_LATIN_PRESENTATION: + case DefaultFontType::SERIF: + case DefaultFontType::LATIN_TEXT: + case DefaultFontType::LATIN_PRESENTATION: aFont.SetFamily( FAMILY_ROMAN ); break; - case DEFAULTFONT_FIXED: - case DEFAULTFONT_LATIN_FIXED: - case DEFAULTFONT_UI_FIXED: + case DefaultFontType::FIXED: + case DefaultFontType::LATIN_FIXED: + case DefaultFontType::UI_FIXED: aFont.SetPitch( PITCH_FIXED ); aFont.SetFamily( FAMILY_MODERN ); break; - case DEFAULTFONT_SYMBOL: + case DefaultFontType::SYMBOL: aFont.SetCharSet( RTL_TEXTENCODING_SYMBOL ); break; - case DEFAULTFONT_CJK_TEXT: - case DEFAULTFONT_CJK_PRESENTATION: - case DEFAULTFONT_CJK_SPREADSHEET: - case DEFAULTFONT_CJK_HEADING: - case DEFAULTFONT_CJK_DISPLAY: + case DefaultFontType::CJK_TEXT: + case DefaultFontType::CJK_PRESENTATION: + case DefaultFontType::CJK_SPREADSHEET: + case DefaultFontType::CJK_HEADING: + case DefaultFontType::CJK_DISPLAY: aFont.SetFamily( FAMILY_SYSTEM ); // don't care, but don't use font subst config later... break; - case DEFAULTFONT_CTL_TEXT: - case DEFAULTFONT_CTL_PRESENTATION: - case DEFAULTFONT_CTL_SPREADSHEET: - case DEFAULTFONT_CTL_HEADING: - case DEFAULTFONT_CTL_DISPLAY: + case DefaultFontType::CTL_TEXT: + case DefaultFontType::CTL_PRESENTATION: + case DefaultFontType::CTL_SPREADSHEET: + case DefaultFontType::CTL_HEADING: + case DefaultFontType::CTL_DISPLAY: aFont.SetFamily( FAMILY_SYSTEM ); // don't care, but don't use font subst config later... break; } @@ -927,38 +927,38 @@ vcl::Font OutputDevice::GetDefaultFont( sal_uInt16 nType, LanguageType eLang, } #if OSL_DEBUG_LEVEL > 2 - const char* s = "DEFAULTFONT_SANS_UNKNOWN"; + const char* s = "DefaultFontType::SANS_UNKNOWN"; switch ( nType ) { - case DEFAULTFONT_SANS_UNICODE: s = "DEFAULTFONT_SANS_UNICODE"; break; - case DEFAULTFONT_UI_SANS: s = "DEFAULTFONT_UI_SANS"; break; + case DefaultFontType::SANS_UNICODE: s = "DefaultFontType::SANS_UNICODE"; break; + case DefaultFontType::UI_SANS: s = "DefaultFontType::UI_SANS"; break; - case DEFAULTFONT_SANS: s = "DEFAULTFONT_SANS"; break; - case DEFAULTFONT_LATIN_HEADING: s = "DEFAULTFONT_LATIN_HEADING"; break; - case DEFAULTFONT_LATIN_SPREADSHEET: s = "DEFAULTFONT_LATIN_SPREADSHEET"; break; - case DEFAULTFONT_LATIN_DISPLAY: s = "DEFAULTFONT_LATIN_DISPLAY"; break; + case DefaultFontType::SANS: s = "DefaultFontType::SANS"; break; + case DefaultFontType::LATIN_HEADING: s = "DefaultFontType::LATIN_HEADING"; break; + case DefaultFontType::LATIN_SPREADSHEET: s = "DefaultFontType::LATIN_SPREADSHEET"; break; + case DefaultFontType::LATIN_DISPLAY: s = "DefaultFontType::LATIN_DISPLAY"; break; - case DEFAULTFONT_SERIF: s = "DEFAULTFONT_SERIF"; break; - case DEFAULTFONT_LATIN_TEXT: s = "DEFAULTFONT_LATIN_TEXT"; break; - case DEFAULTFONT_LATIN_PRESENTATION: s = "DEFAULTFONT_LATIN_PRESENTATION"; break; + case DefaultFontType::SERIF: s = "DefaultFontType::SERIF"; break; + case DefaultFontType::LATIN_TEXT: s = "DefaultFontType::LATIN_TEXT"; break; + case DefaultFontType::LATIN_PRESENTATION: s = "DefaultFontType::LATIN_PRESENTATION"; break; - case DEFAULTFONT_FIXED: s = "DEFAULTFONT_FIXED"; break; - case DEFAULTFONT_LATIN_FIXED: s = "DEFAULTFONT_LATIN_FIXED"; break; - case DEFAULTFONT_UI_FIXED: s = "DEFAULTFONT_UI_FIXED"; break; + case DefaultFontType::FIXED: s = "DefaultFontType::FIXED"; break; + case DefaultFontType::LATIN_FIXED: s = "DefaultFontType::LATIN_FIXED"; break; + case DefaultFontType::UI_FIXED: s = "DefaultFontType::UI_FIXED"; break; - case DEFAULTFONT_SYMBOL: s = "DEFAULTFONT_SYMBOL"; break; + case DefaultFontType::SYMBOL: s = "DefaultFontType::SYMBOL"; break; - case DEFAULTFONT_CJK_TEXT: s = "DEFAULTFONT_CJK_TEXT"; break; - case DEFAULTFONT_CJK_PRESENTATION: s = "DEFAULTFONT_CJK_PRESENTATION"; break; - case DEFAULTFONT_CJK_SPREADSHEET: s = "DEFAULTFONT_CJK_SPREADSHEET"; break; - case DEFAULTFONT_CJK_HEADING: s = "DEFAULTFONT_CJK_HEADING"; break; - case DEFAULTFONT_CJK_DISPLAY: s = "DEFAULTFONT_CJK_DISPLAY"; break; + case DefaultFontType::CJK_TEXT: s = "DefaultFontType::CJK_TEXT"; break; + case DefaultFontType::CJK_PRESENTATION: s = "DefaultFontType::CJK_PRESENTATION"; break; + case DefaultFontType::CJK_SPREADSHEET: s = "DefaultFontType::CJK_SPREADSHEET"; break; + case DefaultFontType::CJK_HEADING: s = "DefaultFontType::CJK_HEADING"; break; + case DefaultFontType::CJK_DISPLAY: s = "DefaultFontType::CJK_DISPLAY"; break; - case DEFAULTFONT_CTL_TEXT: s = "DEFAULTFONT_CTL_TEXT"; break; - case DEFAULTFONT_CTL_PRESENTATION: s = "DEFAULTFONT_CTL_PRESENTATION"; break; - case DEFAULTFONT_CTL_SPREADSHEET: s = "DEFAULTFONT_CTL_SPREADSHEET"; break; - case DEFAULTFONT_CTL_HEADING: s = "DEFAULTFONT_CTL_HEADING"; break; - case DEFAULTFONT_CTL_DISPLAY: s = "DEFAULTFONT_CTL_DISPLAY"; break; + case DefaultFontType::CTL_TEXT: s = "DefaultFontType::CTL_TEXT"; break; + case DefaultFontType::CTL_PRESENTATION: s = "DefaultFontType::CTL_PRESENTATION"; break; + case DefaultFontType::CTL_SPREADSHEET: s = "DefaultFontType::CTL_SPREADSHEET"; break; + case DefaultFontType::CTL_HEADING: s = "DefaultFontType::CTL_HEADING"; break; + case DefaultFontType::CTL_DISPLAY: s = "DefaultFontType::CTL_DISPLAY"; break; } fprintf( stderr, " OutputDevice::GetDefaultFont() Type=\"%s\" lang=%d flags=%ld FontName=\"%s\"\n", s, eLang, nFlags, diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index fa7cee61135e..c928516d767b 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -545,11 +545,11 @@ void Window::SetZoomedPointFont( const vcl::Font& rFont ) long nFontDiff = std::abs( GetFont().GetSize().Height()-aMetric.GetSize().Height() ); if ( (aMetric.GetType() == TYPE_RASTER) && (nFontDiff >= 2) ) { - sal_uInt16 nType; + DefaultFontType nType; if ( aMetric.GetPitch() == PITCH_FIXED ) - nType = DEFAULTFONT_FIXED; + nType = DefaultFontType::FIXED; else - nType = DEFAULTFONT_UI_SANS; + nType = DefaultFontType::UI_SANS; vcl::Font aTempFont = GetDefaultFont( nType, GetSettings().GetLanguageTag().getLanguageType(), 0 ); aFont.SetName( aTempFont.GetName() ); SetPointFont( aFont ); diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx index 61cbf28f1dae..576b3ed73e75 100644 --- a/xmlsecurity/source/dialogs/certificateviewer.cxx +++ b/xmlsecurity/source/dialogs/certificateviewer.cxx @@ -213,7 +213,7 @@ void CertificateViewerDetailsTP::InsertElement( const OUString& _rField, const O CertificateViewerDetailsTP::CertificateViewerDetailsTP( vcl::Window* _pParent, CertificateViewer* _pDlg ) :CertificateViewerTP ( _pParent, "CertDetails", "xmlsec/ui/certdetails.ui", _pDlg ) - ,m_aFixedWidthFont( OutputDevice::GetDefaultFont( DEFAULTFONT_UI_FIXED, LANGUAGE_DONTKNOW, DEFAULTFONT_FLAGS_ONLYONE, this ) ) + ,m_aFixedWidthFont( OutputDevice::GetDefaultFont( DefaultFontType::UI_FIXED, LANGUAGE_DONTKNOW, DEFAULTFONT_FLAGS_ONLYONE, this ) ) { get( m_pValueDetails, "valuedetails" ); get( m_pElementsLBContainer, "tablecontainer" ); |