diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2019-04-28 00:28:41 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2019-04-28 08:34:46 +0200 |
| commit | 38e7f933c86b66010f65d821155eccd9e8a4135e (patch) | |
| tree | 9b71f3b1927f66394af0ce1560388a6cb2daf96a /svx | |
| parent | 3159ba99d16bf875c28b77c1219a794d9e9a6186 (diff) | |
tdf#120703 PVS: V581 ifs with identical conditions
V581 The conditional expressions of the 'if' statements situated
alongside each other are identical.
Change-Id: I11fa13677c7980e6ac17fc4358406472ee784e41
Reviewed-on: https://gerrit.libreoffice.org/71446
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx | 3 | ||||
| -rw-r--r-- | svx/source/svdraw/svdedtv.cxx | 5 | ||||
| -rw-r--r-- | svx/source/svdraw/svdedtv2.cxx | 7 | ||||
| -rw-r--r-- | svx/source/tbxctrls/tbunosearchcontrollers.cxx | 5 |
4 files changed, 9 insertions, 11 deletions
diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx index 02e93dc159be..d188ce4d2243 100644 --- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx @@ -1540,9 +1540,6 @@ namespace sdr { namespace contact { if ( !bHadControl && rControl.is() && rControl.isVisible() ) rControl.invalidate(); - if ( !bHadControl && rControl.is() && rControl.isVisible() ) - rControl.invalidate(); - // check if we already have an XControl. if ( !xControlModel.is() || !rControl.is() ) { diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx index 5fffa2b3da23..51678b78b0d0 100644 --- a/svx/source/svdraw/svdedtv.cxx +++ b/svx/source/svdraw/svdedtv.cxx @@ -457,10 +457,9 @@ bool SdrEditView::IsDismantlePossible(bool bMakeLines) const void SdrEditView::CheckPossibilities() { if (mbSomeObjChgdFlag) - m_bPossibilitiesDirty=true; - - if (mbSomeObjChgdFlag) { + m_bPossibilitiesDirty = true; + // This call IS necessary to correct the MarkList, in which // no longer to the model belonging objects still can reside. // These ones need to be removed. diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx index 7b503bf9c5df..4f00a877ef35 100644 --- a/svx/source/svdraw/svdedtv2.cxx +++ b/svx/source/svdraw/svdedtv2.cxx @@ -1966,8 +1966,11 @@ void SdrEditView::ImpConvertTo(bool bPath, bool bLineToArea) } } EndUndo(); - if (bMrkChg) AdjustMarkHdl(); - if (bMrkChg) MarkListHasChanged(); + if (bMrkChg) + { + AdjustMarkHdl(); + MarkListHasChanged(); + } } } diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx index 8eba70390954..8d21bbb518ee 100644 --- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx +++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx @@ -121,9 +121,8 @@ void impl_executeSearch( const css::uno::Reference< css::uno::XComponentContext if (!aMatchCase) nFlags |= TransliterationFlags::IGNORE_CASE; if (aCTLOptions.IsCTLFontEnabled()) - nFlags |= TransliterationFlags::IGNORE_DIACRITICS_CTL; - if (aCTLOptions.IsCTLFontEnabled()) - nFlags |= TransliterationFlags::IGNORE_KASHIDA_CTL; + nFlags |= TransliterationFlags::IGNORE_DIACRITICS_CTL + | TransliterationFlags::IGNORE_KASHIDA_CTL; auto aArgs( comphelper::InitPropertySequence( { { "SearchItem.SearchString", css::uno::makeAny( sFindText ) }, |