[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - connectivity/source

[Xisco Fauli (via logerrit)]

 connectivity/source/drivers/firebird/ResultSetMetaData.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a624aa0e4c8ac86b40a84a072c2671f2f14c9a26
Author:     Xisco Fauli <xiscofauli at libreoffice.org>
AuthorDate: Wed Jul 10 16:00:56 2019 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Sun Aug 4 21:01:29 2019 +0200

    tdf#121528: Firebird stores scale as a negative number
    
    Change-Id: Ic301952aeef93d3035b04442e70705d08f45f95d
    Reviewed-on: https://gerrit.libreoffice.org/75357
    Reviewed-by: Lionel Elie Mamane <lionel at mamane.lu>
    Tested-by: Jenkins
    (cherry picked from commit 3278dfd0a2c09f8a8862277dffd9ef666d4862c6)
    Reviewed-on: https://gerrit.libreoffice.org/75376
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
    (cherry picked from commit 147d65c471efd4c0d4299dbaeac70922fac0f4f3)
    Reviewed-on: https://gerrit.libreoffice.org/75489
    Reviewed-by: Tamás Bunth <btomi96 at gmail.com>
    (cherry picked from commit d8ba2f6c559218191482489fa4d8e5b760ebbd5f)
    Reviewed-on: https://gerrit.libreoffice.org/76921
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/connectivity/source/drivers/firebird/ResultSetMetaData.cxx b/connectivity/source/drivers/firebird/ResultSetMetaData.cxx
index 6c1b8e8d09bb..f332b6e8bc18 100644
--- a/connectivity/source/drivers/firebird/ResultSetMetaData.cxx
+++ b/connectivity/source/drivers/firebird/ResultSetMetaData.cxx
@@ -106,7 +106,7 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnType(sal_Int32 column)
 
     ColumnTypeInfo aInfo( m_pSqlda->sqlvar[column-1].sqltype,
             m_pSqlda->sqlvar[column-1].sqlsubtype,
-            m_pSqlda->sqlvar[column-1].sqlscale,
+            -(m_pSqlda->sqlvar[column-1].sqlscale),
             sCharset );
 
     return aInfo.getSdbcType();
@@ -156,7 +156,7 @@ OUString SAL_CALL OResultSetMetaData::getColumnTypeName(sal_Int32 column)
 
     ColumnTypeInfo aInfo( m_pSqlda->sqlvar[column-1].sqltype,
             m_pSqlda->sqlvar[column-1].sqlsubtype,
-            m_pSqlda->sqlvar[column-1].sqlscale );
+            -(m_pSqlda->sqlvar[column-1].sqlscale) );
 
     return aInfo.getColumnTypeName();
 }