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

[Giuseppe Bilotta]

 sw/source/uibase/dbui/dbmgr.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit aa39d4946222f8b43703acb0a132c103272ef3f6
Author: Giuseppe Bilotta <giuseppe.bilotta at gmail.com>
Date:   Wed Oct 1 15:46:43 2014 +0200

    dbmgr: consistently initialize colum type to DataType::SQLNULL
    
    Fixes a warning about use uninitialized in
    SwDBManager::FillCalcWithMergeData().
    
    Change-Id: I03954f6d47a699e3a694269757ad9613b92c5695
    Reviewed-on: https://gerrit.libreoffice.org/11740
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>
    Tested-by: Jan-Marek Glogowski <glogow at fbihome.de>

diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 49a714f..623b933 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -1763,7 +1763,7 @@ OUString SwDBManager::GetDBField(uno::Reference<XPropertySet> xColumnProps,
         return sRet;
 
     Any aType = xColumnProps->getPropertyValue("Type");
-    sal_Int32 eDataType = 0;
+    sal_Int32 eDataType = DataType::SQLNULL;
     aType >>= eDataType;
     switch(eDataType)
     {
@@ -1966,7 +1966,7 @@ bool SwDBManager::FillCalcWithMergeData( SvNumberFormatter *pDocFormatter,
             if( lcl_GetColumnCnt(pImpl->pMergeData, rColName, nLanguage, aString, &aNumber) )
             {
                 // get the column type
-                sal_Int32 nColumnType;
+                sal_Int32 nColumnType = DataType::SQLNULL;
                 Any aCol = xCols->getByName( pColNames[nCol] );
                 uno::Reference<XPropertySet> xCol;
                 aCol >>= xCol;