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 /sc | |
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 'sc')
-rw-r--r-- | sc/qa/unit/datacache.cxx | 2 | ||||
-rw-r--r-- | sc/qa/unit/range.cxx | 2 | ||||
-rw-r--r-- | sc/source/core/data/global2.cxx | 2 | ||||
-rw-r--r-- | sc/source/core/data/globalx.cxx | 2 | ||||
-rw-r--r-- | sc/source/core/tool/calcconfig.cxx | 4 | ||||
-rw-r--r-- | sc/source/core/tool/compiler.cxx | 2 | ||||
-rw-r--r-- | sc/source/core/tool/optutil.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/lotus/lotus.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/docshell/docsh2.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/docshell/externalrefmgr.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/docshell/tablink.cxx | 2 |
11 files changed, 13 insertions, 13 deletions
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 |