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 /sfx2 | |
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 'sfx2')
-rw-r--r-- | sfx2/source/appl/app.cxx | 8 | ||||
-rw-r--r-- | sfx2/source/appl/appbas.cxx | 8 | ||||
-rw-r--r-- | sfx2/source/appl/appinit.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/control/shell.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/doc/docfile.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/doc/objstor.cxx | 6 | ||||
-rw-r--r-- | sfx2/source/doc/objxtor.cxx | 4 |
7 files changed, 16 insertions, 16 deletions
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 ) { |