svn commit: r1483697 - in /openoffice/trunk/main: sfx2/source/dialog/templdlg.cxx vcl/source/window/dockwin.cxx

[af]

Author: af
Date: Fri May 17 08:56:55 2013
New Revision: 1483697

URL: http://svn.apache.org/r1483697
Log:
122329: Disable undocking of stylist in the sidebar.

Modified:
    openoffice/trunk/main/sfx2/source/dialog/templdlg.cxx
    openoffice/trunk/main/vcl/source/window/dockwin.cxx

Modified: openoffice/trunk/main/sfx2/source/dialog/templdlg.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/dialog/templdlg.cxx?rev=1483697&r1=1483696&r2=1483697&view=diff
==============================================================================
--- openoffice/trunk/main/sfx2/source/dialog/templdlg.cxx (original)
+++ openoffice/trunk/main/sfx2/source/dialog/templdlg.cxx Fri May 17 08:56:55 
2013
@@ -419,6 +419,8 @@ SfxTemplatePanelControl::SfxTemplatePane
     OSL_ASSERT(mpBindings!=NULL);
 
     pImpl->updateNonFamilyImages();
+
+    SetStyle(GetStyle() & ~WB_DOCKABLE);
 }
 
 

Modified: openoffice/trunk/main/vcl/source/window/dockwin.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/source/window/dockwin.cxx?rev=1483697&r1=1483696&r2=1483697&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/source/window/dockwin.cxx (original)
+++ openoffice/trunk/main/vcl/source/window/dockwin.cxx Fri May 17 08:56:55 2013
@@ -762,10 +762,19 @@ void DockingWindow::Resizing( Size& )
 
 void DockingWindow::StateChanged( StateChangedType nType )
 {
-    if ( nType == STATE_CHANGE_CONTROLBACKGROUND )
+    switch(nType)
     {
-        ImplInitSettings();
-        Invalidate();
+        case STATE_CHANGE_CONTROLBACKGROUND:
+            ImplInitSettings();
+            Invalidate();
+            break;
+
+        case STATE_CHANGE_STYLE:
+            mbDockable = (GetStyle() & WB_DOCKABLE) != 0;
+            break;
+
+        default:
+            break;
     }
 
     Window::StateChanged( nType );