diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-01-12 20:14:18 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-01-12 20:14:18 +0100 |
| commit | 43b137e1404acbd16649813e9d493ba97b8f509c (patch) | |
| tree | 2e5827c0d60185c56603e66b1ea74a72230b9476 /svtools/source/dialogs/addresstemplate.cxx | |
| parent | c049c76fc521f2b55b39a6e9eb0f0092bcf6ef77 (diff) | |
More loplugin:cstylecast: svtools
auto-rewrite with <https://gerrit.libreoffice.org/#/c/47798/> "Enable
loplugin:cstylecast for some more cases" plus
solenv/clang-format/reformat-formatted-files
Change-Id: Ide9e7c53b554f0a36e2078a8823f5ef6fb5cc8fa
Diffstat (limited to 'svtools/source/dialogs/addresstemplate.cxx')
| -rw-r--r-- | svtools/source/dialogs/addresstemplate.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index fd1c4a548285..b1df44bdf245 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -617,7 +617,7 @@ void AssignmentPersistentData::ImplCommit() // the logical names OUString sLogicalFieldNames(STR_LOGICAL_FIELD_NAMES); sal_Int32 nAdjustedTokenCount = comphelper::string::getTokenCount(sLogicalFieldNames, ';') + (m_pImpl->bOddFieldNumber ? 1 : 0); - DBG_ASSERT(nAdjustedTokenCount == (sal_Int32)m_pImpl->aFieldLabels.size(), + DBG_ASSERT(nAdjustedTokenCount == static_cast<sal_Int32>(m_pImpl->aFieldLabels.size()), "AddressBookSourceDialog::AddressBookSourceDialog: inconsistence between logical and UI field names!"); m_pImpl->aLogicalFieldNames.reserve(nAdjustedTokenCount); for (sal_Int32 i = 0; i<nAdjustedTokenCount; ++i) @@ -1049,8 +1049,8 @@ void AssignmentPersistentData::ImplCommit() // the new row for the focus sal_Int32 nNewFocusRow = nOldFocusRow + nDelta; // normalize - nNewFocusRow = std::min(nNewFocusRow, (sal_Int32)(FIELD_PAIRS_VISIBLE - 1), ::std::less< sal_Int32 >()); - nNewFocusRow = std::max(nNewFocusRow, (sal_Int32)0, ::std::less< sal_Int32 >()); + nNewFocusRow = std::min(nNewFocusRow, sal_Int32(FIELD_PAIRS_VISIBLE - 1), ::std::less< sal_Int32 >()); + nNewFocusRow = std::max(nNewFocusRow, sal_Int32(0), ::std::less< sal_Int32 >()); // set the new focus (in the same column) m_pImpl->pFields[nNewFocusRow * 2 + nOldFocusColumn]->GrabFocus(); } |