summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2015-03-10 23:56:55 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-03-19 11:04:18 +0000
commit32a466e6a95723f26d20a20e74d1f0e563d5dbca (patch)
tree954c135d846263031108129962e578e23bec6b92
parentafae8d1e9eb37265bd356773caa77d6d8ac481bc (diff)
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@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--editeng/source/misc/acorrcfg.cxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/editeng/source/misc/acorrcfg.cxx b/editeng/source/misc/acorrcfg.cxx
index dce7df478b63..9ca989c6cace 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 */ )