summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/doc/DocumentStylePoolManager.cxx6
-rw-r--r--sw/source/filter/html/htmlform.cxx2
-rw-r--r--sw/source/filter/html/htmlforw.cxx2
-rw-r--r--sw/source/ui/config/optpage.cxx6
-rw-r--r--sw/source/ui/dialog/ascfldlg.cxx2
-rw-r--r--sw/source/ui/misc/outline.cxx2
-rw-r--r--sw/source/uibase/app/docshini.cxx2
-rw-r--r--sw/source/uibase/config/fontcfg.cxx2
-rw-r--r--sw/source/uibase/docvw/srcedtw.cxx4
-rw-r--r--sw/source/uibase/shells/annotsh.cxx2
-rw-r--r--sw/source/uibase/shells/drwtxtsh.cxx2
-rw-r--r--sw/source/uibase/uiview/viewling.cxx2
12 files changed, 17 insertions, 17 deletions
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)
generated by cgit (git 2.34.1) at 2024-07-17 20:17:47 +0000