diff options
author | Caolán McNamara <caolanm@redhat.com> | 2017-11-08 15:47:50 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2017-11-09 00:16:43 +0100 |
commit | 9cb2962197b592a9b93dac2ea8b8f3652cb5fbcb (patch) | |
tree | b995c09768d5c3c2e89c08d7833c8b4669cf112e /vcl | |
parent | f5765d9f621bdc8fd0e1ac5eec1dcab9ae5b5d06 (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 'vcl')
-rw-r--r-- | vcl/source/app/settings.cxx | 14 | ||||
-rw-r--r-- | vcl/source/app/svapp.cxx | 2 | ||||
-rw-r--r-- | vcl/source/filter/FilterConfigCache.cxx | 2 | ||||
-rw-r--r-- | vcl/source/font/PhysicalFontCollection.cxx | 10 | ||||
-rw-r--r-- | vcl/source/outdev/font.cxx | 6 | ||||
-rw-r--r-- | vcl/source/window/settings.cxx | 2 | ||||
-rw-r--r-- | vcl/source/window/window.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/generic/fontmanager/fontconfig.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/gdi/cairotextrender.cxx | 2 | ||||
-rw-r--r-- | vcl/workben/commonfuzzer.hxx | 2 | ||||
-rw-r--r-- | vcl/workben/fftester.cxx | 2 |
11 files changed, 24 insertions, 24 deletions
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index 5fa327948971..215d8eaca122 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -677,7 +677,7 @@ void ImplStyleData::SetStandardStyles() vcl::Font aStdFont( FAMILY_SWISS, Size( 0, 8 ) ); aStdFont.SetCharSet( osl_getThreadTextEncoding() ); aStdFont.SetWeight( WEIGHT_NORMAL ); - if (!utl::ConfigManager::IsAvoidConfig()) + if (!utl::ConfigManager::IsFuzzing()) aStdFont.SetFamilyName(utl::DefaultFontConfiguration::get().getUserInterfaceFont(LanguageTag("en"))); else aStdFont.SetFamilyName("Liberation Serif"); @@ -2656,7 +2656,7 @@ ImplAllSettingsData::ImplAllSettingsData() mpUILocaleDataWrapper = nullptr; mpI18nHelper = nullptr; mpUII18nHelper = nullptr; - if (!utl::ConfigManager::IsAvoidConfig()) + if (!utl::ConfigManager::IsFuzzing()) maMiscSettings.SetEnableLocalizedDecimalSep( maSysLocale.GetOptions().IsDecimalSeparatorAsLocale() ); } @@ -2860,21 +2860,21 @@ namespace bool AllSettings::GetLayoutRTL() { - if (utl::ConfigManager::IsAvoidConfig()) + if (utl::ConfigManager::IsFuzzing()) return false; return GetConfigLayoutRTL(false); } bool AllSettings::GetMathLayoutRTL() { - if (utl::ConfigManager::IsAvoidConfig()) + if (utl::ConfigManager::IsFuzzing()) return false; return GetConfigLayoutRTL(true); } const LanguageTag& AllSettings::GetLanguageTag() const { - if (utl::ConfigManager::IsAvoidConfig()) + if (utl::ConfigManager::IsFuzzing()) { static LanguageTag aRet("en-US"); return aRet; @@ -2889,7 +2889,7 @@ const LanguageTag& AllSettings::GetLanguageTag() const const LanguageTag& AllSettings::GetUILanguageTag() const { - if (utl::ConfigManager::IsAvoidConfig()) + if (utl::ConfigManager::IsFuzzing()) { static LanguageTag aRet("en-US"); return aRet; @@ -3004,7 +3004,7 @@ StyleSettings::DetermineIconTheme() const OUString sTheme(mxData->mIconTheme); if (sTheme.isEmpty()) { - if (utl::ConfigManager::IsAvoidConfig()) + if (utl::ConfigManager::IsFuzzing()) sTheme = "galaxy"; else { diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 351a5bfa2f77..f9e82ccd2acb 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -744,7 +744,7 @@ void InitSettings(ImplSVData* pSVData) assert(!pSVData->maAppData.mpSettings && "initialization should not happen twice!"); pSVData->maAppData.mpSettings = new AllSettings(); - if (!utl::ConfigManager::IsAvoidConfig()) + if (!utl::ConfigManager::IsFuzzing()) { pSVData->maAppData.mpCfgListener = new LocaleConfigurationListener; pSVData->maAppData.mpSettings->GetSysLocale().GetOptions().AddListener( pSVData->maAppData.mpCfgListener ); diff --git a/vcl/source/filter/FilterConfigCache.cxx b/vcl/source/filter/FilterConfigCache.cxx index bde60c7d3ae6..d652093285e5 100644 --- a/vcl/source/filter/FilterConfigCache.cxx +++ b/vcl/source/filter/FilterConfigCache.cxx @@ -296,7 +296,7 @@ FilterConfigCache::FilterConfigCache( bool bConfig ) : bUseConfig ( bConfig ) { if (bUseConfig) - bUseConfig = !utl::ConfigManager::IsAvoidConfig(); + bUseConfig = !utl::ConfigManager::IsFuzzing(); if (bUseConfig) ImplInit(); else diff --git a/vcl/source/font/PhysicalFontCollection.cxx b/vcl/source/font/PhysicalFontCollection.cxx index 42fe0707134b..39390b7bf107 100644 --- a/vcl/source/font/PhysicalFontCollection.cxx +++ b/vcl/source/font/PhysicalFontCollection.cxx @@ -424,7 +424,7 @@ void PhysicalFontCollection::ImplInitMatchData() const return; mbMatchData = true; - if (utl::ConfigManager::IsAvoidConfig()) + if (utl::ConfigManager::IsFuzzing()) return; // calculate MatchData for all entries @@ -867,7 +867,7 @@ PhysicalFontFamily* PhysicalFontCollection::ImplFindFontFamilyOfDefaultFont() co // try to find one of the default fonts of the // UNICODE, SANSSERIF, SERIF or FIXED default font lists PhysicalFontFamily* pFoundData = nullptr; - if (!utl::ConfigManager::IsAvoidConfig()) + if (!utl::ConfigManager::IsFuzzing()) { const utl::DefaultFontConfiguration& rDefaults = utl::DefaultFontConfiguration::get(); LanguageTag aLanguageTag("en"); @@ -1179,7 +1179,7 @@ PhysicalFontFamily* PhysicalFontCollection::FindFontFamily( FontSelectPattern& r // use font fallback const utl::FontNameAttr* pFontAttr = nullptr; - if (!aSearchName.isEmpty() && !utl::ConfigManager::IsAvoidConfig()) + if (!aSearchName.isEmpty() && !utl::ConfigManager::IsFuzzing()) { // get fallback info using FontSubstConfiguration and // the target name, it's shortened name and family name in that order @@ -1203,7 +1203,7 @@ PhysicalFontFamily* PhysicalFontCollection::FindFontFamily( FontSelectPattern& r if( rFSD.IsSymbolFont() ) { LanguageTag aDefaultLanguageTag("en"); - if (utl::ConfigManager::IsAvoidConfig()) + if (utl::ConfigManager::IsFuzzing()) aSearchName = "OpenSymbol"; else aSearchName = utl::DefaultFontConfiguration::get().getDefaultFont( aDefaultLanguageTag, DefaultFontType::SYMBOL ); @@ -1238,7 +1238,7 @@ PhysicalFontFamily* PhysicalFontCollection::FindFontFamily( FontSelectPattern& r } const utl::FontNameAttr* pTempFontAttr = nullptr; - if (!utl::ConfigManager::IsAvoidConfig()) + if (!utl::ConfigManager::IsFuzzing()) { // use a font name from font fallback list to determine font attributes // get fallback info using FontSubstConfiguration and diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx index e0d81ccf231b..c018113a9ff5 100644 --- a/vcl/source/outdev/font.cxx +++ b/vcl/source/outdev/font.cxx @@ -756,11 +756,11 @@ void ImplFontSubstitute( OUString& rFontName ) vcl::Font OutputDevice::GetDefaultFont( DefaultFontType nType, LanguageType eLang, GetDefaultFontFlags nFlags, const OutputDevice* pOutDev ) { - if (!pOutDev && !utl::ConfigManager::IsAvoidConfig()) // default is NULL + if (!pOutDev && !utl::ConfigManager::IsFuzzing()) // default is NULL pOutDev = Application::GetDefaultDevice(); OUString aSearch; - if (!utl::ConfigManager::IsAvoidConfig()) + if (!utl::ConfigManager::IsFuzzing()) { LanguageTag aLanguageTag( ( eLang == LANGUAGE_NONE || eLang == LANGUAGE_SYSTEM || eLang == LANGUAGE_DONTKNOW ) ? @@ -987,7 +987,7 @@ void OutputDevice::InitFont() const { // decide if antialiasing is appropriate bool bNonAntialiased(GetAntialiasing() & AntialiasingFlags::DisableText); - if (!utl::ConfigManager::IsAvoidConfig()) + if (!utl::ConfigManager::IsFuzzing()) { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); bNonAntialiased |= bool(rStyleSettings.GetDisplayOptions() & DisplayOptions::AADisable); diff --git a/vcl/source/window/settings.cxx b/vcl/source/window/settings.cxx index f9ca0d2cb87b..ce85784ab0f1 100644 --- a/vcl/source/window/settings.cxx +++ b/vcl/source/window/settings.cxx @@ -228,7 +228,7 @@ void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, bool bCallHdl ) c // auto detect HC mode; if the system already set it to "yes" // (see above) then accept that - if (!rSettings.GetStyleSettings().GetHighContrastMode() && !utl::ConfigManager::IsAvoidConfig()) + if (!rSettings.GetStyleSettings().GetHighContrastMode() && !utl::ConfigManager::IsFuzzing()) { bool bAutoHCMode = true; utl::OConfigurationNode aNode = utl::OConfigurationTreeRoot::tryCreateWithComponentContext( diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 91e36464982a..5083f418b2c2 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -1133,7 +1133,7 @@ void Window::ImplInit( vcl::Window* pParent, WinBits nStyle, SystemParentData* p mpWindowImpl->meAlwaysInputMode = pParent->mpWindowImpl->meAlwaysInputMode; } - if (!utl::ConfigManager::IsAvoidConfig()) + if (!utl::ConfigManager::IsFuzzing()) OutputDevice::SetSettings( pParent->GetSettings() ); } @@ -1144,7 +1144,7 @@ void Window::ImplInit( vcl::Window* pParent, WinBits nStyle, SystemParentData* p mnDPIX = mpWindowImpl->mpFrameData->mnDPIX; mnDPIY = mpWindowImpl->mpFrameData->mnDPIY; - if (!utl::ConfigManager::IsAvoidConfig()) + if (!utl::ConfigManager::IsFuzzing()) { const StyleSettings& rStyleSettings = mxSettings->GetStyleSettings(); maFont = rStyleSettings.GetAppFont(); diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx index f093f0e8d097..2c16e040cdab 100644 --- a/vcl/unx/generic/fontmanager/fontconfig.cxx +++ b/vcl/unx/generic/fontmanager/fontconfig.cxx @@ -482,7 +482,7 @@ void PrintFontManager::countFontconfigFonts( std::unordered_map<OString, int>& o FontCfgWrapper& rWrapper = FontCfgWrapper::get(); FcFontSet* pFSet = rWrapper.getFontSet(); - const bool bMinimalFontset = utl::ConfigManager::IsAvoidConfig(); + const bool bMinimalFontset = utl::ConfigManager::IsFuzzing(); if( pFSet ) { #if OSL_DEBUG_LEVEL > 1 diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx b/vcl/unx/generic/gdi/cairotextrender.cxx index b7cc4207dff1..210f38385600 100644 --- a/vcl/unx/generic/gdi/cairotextrender.cxx +++ b/vcl/unx/generic/gdi/cairotextrender.cxx @@ -393,7 +393,7 @@ void CairoTextRender::GetDevFontList( PhysicalFontCollection* pFontCollection ) rGC.AnnounceFonts( pFontCollection ); // register platform specific font substitutions if available - if (!utl::ConfigManager::IsAvoidConfig()) + if (!utl::ConfigManager::IsFuzzing()) SalGenericInstance::RegisterFontSubstitutors( pFontCollection ); } diff --git a/vcl/workben/commonfuzzer.hxx b/vcl/workben/commonfuzzer.hxx index 054ea00bfb51..f19a5824e028 100644 --- a/vcl/workben/commonfuzzer.hxx +++ b/vcl/workben/commonfuzzer.hxx @@ -98,7 +98,7 @@ void CommonInitialize(int *argc, char ***argv) if( !xServiceManager.is() ) Application::Abort( "Failed to bootstrap" ); comphelper::setProcessServiceFactory( xServiceManager ); - utl::ConfigManager::EnableAvoidConfig(); + utl::ConfigManager::EnableFuzzing(); InitVCL(); //we don't have a de-init, so inside this leak disabled region... diff --git a/vcl/workben/fftester.cxx b/vcl/workben/fftester.cxx index 548ff3cd0c00..2ddcf72864c7 100644 --- a/vcl/workben/fftester.cxx +++ b/vcl/workben/fftester.cxx @@ -89,7 +89,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) if( !xServiceManager.is() ) Application::Abort( "Failed to bootstrap" ); comphelper::setProcessServiceFactory( xServiceManager ); - utl::ConfigManager::EnableAvoidConfig(); + utl::ConfigManager::EnableFuzzing(); // initialise unconfigured UCB: css::uno::Reference<css::ucb::XUniversalContentBroker> xUcb(comphelper::getProcessServiceFactory()-> |