diff options
89 files changed, 149 insertions, 149 deletions
diff --git a/canvas/source/factory/cf_service.cxx b/canvas/source/factory/cf_service.cxx index ed49bcfa1474..8ec48901728c 100644 --- a/canvas/source/factory/cf_service.cxx +++ b/canvas/source/factory/cf_service.cxx @@ -125,7 +125,7 @@ CanvasFactory::CanvasFactory( Reference<XComponentContext> const & xContext ) : m_bCacheHasUseAcceleratedEntry(), m_bCacheHasUseAAEntry() { - if (!utl::ConfigManager::IsAvoidConfig()) + if (!utl::ConfigManager::IsFuzzing()) { try { diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index b24f126d7f36..ba56dce73a14 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -4336,7 +4336,7 @@ const SvxLRSpaceItem& ImpEditEngine::GetLRSpaceItem( ContentNode* pNode ) // text numeral setting: LanguageType ImpEditEngine::ImplCalcDigitLang(LanguageType eCurLang) const { - if (utl::ConfigManager::IsAvoidConfig()) + if (utl::ConfigManager::IsFuzzing()) return LANGUAGE_ENGLISH_US; // #114278# Also setting up digit language from Svt options diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx index 6e0d175f029d..cf26cb20231e 100644 --- a/editeng/source/items/numitem.cxx +++ b/editeng/source/items/numitem.cxx @@ -100,7 +100,7 @@ SvxNumberType::~SvxNumberType() OUString SvxNumberType::GetNumStr( sal_Int32 nNo ) const { - LanguageTag aLang = utl::ConfigManager::IsAvoidConfig() ? + LanguageTag aLang = utl::ConfigManager::IsFuzzing() ? LanguageTag("en-US") : Application::GetSettings().GetLanguageTag(); return GetNumStr( nNo, aLang.getLocale() ); diff --git a/emfio/source/reader/mtftools.cxx b/emfio/source/reader/mtftools.cxx index 89123272652f..c6bbfa745b9a 100644 --- a/emfio/source/reader/mtftools.cxx +++ b/emfio/source/reader/mtftools.cxx @@ -170,7 +170,7 @@ namespace emfio OUString getLODefaultLanguage() { - if (utl::ConfigManager::IsAvoidConfig()) + if (utl::ConfigManager::IsFuzzing()) return OUString("en-US"); OUString result(officecfg::Office::Linguistic::General::DefaultLocale::get()); if (result.isEmpty()) diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx index a844edeb132c..180a853def6a 100644 --- a/filter/source/config/cache/filtercache.cxx +++ b/filter/source/config/cache/filtercache.cxx @@ -892,7 +892,7 @@ css::uno::Reference< css::uno::XInterface > FilterCache::impl_createConfigAccess css::uno::Reference< css::uno::XInterface > xCfg; - if (!utl::ConfigManager::IsAvoidConfig()) + if (!utl::ConfigManager::IsFuzzing()) { try { diff --git a/filter/source/graphicfilter/idxf/dxfreprd.cxx b/filter/source/graphicfilter/idxf/dxfreprd.cxx index adb86887e431..5cd11bc3a84b 100644 --- a/filter/source/graphicfilter/idxf/dxfreprd.cxx +++ b/filter/source/graphicfilter/idxf/dxfreprd.cxx @@ -139,7 +139,7 @@ namespace { OUString getLODefaultLanguage() { - if (utl::ConfigManager::IsAvoidConfig()) + if (utl::ConfigManager::IsFuzzing()) return OUString("en-US"); OUString result(officecfg::Office::Linguistic::General::DefaultLocale::get()); diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx index 265349a7119d..9c8e73b5d520 100644 --- a/filter/source/graphicfilter/ieps/ieps.cxx +++ b/filter/source/graphicfilter/ieps/ieps.cxx @@ -771,7 +771,7 @@ ipsGraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* ) GDIMetaFile aMtf; // if there is no preview -> try with gs to make one - if (!bHasPreview && !utl::ConfigManager::IsAvoidConfig()) + if (!bHasPreview && !utl::ConfigManager::IsFuzzing()) { bHasPreview = RenderAsEMF(pBuf.get(), nBytesRead, aGraphic); if (!bHasPreview) diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 2969d000e754..25be4f0f04f6 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -6978,7 +6978,7 @@ css::uno::Reference < css::embed::XEmbeddedObject > SvxMSDffManager::CheckForCo xStorage->Commit(); xStorage.clear(); OUString aType = SfxFilter::GetTypeFromStorage( rSrcStg ); - if (aType.getLength() && !utl::ConfigManager::IsAvoidConfig()) + if (aType.getLength() && !utl::ConfigManager::IsFuzzing()) pFilter = aMatch.GetFilter4EA( aType ); } diff --git a/framework/source/jobs/jobexecutor.cxx b/framework/source/jobs/jobexecutor.cxx index e5efb3b45368..23977920ee36 100644 --- a/framework/source/jobs/jobexecutor.cxx +++ b/framework/source/jobs/jobexecutor.cxx @@ -134,7 +134,7 @@ JobExecutor::JobExecutor( /*IN*/ const css::uno::Reference< css::uno::XComponent void JobExecutor::initListeners() { - if (utl::ConfigManager::IsAvoidConfig()) + if (utl::ConfigManager::IsFuzzing()) return; // read the list of all currently registered events inside configuration. diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index c892c6eb7a9a..fd52af489998 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -698,7 +698,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL Desktop::queryDispatch( co if ( aURL.Protocol.equalsIgnoreAsciiCase(".uno:") ) aCommand = aURL.Path; - if (!m_xCommandOptions && !utl::ConfigManager::IsAvoidConfig()) + if (!m_xCommandOptions && !utl::ConfigManager::IsFuzzing()) m_xCommandOptions.reset(new SvtCommandOptions); // Make std::unordered_map lookup if the current URL is in the disabled list diff --git a/i18nutil/source/utility/paper.cxx b/i18nutil/source/utility/paper.cxx index f11fbb3a7f72..a1b8064a1fc5 100644 --- a/i18nutil/source/utility/paper.cxx +++ b/i18nutil/source/utility/paper.cxx @@ -207,7 +207,7 @@ long PaperInfo::sloppyFitPageDimension(long nDimension) PaperInfo PaperInfo::getSystemDefaultPaper() { - if (utl::ConfigManager::IsAvoidConfig()) + if (utl::ConfigManager::IsFuzzing()) return PaperInfo(PAPER_A4); OUString aLocaleStr = officecfg::Setup::L10N::ooSetupSystemLocale::get(); diff --git a/include/unotools/configmgr.hxx b/include/unotools/configmgr.hxx index fe6a13545ed0..fd2dbb2455c2 100644 --- a/include/unotools/configmgr.hxx +++ b/include/unotools/configmgr.hxx @@ -71,11 +71,11 @@ public: SAL_DLLPRIVATE void registerConfigItem(utl::ConfigItem * item); - // Avoid using the config layer and rely on defaults - // which is only useful for special test tool targets - // where start-up speed is of the essence - static bool IsAvoidConfig(); - static void EnableAvoidConfig(); + // Avoid using the config layer and rely on defaults which is only useful + // for special test tool targets (typically fuzzing) where start-up speed + // is of the essence + static bool IsFuzzing(); + static void EnableFuzzing(); private: diff --git a/sc/qa/unit/datacache.cxx b/sc/qa/unit/datacache.cxx index f1a6ff95bb4b..f95b7028b971 100644 --- a/sc/qa/unit/datacache.cxx +++ b/sc/qa/unit/datacache.cxx @@ -34,7 +34,7 @@ public: public: virtual void setUp() override { - utl::ConfigManager::EnableAvoidConfig(); + utl::ConfigManager::EnableFuzzing(); ScDLL::Init(); ScGlobal::Init(); } diff --git a/sc/qa/unit/range.cxx b/sc/qa/unit/range.cxx index 065062a6b934..ddc84e94ef69 100644 --- a/sc/qa/unit/range.cxx +++ b/sc/qa/unit/range.cxx @@ -108,7 +108,7 @@ public: virtual void setUp() override { - utl::ConfigManager::EnableAvoidConfig(); + utl::ConfigManager::EnableFuzzing(); ScDLL::Init(); ScGlobal::Init(); } diff --git a/sc/source/core/data/global2.cxx b/sc/source/core/data/global2.cxx index eec394f4ecd9..d772e319ebc2 100644 --- a/sc/source/core/data/global2.cxx +++ b/sc/source/core/data/global2.cxx @@ -313,7 +313,7 @@ OUString ScGlobal::GetAbsDocName( const OUString& rFileName, if (!pShell || !pShell->HasName()) { // maybe relative to document path working directory INetURLObject aObj; - aObj.SetSmartURL(!utl::ConfigManager::IsAvoidConfig() ? SvtPathOptions().GetWorkPath() : OUString("file:///tmp")); + aObj.SetSmartURL(!utl::ConfigManager::IsFuzzing() ? SvtPathOptions().GetWorkPath() : OUString("file:///tmp")); aObj.setFinalSlash(); // it IS a path bool bWasAbs = true; aAbsName = aObj.smartRel2Abs( rFileName, bWasAbs ).GetMainURL(INetURLObject::DecodeMechanism::NONE); diff --git a/sc/source/core/data/globalx.cxx b/sc/source/core/data/globalx.cxx index b4546d9af8b3..cdd7acac3a71 100644 --- a/sc/source/core/data/globalx.cxx +++ b/sc/source/core/data/globalx.cxx @@ -43,7 +43,7 @@ using namespace ::com::sun::star::ucb; void ScGlobal::InitAddIns() { - if (utl::ConfigManager::IsAvoidConfig()) + if (utl::ConfigManager::IsFuzzing()) return; // multi paths separated by semicolons diff --git a/sc/source/core/tool/calcconfig.cxx b/sc/source/core/tool/calcconfig.cxx index 3862eeef5a2f..7d5c0dbe4719 100644 --- a/sc/source/core/tool/calcconfig.cxx +++ b/sc/source/core/tool/calcconfig.cxx @@ -35,7 +35,7 @@ static rtl::Reference<ConfigurationListener> const & getMiscListener() bool ScCalcConfig::isOpenCLEnabled() { - if (utl::ConfigManager::IsAvoidConfig()) + if (utl::ConfigManager::IsFuzzing()) return false; static comphelper::ConfigurationListenerProperty<bool> gOpenCLEnabled(getMiscListener(), "UseOpenCL"); return gOpenCLEnabled.get(); @@ -43,7 +43,7 @@ bool ScCalcConfig::isOpenCLEnabled() bool ScCalcConfig::isSwInterpreterEnabled() { - if (utl::ConfigManager::IsAvoidConfig()) + if (utl::ConfigManager::IsFuzzing()) return false; static comphelper::ConfigurationListenerProperty<bool> gSwInterpreterEnabled(getMiscListener(), "UseSwInterpreter"); return gSwInterpreterEnabled.get(); diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index a12f0e05c258..7bad98fe742e 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -4148,7 +4148,7 @@ bool ScCompiler::NextNewToken( bool bInArray ) if ( cSymbol[0] < 128 ) { bMayBeFuncName = rtl::isAsciiAlpha( cSymbol[0] ); - if (!bMayBeFuncName && (cSymbol[0] == '_' && cSymbol[1] == '_') && !utl::ConfigManager::IsAvoidConfig()) + if (!bMayBeFuncName && (cSymbol[0] == '_' && cSymbol[1] == '_') && !utl::ConfigManager::IsFuzzing()) { SvtMiscOptions aOpt; bMayBeFuncName = aOpt.IsExperimentalMode(); diff --git a/sc/source/core/tool/optutil.cxx b/sc/source/core/tool/optutil.cxx index 778fef9d409f..9edad85bf779 100644 --- a/sc/source/core/tool/optutil.cxx +++ b/sc/source/core/tool/optutil.cxx @@ -26,7 +26,7 @@ bool ScOptionsUtil::IsMetricSystem() { - if (utl::ConfigManager::IsAvoidConfig()) + if (utl::ConfigManager::IsFuzzing()) return true; //TODO: which language should be used here - system language or installed office language? diff --git a/sc/source/filter/lotus/lotus.cxx b/sc/source/filter/lotus/lotus.cxx index 4eca011a212f..7228153dbabb 100644 --- a/sc/source/filter/lotus/lotus.cxx +++ b/sc/source/filter/lotus/lotus.cxx @@ -43,7 +43,7 @@ ErrCode ScFormatFilterPluginImpl::ScImportLotus123( SfxMedium& rMedium, ScDocume ImportLotus aLotusImport(aContext, *pStream, pDocument, eSrc); - const bool bWithWK3 = utl::ConfigManager::IsAvoidConfig() || ScFilterOptions().GetWK3Flag(); + const bool bWithWK3 = utl::ConfigManager::IsFuzzing() || ScFilterOptions().GetWK3Flag(); ErrCode eRet; if (bWithWK3) eRet = aLotusImport.Read(); diff --git a/sc/source/ui/docshell/docsh2.cxx b/sc/source/ui/docshell/docsh2.cxx index 4de6e328ee72..8dff8eb694b2 100644 --- a/sc/source/ui/docshell/docsh2.cxx +++ b/sc/source/ui/docshell/docsh2.cxx @@ -110,13 +110,13 @@ void ScDocShell::InitItems() // Other modifications after creation of the DrawLayer pDrawLayer->SetNotifyUndoActionHdl( LINK( pDocFunc, ScDocFunc, NotifyDrawUndo ) ); } - else if (!utl::ConfigManager::IsAvoidConfig()) + else if (!utl::ConfigManager::IsFuzzing()) { // always use global color table instead of local copy PutItem( SvxColorListItem( XColorList::GetStdColorList(), SID_COLOR_TABLE ) ); } - if (!utl::ConfigManager::IsAvoidConfig() && + if (!utl::ConfigManager::IsFuzzing() && (!aDocument.GetForbiddenCharacters() || !aDocument.IsValidAsianCompression() || !aDocument.IsValidAsianKerning())) { // get settings from SvxAsianConfig diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index fe34a0b88e91..0f28f6317312 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -2109,7 +2109,7 @@ bool ScExternalRefManager::isValidRangeName(sal_uInt16 nFileId, const OUString& // Range name is cached. return true; - pSrcDoc = utl::ConfigManager::IsAvoidConfig() ? nullptr : getSrcDocument(nFileId); + pSrcDoc = utl::ConfigManager::IsFuzzing() ? nullptr : getSrcDocument(nFileId); if (!pSrcDoc) // failed to load document from disk. return false; diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx index 1166412616b1..c9cbdba7ec3c 100644 --- a/sc/source/ui/docshell/tablink.cxx +++ b/sc/source/ui/docshell/tablink.cxx @@ -455,7 +455,7 @@ bool ScDocumentLoader::GetFilterName( const OUString& rFileName, std::shared_ptr<const SfxFilter> pSfxFilter; auto pMedium = o3tl::make_unique<SfxMedium>( rFileName, StreamMode::STD_READ ); - if (pMedium->GetError() == ERRCODE_NONE && !utl::ConfigManager::IsAvoidConfig()) + if (pMedium->GetError() == ERRCODE_NONE && !utl::ConfigManager::IsFuzzing()) { if ( bWithInteraction ) pMedium->UseInteractionHandler(true); // #i73992# no longer called from GuessFilter diff --git a/sd/source/core/TransitionPreset.cxx b/sd/source/core/TransitionPreset.cxx index 9d7eb3a485e5..1d07e80e33ea 100644 --- a/sd/source/core/TransitionPreset.cxx +++ b/sd/source/core/TransitionPreset.cxx @@ -189,7 +189,7 @@ bool TransitionPreset::importTransitionsFile( TransitionPresetList& rList, bool TransitionPreset::importTransitionPresetList( TransitionPresetList& rList ) { - if (utl::ConfigManager::IsAvoidConfig()) + if (utl::ConfigManager::IsFuzzing()) return false; bool bRet = false; diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index 948bba6dc85d..ff30462fc3c9 100644 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.cxx @@ -148,7 +148,7 @@ PresentationSettings::PresentationSettings( const PresentationSettings& r ) } SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh) -: FmFormModel( !utl::ConfigManager::IsAvoidConfig() ? SvtPathOptions().GetPalettePath() : OUString(), nullptr, pDrDocSh ) +: FmFormModel( !utl::ConfigManager::IsFuzzing() ? SvtPathOptions().GetPalettePath() : OUString(), nullptr, pDrDocSh ) , mpOutliner(nullptr) , mpInternalOutliner(nullptr) , mpWorkStartupTimer(nullptr) @@ -215,7 +215,7 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh) SetCalcFieldValueHdl( &rOutliner ); // set linguistic options - if (!utl::ConfigManager::IsAvoidConfig()) + if (!utl::ConfigManager::IsFuzzing()) { const SvtLinguConfig aLinguConfig; SvtLinguOptions aOptions; @@ -996,7 +996,7 @@ sal_uInt16 SdDrawDocument::GetAnnotationAuthorIndex( const OUString& rAuthor ) void SdDrawDocument::InitLayoutVector() { - if (utl::ConfigManager::IsAvoidConfig()) + if (utl::ConfigManager::IsFuzzing()) return; const Reference<css::uno::XComponentContext> xContext( @@ -1035,7 +1035,7 @@ void SdDrawDocument::InitLayoutVector() void SdDrawDocument::InitObjectVector() { - if (utl::ConfigManager::IsAvoidConfig()) + if (utl::ConfigManager::IsFuzzing()) return; const Reference<css::uno::XComponentContext> xContext( diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 568d8414b8e3..537ec33b0469 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -564,7 +564,7 @@ bool ImplSdPPTImport::Import() // create master pages: std::unique_ptr<SfxProgress> xStbMgr; - if (!utl::ConfigManager::IsAvoidConfig()) + if (!utl::ConfigManager::IsFuzzing()) { xStbMgr.reset(new SfxProgress(pDocShell, SdResId( STR_POWERPOINT_IMPORT), @@ -1945,7 +1945,7 @@ OUString ImplSdPPTImport::ReadSound(sal_uInt32 nSoundRef) const if ( SeekToRec( rStCtrl, PPT_PST_SoundData, nStrLen, &aSoundDataRecHd ) ) { OUString aGalleryDir; - if (utl::ConfigManager::IsAvoidConfig()) + if (utl::ConfigManager::IsFuzzing()) osl_getTempDirURL(&aGalleryDir.pData); else aGalleryDir = SvtPathOptions().GetGalleryPath(); diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx index d060b641505b..b48b928dd31b 100644 --- a/sd/source/ui/app/sddll.cxx +++ b/sd/source/ui/app/sddll.cxx @@ -102,7 +102,7 @@ using namespace ::com::sun::star; // Register all Factories void SdDLL::RegisterFactorys() { - if (utl::ConfigManager::IsAvoidConfig() || SvtModuleOptions().IsImpress()) + if (utl::ConfigManager::IsFuzzing() || SvtModuleOptions().IsImpress()) { ::sd::ImpressViewShellBase::RegisterFactory ( ::sd::IMPRESS_FACTORY_ID); @@ -113,7 +113,7 @@ void SdDLL::RegisterFactorys() ::sd::PresentationViewShellBase::RegisterFactory ( ::sd::PRESENTATION_FACTORY_ID); } - if (!utl::ConfigManager::IsAvoidConfig() && SvtModuleOptions().IsDraw()) + if (!utl::ConfigManager::IsFuzzing() && SvtModuleOptions().IsDraw()) { ::sd::GraphicViewShellBase::RegisterFactory (::sd::DRAW_FACTORY_ID); } @@ -245,24 +245,24 @@ void SdDLL::Init() SfxObjectFactory* pDrawFact = nullptr; SfxObjectFactory* pImpressFact = nullptr; - if (utl::ConfigManager::IsAvoidConfig() || SvtModuleOptions().IsImpress()) + if (utl::ConfigManager::IsFuzzing() || SvtModuleOptions().IsImpress()) pImpressFact = &::sd::DrawDocShell::Factory(); - if (!utl::ConfigManager::IsAvoidConfig() && SvtModuleOptions().IsDraw()) + if (!utl::ConfigManager::IsFuzzing() && SvtModuleOptions().IsDraw()) pDrawFact = &::sd::GraphicDocShell::Factory(); auto pUniqueModule = o3tl::make_unique<SdModule>(pImpressFact, pDrawFact); SdModule* pModule = pUniqueModule.get(); SfxApplication::SetModule(SfxToolsModule::Draw, std::move(pUniqueModule)); - if (!utl::ConfigManager::IsAvoidConfig() && SvtModuleOptions().IsImpress()) + if (!utl::ConfigManager::IsFuzzing() && SvtModuleOptions().IsImpress()) { // Register the Impress shape types in order to make the shapes accessible. ::accessibility::RegisterImpressShapeTypes (); ::sd::DrawDocShell::Factory().SetDocumentServiceName( "com.sun.star.presentation.PresentationDocument" ); } - if (!utl::ConfigManager::IsAvoidConfig() && SvtModuleOptions().IsDraw()) + if (!utl::ConfigManager::IsFuzzing() && SvtModuleOptions().IsDraw()) { ::sd::GraphicDocShell::Factory().SetDocumentServiceName( "com.sun.star.drawing.DrawingDocument" ); } @@ -284,7 +284,7 @@ void SdDLL::Init() // register your exotic remote controls here #ifdef ENABLE_SDREMOTE - if (!utl::ConfigManager::IsAvoidConfig() && !Application::IsHeadlessModeEnabled()) + if (!utl::ConfigManager::IsFuzzing() && !Application::IsHeadlessModeEnabled()) RegisterRemotes(); #endif } diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx index e01b77fb211b..94a66e9bb18d 100644 --- a/sd/source/ui/docshell/docshell.cxx +++ b/sd/source/ui/docshell/docshell.cxx @@ -117,7 +117,7 @@ void DrawDocShell::Construct( bool bClipboard ) SetBaseModel( new SdXImpressDocument( this, bClipboard ) ); SetPool( &mpDoc->GetItemPool() ); mpUndoManager = new sd::UndoManager; - if (!utl::ConfigManager::IsAvoidConfig() + if (!utl::ConfigManager::IsFuzzing() && officecfg::Office::Common::Undo::Steps::get() < 1) { mpUndoManager->EnableUndo(false); // tdf#108863 disable if 0 steps diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index b6c5a65e4013..6afc7fd27a70 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -156,11 +156,11 @@ SfxApplication* SfxApplication::GetOrCreate() ::framework::SetIsDockingWindowVisible( IsDockingWindowVisible ); #if HAVE_FEATURE_DESKTOP Application::SetHelp( pSfxHelp ); - if (!utl::ConfigManager::IsAvoidConfig() && SvtHelpOptions().IsHelpTips()) + if (!utl::ConfigManager::IsFuzzing() && SvtHelpOptions().IsHelpTips()) Help::EnableQuickHelp(); else Help::DisableQuickHelp(); - if (!utl::ConfigManager::IsAvoidConfig() && SvtHelpOptions().IsHelpTips() && SvtHelpOptions().IsExtendedHelp()) + if (!utl::ConfigManager::IsFuzzing() && SvtHelpOptions().IsHelpTips() && SvtHelpOptions().IsExtendedHelp()) Help::EnableBalloonHelp(); else Help::DisableBalloonHelp(); @@ -173,7 +173,7 @@ SfxApplication::SfxApplication() : pImpl( new SfxAppData_Impl ) { SetName( "StarOffice" ); - if (!utl::ConfigManager::IsAvoidConfig()) + if (!utl::ConfigManager::IsFuzzing()) SvtViewOptions::AcquireOptions(); pImpl->m_xImeStatusWindow->init(); @@ -222,7 +222,7 @@ SfxApplication::~SfxApplication() #endif // delete global options - if (!utl::ConfigManager::IsAvoidConfig()) + if (!utl::ConfigManager::IsFuzzing()) SvtViewOptions::ReleaseOptions(); if ( !pImpl->bDowning ) diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx index 38adb1dbf712..2b0d2d1d2319 100644 --- a/sfx2/source/appl/appbas.cxx +++ b/sfx2/source/appl/appbas.cxx @@ -96,7 +96,7 @@ BasicManager* SfxApplication::GetBasicManager() #if !HAVE_FEATURE_SCRIPTING return 0; #else - if (utl::ConfigManager::IsAvoidConfig()) + if (utl::ConfigManager::IsFuzzing()) return nullptr; return BasicManagerRepository::getApplicationBasicManager(); #endif @@ -107,7 +107,7 @@ XLibraryContainer * SfxApplication::GetDialogContainer() #if !HAVE_FEATURE_SCRIPTING return NULL; #else - if (utl::ConfigManager::IsAvoidConfig()) + if (utl::ConfigManager::IsFuzzing()) return nullptr; if ( !pImpl->pBasicManager->isValid() ) GetBasicManager(); @@ -121,7 +121,7 @@ XLibraryContainer * SfxApplication::GetBasicContainer() #if !HAVE_FEATURE_SCRIPTING return NULL; #else - if (utl::ConfigManager::IsAvoidConfig()) + if (utl::ConfigManager::IsFuzzing()) return nullptr; if ( !pImpl->pBasicManager->isValid() ) GetBasicManager(); @@ -134,7 +134,7 @@ StarBASIC* SfxApplication::GetBasic() #if !HAVE_FEATURE_SCRIPTING return 0; #else - if (utl::ConfigManager::IsAvoidConfig()) + if (utl::ConfigManager::IsFuzzing()) return nullptr; return GetBasicManager()->GetLib(0); #endif diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx index 2b8c5c337940..80e14989ec48 100644 --- a/sfx2/source/appl/appinit.cxx +++ b/sfx2/source/appl/appinit.cxx @@ -216,7 +216,7 @@ void SfxApplication::Initialize_Impl() getRID_BASIC_START(), ErrCodeArea::Sbx, ErrCodeArea::Sbx, BasResLocale()); #endif - if (!utl::ConfigManager::IsAvoidConfig()) + if (!utl::ConfigManager::IsFuzzing()) { //ensure instantiation of listener that manages the internal recently-used //list diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx index f38852910171..c6c34ca14667 100644 --- a/sfx2/source/control/shell.cxx +++ b/sfx2/source/control/shell.cxx @@ -215,7 +215,7 @@ void SfxShell::SetUndoManager( ::svl::IUndoManager *pNewUndoMgr ) // a supported scenario (/me thinks it is not), then we would need to notify all such clients instances. pUndoMgr = pNewUndoMgr; - if (pUndoMgr && !utl::ConfigManager::IsAvoidConfig()) + if (pUndoMgr && !utl::ConfigManager::IsFuzzing()) { pUndoMgr->SetMaxUndoActionCount( officecfg::Office::Common::Undo::Steps::get()); diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 495a3d3ab454..02ceef29f9e7 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -441,7 +441,7 @@ OUString SfxMedium::GetBaseURL( bool bForSaving ) const SfxStringItem* pBaseURLItem = GetItemSet()->GetItem<SfxStringItem>(SID_DOC_BASEURL); if ( pBaseURLItem ) aBaseURL = pBaseURLItem->GetValue(); - else if (!utl::ConfigManager::IsAvoidConfig() && GetContent().is()) + else if (!utl::ConfigManager::IsFuzzing() && GetContent().is()) { try { diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index d93947511060..da74a0a5d075 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -363,7 +363,7 @@ void SfxObjectShell::SetupStorage( const uno::Reference< embed::XStorage >& xSto bool bUseSHA1InODF12 = false; bool bUseBlowfishInODF12 = false; - if (!utl::ConfigManager::IsAvoidConfig()) + if (!utl::ConfigManager::IsFuzzing()) { SvtSaveOptions aSaveOpt; nDefVersion = aSaveOpt.GetODFDefaultVersion(); @@ -531,7 +531,7 @@ bool SfxObjectShell::DoInitNew( SfxMedium* pMed ) aArgs[nLength].Name = "Title"; aArgs[nLength].Value <<= GetTitle( SFX_TITLE_DETECT ); xModel->attachResource( OUString(), aArgs ); - if (!utl::ConfigManager::IsAvoidConfig()) + if (!utl::ConfigManager::IsFuzzing()) impl_addToModelCollection(xModel); } @@ -3020,7 +3020,7 @@ uno::Reference< embed::XStorage > SfxObjectShell::GetStorage() SetupStorage( pImpl->m_xDocStorage, SOFFICE_FILEFORMAT_CURRENT, false ); pImpl->m_bCreateTempStor = false; - if (!utl::ConfigManager::IsAvoidConfig()) + if (!utl::ConfigManager::IsFuzzing()) SfxGetpApp()->NotifyEvent( SfxEventHint( SfxEventHintId::StorageChanged, GlobalEventConfig::GetEventName(GlobalEventId::STORAGECHANGED), this ) ); } catch( uno::Exception& ) diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index 5c35ef09b3c6..5e4e5ed78a91 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -740,7 +740,7 @@ Reference< XLibraryContainer > SfxObjectShell::GetDialogContainer() Reference< XLibraryContainer > SfxObjectShell::GetBasicContainer() { #if HAVE_FEATURE_SCRIPTING - if (!utl::ConfigManager::IsAvoidConfig()) + if (!utl::ConfigManager::IsFuzzing()) { try { @@ -1087,7 +1087,7 @@ SfxObjectShell* SfxObjectShell::GetShellFromComponent( const Reference<lang::XCo void SfxObjectShell::SetInitialized_Impl( const bool i_fromInitNew ) { pImpl->bInitialized = true; - if (utl::ConfigManager::IsAvoidConfig()) + if (utl::ConfigManager::IsFuzzing()) return; if ( i_fromInitNew ) { diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index c9026ac11969..97f846ecc98b 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -3250,7 +3250,7 @@ sal_uInt16 SvNumberFormatter::ExpandTwoDigitYear( sal_uInt16 nYear ) const // static sal_uInt16 SvNumberFormatter::GetYear2000Default() { - if (!utl::ConfigManager::IsAvoidConfig()) + if (!utl::ConfigManager::IsFuzzing()) return (sal_uInt16) ::utl::MiscCfg().GetYear2000(); return 1930; } diff --git a/svtools/source/config/accessibilityoptions.cxx b/svtools/source/config/accessibilityoptions.cxx index 4f00f2b73a44..98f5eb96a452 100644 --- a/svtools/source/config/accessibilityoptions.cxx +++ b/svtools/source/config/accessibilityoptions.cxx @@ -357,7 +357,7 @@ void SvtAccessibilityOptions_Impl::SetVCLSettings() SvtAccessibilityOptions::SvtAccessibilityOptions() { - if (!utl::ConfigManager::IsAvoidConfig()) + if (!utl::ConfigManager::IsFuzzing()) { ::osl::MutexGuard aGuard( SingletonMutex::get() ); if(!sm_pSingleImplConfig) diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx index 78f25796f202..9acf01a6326c 100644 --- a/svtools/source/config/colorcfg.cxx +++ b/svtools/source/config/colorcfg.cxx @@ -189,7 +189,7 @@ ColorConfig_Impl::ColorConfig_Impl() : uno::Sequence < OUString > aNames(1); EnableNotification( aNames ); - if (!utl::ConfigManager::IsAvoidConfig()) + if (!utl::ConfigManager::IsFuzzing()) Load(OUString()); ImplUpdateApplicationSettings(); @@ -369,7 +369,7 @@ void ColorConfig_Impl::ImplUpdateApplicationSettings() ColorConfig::ColorConfig() { - if (utl::ConfigManager::IsAvoidConfig()) + if (utl::ConfigManager::IsFuzzing()) return; ::osl::MutexGuard aGuard( ColorMutex_Impl::get() ); if ( !m_pImpl ) @@ -383,7 +383,7 @@ ColorConfig::ColorConfig() ColorConfig::~ColorConfig() { - if (utl::ConfigManager::IsAvoidConfig()) + if (utl::ConfigManager::IsFuzzing()) return; ::osl::MutexGuard aGuard( ColorMutex_Impl::get() ); m_pImpl->RemoveListener(this); diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx index fb6848544220..8d030fdc19c5 100644 --- a/svtools/source/graphic/grfmgr.cxx +++ b/svtools/source/graphic/grfmgr.cxx @@ -155,7 +155,7 @@ void GraphicObject::ImplEnsureGraphicManager() sal_uLong nCacheSize = 20000; sal_uLong nMaxObjCacheSize = 20000; sal_uLong nTimeoutSeconds = 20000; - if (!utl::ConfigManager::IsAvoidConfig()) + if (!utl::ConfigManager::IsFuzzing()) { try { @@ -378,7 +378,7 @@ void GraphicObject::SetUserData( const OUString& rUserData ) static sal_uInt32 GetCacheTimeInMs() { - if (utl::ConfigManager::IsAvoidConfig()) + if (utl::ConfigManager::IsFuzzing()) return 20000; const sal_uInt32 nSeconds = 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() : "", "")); } diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx index 1e177f977d49..a17a1d31b98c 100644 --- a/sw/source/core/bastyp/init.cxx +++ b/sw/source/core/bastyp/init.cxx @@ -652,7 +652,7 @@ void InitCore() pGlobalOLEExcludeList = new std::vector<SvGlobalName*>; - if (!utl::ConfigManager::IsAvoidConfig()) + if (!utl::ConfigManager::IsFuzzing()) { const SvxSwAutoFormatFlags& rAFlags = SvxAutoCorrCfg::Get().GetAutoCorrect()->GetSwFlags(); SwDoc::mpACmpltWords = new SwAutoCompleteWord( rAFlags.nAutoCmpltListLen, @@ -762,7 +762,7 @@ void SwCalendarWrapper::LoadDefaultCalendar( LanguageType eLang ) LanguageType GetAppLanguage() { - if (!utl::ConfigManager::IsAvoidConfig()) + if (!utl::ConfigManager::IsFuzzing()) return Application::GetSettings().GetLanguageTag().getLanguageType(); return LANGUAGE_ENGLISH_US; } diff --git a/sw/source/core/doc/DocumentDrawModelManager.cxx b/sw/source/core/doc/DocumentDrawModelManager.cxx index ce898e559362..7ce5c2543465 100644 --- a/sw/source/core/doc/DocumentDrawModelManager.cxx +++ b/sw/source/core/doc/DocumentDrawModelManager.cxx @@ -109,7 +109,7 @@ void DocumentDrawModelManager::InitDrawModel() mpDrawModel->InsertPage( pMasterPage ); SAL_INFO( "sw.doc", "after create DrawDocument" ); SdrOutliner& rOutliner = mpDrawModel->GetDrawOutliner(); - if (!utl::ConfigManager::IsAvoidConfig()) + if (!utl::ConfigManager::IsFuzzing()) { SAL_INFO( "sw.doc", "before create Spellchecker/Hyphenator" ); css::uno::Reference< css::linguistic2::XSpellChecker1 > xSpell = ::GetSpellChecker(); diff --git a/sw/source/core/doc/DocumentSettingManager.cxx b/sw/source/core/doc/DocumentSettingManager.cxx index 127609ecdc09..47c513e1486e 100644 --- a/sw/source/core/doc/DocumentSettingManager.cxx +++ b/sw/source/core/doc/DocumentSettingManager.cxx @@ -96,7 +96,7 @@ sw::DocumentSettingManager::DocumentSettingManager(SwDoc &rDoc) // Note: Any non-hidden compatibility flag should obtain its default // by asking SvtCompatibilityOptions, see below. - if (!utl::ConfigManager::IsAvoidConfig()) + if (!utl::ConfigManager::IsFuzzing()) { const SvtCompatibilityOptions aOptions; mbParaSpaceMax = aOptions.GetDefault( SvtCompatibilityEntry::Index::AddSpacing ); diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx index d4e8b8dc2e60..55986aafae5f 100644 --- a/sw/source/core/doc/docdesc.cxx +++ b/sw/source/core/doc/docdesc.cxx @@ -93,7 +93,7 @@ static void lcl_DefaultPageFormat( sal_uInt16 nPoolFormatId, nMinRight = nMinTop = nMinBottom = GetMetricVal( CM_1 ); nMinLeft = nMinRight * 2; } - else if (!utl::ConfigManager::IsAvoidConfig() && MeasurementSystem::Metric == SvtSysLocale().GetLocaleData().getMeasurementSystemEnum() ) + else if (!utl::ConfigManager::IsFuzzing() && MeasurementSystem::Metric == SvtSysLocale().GetLocaleData().getMeasurementSystemEnum() ) { nMinTop = nMinBottom = nMinLeft = nMinRight = 1134; // 2 centimeters } diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx index 37930e4932f7..2f76561a785e 100644 --- a/sw/source/core/doc/docfmt.cxx +++ b/sw/source/core/doc/docfmt.cxx @@ -1721,7 +1721,7 @@ void SwDoc::CreateNumberFormatter() mpNumberFormatter = new SvNumberFormatter( comphelper::getProcessComponentContext(), eLang ); mpNumberFormatter->SetEvalDateFormat( NF_EVALDATEFORMAT_FORMAT_INTL ); - if (!utl::ConfigManager::IsAvoidConfig()) + if (!utl::ConfigManager::IsFuzzing()) mpNumberFormatter->SetYear2000(static_cast<sal_uInt16>(::utl::MiscCfg().GetYear2000())); } diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx index 3fe67f0c4729..1117de69cc03 100644 --- a/sw/source/core/doc/number.cxx +++ b/sw/source/core/doc/number.cxx @@ -1391,7 +1391,7 @@ namespace numfunc SvxNumberFormat::SvxNumPositionAndSpaceMode GetDefaultPositionAndSpaceMode() { - if (utl::ConfigManager::IsAvoidConfig()) + if (utl::ConfigManager::IsFuzzing()) return SvxNumberFormat::LABEL_ALIGNMENT; SvxNumberFormat::SvxNumPositionAndSpaceMode ePosAndSpaceMode; diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx index d8932eb774e5..7491f33a78a8 100644 --- a/sw/source/core/doc/tblafmt.cxx +++ b/sw/source/core/doc/tblafmt.cxx @@ -1257,7 +1257,7 @@ SwTableAutoFormatTable::SwTableAutoFormatTable() bool SwTableAutoFormatTable::Load() { - if (utl::ConfigManager::IsAvoidConfig()) + if (utl::ConfigManager::IsFuzzing()) return false; bool bRet = false; OUString sNm(AUTOTABLE_FORMAT_NAME); @@ -1274,7 +1274,7 @@ bool SwTableAutoFormatTable::Load() bool SwTableAutoFormatTable::Save() const { - if (utl::ConfigManager::IsAvoidConfig()) + if (utl::ConfigManager::IsFuzzing()) return false; SvtPathOptions aPathOpt; const OUString sNm( aPathOpt.GetUserConfigPath() + "/" AUTOTABLE_FORMAT_NAME ); diff --git a/sw/source/core/draw/drawdoc.cxx b/sw/source/core/draw/drawdoc.cxx index b1dd50b45bc5..7655f98eb628 100644 --- a/sw/source/core/draw/drawdoc.cxx +++ b/sw/source/core/draw/drawdoc.cxx @@ -45,7 +45,7 @@ using namespace com::sun::star; const OUString GetPalettePath() { - if (utl::ConfigManager::IsAvoidConfig()) + if (utl::ConfigManager::IsFuzzing()) return OUString(); SvtPathOptions aPathOpt; return aPathOpt.GetPalettePath(); diff --git a/sw/source/core/edit/edws.cxx b/sw/source/core/edit/edws.cxx index fc7ed9683311..d9ce2329e225 100644 --- a/sw/source/core/edit/edws.cxx +++ b/sw/source/core/edit/edws.cxx @@ -46,7 +46,7 @@ SwEditShell::SwEditShell( SwDoc& rDoc, vcl::Window *pWindow, const SwViewOption , m_bNbspRunNext(false) , m_bDoParagraphSignatureValidation(true) { - if (!utl::ConfigManager::IsAvoidConfig() && 0 < officecfg::Office::Common::Undo::Steps::get()) + if (!utl::ConfigManager::IsFuzzing() && 0 < officecfg::Office::Common::Undo::Steps::get()) { GetDoc()->GetIDocumentUndoRedo().DoUndo(true); } diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx index 22aa06a07282..aa09788b7202 100644 --- a/sw/source/core/text/txtfrm.cxx +++ b/sw/source/core/text/txtfrm.cxx @@ -331,7 +331,7 @@ SwDigitModeModifier::SwDigitModeModifier( const OutputDevice& rOutp, LanguageTyp rOut( rOutp ), nOldLanguageType( rOutp.GetDigitLanguage() ) { LanguageType eLang = eCurLang; - if (!utl::ConfigManager::IsAvoidConfig()) + if (!utl::ConfigManager::IsFuzzing()) { const SvtCTLOptions::TextNumerals nTextNumerals = SW_MOD()->GetCTLOptions().GetCTLTextNumerals(); diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index bda9c9856542..bb1ab6b3f454 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -2438,7 +2438,7 @@ SwAccessibleMap* SwViewShell::GetAccessibleMap() void SwViewShell::ApplyAccessiblityOptions(SvtAccessibilityOptions const & rAccessibilityOptions) { - if (utl::ConfigManager::IsAvoidConfig()) + if (utl::ConfigManager::IsFuzzing()) return; if (mpOpt->IsPagePreview() && !rAccessibilityOptions.GetIsForPagePreviews()) { diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index d1aefa0a1910..39b235199e26 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -4849,7 +4849,7 @@ void WW8Customizations::Import( SwDocShell* pShell ) void SwWW8ImplReader::ReadGlobalTemplateSettings( const OUString& sCreatedFrom, const uno::Reference< container::XNameContainer >& xPrjNameCache ) { - if (utl::ConfigManager::IsAvoidConfig()) + if (utl::ConfigManager::IsFuzzing()) return; SvtPathOptions aPathOpt; @@ -5196,7 +5196,7 @@ ErrCode SwWW8ImplReader::CoreLoad(WW8Glossary const *pGloss) } #if HAVE_FEATURE_SCRIPTING - if (!utl::ConfigManager::IsAvoidConfig()) + if (!utl::ConfigManager::IsFuzzing()) { BasicManager *pBasicMan = m_pDocShell->GetBasicManager(); if (pBasicMan) diff --git a/sw/source/filter/ww8/ww8toolbar.cxx b/sw/source/filter/ww8/ww8toolbar.cxx index ecc5e6b66bc8..d5d4857baf92 100644 --- a/sw/source/filter/ww8/ww8toolbar.cxx +++ b/sw/source/filter/ww8/ww8toolbar.cxx @@ -228,7 +228,7 @@ bool SwCTBWrapper::ImportCustomToolBar( SfxObjectShell& rDocSh ) try { css::uno::Reference<css::ui::XUIConfigurationManager> xCfgMgr; - if (!utl::ConfigManager::IsAvoidConfig()) + if (!utl::ConfigManager::IsFuzzing()) { uno::Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); uno::Reference< ui::XModuleUIConfigurationManagerSupplier > xAppCfgSupp( ui::theModuleUIConfigurationManagerSupplier::get(xContext) ); diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx index d288a6781300..e9877bf14ee9 100644 --- a/sw/source/uibase/app/docsh2.cxx +++ b/sw/source/uibase/app/docsh2.cxx @@ -1334,7 +1334,7 @@ void SwDocShell::FillClass( SvGlobalName * pClassName, void SwDocShell::SetModified( bool bSet ) { - if (utl::ConfigManager::IsAvoidConfig()) + if (utl::ConfigManager::IsFuzzing()) return; SfxObjectShell::SetModified( bSet ); if( IsEnableSetModified()) diff --git a/sw/source/uibase/app/docshdrw.cxx b/sw/source/uibase/app/docshdrw.cxx index cc18ba2cd75f..083aec44d28d 100644 --- a/sw/source/uibase/app/docshdrw.cxx +++ b/sw/source/uibase/app/docshdrw.cxx @@ -68,7 +68,7 @@ void InitDrawModelAndDocShell(SwDocShell* pSwDocShell, SwDrawModel* pSwDrawDocum { pSwDocShell->PutItem(SvxColorListItem(xColorList, SID_COLOR_TABLE)); } - else if (!utl::ConfigManager::IsAvoidConfig()) + else if (!utl::ConfigManager::IsFuzzing()) { // there wasn't one, get the standard and set to the // docshell and then to the drawdocument diff --git a/sw/source/uibase/app/docshini.cxx b/sw/source/uibase/app/docshini.cxx index 983a8a8bc633..fe99774d7a6c 100644 --- a/sw/source/uibase/app/docshini.cxx +++ b/sw/source/uibase/app/docshini.cxx @@ -120,7 +120,7 @@ bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor ) SwTransferable::InitOle( this ); // set forbidden characters if necessary - if (!utl::ConfigManager::IsAvoidConfig()) + if (!utl::ConfigManager::IsFuzzing()) { SvxAsianConfig aAsian; Sequence<lang::Locale> aLocales = aAsian.GetStartEndCharLocales(); @@ -660,7 +660,7 @@ void SwDocShell::SubInitNew() //! get lingu options without loading lingu DLL SvtLinguOptions aLinguOpt; - if (!utl::ConfigManager::IsAvoidConfig()) + if (!utl::ConfigManager::IsFuzzing()) SvtLinguConfig().GetOptions(aLinguOpt); LanguageType nVal = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage, css::i18n::ScriptType::LATIN), diff --git a/sw/source/uibase/app/swdll.cxx b/sw/source/uibase/app/swdll.cxx index 553f8e613bac..10e6f59d3bc6 100644 --- a/sw/source/uibase/app/swdll.cxx +++ b/sw/source/uibase/app/swdll.cxx @@ -85,7 +85,7 @@ SwDLL::SwDLL() return; std::unique_ptr<SvtModuleOptions> xOpt; - if (!utl::ConfigManager::IsAvoidConfig()) + if (!utl::ConfigManager::IsFuzzing()) xOpt.reset(new SvtModuleOptions); SfxObjectFactory* pDocFact = nullptr; SfxObjectFactory* pGlobDocFact = nullptr; @@ -137,7 +137,7 @@ SwDLL::SwDLL() RegisterControls(); #endif - if (!utl::ConfigManager::IsAvoidConfig()) + if (!utl::ConfigManager::IsFuzzing()) { // replace SvxAutocorrect with SwAutocorrect SvxAutoCorrCfg& rACfg = SvxAutoCorrCfg::Get(); diff --git a/sw/source/uibase/app/swmodule.cxx b/sw/source/uibase/app/swmodule.cxx index ee09b4680a5b..71264ffd5bea 100644 --- a/sw/source/uibase/app/swmodule.cxx +++ b/sw/source/uibase/app/swmodule.cxx @@ -186,7 +186,7 @@ SwModule::SwModule( SfxObjectFactory* pWebFact, StartListening( *SfxGetpApp() ); - if (!utl::ConfigManager::IsAvoidConfig()) + if (!utl::ConfigManager::IsFuzzing()) { // init color configuration // member <pColorConfig> is created and the color configuration is applied @@ -235,13 +235,13 @@ void SwDLL::RegisterFactories() { // These Id's must not be changed. Through these Id's the View (resume Documentview) // is created by Sfx. - if (utl::ConfigManager::IsAvoidConfig() || SvtModuleOptions().IsWriter()) + if (utl::ConfigManager::IsFuzzing() || SvtModuleOptions().IsWriter()) SwView::RegisterFactory ( SFX_INTERFACE_SFXDOCSH ); #if HAVE_FEATURE_DESKTOP SwWebView::RegisterFactory ( SFX_INTERFACE_SFXMODULE ); - if (utl::ConfigManager::IsAvoidConfig() || SvtModuleOptions().IsWriter()) + if (utl::ConfigManager::IsFuzzing() || SvtModuleOptions().IsWriter()) { SwSrcView::RegisterFactory ( SfxInterfaceId(6) ); SwPagePreview::RegisterFactory ( SfxInterfaceId(7) ); 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; diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx index 92da15465e21..f2bcc222b22c 100644 --- a/sw/source/uibase/uiview/view.cxx +++ b/sw/source/uibase/uiview/view.cxx @@ -904,7 +904,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh ) SAL_WARN_IF( officecfg::Office::Common::Undo::Steps::get() <= 0, "sw.ui", "/org.openoffice.Office.Common/Undo/Steps <= 0"); - if (!utl::ConfigManager::IsAvoidConfig() && 0 < officecfg::Office::Common::Undo::Steps::get()) + if (!utl::ConfigManager::IsFuzzing() && 0 < officecfg::Office::Common::Undo::Steps::get()) { m_pWrtShell->DoUndo(); } diff --git a/sw/source/uibase/uiview/view0.cxx b/sw/source/uibase/uiview/view0.cxx index 03d981d0db11..9345af5541f2 100644 --- a/sw/source/uibase/uiview/view0.cxx +++ b/sw/source/uibase/uiview/view0.cxx @@ -77,7 +77,7 @@ using namespace ::com::sun::star; SFX_IMPL_NAMED_VIEWFACTORY(SwView, "Default") { - if (utl::ConfigManager::IsAvoidConfig() || SvtModuleOptions().IsWriter()) + if (utl::ConfigManager::IsFuzzing() || SvtModuleOptions().IsWriter()) { SFX_VIEW_REGISTRATION(SwDocShell); SFX_VIEW_REGISTRATION(SwGlobalDocShell); diff --git a/unotools/source/config/configitem.cxx b/unotools/source/config/configitem.cxx index 80d18841299e..1a2b9f7d11d1 100644 --- a/unotools/source/config/configitem.cxx +++ b/unotools/source/config/configitem.cxx @@ -157,7 +157,7 @@ ConfigItem::ConfigItem(const OUString &rSubTree, ConfigItemMode nSetMode ) : m_bEnableInternalNotification(false), m_nInValueChange(0) { - if (utl::ConfigManager::IsAvoidConfig()) + if (utl::ConfigManager::IsFuzzing()) return; if (nSetMode & ConfigItemMode::ReleaseTree) @@ -1113,7 +1113,7 @@ void ConfigItem::ClearModified() Reference< XHierarchicalNameAccess> ConfigItem::GetTree() { Reference< XHierarchicalNameAccess> xRet; - if (utl::ConfigManager::IsAvoidConfig()) + if (utl::ConfigManager::IsFuzzing()) return xRet; if(!m_xHierarchyAccess.is()) xRet = ConfigManager::acquireTree(*this); diff --git a/unotools/source/config/configmgr.cxx b/unotools/source/config/configmgr.cxx index 5dd1dc7ee3f8..417bfc311bbf 100644 --- a/unotools/source/config/configmgr.cxx +++ b/unotools/source/config/configmgr.cxx @@ -195,16 +195,16 @@ void utl::ConfigManager::doStoreConfigItems() { } } -static bool bIsAvoidConfig = false; +static bool bIsFuzzing = false; -bool utl::ConfigManager::IsAvoidConfig() +bool utl::ConfigManager::IsFuzzing() { - return bIsAvoidConfig; + return bIsFuzzing; } -void utl::ConfigManager::EnableAvoidConfig() +void utl::ConfigManager::EnableFuzzing() { - bIsAvoidConfig = true; + bIsFuzzing = true; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unotools/source/config/eventcfg.cxx b/unotools/source/config/eventcfg.cxx index b998e820f28b..12b99a2db9cc 100644 --- a/unotools/source/config/eventcfg.cxx +++ b/unotools/source/config/eventcfg.cxx @@ -396,7 +396,7 @@ Mutex& GlobalEventConfig::GetOwnStaticMutex() OUString GlobalEventConfig::GetEventName( GlobalEventId nIndex ) { - if (utl::ConfigManager::IsAvoidConfig()) + if (utl::ConfigManager::IsFuzzing()) return OUString(); rtl::Reference<GlobalEventConfig> createImpl(new GlobalEventConfig); return GlobalEventConfig::m_pImpl->GetEventName( nIndex ); diff --git a/unotools/source/config/fontcfg.cxx b/unotools/source/config/fontcfg.cxx index 0e4dac43ce2d..38751cd7a912 100644 --- a/unotools/source/config/fontcfg.cxx +++ b/unotools/source/config/fontcfg.cxx @@ -99,7 +99,7 @@ DefaultFontConfiguration& DefaultFontConfiguration::get() DefaultFontConfiguration::DefaultFontConfiguration() { - if (utl::ConfigManager::IsAvoidConfig()) + if (utl::ConfigManager::IsFuzzing()) return; // create configuration hierarchical access name try @@ -352,7 +352,7 @@ FontSubstConfiguration& FontSubstConfiguration::get() FontSubstConfiguration::FontSubstConfiguration() : maSubstHash( 300 ) { - if (utl::ConfigManager::IsAvoidConfig()) + if (utl::ConfigManager::IsFuzzing()) return; try { diff --git a/unotools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx index 7fa55766aa5b..cdb66c6fabe4 100644 --- a/unotools/source/config/saveopt.cxx +++ b/unotools/source/config/saveopt.cxx @@ -557,7 +557,7 @@ SvtSaveOptions_Impl::SvtSaveOptions_Impl() } } - if (!utl::ConfigManager::IsAvoidConfig()) + if (!utl::ConfigManager::IsFuzzing()) { bAutoSave = officecfg::Office::Recovery::AutoSave::Enabled::get(); nAutoSaveTime = officecfg::Office::Recovery::AutoSave::TimeIntervall::get(); diff --git a/unotools/source/config/securityoptions.cxx b/unotools/source/config/securityoptions.cxx index de9c0dcc2dfc..3e928de6709c 100644 --- a/unotools/source/config/securityoptions.cxx +++ b/unotools/source/config/securityoptions.cxx @@ -284,7 +284,7 @@ void SvtSecurityOptions_Impl::SetProperty( sal_Int32 nProperty, const Any& rValu { m_seqSecureURLs.realloc( 0 ); rValue >>= m_seqSecureURLs; - if (!utl::ConfigManager::IsAvoidConfig()) + if (!utl::ConfigManager::IsFuzzing()) { SvtPathOptions aOpt; sal_uInt32 nCount = m_seqSecureURLs.getLength(); diff --git a/unotools/source/config/syslocaleoptions.cxx b/unotools/source/config/syslocaleoptions.cxx index 4eadf6d3aa54..5f9b744c3d27 100644 --- a/unotools/source/config/syslocaleoptions.cxx +++ b/unotools/source/config/syslocaleoptions.cxx @@ -542,7 +542,7 @@ SvtSysLocaleOptions::SvtSysLocaleOptions() { pImpl = std::make_shared<SvtSysLocaleOptions_Impl>(); g_pSysLocaleOptions = pImpl; - if (!utl::ConfigManager::IsAvoidConfig()) + if (!utl::ConfigManager::IsFuzzing()) ItemHolder1::holdConfigItem(EItem::SysLocaleOptions); } pImpl->AddListener(this); diff --git a/unotools/source/config/viewoptions.cxx b/unotools/source/config/viewoptions.cxx index 0332e94718ac..a4c49a4a3373 100644 --- a/unotools/source/config/viewoptions.cxx +++ b/unotools/source/config/viewoptions.cxx @@ -149,7 +149,7 @@ SvtViewOptionsBase_Impl::SvtViewOptionsBase_Impl( const OUString& sList ) , m_nWriteCount( 0 ) #endif { - if (utl::ConfigManager::IsAvoidConfig()) + if (utl::ConfigManager::IsFuzzing()) return; try diff --git a/unotools/source/misc/mediadescriptor.cxx b/unotools/source/misc/mediadescriptor.cxx index b9b4610012c3..5bb5660afcf8 100644 --- a/unotools/source/misc/mediadescriptor.cxx +++ b/unotools/source/misc/mediadescriptor.cxx @@ -484,7 +484,7 @@ bool MediaDescriptor::addInputStream() /*-----------------------------------------------*/ bool MediaDescriptor::addInputStreamOwnLock() { - const bool bLock = !utl::ConfigManager::IsAvoidConfig() + const bool bLock = !utl::ConfigManager::IsFuzzing() && officecfg::Office::Common::Misc::UseDocumentSystemFileLocking::get(); return impl_addInputStream(bLock); } 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()-> diff --git a/xmloff/source/core/DocumentSettingsContext.cxx b/xmloff/source/core/DocumentSettingsContext.cxx index d53ce780fb5e..7db425f4573b 100644 --- a/xmloff/source/core/DocumentSettingsContext.cxx +++ b/xmloff/source/core/DocumentSettingsContext.cxx @@ -381,7 +381,7 @@ void XMLDocumentSettingsContext::EndElement() uno::Sequence<beans::PropertyValue> aSeqConfigProps; if ( m_pData->aConfigProps >>= aSeqConfigProps ) { - if (!utl::ConfigManager::IsAvoidConfig() && !officecfg::Office::Common::Save::Document::LoadPrinter::get()) + if (!utl::ConfigManager::IsFuzzing() && !officecfg::Office::Common::Save::Document::LoadPrinter::get()) { sal_Int32 i = aSeqConfigProps.getLength() - 1; int nFound = 0; |