[Libreoffice-commits] core.git: 3 commits - connectivity/source fpicker/source xmlsecurity/source

[Stephan Bergmann]

 connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx |    2 +-
 fpicker/source/win32/folderpicker/MtaFop.cxx              |    2 +-
 xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx    |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit e28ed8c0fb2ffcf5d3a282563ee3a1bf5687b875
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Sun Dec 10 23:16:33 2017 +0100

    loplugin:conststringvar (clang-cl)
    
    Change-Id: Icb0e32716ae58886912a1a1c7c50e66f30256227
    Reviewed-on: https://gerrit.libreoffice.org/46202
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index 195c74ec5c3e..e2dff90c55fa 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -474,7 +474,7 @@ IMPL_STATIC_LINK_NOARG(DigitalSignaturesDialog, CertMgrButtonHdl, Button*, void)
     // FIXME: perhaps poke GpgME for uiserver, and hope it returns something useful?
     const OUString aGUIServers[] = { OUString("kleopatra.exe"), OUString("launch-gpa.exe"), OUString("gpa.exe"),
                                      OUString("bin\\kleopatra.exe"), OUString("bin\\launch-gpa.exe"), OUString("bin\\gpa.exe") };
-    const char* cPath = "C:\\Program Files (x86)\\GNU\\GnuPG";
+    const char* const cPath = "C:\\Program Files (x86)\\GNU\\GnuPG";
 #else
     const OUString aGUIServers[] = { OUString("kleopatra"), OUString("seahorse"),  OUString("gpa"), OUString("kgpg") };
     const char* cPath = getenv("PATH");
commit c8d46b68aec94528c3c787484df3b2ad5479d46b
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Sun Dec 10 23:15:33 2017 +0100

    loplugin:redundantcast (clang-cl)
    
    Change-Id: Ie36853231d58fdf985c32497732abe34f7828d7b
    Reviewed-on: https://gerrit.libreoffice.org/46201
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/fpicker/source/win32/folderpicker/MtaFop.cxx b/fpicker/source/win32/folderpicker/MtaFop.cxx
index 4958699a7e5d..497d1ebba835 100644
--- a/fpicker/source/win32/folderpicker/MtaFop.cxx
+++ b/fpicker/source/win32/folderpicker/MtaFop.cxx
@@ -704,7 +704,7 @@ ATOM SAL_CALL CMtaFolderPicker::RegisterStaRequestWindowClass( )
 
         wcex.cbSize         = sizeof(wcex);
         wcex.style          = 0;
-        wcex.lpfnWndProc    = static_cast< WNDPROC >( CMtaFolderPicker::StaWndProc );
+        wcex.lpfnWndProc    = CMtaFolderPicker::StaWndProc;
         wcex.cbClsExtra     = 0;
         wcex.cbWndExtra     = 0;
         wcex.hInstance      = m_hInstance;
commit 74254cd81542e308d905782da0500ba9ab9dba62
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Sun Dec 10 23:13:05 2017 +0100

    loplugin:unnecessaryparen (clang-cl)
    
    Change-Id: I2c5aa4c5c3a100de87d3f873b371dded994e4a7c
    Reviewed-on: https://gerrit.libreoffice.org/46200
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
index 6a066f680348..cbb9c9ff116b 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
@@ -87,7 +87,7 @@ sal_Int32 ODatabaseMetaData::getMaxSize(sal_uInt32 _nId)
     sal_Int32 nSize = 0;
     std::map<sal_uInt32,LiteralInfo>::const_iterator aIter = m_aLiteralInfo.find(_nId);
     if(aIter != m_aLiteralInfo.end() && (*aIter).second.fSupported)
-        nSize = (static_cast<sal_Int32>((*aIter).second.cchMaxLen) == (-1)) ? 0 : (*aIter).second.cchMaxLen;
+        nSize = (static_cast<sal_Int32>((*aIter).second.cchMaxLen) == -1) ? 0 : (*aIter).second.cchMaxLen;
     return nSize;
 }