diff options
| -rw-r--r-- | sfx2/source/dialog/templdlg.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/dockwin.cxx | 15 |
2 files changed, 14 insertions, 3 deletions
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 7853b729c6ac..3d81345f8767 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -398,6 +398,8 @@ SfxTemplatePanelControl::SfxTemplatePanelControl ( OSL_ASSERT(mpBindings!=NULL); pImpl->updateNonFamilyImages(); + + SetStyle(GetStyle() & ~WB_DOCKABLE); } diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index 2ee2f4834144..42954e6a14bb 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -755,10 +755,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 ); |