sw/inc/shellres.hxx | 2 +- sw/source/ui/utlui/initui.cxx | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-)
New commits: commit a0926265dbfc617603cfa1fb8a4a22a5663183fe Author: Caolán McNamara <caol...@redhat.com> Date: Sat Dec 1 12:18:53 2012 +0000 Resolves: fdo#56549 crash in format->autocorrect->apply and edit changes regression from cad9afa15f53d547733fa55f1353772f6d696611 Change-Id: I1aa36bf86969a5a90456817d360d59125948e519 (cherry picked from commit 32c26ffb1f7585318a11f684a9886b58cea5b307) Reviewed-on: https://gerrit.libreoffice.org/1218 Reviewed-by: Miklos Vajna <vmik...@suse.cz> Tested-by: Miklos Vajna <vmik...@suse.cz> diff --git a/sw/inc/shellres.hxx b/sw/inc/shellres.hxx index 688fe08..7a7a543 100644 --- a/sw/inc/shellres.hxx +++ b/sw/inc/shellres.hxx @@ -95,7 +95,7 @@ struct SW_DLLPUBLIC ShellResource : public Resource private: void _GetAutoFmtNameLst() const; - std::vector<String> *pAutoFmtNameLst; + mutable std::vector<String> *pAutoFmtNameLst; String sPageDescFirstName; String sPageDescFollowName; String sPageDescName; diff --git a/sw/source/ui/utlui/initui.cxx b/sw/source/ui/utlui/initui.cxx index 1a3e6d4..0b2dac9 100644 --- a/sw/source/ui/utlui/initui.cxx +++ b/sw/source/ui/utlui/initui.cxx @@ -238,10 +238,10 @@ struct ImpAutoFmtNameListLoader : public Resource void ShellResource::_GetAutoFmtNameLst() const { - std::vector<String>* pLst(pAutoFmtNameLst); - pLst = new std::vector<String>; - pLst->reserve(STR_AUTOFMTREDL_END); - ImpAutoFmtNameListLoader aTmp( *pLst ); + assert(!pAutoFmtNameLst); + pAutoFmtNameLst = new std::vector<String>; + pAutoFmtNameLst->reserve(STR_AUTOFMTREDL_END); + ImpAutoFmtNameListLoader aTmp(*pAutoFmtNameLst); } ImpAutoFmtNameListLoader::ImpAutoFmtNameListLoader( std::vector<String>& rLst )
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits