summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-12-01 12:18:53 +0000
committerAndras Timar <atimar@suse.com>2013-01-13 22:00:19 +0100
commitb5c39d6842f7489f4782d7e771cf8822ee1f262c (patch)
tree0ac13a3294f06a2dd25d5778652b7e9ae7b2c6e1
parent45f64fb9d9017c833f8fe2a900b63f7a3a770cf1 (diff)
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 <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
-rw-r--r--sw/inc/shellres.hxx2
-rw-r--r--sw/source/ui/utlui/initui.cxx8
2 files changed, 5 insertions, 5 deletions
diff --git a/sw/inc/shellres.hxx b/sw/inc/shellres.hxx
index 688fe084385c..7a7a543694b0 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 1a3e6d4319d1..0b2dac9db19f 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 )