diff options
50 files changed, 78 insertions, 69 deletions
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 9b5aa20e552b..fe617dd87c5c 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -1236,7 +1236,7 @@ void EditorWindow::ImplSetFont() { vcl::Font aTmpFont(OutputDevice::GetDefaultFont(DefaultFontType::FIXED, Application::GetSettings().GetUILanguageTag().getLanguageType(), - 0 , this)); + GetDefaultFontFlags::NONE, 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 4fc88a266626..6370f290a08f 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( DefaultFontType::LATIN_SPREADSHEET, nLang, DEFAULTFONT_FLAGS_ONLYONE, 0 ); + vcl::Font aFont = OutputDevice::GetDefaultFont( DefaultFontType::LATIN_SPREADSHEET, nLang, GetDefaultFontFlags::OnlyOne, 0 ); nLang = MsLangId::resolveSystemLanguageByScriptType(LanguageTag::convertToLanguageType( aDefaultLocale_CJK, false), ASIAN); - vcl::Font aFontCJK = OutputDevice::GetDefaultFont( DefaultFontType::CJK_SPREADSHEET, nLang, DEFAULTFONT_FLAGS_ONLYONE, 0 ); + vcl::Font aFontCJK = OutputDevice::GetDefaultFont( DefaultFontType::CJK_SPREADSHEET, nLang, GetDefaultFontFlags::OnlyOne, 0 ); nLang = MsLangId::resolveSystemLanguageByScriptType(LanguageTag::convertToLanguageType( aDefaultLocale_CTL, false), COMPLEX); - vcl::Font aFontCTL = OutputDevice::GetDefaultFont( DefaultFontType::CTL_SPREADSHEET, nLang, DEFAULTFONT_FLAGS_ONLYONE, 0 ); + vcl::Font aFontCTL = OutputDevice::GetDefaultFont( DefaultFontType::CTL_SPREADSHEET, nLang, GetDefaultFontFlags::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 7b2698f98cb8..09f62262fc76 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -2058,7 +2058,7 @@ IMPL_LINK( OfaQuoteTabPage, QuoteHdl, PushButton*, pBtn ) // start character selection dialog ScopedVclPtrInstance< SvxCharacterMap > pMap( this, true ); pMap->SetCharFont( OutputDevice::GetDefaultFont(DefaultFontType::LATIN_TEXT, - LANGUAGE_ENGLISH_US, DEFAULTFONT_FLAGS_ONLYONE, 0 )); + LANGUAGE_ENGLISH_US, GetDefaultFontFlags::OnlyOne, 0 )); pMap->SetText(nMode < SGL_END ? m_sStartQuoteDlg : m_sEndQuoteDlg ); sal_UCS4 cDlg; SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect(); diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 0a3f7898e7d9..86930e231508 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -2518,7 +2518,7 @@ void SvxNumberingPreview::Paint(vcl::RenderContext& rRenderContext, const Rectan // 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(DefaultFontType::UI_SANS, MsLangId::getSystemLanguage(), DEFAULTFONT_FLAGS_ONLYONE); + aStdFont = OutputDevice::GetDefaultFont(DefaultFontType::UI_SANS, MsLangId::getSystemLanguage(), GetDefaultFontFlags::OnlyOne); aStdFont.SetColor(aTextColor); aStdFont.SetFillColor(aBackColor); diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx index c1b15806da8c..938404686cc4 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( DefaultFontType::FIXED, Application::GetSettings().GetUILanguageTag().getLanguageType(), 0 , this ) ); + vcl::Font aTmpFont( OutputDevice::GetDefaultFont( DefaultFontType::FIXED, Application::GetSettings().GetUILanguageTag().getLanguageType(), GetDefaultFontFlags::NONE, this ) ); sFontName = aTmpFont.GetName(); } Size aFontSize( diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx index f2f39c812b1d..6d670c3e9ff6 100644 --- a/dbaccess/source/ui/misc/TokenWriter.cxx +++ b/dbaccess/source/ui/misc/TokenWriter.cxx @@ -323,7 +323,7 @@ void ODatabaseImportExport::initialize() vcl::Font aApplicationFont = OutputDevice::GetDefaultFont( DefaultFontType::SANS_UNICODE, Application::GetSettings().GetUILanguageTag().getLanguageType(), - DEFAULTFONT_FLAGS_ONLYONE + GetDefaultFontFlags::OnlyOne ); m_aFont = VCLUnoHelper::CreateFontDescriptor( aApplicationFont ); } diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 74006eac0a29..4cddc7d595a9 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( DefaultFontType::SANS_UNICODE,Window::GetSettings().GetLanguageTag().getLanguageType(),DEFAULTFONT_FLAGS_ONLYONE); + vcl::Font aTitleFont = OutputDevice::GetDefaultFont( DefaultFontType::SANS_UNICODE,Window::GetSettings().GetLanguageTag().getLanguageType(),GetDefaultFontFlags::OnlyOne); aTitleFont.SetSize(Size(0, 6)); SetTitleFont(aTitleFont); diff --git a/editeng/source/editeng/eehtml.cxx b/editeng/source/editeng/eehtml.cxx index bf4fae4375e3..70f3f2c46125 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( DefaultFontType::FIXED, LANGUAGE_SYSTEM, 0 ); + vcl::Font aFont = OutputDevice::GetDefaultFont( DefaultFontType::FIXED, LANGUAGE_SYSTEM, GetDefaultFontFlags::NONE ); 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 006d6f265cb4..d35a20edbde9 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( DefaultFontType::FIXED, LANGUAGE_SYSTEM, 0 ); + aFont = OutputDevice::GetDefaultFont( DefaultFontType::FIXED, LANGUAGE_SYSTEM, GetDefaultFontFlags::NONE ); aFont.SetAlign( ALIGN_BOTTOM); aFont.SetTransparent( true ); } diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index 629eec483836..50140033e1ba 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -3521,7 +3521,7 @@ void GetDefaultFonts( SvxFontItem& rLatin, SvxFontItem& rAsian, SvxFontItem& rCo { vcl::Font aFont( OutputDevice::GetDefaultFont( aOutTypeArr[ n ].nFontType, aOutTypeArr[ n ].nLanguage, - DEFAULTFONT_FLAGS_ONLYONE, 0 ) ); + GetDefaultFontFlags::OnlyOne, 0 ) ); SvxFontItem* pItem = aItemArr[ n ]; pItem->SetFamily( aFont.GetFamily() ); pItem->SetFamilyName( aFont.GetName() ); diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index f9586ca7023a..27cee53d4c00 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -278,7 +278,16 @@ namespace o3tl template<> struct typed_flags<AddFontSubstituteFlags> : is_typed_flags<AddFontSubstituteFlags, 0x03> {}; } -#define DEFAULTFONT_FLAGS_ONLYONE ((sal_uLong)0x00000001) +// GetDefaultFont() flags +enum GetDefaultFontFlags +{ + NONE = 0x0000, + OnlyOne = 0x0001, +}; +namespace o3tl +{ + template<> struct typed_flags<GetDefaultFontFlags> : is_typed_flags<GetDefaultFontFlags, 0x01> {}; +} enum OutDevType { OUTDEV_DONTKNOW, OUTDEV_WINDOW, OUTDEV_PRINTER, OUTDEV_VIRDEV }; @@ -1273,7 +1282,7 @@ public: static vcl::Font GetDefaultFont( DefaultFontType nType, LanguageType eLang, - sal_uLong nFlags, + GetDefaultFontFlags nFlags, const OutputDevice* pOutDev = NULL ); SAL_DLLPRIVATE void ImplInitFontList() const; diff --git a/reportdesign/source/core/api/ReportComponent.cxx b/reportdesign/source/core/api/ReportComponent.cxx index 2d73e1550e08..9bc9fd2ee0f9 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( 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 ) ; + rLatinFont = OutputDevice::GetDefaultFont( DefaultFontType::LATIN_PRESENTATION, eLatin, GetDefaultFontFlags::OnlyOne ); + rCJKFont = OutputDevice::GetDefaultFont( DefaultFontType::CJK_PRESENTATION, _eCJK, GetDefaultFontFlags::OnlyOne ); + rCTLFont = OutputDevice::GetDefaultFont( DefaultFontType::CTL_PRESENTATION, _eCTL, GetDefaultFontFlags::OnlyOne ) ; } OFormatProperties::OFormatProperties() :nAlign(style::ParagraphAdjust_LEFT) diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx index 0588f1f090a6..41b15efa9417 100644 --- a/sc/source/core/data/docpool.cxx +++ b/sc/source/core/data/docpool.cxx @@ -197,7 +197,7 @@ ScDocumentPool::ScDocumentPool( SfxItemPool* pSecPool) { // latin font from GetDefaultFonts is not used, DEFAULTFONT_LATIN_SPREADSHEET instead vcl::Font aStdFont = OutputDevice::GetDefaultFont( DefaultFontType::LATIN_SPREADSHEET, LANGUAGE_ENGLISH_US, - DEFAULTFONT_FLAGS_ONLYONE ); + GetDefaultFontFlags::OnlyOne ); SvxFontItem* pStdFont = new SvxFontItem( aStdFont.GetFamily(), aStdFont.GetName(), aStdFont.GetStyleName(), aStdFont.GetPitch(), aStdFont.GetCharSet(), diff --git a/sc/source/core/data/stlpool.cxx b/sc/source/core/data/stlpool.cxx index abd00b567114..996a35a0ee13 100644 --- a/sc/source/core/data/stlpool.cxx +++ b/sc/source/core/data/stlpool.cxx @@ -201,7 +201,7 @@ static void lcl_CheckFont( SfxItemSet& rSet, LanguageType eLang, DefaultFontType { if ( eLang != LANGUAGE_NONE && eLang != LANGUAGE_DONTKNOW && eLang != LANGUAGE_SYSTEM ) { - vcl::Font aDefFont = OutputDevice::GetDefaultFont( nFontType, eLang, DEFAULTFONT_FLAGS_ONLYONE ); + vcl::Font aDefFont = OutputDevice::GetDefaultFont( nFontType, eLang, GetDefaultFontFlags::OnlyOne ); SvxFontItem aNewItem( aDefFont.GetFamily(), aDefFont.GetName(), aDefFont.GetStyleName(), aDefFont.GetPitch(), aDefFont.GetCharSet(), nItemId ); if ( aNewItem != rSet.Get( nItemId ) ) diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx index 387835005893..522e95591418 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( - DefaultFontType::LATIN_SPREADSHEET, LANGUAGE_ENGLISH_US, DEFAULTFONT_FLAGS_ONLYONE ); + DefaultFontType::LATIN_SPREADSHEET, LANGUAGE_ENGLISH_US, GetDefaultFontFlags::OnlyOne ); SvxFontItem aFontItem( aStdFont.GetFamily(), aStdFont.GetName(), aStdFont.GetStyleName(), aStdFont.GetPitch(), aStdFont.GetCharSet(), ATTR_FONT ); aStdFont = OutputDevice::GetDefaultFont( - DefaultFontType::CJK_SPREADSHEET, LANGUAGE_ENGLISH_US, DEFAULTFONT_FLAGS_ONLYONE ); + DefaultFontType::CJK_SPREADSHEET, LANGUAGE_ENGLISH_US, GetDefaultFontFlags::OnlyOne ); SvxFontItem aCJKFontItem( aStdFont.GetFamily(), aStdFont.GetName(), aStdFont.GetStyleName(), aStdFont.GetPitch(), aStdFont.GetCharSet(), ATTR_CJK_FONT ); aStdFont = OutputDevice::GetDefaultFont( - DefaultFontType::CTL_SPREADSHEET, LANGUAGE_ENGLISH_US, DEFAULTFONT_FLAGS_ONLYONE ); + DefaultFontType::CTL_SPREADSHEET, LANGUAGE_ENGLISH_US, GetDefaultFontFlags::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 a5c31e4f6a7f..7d6172496294 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( DefaultFontType::FIXED, LANGUAGE_ENGLISH_US, 0 ); + maMonoFont = OutputDevice::GetDefaultFont( DefaultFontType::FIXED, LANGUAGE_ENGLISH_US, GetDefaultFontFlags::NONE ); 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 81a33e9b44c9..b0da0a8583da 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(DefaultFontType::UI_SANS, MsLangId::getSystemLanguage(), DEFAULTFONT_FLAGS_ONLYONE)); + vcl::Font aFont(OutputDevice::GetDefaultFont(DefaultFontType::UI_SANS, MsLangId::getSystemLanguage(), GetDefaultFontFlags::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 32236d9fd357..1b81de7c4eb7 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -1764,7 +1764,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) vcl::Font aTargetFont = OutputDevice::GetDefaultFont( DefaultFontType::CJK_SPREADSHEET, - eTargetLang, DEFAULTFONT_FLAGS_ONLYONE ); + eTargetLang, GetDefaultFontFlags::OnlyOne ); ScConversionParam aConvParam( SC_CONVERSION_CHINESE_TRANSL, eSourceLang, eTargetLang, aTargetFont, nOptions, false ); pTabViewShell->DoSheetConversion( aConvParam ); diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index c6dcbde8b3da..2b26fda54c1e 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( 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 ) ; + rLatinFont = OutputDevice::GetDefaultFont( DefaultFontType::LATIN_PRESENTATION, eLatin, GetDefaultFontFlags::OnlyOne ); + rCJKFont = OutputDevice::GetDefaultFont( DefaultFontType::CJK_PRESENTATION, GetLanguage( EE_CHAR_LANGUAGE_CJK ), GetDefaultFontFlags::OnlyOne ); + rCTLFont = OutputDevice::GetDefaultFont( DefaultFontType::CTL_PRESENTATION, GetLanguage( EE_CHAR_LANGUAGE_CTL ), GetDefaultFontFlags::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 ad5fd9bfa1bc..a8331942f3c9 100644 --- a/sd/source/ui/func/fuhhconv.cxx +++ b/sd/source/ui/func/fuhhconv.cxx @@ -243,7 +243,7 @@ void FuHangulHanjaConversion::StartChineseConversion() vcl::Font aTargetFont = OutputDevice::GetDefaultFont( DefaultFontType::CJK_PRESENTATION, - nTargetLang, DEFAULTFONT_FLAGS_ONLYONE ); + nTargetLang, GetDefaultFontFlags::OnlyOne ); StartConversion( nSourceLang, nTargetLang, &aTargetFont, nOptions, false ); ConvertStyles( nTargetLang, &aTargetFont ); diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx index 4439d73975d5..c8d9c364fd05 100644 --- a/sd/source/ui/presenter/PresenterTextView.cxx +++ b/sd/source/ui/presenter/PresenterTextView.cxx @@ -309,7 +309,7 @@ EditEngine* PresenterTextView::Implementation::CreateEditEngine() LanguageType nLang = (LANGUAGE_NONE == rFntDta.nLang) ? rFntDta.nFallbackLang : rFntDta.nLang; vcl::Font aFont = OutputDevice::GetDefaultFont( - rFntDta.nFontType, nLang, DEFAULTFONT_FLAGS_ONLYONE); + rFntDta.nFontType, nLang, GetDefaultFontFlags::OnlyOne); mpEditEngineItemPool->SetPoolDefaultItem( SvxFontItem( aFont.GetFamily(), diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index 15f462e5fa86..277d262fc163 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( DefaultFontType::SANS_UNICODE, eLang, 0 ); + maPageNumberFont = OutputDevice::GetDefaultFont( DefaultFontType::SANS_UNICODE, eLang, GetDefaultFontFlags::NONE ); 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( DefaultFontType::SANS_UNICODE, eLang, 0 ) ); + vcl::Font aNewFont( OutputDevice::GetDefaultFont( DefaultFontType::SANS_UNICODE, eLang, GetDefaultFontFlags::NONE ) ); aNewFont.SetSize( aFontSz ); aNewFont.SetVertical( bVertical ); aNewFont.SetOrientation( bVertical ? 2700 : 0 ); diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx index ff464741fc1d..26e95ad24fb9 100644 --- a/starmath/source/document.cxx +++ b/starmath/source/document.cxx @@ -337,7 +337,7 @@ void SetEditEngineDefaultFonts(SfxItemPool &rEditEngineItemPool) LanguageType nLang = (LANGUAGE_NONE == rFntDta.nLang) ? rFntDta.nFallbackLang : rFntDta.nLang; vcl::Font aFont = OutputDevice::GetDefaultFont( - rFntDta.nFontType, nLang, DEFAULTFONT_FLAGS_ONLYONE ); + rFntDta.nFontType, nLang, GetDefaultFontFlags::OnlyOne ); rEditEngineItemPool.SetPoolDefaultItem( SvxFontItem( aFont.GetFamily(), aFont.GetName(), aFont.GetStyleName(), aFont.GetPitch(), aFont.GetCharSet(), diff --git a/starmath/source/format.cxx b/starmath/source/format.cxx index 870a8282342e..94222820af1d 100644 --- a/starmath/source/format.cxx +++ b/starmath/source/format.cxx @@ -89,7 +89,7 @@ OUString GetDefaultFontName( LanguageType nLang, sal_uInt16 nIdent ) return OutputDevice::GetDefaultFont( pTable[ nIdent ], nLang, - DEFAULTFONT_FLAGS_ONLYONE ).GetName(); + GetDefaultFontFlags::OnlyOne ).GetName(); } } diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx index 8c318494870a..c8459b01d378 100644 --- a/svx/source/dialog/dialcontrol.cxx +++ b/svx/source/dialog/dialcontrol.cxx @@ -429,7 +429,7 @@ void DialControl::Init( const Size& rWinSize ) vcl::Font aDefaultSize = GetFont(); vcl::Font aFont( OutputDevice::GetDefaultFont( - DefaultFontType::UI_SANS, Application::GetSettings().GetUILanguageTag().getLanguageType(), DEFAULTFONT_FLAGS_ONLYONE ) ); + DefaultFontType::UI_SANS, Application::GetSettings().GetUILanguageTag().getLanguageType(), GetDefaultFontFlags::OnlyOne ) ); aFont.SetHeight(aDefaultSize.GetHeight()); Init( rWinSize, aFont ); diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx index 4ad4d87582b4..e392e7ab0998 100644 --- a/svx/source/dialog/svxbmpnumvalueset.cxx +++ b/svx/source/dialog/svxbmpnumvalueset.cxx @@ -156,7 +156,7 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) Color aOldColor = pDev->GetLineColor(); pDev->SetLineColor(aTextColor); vcl::Font aFont(OutputDevice::GetDefaultFont( - DefaultFontType::UI_SANS, MsLangId::getSystemLanguage(), DEFAULTFONT_FLAGS_ONLYONE)); + DefaultFontType::UI_SANS, MsLangId::getSystemLanguage(), GetDefaultFontFlags::OnlyOne)); Size aSize = aFont.GetSize(); diff --git a/svx/source/dialog/swframeexample.cxx b/svx/source/dialog/swframeexample.cxx index e31638129409..f4dfca86001f 100644 --- a/svx/source/dialog/swframeexample.cxx +++ b/svx/source/dialog/swframeexample.cxx @@ -168,7 +168,7 @@ void SvxSwFrameExample::InitAllRects_Impl(vcl::RenderContext& rRenderContext) { vcl::Font aFont = OutputDevice::GetDefaultFont( DefaultFontType::LATIN_TEXT, Application::GetSettings().GetLanguageTag().getLanguageType(), - DEFAULTFONT_FLAGS_ONLYONE, this ); + GetDefaultFontFlags::OnlyOne, this ); aFont.SetColor( m_aTxtCol ); aFont.SetFillColor( m_aBgCol ); aFont.SetWeight(WEIGHT_NORMAL); diff --git a/svx/source/form/fmcontrollayout.cxx b/svx/source/form/fmcontrollayout.cxx index 661b481697d9..fecbb2351fd8 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( DefaultFontType::SANS, LanguageTag::convertToLanguageType( aDocumentCharLocale ), DEFAULTFONT_FLAGS_ONLYONE ); + vcl::Font aFont = OutputDevice::GetDefaultFont( DefaultFontType::SANS, LanguageTag::convertToLanguageType( aDocumentCharLocale ), GetDefaultFontFlags::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 85b59696fe11..db4fe239b835 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(DefaultFontType::UI_SANS, MsLangId::getSystemLanguage(), DEFAULTFONT_FLAGS_ONLYONE)); + vcl::Font aFont(OutputDevice::GetDefaultFont(DefaultFontType::UI_SANS, MsLangId::getSystemLanguage(), GetDefaultFontFlags::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 889c8377c2b0..1b47ccd5b4ba 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(DefaultFontType::UI_SANS, MsLangId::getSystemLanguage(), DEFAULTFONT_FLAGS_ONLYONE)); + vcl::Font aFont(OutputDevice::GetDefaultFont(DefaultFontType::UI_SANS, MsLangId::getSystemLanguage(), GetDefaultFontFlags::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 f6f7662081b5..7f04c4a45ca4 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( DefaultFontType::SERIF, LANGUAGE_SYSTEM, DEFAULTFONT_FLAGS_ONLYONE ).GetName() ), + aFontName( OutputDevice::GetDefaultFont( DefaultFontType::SERIF, LANGUAGE_SYSTEM, GetDefaultFontFlags::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 588000854fbb..47c3c21d7aa2 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(DefaultFontType::LATIN_TEXT, nLanguage, DEFAULTFONT_FLAGS_ONLYONE, 0)); + vcl::Font aFont(OutputDevice::GetDefaultFont(DefaultFontType::LATIN_TEXT, nLanguage, GetDefaultFontFlags::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(DefaultFontType::CJK_TEXT, nLanguage, DEFAULTFONT_FLAGS_ONLYONE, 0)); + vcl::Font aFontCJK(OutputDevice::GetDefaultFont(DefaultFontType::CJK_TEXT, nLanguage, GetDefaultFontFlags::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(DefaultFontType::CTL_TEXT, nLanguage, DEFAULTFONT_FLAGS_ONLYONE, 0)); + vcl::Font aFontCTL(OutputDevice::GetDefaultFont(DefaultFontType::CTL_TEXT, nLanguage, GetDefaultFontFlags::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 ac66106d7078..47696fd28204 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( DefaultFontType::SERIF, LANGUAGE_SYSTEM, DEFAULTFONT_FLAGS_ONLYONE ) ); + vcl::Font aTmpFont( OutputDevice::GetDefaultFont( DefaultFontType::SERIF, LANGUAGE_SYSTEM, GetDefaultFontFlags::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 d6c10ffa879e..b9403e8e38b1 100644 --- a/sw/source/core/doc/DocumentStylePoolManager.cxx +++ b/sw/source/core/doc/DocumentStylePoolManager.cxx @@ -117,7 +117,7 @@ namespace sal_uInt16 nLng = static_cast<const SvxLanguageItem&>(rSet.GetPool()->GetDefaultItem( aArr[n].nResLngId )).GetLanguage(); vcl::Font aFnt( OutputDevice::GetDefaultFont( nFntType, - nLng, DEFAULTFONT_FLAGS_ONLYONE ) ); + nLng, GetDefaultFontFlags::OnlyOne ) ); rSet.Put( SvxFontItem( aFnt.GetFamily(), aFnt.GetName(), OUString(), aFnt.GetPitch(), @@ -146,7 +146,7 @@ namespace sal_uInt16 nLng = static_cast<const SvxLanguageItem&>(rSet.GetPool()->GetDefaultItem( aArr[n].nResLngId )).GetLanguage(); vcl::Font aFnt( OutputDevice::GetDefaultFont( aArr[n].nFntType, - nLng, DEFAULTFONT_FLAGS_ONLYONE ) ); + nLng, GetDefaultFontFlags::OnlyOne ) ); rSet.Put( SvxFontItem( aFnt.GetFamily(), aFnt.GetName(), OUString(), aFnt.GetPitch(), @@ -455,7 +455,7 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool nLng = aLangs[i]; vcl::Font aFnt( OutputDevice::GetDefaultFont( nFontTypes[i], - nLng, DEFAULTFONT_FLAGS_ONLYONE ) ); + nLng, GetDefaultFontFlags::OnlyOne ) ); aSet.Put( SvxFontItem( aFnt.GetFamily(), aFnt.GetName(), OUString(), aFnt.GetPitch(), diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx index c99dd5f9bbbc..13469b1569f1 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -611,7 +611,7 @@ static void lcl_html_setFixedFontProperty( { vcl::Font aFixedFont( OutputDevice::GetDefaultFont( DefaultFontType::FIXED, LANGUAGE_ENGLISH_US, - DEFAULTFONT_FLAGS_ONLYONE ) ); + GetDefaultFontFlags::OnlyOne ) ); Any aTmp; aTmp <<= OUString( aFixedFont.GetName() ); rPropSet->setPropertyValue("FontName", aTmp ); diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx index add3ced7b37c..6ae81f73e066 100644 --- a/sw/source/filter/html/htmlforw.cxx +++ b/sw/source/filter/html/htmlforw.cxx @@ -1077,7 +1077,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, { vcl::Font aFixedFont( OutputDevice::GetDefaultFont( DefaultFontType::FIXED, LANGUAGE_ENGLISH_US, - DEFAULTFONT_FLAGS_ONLYONE ) ); + GetDefaultFontFlags::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 47bfd670a5b1..271a91be0fda 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -2314,11 +2314,11 @@ void SwRedlineOptionsTabPage::InitFontStyle(SvxFontPrevWindow& rExampleWin) SvxFont& rCTLFont = rExampleWin.GetCTLFont(); vcl::Font aFont( OutputDevice::GetDefaultFont( DefaultFontType::SERIF, eLangType, - DEFAULTFONT_FLAGS_ONLYONE, &rExampleWin ) ); + GetDefaultFontFlags::OnlyOne, &rExampleWin ) ); vcl::Font aCJKFont( OutputDevice::GetDefaultFont( DefaultFontType::CJK_TEXT, eLangType, - DEFAULTFONT_FLAGS_ONLYONE, &rExampleWin ) ); + GetDefaultFontFlags::OnlyOne, &rExampleWin ) ); vcl::Font aCTLFont( OutputDevice::GetDefaultFont( DefaultFontType::CTL_TEXT, eLangType, - DEFAULTFONT_FLAGS_ONLYONE, &rExampleWin ) ); + GetDefaultFontFlags::OnlyOne, &rExampleWin ) ); const Size aDefSize( 0, 12 ); aFont.SetSize( aDefSize ); aCJKFont.SetSize( aDefSize ); diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx index 588e190dbe8f..85e040ccb3c8 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(DefaultFontType::FIXED, eLang, DEFAULTFONT_FLAGS_ONLYONE, pPrt)); + vcl::Font aTmpFont(OutputDevice::GetDefaultFont(DefaultFontType::FIXED, eLang, GetDefaultFontFlags::OnlyOne, pPrt)); aOpt.SetFontName(aTmpFont.GetName()); } diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index b19993fc8fb6..3b58a69de47d 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -948,7 +948,7 @@ void NumberingPreview::Paint(vcl::RenderContext& rRenderContext, const Rectangle const long nYStep = (aSize.Height() - 6)/ MAXLEVEL; long nYStart = 4; aStdFont = OutputDevice::GetDefaultFont(DefaultFontType::UI_SANS, GetAppLanguage(), - DEFAULTFONT_FLAGS_ONLYONE, &rRenderContext); + GetDefaultFontFlags::OnlyOne, &rRenderContext); // #101524# OJ aStdFont.SetColor(SwViewOption::GetFontColor()); diff --git a/sw/source/uibase/app/docshini.cxx b/sw/source/uibase/app/docshini.cxx index 7ea0063b9655..dcd203d423c3 100644 --- a/sw/source/uibase/app/docshini.cxx +++ b/sw/source/uibase/app/docshini.cxx @@ -206,7 +206,7 @@ bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor ) vcl::Font aLangDefFont = OutputDevice::GetDefaultFont( nFontTypes[i], eLanguage, - DEFAULTFONT_FLAGS_ONLYONE ); + GetDefaultFontFlags::OnlyOne ); pFontItem.reset(new SvxFontItem(aLangDefFont.GetFamily(), aLangDefFont.GetName(), aEmptyOUStr, aLangDefFont.GetPitch(), aLangDefFont.GetCharSet(), nFontWhich)); } diff --git a/sw/source/uibase/config/fontcfg.cxx b/sw/source/uibase/config/fontcfg.cxx index 949b43bcb06c..7511424b61c5 100644 --- a/sw/source/uibase/config/fontcfg.cxx +++ b/sw/source/uibase/config/fontcfg.cxx @@ -253,7 +253,7 @@ OUString SwStdFontConfig::GetDefaultFor(sal_uInt16 nFontType, LanguageType eLan default: nFontId = DefaultFontType::LATIN_TEXT; } - vcl::Font aFont = OutputDevice::GetDefaultFont(nFontId, eLang, DEFAULTFONT_FLAGS_ONLYONE); + vcl::Font aFont = OutputDevice::GetDefaultFont(nFontId, eLang, GetDefaultFontFlags::OnlyOne); return aFont.GetName(); } diff --git a/sw/source/uibase/docvw/srcedtw.cxx b/sw/source/uibase/docvw/srcedtw.cxx index 012f34ba5f81..968760543e4d 100644 --- a/sw/source/uibase/docvw/srcedtw.cxx +++ b/sw/source/uibase/docvw/srcedtw.cxx @@ -964,11 +964,11 @@ void SwSrcEditWindow::SetFont() if(lcl_GetLanguagesForEncoding(eSourceEncoding, aLanguages)) { //TODO: check for multiple languages - aFont = OutputDevice::GetDefaultFont(DefaultFontType::FIXED, aLanguages[0], 0, this); + aFont = OutputDevice::GetDefaultFont(DefaultFontType::FIXED, aLanguages[0], GetDefaultFontFlags::NONE, this); } else aFont = OutputDevice::GetDefaultFont(DefaultFontType::SANS_UNICODE, - Application::GetSettings().GetLanguageTag().getLanguageType(), 0, this); + Application::GetSettings().GetLanguageTag().getLanguageType(), GetDefaultFontFlags::NONE, this); sFontName = aFont.GetName(); } const SvxFontListItem* pFontListItem = diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx index 7a4f003eb4ab..3b6c4e6401ad 100644 --- a/sw/source/uibase/shells/annotsh.cxx +++ b/sw/source/uibase/shells/annotsh.cxx @@ -1285,7 +1285,7 @@ void SwAnnotationShell::ExecLingu(SfxRequest &rReq) nOptions = nOptions | i18n::TextConversionOption::CHARACTER_BY_CHARACTER; vcl::Font aTargetFont = OutputDevice::GetDefaultFont( DefaultFontType::CJK_TEXT, - nTargetLang, DEFAULTFONT_FLAGS_ONLYONE ); + nTargetLang, GetDefaultFontFlags::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 cb11915ca6c6..e081614db9b9 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(DefaultFontType::CJK_TEXT, nTargetLang, DEFAULTFONT_FLAGS_ONLYONE); + vcl::Font aTargetFont = OutputDevice::GetDefaultFont(DefaultFontType::CJK_TEXT, nTargetLang, GetDefaultFontFlags::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 a86d367a3277..4ae22cd95243 100644 --- a/sw/source/uibase/uiview/viewling.cxx +++ b/sw/source/uibase/uiview/viewling.cxx @@ -165,7 +165,7 @@ void SwView::ExecLingu(SfxRequest &rReq) nOptions = nOptions | i18n::TextConversionOption::CHARACTER_BY_CHARACTER; vcl::Font aTargetFont = OutputDevice::GetDefaultFont( DefaultFontType::CJK_TEXT, - nTargetLang, DEFAULTFONT_FLAGS_ONLYONE ); + nTargetLang, GetDefaultFontFlags::OnlyOne ); // disallow formatting, updating the view, ... while // converting the document. (saves time) diff --git a/vcl/qa/cppunit/complextext.cxx b/vcl/qa/cppunit/complextext.cxx index 126a5fb84ebd..e200ad2903ec 100644 --- a/vcl/qa/cppunit/complextext.cxx +++ b/vcl/qa/cppunit/complextext.cxx @@ -51,7 +51,7 @@ void VclComplexTextTest::testArabic() vcl::Font aFont = OutputDevice::GetDefaultFont( DefaultFontType::CTL_SPREADSHEET, LANGUAGE_ARABIC_SAUDI_ARABIA, - DEFAULTFONT_FLAGS_ONLYONE, 0 ); + GetDefaultFontFlags::OnlyOne, 0 ); pOutDev->SetFont( aFont ); // normal orientation diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx index 078baf113186..8bf7467dc04c 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( DefaultFontType::FIXED, LANGUAGE_ENGLISH_US, 0 ); + vcl::Font aFont = GetDefaultFont( DefaultFontType::FIXED, LANGUAGE_ENGLISH_US, GetDefaultFontFlags::NONE ); aFont.SetHeight( 8 ); aFont.SetPitch( PITCH_FIXED ); maListBox->SetControlFont( aFont ); diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx index 05ff359e2d71..a5e54e47056b 100644 --- a/vcl/source/outdev/font.cxx +++ b/vcl/source/outdev/font.cxx @@ -773,7 +773,7 @@ void ImplFontSubstitute( OUString& rFontName ) //hidpi TODO: This routine has hard-coded font-sizes that break places such as DialControl vcl::Font OutputDevice::GetDefaultFont( DefaultFontType nType, LanguageType eLang, - sal_uLong nFlags, const OutputDevice* pOutDev ) + GetDefaultFontFlags nFlags, const OutputDevice* pOutDev ) { if (!pOutDev) // default is NULL pOutDev = Application::GetDefaultDevice(); @@ -869,7 +869,7 @@ vcl::Font OutputDevice::GetDefaultFont( DefaultFontType nType, LanguageType eLan if( pFontFamily ) { AddTokenFontName( aName, pFontFamily->GetFamilyName() ); - if( nFlags & DEFAULTFONT_FLAGS_ONLYONE ) + if( nFlags & GetDefaultFontFlags::OnlyOne ) break; } } @@ -880,7 +880,7 @@ vcl::Font OutputDevice::GetDefaultFont( DefaultFontType nType, LanguageType eLan // No Name, than set all names if ( aFont.GetName().isEmpty() ) { - if ( nFlags & DEFAULTFONT_FLAGS_ONLYONE ) + if ( nFlags & GetDefaultFontFlags::OnlyOne ) { if( !pOutDev ) { diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index e15c8b4fa7be..dd436d90cfa3 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -550,7 +550,7 @@ void Window::SetZoomedPointFont(vcl::RenderContext& rRenderContext, const vcl::F nType = DefaultFontType::FIXED; else nType = DefaultFontType::UI_SANS; - vcl::Font aTempFont = OutputDevice::GetDefaultFont(nType, rRenderContext.GetSettings().GetLanguageTag().getLanguageType(), 0); + vcl::Font aTempFont = OutputDevice::GetDefaultFont(nType, rRenderContext.GetSettings().GetLanguageTag().getLanguageType(), GetDefaultFontFlags::NONE); aFont.SetName(aTempFont.GetName()); SetPointFont(rRenderContext, aFont); } diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx index 576b3ed73e75..3ed07b59a80c 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( DefaultFontType::UI_FIXED, LANGUAGE_DONTKNOW, DEFAULTFONT_FLAGS_ONLYONE, this ) ) + ,m_aFixedWidthFont( OutputDevice::GetDefaultFont( DefaultFontType::UI_FIXED, LANGUAGE_DONTKNOW, GetDefaultFontFlags::OnlyOne, this ) ) { get( m_pValueDetails, "valuedetails" ); get( m_pElementsLBContainer, "tablecontainer" ); |