[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sc/source

Eike Rathke erack at redhat.com
Thu Jun 25 07:45:25 PDT 2015


 sc/source/core/tool/dbdata.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 0ddddb177059a86a02e99cdca706a685d970e2bb
Author: Eike Rathke <erack at redhat.com>
Date:   Thu Jun 25 16:37:13 2015 +0200

    bail out early if maTableColumnNames.empty()
    
    Change-Id: Icda700e80aa3a48ea77b2bc90d73c37b67b62ba8
    (cherry picked from commit 5fbe0fa0dbd823b201e92e65b08742b3853ce4d1)

diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx
index 113fa5f..e51da5d 100644
--- a/sc/source/core/tool/dbdata.cxx
+++ b/sc/source/core/tool/dbdata.cxx
@@ -624,6 +624,9 @@ private:
 
 sal_Int32 ScDBData::GetColumnNameOffset( const OUString& rName ) const
 {
+    if (maTableColumnNames.empty())
+        return -1;
+
     ::std::vector<OUString>::const_iterator it(
             ::std::find_if( maTableColumnNames.begin(), maTableColumnNames.end(), TableColumnNameSearch( rName)));
     if (it != maTableColumnNames.end())


More information about the Libreoffice-commits mailing list