diff options
| author | Andre Fischer <Andre.W.Fischer <Andre Fischer<Andre.W.Fischer@Sun.COM> | 2010-07-08 12:27:24 +0200 |
|---|---|---|
| committer | Andre Fischer <Andre.W.Fischer <Andre Fischer<Andre.W.Fischer@Sun.COM> | 2010-07-08 12:27:24 +0200 |
| commit | 436416a6320037855846fce127a0cfa77ac45270 (patch) | |
| tree | 2a6326eecb06a6996d68580df4b8260515c46b4c /sd/source/ui/dlg/PaneDockingWindow.cxx | |
| parent | df76bfb0695d19d201936df80192108e7ce51b8c (diff) | |
renaissance1: resolved merge conflicts, cleanup.
Diffstat (limited to 'sd/source/ui/dlg/PaneDockingWindow.cxx')
| -rw-r--r-- | sd/source/ui/dlg/PaneDockingWindow.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sd/source/ui/dlg/PaneDockingWindow.cxx b/sd/source/ui/dlg/PaneDockingWindow.cxx index ced567f4f6f6..bcf58c38c0b1 100644 --- a/sd/source/ui/dlg/PaneDockingWindow.cxx +++ b/sd/source/ui/dlg/PaneDockingWindow.cxx @@ -67,7 +67,7 @@ void PaneDockingWindow::StateChanged( StateChangedType nType ) { case STATE_CHANGE_INITSHOW: Resize(); - mpContentWindow->SetStyle(mpContentWindow->GetStyle() | WB_DIALOGCONTROL); + GetContentWindow().SetStyle(GetContentWindow().GetStyle() | WB_DIALOGCONTROL); break; case STATE_CHANGE_VISIBLE: @@ -89,15 +89,15 @@ void PaneDockingWindow::StateChanged( StateChangedType nType ) void PaneDockingWindow::MouseButtonDown (const MouseEvent& rEvent) { - if (rEvent.GetButtons() == MOUSE_LEFT && mpContentWindow) + if (rEvent.GetButtons() == MOUSE_LEFT) { // For some strange reason we have to set the WB_DIALOGCONTROL at // the content window in order to have it pass focus to its content // window. Without setting this flag here that works only on views // that have not been taken from the cash and relocated to this pane // docking window. - mpContentWindow->SetStyle(mpContentWindow->GetStyle() | WB_DIALOGCONTROL); - mpContentWindow->GrabFocus(); + GetContentWindow().SetStyle(GetContentWindow().GetStyle() | WB_DIALOGCONTROL); + GetContentWindow().GrabFocus(); } SfxDockingWindow::MouseButtonDown(rEvent); } @@ -118,9 +118,10 @@ void PaneDockingWindow::SetValidSizeRange (const Range aValidSizeRange) const USHORT nSetId (pSplitWindow->GetSet(nId)); // Because the PaneDockingWindow paints its own decoration, we have // to compensate the valid size range for that. + const SvBorder aBorder (GetDecorationBorder()); sal_Int32 nCompensation (pSplitWindow->IsHorizontal() - ? mnTitleBarHeight + maBorder.Top() + maBorder.Bottom() - : maBorder.Left() + maBorder.Right()); + ? mnTitleBarHeight + aBorder.Top() + aBorder.Bottom() + : aBorder.Left() + aBorder.Right()); pSplitWindow->SetItemSizeRange( nSetId, Range( |