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 /include | |
| 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 'include')
| -rw-r--r-- | include/svx/svdmodel.hxx | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx index 127bf4ed985f..62bb9dd51533 100644 --- a/include/svx/svdmodel.hxx +++ b/include/svx/svdmodel.hxx @@ -270,11 +270,12 @@ private: SVX_DLLPRIVATE void ImpSetOutlinerDefaults( SdrOutliner* pOutliner, bool bInit = false ); SVX_DLLPRIVATE void ImpReformatAllTextObjects(); SVX_DLLPRIVATE void ImpReformatAllEdgeObjects(); - SVX_DLLPRIVATE void ImpCreateTables(); + SVX_DLLPRIVATE void ImpCreateTables(bool bDisablePropertyFiles); SVX_DLLPRIVATE void ImpCtor( SfxItemPool* pPool, - ::comphelper::IEmbeddedHelper* pPers); + ::comphelper::IEmbeddedHelper* pPers, + bool bDisablePropertyFiles); // this is a weak reference to a possible living api wrapper for this model css::uno::Reference< css::uno::XInterface > mxUnoModel; @@ -293,9 +294,13 @@ public: // if you want to use symbol objects inherited from SdrAttrObj. // If, however, you use objects inheriting from SdrObject you are free // to chose a pool of your liking. + // + // tdf#118731 a bDisablePropertyFiles of true will disable ability to load + // XPropertyFiles describing defaults. Useful for UI preview widgets explicit SdrModel( SfxItemPool* pPool = nullptr, - ::comphelper::IEmbeddedHelper* pPers = nullptr); + ::comphelper::IEmbeddedHelper* pPers = nullptr, + bool bDisablePropertyFiles = false); virtual ~SdrModel() override; void ClearModel(bool bCalledFromDestructor); |