summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2018-11-13 00:40:43 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2018-11-18 12:32:18 +0100
commita208ece66416048cdc99235a569bd8c928a07394 (patch)
treee05fd7f828564bd370d21f897cfd2da7fa8f7488 /framework
parentcf6b3bece7d46878302075329c72c7541c65bbd0 (diff)
tdf#120703 PVS: V560 A part of conditional expression is always true/false
Change-Id: I60bb778a88dd5619efd4858eb74d56d28616c777 Reviewed-on: https://gerrit.libreoffice.org/63520 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'framework')
-rw-r--r--framework/source/uielement/controlmenucontroller.cxx5
1 files changed, 2 insertions, 3 deletions
diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx
index 9685ac385a95..bcb88030a8e3 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -292,9 +292,8 @@ void SAL_CALL ControlMenuController::itemActivated( const css::awt::MenuEvent& )
// Check if some modes have changed so we have to update our menu images
const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
bool bShowMenuImages = rSettings.GetUseImagesInMenus();
- bool bUpdateImages = (bShowMenuImages != m_bShowMenuImages);
- if ( bUpdateImages )
+ if (bShowMenuImages != m_bShowMenuImages)
{
m_bShowMenuImages = bShowMenuImages;
@@ -302,7 +301,7 @@ void SAL_CALL ControlMenuController::itemActivated( const css::awt::MenuEvent& )
if ( pPopupMenu )
{
PopupMenu* pVCLPopupMenu = static_cast<PopupMenu *>(pPopupMenu->GetMenu());
- if ( pVCLPopupMenu && bUpdateImages )
+ if (pVCLPopupMenu)
updateImagesPopupMenu( pVCLPopupMenu );
}
}