1 files changed, 11 insertions, 0 deletions
diff --git a/sw/source/uibase/app/swdll.cxx b/sw/source/uibase/app/swdll.cxx
index cb6d19e079e1..1e598ef029b4 100644
--- a/sw/source/uibase/app/swdll.cxx
+++ b/sw/source/uibase/app/swdll.cxx
@@ -41,7 +41,9 @@
 #include <svx/fmobjfac.hxx>
 #include <svx/svdfield.hxx>
 #include <svx/objfac3d.hxx>
+#include <editeng/acorrcfg.hxx>
 
+#include <swacorr.hxx>
 #include <unomid.h>
 
 #include "swdllimpl.hxx"
@@ -135,10 +137,19 @@ SwDLL::SwDLL()
     // register your controllers here
     RegisterControls();
 #endif
+
+    // replace SvxAutocorrect with SwAutocorrect
+    SvxAutoCorrCfg& rACfg = SvxAutoCorrCfg::Get();
+    const SvxAutoCorrect* pOld = rACfg.GetAutoCorrect();
+    rACfg.SetAutoCorrect(new SwAutoCorrect( *pOld ));
 }
 
 SwDLL::~SwDLL()
 {
+    // fdo#86494 SwAutoCorrect must be deleted before _FinitCore
+    SvxAutoCorrCfg& rACfg = SvxAutoCorrCfg::Get();
+    rACfg.SetAutoCorrect(0); // delete SwAutoCorrect before exit handlers
+
     // Pool has to be deleted before statics are
     SW_MOD()->RemoveAttrPool();