Kaydet (Commit) c6e576da authored tarafından Andre Fischer's avatar Andre Fischer Kaydeden (comit) Caolán McNamara

Resolves: #i122329# Disable undocking of stylist in the sidebar

(cherry picked from commit 8dc875f1)

Change-Id: I1a19135d3496463c8759e341449fa51d389fa264
(cherry picked from commit 048eca411083bc8a2ef95e5701bf7eba5d232a2d)
üst 05b2cd08
...@@ -398,6 +398,8 @@ SfxTemplatePanelControl::SfxTemplatePanelControl ( ...@@ -398,6 +398,8 @@ SfxTemplatePanelControl::SfxTemplatePanelControl (
OSL_ASSERT(mpBindings!=NULL); OSL_ASSERT(mpBindings!=NULL);
pImpl->updateNonFamilyImages(); pImpl->updateNonFamilyImages();
SetStyle(GetStyle() & ~WB_DOCKABLE);
} }
......
...@@ -755,10 +755,19 @@ void DockingWindow::Resizing( Size& ) ...@@ -755,10 +755,19 @@ void DockingWindow::Resizing( Size& )
void DockingWindow::StateChanged( StateChangedType nType ) void DockingWindow::StateChanged( StateChangedType nType )
{ {
if ( nType == STATE_CHANGE_CONTROLBACKGROUND ) switch(nType)
{ {
ImplInitSettings(); case STATE_CHANGE_CONTROLBACKGROUND:
Invalidate(); ImplInitSettings();
Invalidate();
break;
case STATE_CHANGE_STYLE:
mbDockable = (GetStyle() & WB_DOCKABLE) != 0;
break;
default:
break;
} }
Window::StateChanged( nType ); Window::StateChanged( nType );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment