xmloff/source/style/xmlimppr.cxx | 2 +-
xmlsecurity/source/xmlsec/mscrypt/akmngr.cxx | 8 --------
2 files changed, 1 insertion(+), 9 deletions(-)
New commits:
commit 0b8682d83e9e5a9832383aff011af5429ddd7e71
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Oct 19 16:15:01 2018 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Sat Oct 20 19:52:52 2018 +0200
pvs-studio: Expression 'keyStore != nullptr' is always true.
Change-Id: I70a78f731a01f3344bf6c874995d367d26bf2397
Reviewed-on: https://gerrit.libreoffice.org/62052
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/xmlsecurity/source/xmlsec/mscrypt/akmngr.cxx
b/xmlsecurity/source/xmlsec/mscrypt/akmngr.cxx
index aafd7d10a66c..4054777afa1e 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/akmngr.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/akmngr.cxx
@@ -55,14 +55,6 @@ xmlSecKeysMngrPtr MSCryptoAppliedKeysMngrCreate()
return nullptr ;
}
- /*-
- * At present, MS Crypto engine do not provide a way to setup a key store.
- */
- if (keyStore != nullptr)
- {
- /*TODO: binding key store.*/
- }
-
keyMngr = xmlSecKeysMngrCreate() ;
if (keyMngr == nullptr)
{
commit 5fa9076a2926b2a54f001f78eea5ce0183466b61
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Oct 19 16:50:50 2018 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Sat Oct 20 19:52:38 2018 +0200
pvs-studio: An excessive check can be simplified
Change-Id: Idaa511d4ccf3d8542bdf6a1dcee4fa54c6d2315f
Reviewed-on: https://gerrit.libreoffice.org/62059
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/xmloff/source/style/xmlimppr.cxx b/xmloff/source/style/xmlimppr.cxx
index 8ebaa88d3fde..f14e64628618 100644
--- a/xmloff/source/style/xmlimppr.cxx
+++ b/xmloff/source/style/xmlimppr.cxx
@@ -585,7 +585,7 @@ void SvXMLImportPropertyMapper::PrepareForMultiPropertySet_(
if ( ( 0 == ( nPropFlags & MID_FLAG_NO_PROPERTY ) ) &&
( ( 0 != ( nPropFlags & MID_FLAG_MUST_EXIST ) ) ||
!rPropSetInfo.is() ||
- (rPropSetInfo.is() && rPropSetInfo->hasPropertyByName(
rPropName )) ) )
+ rPropSetInfo->hasPropertyByName(rPropName) ) )
{
// save property into property pair structure
aPropertyPairs.emplace_back( &rPropName, &rProp.maValue );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
