summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-05-19 14:37:07 +0200
committerNoel Grandin <noel@peralex.com>2015-05-20 09:52:09 +0200
commit23b439a664549e1b43347bc625c267fa3c4f4d3b (patch)
tree157c173a91b49e78aaf037e1cee482fe3925134b /sd
parent49e13aa41895e8562d83cff189ab6a78d5d902aa (diff)
convert DEFAULTCONSTANT constant to scoped enum
Change-Id: I5ebd77edfa29d6c6c7acea37e826ef1d625916c3
Diffstat (limited to 'sd')
-rw-r--r--sd/source/core/drawdoc4.cxx6
-rw-r--r--sd/source/ui/func/fuhhconv.cxx2
-rw-r--r--sd/source/ui/presenter/PresenterTextView.cxx2
-rw-r--r--sd/source/ui/view/outlview.cxx4
4 files changed, 7 insertions, 7 deletions
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 );