diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2013-06-11 16:02:55 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2013-06-11 16:06:20 +0200 |
| commit | 9e851b69d13935a055ffcf08b9171330bbf5ebbb (patch) | |
| tree | 241afe419e1267888e7f6eac25ff1e3aa76d4114 | |
| parent | 3d0a22e8c3a848f7413d6bd090106371227260d0 (diff) | |
sidebar: Remove the setPosSizePixel hack.
Change-Id: I3c074f0860bf9cb384a7189038a214199a2d7222
| -rw-r--r-- | include/svx/sidebar/SidebarDialControl.hxx | 2 | ||||
| -rw-r--r-- | sc/uiconfig/scalc/ui/sidebaralignment.ui | 2 | ||||
| -rw-r--r-- | svx/source/sidebar/possize/SidebarDialControl.cxx | 15 |
3 files changed, 3 insertions, 16 deletions
diff --git a/include/svx/sidebar/SidebarDialControl.hxx b/include/svx/sidebar/SidebarDialControl.hxx index 68293e6ca8e4..a3e53d306c53 100644 --- a/include/svx/sidebar/SidebarDialControl.hxx +++ b/include/svx/sidebar/SidebarDialControl.hxx @@ -32,8 +32,6 @@ public: virtual ~SidebarDialControl (void); virtual Size GetOptimalSize() const; - virtual void setPosSizePixel(long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags = WINDOW_POSSIZE_ALL); - virtual void MouseButtonDown (const MouseEvent& rMEvt); protected: diff --git a/sc/uiconfig/scalc/ui/sidebaralignment.ui b/sc/uiconfig/scalc/ui/sidebaralignment.ui index 0a1481022016..c437636bf08e 100644 --- a/sc/uiconfig/scalc/ui/sidebaralignment.ui +++ b/sc/uiconfig/scalc/ui/sidebaralignment.ui @@ -294,7 +294,7 @@ <property name="use_action_appearance">False</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">0</property> </packing> diff --git a/svx/source/sidebar/possize/SidebarDialControl.cxx b/svx/source/sidebar/possize/SidebarDialControl.cxx index a0c1024a5a58..82163dd76a9a 100644 --- a/svx/source/sidebar/possize/SidebarDialControl.cxx +++ b/svx/source/sidebar/possize/SidebarDialControl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* * This file is part of the LibreOffice project. * @@ -40,9 +41,6 @@ SidebarDialControl::SidebarDialControl ( Init(GetOutputSizePixel()); } - - - SidebarDialControl::~SidebarDialControl (void) { } @@ -52,12 +50,6 @@ Size SidebarDialControl::GetOptimalSize() const return LogicToPixel(Size(10, 10), MAP_APPFONT); } -void SidebarDialControl::setPosSizePixel(long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags) -{ - long nMax = std::max(nWidth, nHeight); - DialControl::setPosSizePixel(nX, nY, nMax, nMax, nFlags); -} - void SidebarDialControl::MouseButtonDown( const MouseEvent& rMEvt ) { if( rMEvt.IsLeft() ) @@ -69,9 +61,6 @@ void SidebarDialControl::MouseButtonDown( const MouseEvent& rMEvt ) } } - - - void SidebarDialControl::HandleMouseEvent( const Point& rPos, bool bInitial ) { long nX = rPos.X() - mpImpl->mnCenterX; @@ -94,4 +83,4 @@ void SidebarDialControl::HandleMouseEvent( const Point& rPos, bool bInitial ) } } // end of namespace svx::sidebar -// eof +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |