From 087f0d5fee7af0cc00484df0e1f3678576f28ce2 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 16 Aug 2013 08:46:36 +0100 Subject: mbParentIsBorder is always false, follow logical consequences of that Change-Id: I6283a3d4df91447d15b62e738be07961ac00ef56 --- sfx2/source/sidebar/SidebarToolBox.cxx | 48 ---------------------------------- 1 file changed, 48 deletions(-) (limited to 'sfx2') diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx b/sfx2/source/sidebar/SidebarToolBox.cxx index 28685cc03817..fe20f4533b41 100644 --- a/sfx2/source/sidebar/SidebarToolBox.cxx +++ b/sfx2/source/sidebar/SidebarToolBox.cxx @@ -41,7 +41,6 @@ namespace sfx2 { namespace sidebar { SidebarToolBox::SidebarToolBox (Window* pParentWindow) : ToolBox(pParentWindow, 0), - mbParentIsBorder(false), maItemSeparator(Theme::GetImage(Theme::Image_ToolBoxItemSeparator)), maControllers(), mbAreHandlersRegistered(false) @@ -120,53 +119,6 @@ void SidebarToolBox::Paint (const Rectangle& rRect) -Point SidebarToolBox::GetPosPixel (void) const -{ - if (mbParentIsBorder) - { - const Point aParentPoint (GetParent()->GetPosPixel()); - const Point aChildPoint (ToolBox::GetPosPixel()); - return Point( - aParentPoint.X() + aChildPoint.X(), - aParentPoint.Y() + aChildPoint.Y()); - } - else - return ToolBox::GetPosPixel(); -} - - - - -void SidebarToolBox::setPosSizePixel ( - long nX, - long nY, - long nWidth, - long nHeight, - sal_uInt16 nFlags) -{ - if (mbParentIsBorder) - { - const Point aRelativePosition (static_cast(GetParent())->SetToolBoxChild( - this, - nX, - nY, - nWidth, - nHeight, - nFlags)); - ToolBox::setPosSizePixel( - aRelativePosition.X(), - aRelativePosition.Y(), - nWidth, - nHeight, - nFlags); - } - else - ToolBox::setPosSizePixel(nX, nY, nWidth, nHeight, nFlags); -} - - - - long SidebarToolBox::Notify (NotifyEvent& rEvent) { if (rEvent.GetType() == EVENT_KEYINPUT) -- cgit