diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-11-25 16:31:42 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2018-11-25 16:52:30 +0100 |
| commit | c59a5b81e9521a92587e701bcad82bf643b00493 (patch) | |
| tree | b08b97f67c53e6ec1b3cae06cd19ebac2ca15cea /framework | |
| parent | Blind fix for pre-C++14 std::equal, for now (diff) | |
| download | core-c59a5b81e9521a92587e701bcad82bf643b00493.tar.gz core-c59a5b81e9521a92587e701bcad82bf643b00493.zip | |
tdf#120703 PVS: V560 A part of conditional expression is always true/false
Change-Id: I8d98aa7dd77fbd79611b8a4aba77e8c378fd1cae
Reviewed-on: https://gerrit.libreoffice.org/63981
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/layoutmanager/layoutmanager.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index b33f92557fd9..d26927ae61d2 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -478,13 +478,12 @@ bool LayoutManager::readWindowStateData( const OUString& aName, UIElement& rElem SolarMutexResettableGuard aWriteLock; bool bGlobalSettings( bInGlobalSettings ); - GlobalSettings* pGlobalSettings( nullptr ); if ( rGlobalSettings == nullptr ) { rGlobalSettings.reset( new GlobalSettings( rComponentContext ) ); bGetSettingsState = true; } - pGlobalSettings = rGlobalSettings.get(); + GlobalSettings* pGlobalSettings = rGlobalSettings.get(); aWriteLock.clear(); try @@ -563,7 +562,7 @@ bool LayoutManager::readWindowStateData( const OUString& aName, UIElement& rElem } // oversteer values with global settings - if ( pGlobalSettings && ( bGetSettingsState || bGlobalSettings )) + if (bGetSettingsState || bGlobalSettings) { if ( pGlobalSettings->HasToolbarStatesInfo()) { |