diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-11-22 13:43:32 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-11-22 14:13:42 +0000 |
| commit | 19c3559e873e79a178e9c4932363e2a2cc1b9ac0 (patch) | |
| tree | 079739ebc85507ea229f1c5adc6930a228a5960b /framework | |
| parent | 6971159bb4468110d79c8367fcd776138302c1b9 (diff) | |
Resolves: rhbz#1397181 toolbar layout manager not respecting drag cancel
plus restore original mbDockCanceled state after wayland-enforced
cancel otherwise next drag won't work
Change-Id: Idefed25b925b36d0bf72b77609c4fc2eb47f71b9
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/layoutmanager/toolbarlayoutmanager.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx index 583d622ae3e1..b770fd8a86e0 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx @@ -3476,6 +3476,9 @@ throw (uno::RuntimeException, std::exception) void SAL_CALL ToolbarLayoutManager::endDocking( const awt::EndDockingEvent& e ) throw (uno::RuntimeException, std::exception) { + if (e.bCancelled) + return; + bool bDockingInProgress( false ); bool bStartDockFloated( false ); bool bFloating( false ); |