diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-07-07 21:05:07 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-07-08 09:22:46 +0100 |
| commit | 467887d3c938b48d13f70e559e15ffd081de512d (patch) | |
| tree | c4916d6672a01e392fee5784b7cf732e8f860a4f /framework | |
| parent | efbe959732687d7a96041a3f7b90e817abbd8145 (diff) | |
Related: tdf#100713 fix more recent bug to try and see older bug...
at the moment AddonsOptions::Notify is called with a null this
which crashes during adding an extension
regression from...
commit 3bdc5063f942b9ea3b6e39e707926fbc516c19f9
Date: Wed Jun 22 02:30:43 2016 +0200
tdf#89329: use shared_ptr for pImpl in addonsoptions
Change-Id: Ic28951e56bb8beca2a01ef2a1864eadcf3864e5b
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/fwe/classes/addonsoptions.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx index 12e7ca94e1af..9deffd4e5e4c 100644 --- a/framework/source/fwe/classes/addonsoptions.cxx +++ b/framework/source/fwe/classes/addonsoptions.cxx @@ -275,6 +275,8 @@ class AddonsOptions_Impl : public ConfigItem Sequence< OUString > GetPropertyNamesImages( const OUString& aPropertyRootNode ) const; bool CreateImageFromSequence( Image& rImage, Sequence< sal_Int8 >& rBitmapDataSeq ) const; + DECL_LINK_TYPED(NotifyEvent, void*, void); + virtual void ImplCommit() override; // private member @@ -409,7 +411,7 @@ void AddonsOptions_Impl::ReadConfigurationData() void AddonsOptions_Impl::Notify( const Sequence< OUString >& /*lPropertyNames*/ ) { - Application::PostUserEvent( LINK( nullptr, AddonsOptions, Notify ) ); + Application::PostUserEvent(LINK(this, AddonsOptions_Impl, NotifyEvent)); } // public method @@ -1613,10 +1615,10 @@ Mutex& AddonsOptions::GetOwnStaticMutex() return *pMutex; } -IMPL_LINK_NOARG_TYPED( AddonsOptions, Notify, void*, void ) +IMPL_LINK_NOARG_TYPED(AddonsOptions_Impl, NotifyEvent, void*, void) { - MutexGuard aGuard( GetOwnStaticMutex() ); - m_pImpl->ReadConfigurationData(); + MutexGuard aGuard(AddonsOptions::GetOwnStaticMutex()); + ReadConfigurationData(); } } |