diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2017-10-06 22:29:46 +0200 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2017-10-07 12:21:11 +0200 |
| commit | 4d31f2e1601efffdbdb3c54227e44666418da5d5 (patch) | |
| tree | c87afd0f7a363195c263a25afccbbb7fe583d957 /sw | |
| parent | fe6f598015176f69b49f4af6d4a2928ff47535c7 (diff) | |
Remove redundant comparison
Change-Id: I51820119f9dd6bacb852680b48f0b052ef6cb7e9
Reviewed-on: https://gerrit.libreoffice.org/43214
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/unocore/unofield.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index 8902c0ea8c27..9d0b21b2cbc5 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -626,7 +626,7 @@ void SAL_CALL SwXFieldMaster::setPropertyValue( } } - else if (!pType && m_pImpl->m_pDoc && rPropertyName == UNO_NAME_NAME) + else if (m_pImpl->m_pDoc && rPropertyName == UNO_NAME_NAME) { OUString sTypeName; rValue >>= sTypeName; @@ -2782,7 +2782,7 @@ sal_Bool SwXTextFieldMasters::hasByName(const OUString& rName) if( SwFieldIds::Unknown != nResId ) { sName = sName.copy(std::min(sTypeName.getLength()+1, sName.getLength())); - bRet = SwFieldIds::Unknown != nResId && nullptr != GetDoc()->getIDocumentFieldsAccess().GetFieldType(nResId, sName, true); + bRet = nullptr != GetDoc()->getIDocumentFieldsAccess().GetFieldType(nResId, sName, true); } return bRet; } |