Kaydet (Commit) 5bff4b01 authored tarafından Michael Stahl's avatar Michael Stahl

sw: delete global SwAutoCorrect instance to avoid crash...

... in exit handlers because VCL and the SolarMutex is gone.

(regression from 4404b718)

Change-Id: I9f33b2cb8c87f7137e3ba0ae033879861f9fe11b
üst 2cfb2aaa
...@@ -77,11 +77,11 @@ SvxAutoCorrCfg::~SvxAutoCorrCfg() ...@@ -77,11 +77,11 @@ SvxAutoCorrCfg::~SvxAutoCorrCfg()
delete pAutoCorrect; delete pAutoCorrect;
} }
void SvxAutoCorrCfg::SetAutoCorrect( SvxAutoCorrect* pNew ) void SvxAutoCorrCfg::SetAutoCorrect(SvxAutoCorrect *const pNew)
{ {
if( pNew && pNew != pAutoCorrect ) if (pNew != pAutoCorrect)
{ {
if( pAutoCorrect->GetFlags() != pNew->GetFlags() ) if (pNew && (pAutoCorrect->GetFlags() != pNew->GetFlags()))
{ {
aBaseConfig.SetModified(); aBaseConfig.SetModified();
aSwConfig.SetModified(); aSwConfig.SetModified();
......
...@@ -227,6 +227,9 @@ SwModule::~SwModule() ...@@ -227,6 +227,9 @@ SwModule::~SwModule()
{ {
delete pErrorHdl; delete pErrorHdl;
EndListening( *SfxGetpApp() ); EndListening( *SfxGetpApp() );
SvxAutoCorrCfg& rACfg = SvxAutoCorrCfg::Get();
rACfg.SetAutoCorrect(0); // delete SwAutCorrect before exit handlers
} }
void SwModule::CreateLngSvcEvtListener() void SwModule::CreateLngSvcEvtListener()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment