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

[Markus Mohrhard]

 sc/source/filter/excel/excrecds.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 1e6e5d3c1df1291500852c340855b9c386418f3f
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date:   Tue Jun 10 06:30:09 2014 +0200

    fix invalid memory access related to temporary object
    
    e.g. export of ooo116460-2.xlsx
    
    Change-Id: Id1ca2249e7b1f197a2df0d122c57dd97c4c4d785
    Reviewed-on: https://gerrit.libreoffice.org/9719
    Reviewed-by: Caolán McNamara <caol...@redhat.com>
    Tested-by: Caolán McNamara <caol...@redhat.com>

diff --git a/sc/source/filter/excel/excrecds.cxx 
b/sc/source/filter/excel/excrecds.cxx
index 614a70a..847e61d 100644
--- a/sc/source/filter/excel/excrecds.cxx
+++ b/sc/source/filter/excel/excrecds.cxx
@@ -894,7 +894,8 @@ void XclExpAutofilter::SaveXml( XclExpXmlStream& rStrm )
             std::vector<OUString>::const_iterator itr = maMultiValues.begin(), 
itrEnd = maMultiValues.end();
             for (; itr != itrEnd; ++itr)
             {
-                const char* pz = OUStringToOString(*itr, 
RTL_TEXTENCODING_UTF8).getStr();
+                OString aStr = OUStringToOString(*itr, RTL_TEXTENCODING_UTF8);
+                const char* pz = aStr.getStr();
                 rWorksheet->singleElement(XML_filter, XML_val, pz, FSEND);
             }
             rWorksheet->endElement(XML_filters);

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits