[Libreoffice-commits] core.git: sc/source

[Stephan Bergmann]

 sc/source/ui/unoobj/chart2uno.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit cb93207d215b696a05246472ba4d13a7a3a2949d
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Sep 2 10:59:44 2016 +0200

    Avoid calling memcpy with illegal nullptr (when aHiddenValues.empty())
    
    Change-Id: I69801b2618c466e8fa31977feb2b07ec909cebff

diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index c443058..79282f5 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -19,6 +19,7 @@
 
 #include <sal/config.h>
 
+#include <algorithm>
 #include <utility>
 
 #include "chart2uno.hxx"
@@ -2628,7 +2629,8 @@ void ScChart2DataSequence::BuildDataCache()
 
     // convert the hidden cell list to sequence.
     m_aHiddenValues.realloc(aHiddenValues.size());
-    memcpy(m_aHiddenValues.getArray(), aHiddenValues.data(), sizeof(sal_Int32) * aHiddenValues.size());
+    std::copy(
+        aHiddenValues.begin(), aHiddenValues.end(), m_aHiddenValues.begin());
 
     // Clear the data series cache when the array is re-built.
     m_aMixedDataCache.realloc(0);