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

[Caolán McNamara (via logerrit)]

 connectivity/source/drivers/firebird/Catalog.cxx |    1 -
 sc/source/ui/dataprovider/datatransformation.cxx |    6 ++++++
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 0413a3e3f662f4a12823b62d93f8887a055b1179
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Sun Mar 15 16:33:20 2020 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Sun Mar 15 22:16:39 2020 +0100

    cid#1460665 Division or modulo by float zero
    
    Change-Id: Iea166a3d152b5b38665691bfa16f3022d684771c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90532
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/sc/source/ui/dataprovider/datatransformation.cxx 
b/sc/source/ui/dataprovider/datatransformation.cxx
index 93b84cf0869a..8aceefe57f4f 100644
--- a/sc/source/ui/dataprovider/datatransformation.cxx
+++ b/sc/source/ui/dataprovider/datatransformation.cxx
@@ -123,6 +123,7 @@ void MergeColumnTransformation::Transform(ScDocument& rDoc) 
const
     {
         nMaxRow = getLastRow(rDoc, itr);
     }
+    assert(nMaxRow != -1);
 
     SCCOL nTargetCol = *maColumns.begin();
 
@@ -197,6 +198,8 @@ void TextTransformation::Transform(ScDocument& rDoc) const
     {
         nEndRow = getLastRow(rDoc, rCol);
     }
+    assert(nEndRow != -1);
+
     for(auto& rCol : mnCol)
     {
         switch (maType)
@@ -307,6 +310,7 @@ void AggregateFunction::Transform(ScDocument& rDoc) const
     {
         nEndRow = getLastRow(rDoc, itr);
     }
+    assert(nEndRow != -1);
 
     for (auto& rCol : maColumns)
     {
@@ -424,6 +428,7 @@ void NumberTransformation::Transform(ScDocument& rDoc) const
     {
         nEndRow = getLastRow(rDoc, rCol);
     }
+    assert(nEndRow != -1);
 
     for(auto& rCol : mnCol)
     {
@@ -718,6 +723,7 @@ void DateTimeTransformation::Transform(ScDocument& rDoc) 
const
     {
         nEndRow = getLastRow(rDoc, rCol);
     }
+    assert(nEndRow != -1);
 
     for(auto& rCol : mnCol)
     {
commit 3905eda231ec3006965539f49af3f8bb048a9df9
Author:     Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Sun Mar 15 22:10:25 2020 +0100
Commit:     Julien Nabet <serval2...@yahoo.fr>
CommitDate: Sun Mar 15 22:16:31 2020 +0100

    Firebird: TODO already fixed (SYSTEM TABLES filtered)
    
    TODO added with:
    commit ec365165ba7f332df479422174899808e1ff4152
    Author: Andrzej J.R. Hunt <andr...@ahunt.org>
    Date:   Mon Aug 12 17:15:46 2013 +0100
    
        Implement refreshTables. (firebird-sdbc)
    
    then fixed with:
    commit c73286f83c64b5216ee430c72a412a2903eee16b
    Author: Andrzej J.R. Hunt <andr...@ahunt.org>
    Date:   Wed Aug 14 09:30:52 2013 +0100
    
        Use table type in getTables. (firebird-sdbc)
    
    +
    
    commit 0506b35c50eddb010097b1359295da2ba6fd3ee1
    Author: Andrzej J.R. Hunt <andr...@ahunt.org>
    Date:   Wed Aug 14 08:49:54 2013 +0100
    
        Avoid selecting system tables for viewing. (firebird-sdbc)
    
    Change-Id: I1882f92a63d23a7cfad4a0e1930b57eec0365e9e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90540
    Tested-by: Julien Nabet <serval2...@yahoo.fr>
    Reviewed-by: Julien Nabet <serval2...@yahoo.fr>

diff --git a/connectivity/source/drivers/firebird/Catalog.cxx 
b/connectivity/source/drivers/firebird/Catalog.cxx
index 6207625296f6..f5969f31ce63 100644
--- a/connectivity/source/drivers/firebird/Catalog.cxx
+++ b/connectivity/source/drivers/firebird/Catalog.cxx
@@ -27,7 +27,6 @@ Catalog::Catalog(const uno::Reference< XConnection >& 
rConnection):
 //----- OCatalog -------------------------------------------------------------
 void Catalog::refreshTables()
 {
-    // TODO: set type -- currently we also get system tables...
     Sequence< OUString > aTypes(2);
     aTypes[0] = "TABLE";
     aTypes[1] = "VIEW";
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits