diff options
| author | Eike Rathke <erack@redhat.com> | 2014-05-09 00:11:06 +0200 |
|---|---|---|
| committer | Kohei Yoshida <libreoffice@kohei.us> | 2014-05-09 00:39:41 +0000 |
| commit | 948728a4159a8ba74ecc663373d31f1840fed9ac (patch) | |
| tree | 9ba5cea08c41c7aeefaf9a39a29a0cf6872bcd6e /sc/inc | |
| parent | 6a1c8a0b53c8ec1c822e60913c1ccdfd2eaa21ce (diff) | |
resolve fdo#77509 memory corruption / crash in Consolidate
Regression introduced with c81dec478ab0618f2acd2580654a93d3a7185444
memcpy some sizeof(OUString) is doomed to fail.
Change-Id: I81dc9cc7eaf02607ed05b4d284a7e5e462eeeb0a
(cherry picked from commit e891afeccba8f20f8bdaeacb20f2215cfcb1abfd)
Reviewed-on: https://gerrit.libreoffice.org/9282
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
Tested-by: Kohei Yoshida <libreoffice@kohei.us>
Diffstat (limited to 'sc/inc')
| -rw-r--r-- | sc/inc/consoli.hxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sc/inc/consoli.hxx b/sc/inc/consoli.hxx index 9ae506096eeb..e93ea8a9fa96 100644 --- a/sc/inc/consoli.hxx +++ b/sc/inc/consoli.hxx @@ -80,11 +80,10 @@ private: double** ppCount; double** ppSumSqr; ScReferenceList** ppRefs; - OUString* mpColHeaders; - OUString* mpRowHeaders; + ::std::vector<OUString> maColHeaders; + ::std::vector<OUString> maRowHeaders; + ::std::vector<OUString> maTitles; SCSIZE nDataCount; - SCSIZE nTitleCount; - OUString* mpTitles; SCSIZE** ppTitlePos; sal_Bool bCornerUsed; OUString aCornerText; // only for bColByName && bRowByName |