Kaydet (Commit) 9e851b69 authored tarafından Jan Holesovsky's avatar Jan Holesovsky

sidebar: Remove the setPosSizePixel hack.

Change-Id: I3c074f0860bf9cb384a7189038a214199a2d7222
üst 3d0a22e8
...@@ -32,8 +32,6 @@ public: ...@@ -32,8 +32,6 @@ public:
virtual ~SidebarDialControl (void); virtual ~SidebarDialControl (void);
virtual Size GetOptimalSize() const; 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); virtual void MouseButtonDown (const MouseEvent& rMEvt);
protected: protected:
......
...@@ -294,7 +294,7 @@ ...@@ -294,7 +294,7 @@
<property name="use_action_appearance">False</property> <property name="use_action_appearance">False</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">True</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">0</property> <property name="position">0</property>
</packing> </packing>
......
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* /*
* This file is part of the LibreOffice project. * This file is part of the LibreOffice project.
* *
...@@ -40,9 +41,6 @@ SidebarDialControl::SidebarDialControl ( ...@@ -40,9 +41,6 @@ SidebarDialControl::SidebarDialControl (
Init(GetOutputSizePixel()); Init(GetOutputSizePixel());
} }
SidebarDialControl::~SidebarDialControl (void) SidebarDialControl::~SidebarDialControl (void)
{ {
} }
...@@ -52,12 +50,6 @@ Size SidebarDialControl::GetOptimalSize() const ...@@ -52,12 +50,6 @@ Size SidebarDialControl::GetOptimalSize() const
return LogicToPixel(Size(10, 10), MAP_APPFONT); 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 ) void SidebarDialControl::MouseButtonDown( const MouseEvent& rMEvt )
{ {
if( rMEvt.IsLeft() ) if( rMEvt.IsLeft() )
...@@ -69,9 +61,6 @@ void SidebarDialControl::MouseButtonDown( const MouseEvent& rMEvt ) ...@@ -69,9 +61,6 @@ void SidebarDialControl::MouseButtonDown( const MouseEvent& rMEvt )
} }
} }
void SidebarDialControl::HandleMouseEvent( const Point& rPos, bool bInitial ) void SidebarDialControl::HandleMouseEvent( const Point& rPos, bool bInitial )
{ {
long nX = rPos.X() - mpImpl->mnCenterX; long nX = rPos.X() - mpImpl->mnCenterX;
...@@ -94,4 +83,4 @@ void SidebarDialControl::HandleMouseEvent( const Point& rPos, bool bInitial ) ...@@ -94,4 +83,4 @@ void SidebarDialControl::HandleMouseEvent( const Point& rPos, bool bInitial )
} } // end of namespace svx::sidebar } } // end of namespace svx::sidebar
// eof /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
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