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

[Caolán McNamara (via logerrit)]

 sc/source/core/data/dpcache.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6feaa8cab9e63a1f13a5bb272aad992f9a5b58ae
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Jun 11 09:44:40 2019 +0100
Commit:     Dennis Francis <dennis.francis at collabora.com>
CommitDate: Wed Jun 12 09:48:36 2019 +0200

    Resolves: tdf#125808 empty labels in pivot table from registered data source
    
    since...
    
    commit 238cadd315901cbacfd9304bb1205e9f53f13eae
    Date:   Wed Apr 10 04:30:25 2019 +0530
    
        dpcache : use case-insensitive normalization of...
    
    Change-Id: I19057bde268ec07561da323bc694536dcad03a95
    Reviewed-on: https://gerrit.libreoffice.org/73821
    Tested-by: Jenkins
    Reviewed-by: Dennis Francis <dennis.francis at collabora.com>

diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx
index fce310bd1ee6..5420185887e9 100644
--- a/sc/source/core/data/dpcache.cxx
+++ b/sc/source/core/data/dpcache.cxx
@@ -374,8 +374,8 @@ std::vector<OUString> normalizeLabels(const std::vector<InitColumnData>& rColDat
 
 std::vector<OUString> normalizeLabels(const ScDPCache::DBConnector& rDB, const sal_Int32 nLabelCount)
 {
-    std::vector<OUString> aLabels(nLabelCount+1);
-    aLabels.push_back(ScResId(STR_PIVOT_DATA));
+    std::vector<OUString> aLabels(1u, ScResId(STR_PIVOT_DATA));
+    aLabels.reserve(nLabelCount + 1);
 
     LabelSet aExistingNames;