summaryrefslogtreecommitdiff
path: root/sw/source/uibase
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 /sw/source/uibase
parent49e13aa41895e8562d83cff189ab6a78d5d902aa (diff)
convert DEFAULTCONSTANT constant to scoped enum
Change-Id: I5ebd77edfa29d6c6c7acea37e826ef1d625916c3
Diffstat (limited to 'sw/source/uibase')
-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
6 files changed, 7 insertions, 7 deletions
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)