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

Eike Rathke erack at redhat.com
Thu Mar 15 18:00:44 UTC 2018


 sc/source/core/data/documen3.cxx |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 47481514174583214cb2c6773caba3e0a439c9f5
Author: Eike Rathke <erack at redhat.com>
Date:   Thu Mar 15 18:59:15 2018 +0100

    Use return value of ScTable::GetDataEntries()
    
    It's unnecessary to insert an empty set and sort it..
    
    Change-Id: I01b7ce926747083dc9b5a82304c8ab182cd5a1bd

diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index 98a3f403bc30..70afce47b4e3 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -1622,9 +1622,11 @@ void ScDocument::GetDataEntries(
         return;
 
     std::set<ScTypedStrData> aStrings;
-    maTabs[nTab]->GetDataEntries(nCol, nRow, aStrings, bLimit);
-    rStrings.insert(rStrings.end(), aStrings.begin(), aStrings.end());
-    sortAndRemoveDuplicates(rStrings, true/*bCaseSens*/);
+    if (maTabs[nTab]->GetDataEntries(nCol, nRow, aStrings, bLimit))
+    {
+        rStrings.insert(rStrings.end(), aStrings.begin(), aStrings.end());
+        sortAndRemoveDuplicates(rStrings, true/*bCaseSens*/);
+    }
 }
 
 /**


More information about the Libreoffice-commits mailing list