summaryrefslogtreecommitdiff
path: root/sw/source/uibase/config
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-11-08 15:47:50 +0000
committerCaolán McNamara <caolanm@redhat.com>2017-11-09 00:16:43 +0100
commit9cb2962197b592a9b93dac2ea8b8f3652cb5fbcb (patch)
treeb995c09768d5c3c2e89c08d7833c8b4669cf112e /sw/source/uibase/config
parentf5765d9f621bdc8fd0e1ac5eec1dcab9ae5b5d06 (diff)
rename AvoidConfig to Fuzzing
cause that's what its really used for and a couple of cases are not specifically about avoiding config but avoiding uninteresting disk acccess and what not Change-Id: I4c6454f98388579fcd0bf9798321d30408ab65ee Reviewed-on: https://gerrit.libreoffice.org/44491 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/uibase/config')
-rw-r--r--sw/source/uibase/config/fontcfg.cxx6
-rw-r--r--sw/source/uibase/config/modcfg.cxx2
-rw-r--r--sw/source/uibase/config/usrpref.cxx2
-rw-r--r--sw/source/uibase/config/viewopt.cxx4
4 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/uibase/config/fontcfg.cxx b/sw/source/uibase/config/fontcfg.cxx
index 807762a80db1..88caae484258 100644
--- a/sw/source/uibase/config/fontcfg.cxx
+++ b/sw/source/uibase/config/fontcfg.cxx
@@ -80,7 +80,7 @@ SwStdFontConfig::SwStdFontConfig() :
{
SvtLinguOptions aLinguOpt;
- if (!utl::ConfigManager::IsAvoidConfig())
+ if (!utl::ConfigManager::IsFuzzing())
SvtLinguConfig().GetOptions( aLinguOpt );
LanguageType eWestern = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage, css::i18n::ScriptType::LATIN),
@@ -160,7 +160,7 @@ bool SwStdFontConfig::IsFontDefault(sal_uInt16 nFontType) const
bool bSame = false;
SvtLinguOptions aLinguOpt;
- if (!utl::ConfigManager::IsAvoidConfig())
+ if (!utl::ConfigManager::IsFuzzing())
SvtLinguConfig().GetOptions(aLinguOpt);
LanguageType eWestern = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage, css::i18n::ScriptType::LATIN),
@@ -274,7 +274,7 @@ void SwStdFontConfig::ChangeInt( sal_uInt16 nFontType, sal_Int32 nHeight )
if( nFontType < DEF_FONT_COUNT && nDefaultFontHeight[nFontType] != nHeight)
{
SvtLinguOptions aLinguOpt;
- if (!utl::ConfigManager::IsAvoidConfig())
+ if (!utl::ConfigManager::IsFuzzing())
SvtLinguConfig().GetOptions( aLinguOpt );
LanguageType eWestern = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage, css::i18n::ScriptType::LATIN),
diff --git a/sw/source/uibase/config/modcfg.cxx b/sw/source/uibase/config/modcfg.cxx
index af7f1d01d024..527abc141670 100644
--- a/sw/source/uibase/config/modcfg.cxx
+++ b/sw/source/uibase/config/modcfg.cxx
@@ -1086,7 +1086,7 @@ void SwInsertConfig::Load()
}
else if (nProp == INS_PROP_CAP_CAPTIONORDERNUMBERINGFIRST)
{
- if (!utl::ConfigManager::IsAvoidConfig())
+ if (!utl::ConfigManager::IsFuzzing())
{
//#i61007# initialize caption order, right now only HUNGARIAN seems to need a different order
SvtSysLocaleOptions aSysLocaleOptions;
diff --git a/sw/source/uibase/config/usrpref.cxx b/sw/source/uibase/config/usrpref.cxx
index 2309bf19c33b..ceae8d0b4eff 100644
--- a/sw/source/uibase/config/usrpref.cxx
+++ b/sw/source/uibase/config/usrpref.cxx
@@ -60,7 +60,7 @@ SwMasterUsrPref::SwMasterUsrPref(bool bWeb) :
m_pWebColorConfig(bWeb ? new SwWebColorConfig(*this) : nullptr),
m_bApplyCharUnit(false)
{
- if (utl::ConfigManager::IsAvoidConfig())
+ if (utl::ConfigManager::IsFuzzing())
{
m_eHScrollMetric = m_eVScrollMetric = m_eUserMetric = FUNIT_CM;
return;
diff --git a/sw/source/uibase/config/viewopt.cxx b/sw/source/uibase/config/viewopt.cxx
index 3a00aa3e7b4b..8c132b83c5c3 100644
--- a/sw/source/uibase/config/viewopt.cxx
+++ b/sw/source/uibase/config/viewopt.cxx
@@ -194,13 +194,13 @@ SwViewOption::SwViewOption() :
ViewOptFlags2::GrfKeepZoom |
ViewOptFlags2::AnyRuler;
- if (!utl::ConfigManager::IsAvoidConfig() && MeasurementSystem::Metric != SvtSysLocale().GetLocaleData().getMeasurementSystemEnum())
+ if (!utl::ConfigManager::IsFuzzing() && MeasurementSystem::Metric != SvtSysLocale().GetLocaleData().getMeasurementSystemEnum())
m_aSnapSize.Width() = m_aSnapSize.Height() = 720; // 1/2"
else
m_aSnapSize.Width() = m_aSnapSize.Height() = 567; // 1 cm
m_nDivisionX = m_nDivisionY = 1;
- m_bSelectionInReadonly = !utl::ConfigManager::IsAvoidConfig() && SW_MOD()->GetAccessibilityOptions().IsSelectionInReadonly();
+ m_bSelectionInReadonly = !utl::ConfigManager::IsFuzzing() && SW_MOD()->GetAccessibilityOptions().IsSelectionInReadonly();
m_bIdle = true;