[Libreoffice-commits] core.git: vcl/source vcl/uiconfig

[Jim Raykowski (via logerrit)]

 vcl/source/window/event.cxx              |    3 ++-
 vcl/uiconfig/ui/interimtearableparent.ui |    1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 99ac14c8ccf89a51de1b3fb9d14789406f2dc95f
Author:     Jim Raykowski <rayk...@gmail.com>
AuthorDate: Mon Feb 7 19:34:51 2022 -0900
Commit:     Jim Raykowski <rayk...@gmail.com>
CommitDate: Mon Mar 7 02:46:38 2022 +0100

    tdf#140222 make InterimTearableParent docking windows not dockable
    
    and only allow dockable type docking windows to be undocked/docked
    
    Change-Id: Ia1b0ccbdd911c24f83baf1c0514954e354c9070b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129650
    Tested-by: Jenkins
    Reviewed-by: Jim Raykowski <rayk...@gmail.com>

diff --git a/vcl/source/window/event.cxx b/vcl/source/window/event.cxx
index aca9fbb803da..4b94b70bc11c 100644
--- a/vcl/source/window/event.cxx
+++ b/vcl/source/window/event.cxx
@@ -111,7 +111,8 @@ bool Window::EventNotify( NotifyEvent& rNEvt )
     // check for docking window
     // but do nothing if window is docked and locked
     ImplDockingWindowWrapper *pWrapper = 
ImplGetDockingManager()->GetDockingWindowWrapper( this );
-    if (pWrapper && ( pWrapper->IsFloatingMode() || !pWrapper->IsLocked() ))
+    if ((GetStyle() & WB_DOCKABLE) &&
+            pWrapper && ( pWrapper->IsFloatingMode() || !pWrapper->IsLocked() 
))
     {
         const bool bDockingSupportCrippled = 
!StyleSettings::GetDockingFloatsSupported();
 
diff --git a/vcl/uiconfig/ui/interimtearableparent.ui 
b/vcl/uiconfig/ui/interimtearableparent.ui
index ad8e952b3582..4ab25d2e9b3e 100644
--- a/vcl/uiconfig/ui/interimtearableparent.ui
+++ b/vcl/uiconfig/ui/interimtearableparent.ui
@@ -9,7 +9,6 @@
     <property name="border_width">4</property>
     <property name="resizable">False</property>
     <property name="destroy_with_parent">True</property>
-    <property name="type_hint">dock</property>
     <child>
       <object class="GtkBox" id="box">
         <property name="visible">True</property>