[Libreoffice-commits] core.git: framework/source

[Libreoffice Gerrit user]

 framework/source/layoutmanager/toolbarlayoutmanager.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0785b156e52705f8b8c6cd0ff5c71f45af9de4fe
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Oct 20 21:16:30 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Oct 21 20:13:14 2018 +0200

    pvs-studio: A part of conditional expression is always true
    
    Change-Id: I57e3feeedf6a235c576bfc2ed3a4bd98eb86a5c4
    Reviewed-on: https://gerrit.libreoffice.org/62109
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index e374da107921..8451bef2bbfc 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -3388,7 +3388,7 @@ awt::DockingData SAL_CALL ToolbarLayoutManager::docking( const awt::DockingEvent
                                                    aNewDockingRect.getWidth(), aNewDockingRect.getHeight() );
                 aDockingData.TrackingRectangle = aNewTrackingRect;
             }
-            else if ( pToolBox && bDockingInProgress )
+            else if (pToolBox)
             {
                 bool bIsHorizontal = isToolboxHorizontalAligned( pToolBox );
                 awt::Size aFloatSize = aUIDockingElement.m_aFloatingData.m_aSize;