[Libreoffice-commits] core.git: sw/source

[Stephan Bergmann]

 sw/source/uibase/app/swdll.cxx      |    1 -
 sw/source/uibase/shells/textsh1.cxx |    1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fc7df6f9a6caf975867f4fcb87b5b0c86ed1ee84
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Oct 29 17:52:38 2015 +0100

    tdf#93509: Commit at the right time
    
    when the change is made, not during exit (as did
    4aab13f77e5dc218d067ca7efe3622f4ea780bf9 "tdf#93509: crash on storing auto
    correction config fixed," which caused PythonTest_sw_python to crash during
    exit)
    
    Change-Id: I0e9c264ae3fee7fdb732d36f42ebbb477557a644

diff --git a/sw/source/uibase/app/swdll.cxx b/sw/source/uibase/app/swdll.cxx
index 0a33c88..cff230c 100644
--- a/sw/source/uibase/app/swdll.cxx
+++ b/sw/source/uibase/app/swdll.cxx
@@ -156,7 +156,6 @@ SwDLL::~SwDLL()
     {
         // fdo#86494 SwAutoCorrect must be deleted before _FinitCore
         SvxAutoCorrCfg& rACfg = SvxAutoCorrCfg::Get();
-        rACfg.Commit();
         rACfg.SetAutoCorrect(0); // delete SwAutoCorrect before exit handlers
     }
 
diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx
index 0c042bb..c57ede2 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -702,6 +702,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
             if( bSet != rACfg.IsAutoFormatByInput() )
             {
                 rACfg.SetAutoFormatByInput( bSet );
+                rACfg.Commit();
                 GetView().GetViewFrame()->GetBindings().Invalidate( nSlot );
                 if ( !pItem )
                     rReq.AppendItem( SfxBoolItem( GetPool().GetWhich(nSlot), bSet ) );