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

[Caolán McNamara]

 connectivity/source/drivers/calc/CConnection.cxx       |    2 +-
 connectivity/source/drivers/calc/CDatabaseMetaData.cxx |    4 ++--
 vcl/backendtest/outputdevice/common.cxx                |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 2ae6847bb15957d437702987fa4dbc9a50be9b46
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Aug 25 20:56:55 2016 +0100

    Resolves: coverity#1371769 'Constant' variable guards dead code
    
    Change-Id: I95e829ecc685603e147e68b44cb403d4f010e320

diff --git a/vcl/backendtest/outputdevice/common.cxx b/vcl/backendtest/outputdevice/common.cxx
index ae3ef59..727fbcc 100644
--- a/vcl/backendtest/outputdevice/common.cxx
+++ b/vcl/backendtest/outputdevice/common.cxx
@@ -28,7 +28,7 @@ int deltaColor(BitmapColor aColor1, BitmapColor aColor2)
 void checkValue(Bitmap::ScopedWriteAccess& pAccess, int x, int y, Color aExpected,
                       int& nNumberOfQuirks, int& nNumberOfErrors, bool bQuirkMode, int nColorDeltaThresh = 0)
 {
-    bool bColorize = false;
+    const bool bColorize = false;
     Color aColor = pAccess->GetPixel(y, x);
     int nColorDelta = deltaColor(aColor, aExpected);
 
commit fd9e3d86951a95e6d2447a340740a8b12c0ff12a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Aug 23 20:42:42 2016 +0100

    DocHolder->DocHolder
    
    Change-Id: I8eddff0791a7887e1aee0515e73d40c54b97a0ae

diff --git a/connectivity/source/drivers/calc/CConnection.cxx b/connectivity/source/drivers/calc/CConnection.cxx
index 0d32d31..3934fd4 100644
--- a/connectivity/source/drivers/calc/CConnection.cxx
+++ b/connectivity/source/drivers/calc/CConnection.cxx
@@ -97,7 +97,7 @@ void OCalcConnection::construct(const OUString& url,const Sequence< PropertyValu
             break;
         }
     } // for(;pIter != pEnd;++pIter)
-    ODocHolder aDocHodler(this); // just to test that the doc can be loaded
+    ODocHolder aDocHolder(this); // just to test that the doc can be loaded
     acquireDoc();
 }
 
diff --git a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
index 8ed737b..47986d4 100644
--- a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
@@ -375,8 +375,8 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getTables(
 
     // get the sheet names from the document
 
-    OCalcConnection::ODocHolder aDocHodler(static_cast<OCalcConnection*>(m_pConnection));
-    Reference<XSpreadsheetDocument> xDoc = aDocHodler.getDoc();
+    OCalcConnection::ODocHolder aDocHolder(static_cast<OCalcConnection*>(m_pConnection));
+    Reference<XSpreadsheetDocument> xDoc = aDocHolder.getDoc();
     if ( !xDoc.is() )
         throw SQLException();
     Reference<XSpreadsheets> xSheets = xDoc->getSheets();