diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-08-07 16:21:23 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-08-08 11:26:11 +0200 |
| commit | 674416a2f16dfa050a23f2b1f0b749214ea1f2a6 (patch) | |
| tree | 068b1d4f3f247ab214151696e1deeed9eada448c /svx/source/svdraw/svdmodel.cxx | |
| parent | 3ef76067bfa1f9f60ec3989bd6b40a5760137903 (diff) | |
tdf#118731 delay on showing dialogs that create SdrModels
for their preview widgets. since...
commit 4be44a7a6f2f480e55255d7cdd119f3d6577d085
Date: Thu May 24 19:09:44 2018 +0200
SOSAW080: Cleanup of SdrModel
Change-Id: I102b64bdacc56a41091bbe60e932c2915f20323f
Reviewed-on: https://gerrit.libreoffice.org/58693
Tested-by: Jenkins
Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de>
Diffstat (limited to 'svx/source/svdraw/svdmodel.cxx')
| -rw-r--r-- | svx/source/svdraw/svdmodel.cxx | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index a63401dc88e7..4889328cbf57 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -100,7 +100,8 @@ struct SdrModelImpl void SdrModel::ImpCtor( SfxItemPool* pPool, - ::comphelper::IEmbeddedHelper* _pEmbeddedHelper) + ::comphelper::IEmbeddedHelper* _pEmbeddedHelper, + bool bDisablePropertyFiles) { mpImpl.reset(new SdrModelImpl); mpImpl->mpUndoManager=nullptr; @@ -198,12 +199,13 @@ void SdrModel::ImpCtor( pTextChain.reset(new TextChain); /* End Text Chaining related code */ - ImpCreateTables(); + ImpCreateTables(bDisablePropertyFiles || utl::ConfigManager::IsFuzzing()); } SdrModel::SdrModel( SfxItemPool* pPool, - ::comphelper::IEmbeddedHelper* pPers) + ::comphelper::IEmbeddedHelper* pPers, + bool bDisablePropertyFiles) : #ifdef DBG_UTIL // SdrObjectLifetimeWatchDog: @@ -212,7 +214,7 @@ SdrModel::SdrModel( maMaPag(), maPages() { - ImpCtor(pPool,pPers); + ImpCtor(pPool,pPers,bDisablePropertyFiles); } SdrModel::~SdrModel() @@ -606,10 +608,10 @@ bool SdrModel::IsUndoEnabled() const } } -void SdrModel::ImpCreateTables() +void SdrModel::ImpCreateTables(bool bDisablePropertyFiles) { // use standard path for initial construction - const OUString aTablePath(!utl::ConfigManager::IsFuzzing() ? SvtPathOptions().GetPalettePath() : ""); + const OUString aTablePath(!bDisablePropertyFiles ? SvtPathOptions().GetPalettePath() : ""); for( auto i : o3tl::enumrange<XPropertyListType>() ) { |