From 9cb2962197b592a9b93dac2ea8b8f3652cb5fbcb Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 8 Nov 2017 15:47:50 +0000 Subject: rename AvoidConfig to Fuzzing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- svx/source/gallery2/gallery1.cxx | 2 +- svx/source/sdr/contact/objectcontactofpageview.cxx | 4 ++-- svx/source/svdraw/svdetc.cxx | 4 ++-- svx/source/svdraw/svdmodel.cxx | 4 ++-- svx/source/xoutdev/xtabcolr.cxx | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) (limited to 'svx') diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx index a5b832c4ad03..c089ba034e44 100644 --- a/svx/source/gallery2/gallery1.cxx +++ b/svx/source/gallery2/gallery1.cxx @@ -272,7 +272,7 @@ Gallery* Gallery::GetGalleryInstance() if (!s_pGallery) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); - if (!s_pGallery && !utl::ConfigManager::IsAvoidConfig()) + if (!s_pGallery && !utl::ConfigManager::IsFuzzing()) { s_pGallery = new Gallery( SvtPathOptions().GetGalleryPath() ); } diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx b/svx/source/sdr/contact/objectcontactofpageview.cxx index d99c335a31bb..badb9f4aa121 100644 --- a/svx/source/sdr/contact/objectcontactofpageview.cxx +++ b/svx/source/sdr/contact/objectcontactofpageview.cxx @@ -403,7 +403,7 @@ namespace sdr // check if text animation is allowed. bool ObjectContactOfPageView::IsTextAnimationAllowed() const { - if (utl::ConfigManager::IsAvoidConfig()) + if (utl::ConfigManager::IsFuzzing()) return true; SdrView& rView = GetPageWindow().GetPageView().GetView(); const SvtAccessibilityOptions& rOpt = rView.getAccessibilityOptions(); @@ -413,7 +413,7 @@ namespace sdr // check if graphic animation is allowed. bool ObjectContactOfPageView::IsGraphicAnimationAllowed() const { - if (utl::ConfigManager::IsAvoidConfig()) + if (utl::ConfigManager::IsFuzzing()) return true; SdrView& rView = GetPageWindow().GetPageView().GetView(); const SvtAccessibilityOptions& rOpt = rView.getAccessibilityOptions(); diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx index 9816a4db0327..9ad0fb266378 100644 --- a/svx/source/svdraw/svdetc.cxx +++ b/svx/source/svdraw/svdetc.cxx @@ -72,7 +72,7 @@ SdrGlobalData::SdrGlobalData() : pSysLocale(nullptr) , pLocaleData(nullptr) { - if (!utl::ConfigManager::IsAvoidConfig()) + if (!utl::ConfigManager::IsFuzzing()) { svx::ExtrusionBar::RegisterInterface(); svx::FontworkBar::RegisterInterface(); @@ -104,7 +104,7 @@ SdrGlobalData & GetSdrGlobalData() { OLEObjCache::OLEObjCache() { - if (!utl::ConfigManager::IsAvoidConfig()) + if (!utl::ConfigManager::IsFuzzing()) nSize = officecfg::Office::Common::Cache::DrawingEngine::OLE_Objects::get(); else nSize = 100; diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index 61e580d1f41a..95532a7b6b34 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -161,7 +161,7 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe mbDisableTextEditUsesCommonUndoManager = false; - if (!utl::ConfigManager::IsAvoidConfig()) + if (!utl::ConfigManager::IsFuzzing()) mnCharCompressType = (CharCompressType) officecfg::Office::Common::AsianLayout::CompressCharacterDistance:: get(); @@ -699,7 +699,7 @@ void SdrModel::SetTextDefaults( SfxItemPool* pItemPool, sal_uIntPtr nDefTextHgt SvxFontItem aSvxFontItemCJK(EE_CHAR_FONTINFO_CJK); SvxFontItem aSvxFontItemCTL(EE_CHAR_FONTINFO_CTL); LanguageType nLanguage; - if (!utl::ConfigManager::IsAvoidConfig()) + if (!utl::ConfigManager::IsFuzzing()) nLanguage = Application::GetSettings().GetLanguageTag().getLanguageType(); else nLanguage = LANGUAGE_ENGLISH_US; diff --git a/svx/source/xoutdev/xtabcolr.cxx b/svx/source/xoutdev/xtabcolr.cxx index 0a148eb1b084..3d3627cee23a 100644 --- a/svx/source/xoutdev/xtabcolr.cxx +++ b/svx/source/xoutdev/xtabcolr.cxx @@ -35,7 +35,7 @@ XColorListRef XColorList::CreateStdColorList() { return XPropertyList::AsColorList( XPropertyList::CreatePropertyList( - XPropertyListType::Color, !utl::ConfigManager::IsAvoidConfig() ? + XPropertyListType::Color, !utl::ConfigManager::IsFuzzing() ? SvtPathOptions().GetPalettePath() : "", "")); } -- cgit