[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - editeng/source

[Michael Stahl]

 editeng/source/misc/acorrcfg.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 32a466e6a95723f26d20a20e74d1f0e563d5dbca
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Mar 10 23:56:55 2015 +0100

    tdf#89867: editeng: fix crash on shutdown after changing AutoCorrect options
    
    Since commit 5bff4b016c4b44f4123e0e6a4fd4c0c4dc0cfa2d the
    SvxAutoCorrCfg::pAutoCorrect is cleared by one terminate() listener but
    then another terminate() listener calls Commit() on all modified
    utl::ConfigItem and these two have a Commit() that does not clear the
    modified flag so they are always modified.
    
    Sadly there's no non-virtual Commit() wrapper that
    calls ClearModified() on the base class...
    
    Change-Id: I9ae220d78bb109c7bf0fdc544754a0686b357115
    (cherry picked from commit d1698027e9f1c4a88b17da7357f257be3cfb7c1a)
    Reviewed-on: https://gerrit.libreoffice.org/14828
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/editeng/source/misc/acorrcfg.cxx b/editeng/source/misc/acorrcfg.cxx
index dce7df4..9ca989c 100644
--- a/editeng/source/misc/acorrcfg.cxx
+++ b/editeng/source/misc/acorrcfg.cxx
@@ -321,6 +321,7 @@ void SvxBaseAutoCorrCfg::Commit()
         }
     }
     PutProperties(aNames, aValues);
+    ClearModified();
 }
 
 void SvxBaseAutoCorrCfg::Notify( const Sequence<OUString>& /* aPropertyNames */)
@@ -640,6 +641,7 @@ void SvxSwAutoCorrCfg::Commit()
         }
     }
     PutProperties(aNames, aValues);
+    ClearModified();
 }
 
 void SvxSwAutoCorrCfg::Notify( const Sequence<OUString>& /* aPropertyNames */ )