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 /sd/source/ui | |
| 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 'sd/source/ui')
| -rw-r--r-- | sd/source/ui/app/sddll.cxx | 14 | ||||
| -rw-r--r-- | sd/source/ui/docshell/docshell.cxx | 2 |
2 files changed, 8 insertions, 8 deletions
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 |