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

Stephan Bergmann sbergman at redhat.com
Tue Apr 28 13:48:50 PDT 2015


 sc/source/core/data/dpfilteredcache.cxx |    2 +-
 sd/source/ui/view/sdview.cxx            |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit bc0849dee744069488a54fe029f7a174fdd87dee
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Apr 28 22:42:16 2015 +0200

    default initialization of object of const type w/o user-provided default ctor
    
    ...same as aef1826d9ca318a1359a2116e7f146e993413234, actually fallout from
    diverging behavior regarding DR 253 betwween GCC/libstdc++ and Clang, cf. thread
    starting at <https://gcc.gnu.org/ml/libstdc++/2015-04/msg00165.html>
    "std::__debug::vector default ctor must not be defaulted"
    
    Change-Id: I9189d472b57249857d64f7d807a0e08fc1758759

diff --git a/sc/source/core/data/dpfilteredcache.cxx b/sc/source/core/data/dpfilteredcache.cxx
index f20b577..8487da4 100644
--- a/sc/source/core/data/dpfilteredcache.cxx
+++ b/sc/source/core/data/dpfilteredcache.cxx
@@ -301,7 +301,7 @@ const ::std::vector<SCROW>&  ScDPFilteredCache::getFieldEntries( sal_Int32 nColu
     if (nColumn < 0 || static_cast<size_t>(nColumn) >= maFieldEntries.size())
     {
         // index out of bound.  Hopefully this code will never be reached.
-        static const ::std::vector<SCROW> emptyEntries;
+        static const ::std::vector<SCROW> emptyEntries{};
         return emptyEntries;
     }
     return maFieldEntries[nColumn];
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index e5925fa..522d3be 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -422,7 +422,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewRedirector::createRedirectedP
                                 fPosX, fPosY));
 
                             // create DXTextArray (can be empty one)
-                            const ::std::vector< double > aDXArray;
+                            const ::std::vector< double > aDXArray{};
 
                             // create locale; this may need some more information in the future
                             const ::com::sun::star::lang::Locale aLocale;


More information about the Libreoffice-commits mailing list