diff options
-rw-r--r-- | editeng/source/misc/acorrcfg.cxx | 6 | ||||
-rw-r--r-- | sw/source/uibase/app/swmodule.cxx | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/editeng/source/misc/acorrcfg.cxx b/editeng/source/misc/acorrcfg.cxx index de1805acc0c5..dce7df478b63 100644 --- a/editeng/source/misc/acorrcfg.cxx +++ b/editeng/source/misc/acorrcfg.cxx @@ -77,11 +77,11 @@ SvxAutoCorrCfg::~SvxAutoCorrCfg() 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(); aSwConfig.SetModified(); diff --git a/sw/source/uibase/app/swmodule.cxx b/sw/source/uibase/app/swmodule.cxx index ecee71758f05..e3817b1061b5 100644 --- a/sw/source/uibase/app/swmodule.cxx +++ b/sw/source/uibase/app/swmodule.cxx @@ -227,6 +227,9 @@ SwModule::~SwModule() { delete pErrorHdl; EndListening( *SfxGetpApp() ); + + SvxAutoCorrCfg& rACfg = SvxAutoCorrCfg::Get(); + rACfg.SetAutoCorrect(0); // delete SwAutCorrect before exit handlers } void SwModule::CreateLngSvcEvtListener() |