sfx2/source/dialog/templdlg.cxx | 2 ++ vcl/source/window/dockwin.cxx | 15 ++++++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-)
New commits: commit 048eca411083bc8a2ef95e5701bf7eba5d232a2d Author: Andre Fischer <a...@apache.org> Date: Fri May 17 08:56:55 2013 +0000 Resolves: #i122329# Disable undocking of stylist in the sidebar (cherry picked from commit 8dc875f17c0cdd41e7ba6ad2f4c1ea3bda1a8be2) Change-Id: I1a19135d3496463c8759e341449fa51d389fa264 diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index dda190a..2f04b53 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 2ee2f48..42954e6 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 ); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits