diff options
| -rw-r--r-- | include/sfx2/sidebar/SidebarToolBox.hxx | 8 | ||||
| -rw-r--r-- | sfx2/source/sidebar/SidebarToolBox.cxx | 48 |
2 files changed, 0 insertions, 56 deletions
diff --git a/include/sfx2/sidebar/SidebarToolBox.hxx b/include/sfx2/sidebar/SidebarToolBox.hxx index 5627749cb1d4..74e4e87585f1 100644 --- a/include/sfx2/sidebar/SidebarToolBox.hxx +++ b/include/sfx2/sidebar/SidebarToolBox.hxx @@ -53,13 +53,6 @@ public: virtual void Paint (const Rectangle& rRect); - virtual Point GetPosPixel (void) const; - virtual void setPosSizePixel ( - long nX, - long nY, - long nWidth, - long nHeight, - sal_uInt16 nFlags); virtual long Notify (NotifyEvent& rEvent); cssu::Reference<css::frame::XToolbarController> GetControllerForItemId ( @@ -73,7 +66,6 @@ public: const ::rtl::OUString& rsCommandName); private: - bool mbParentIsBorder; Image maItemSeparator; class ItemDescriptor { 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<ToolBoxBackground*>(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) |