convert Link<> to typed
and remove some dead code Change-Id: I6a42dbaea5053b4aa3c47b3f154410b05f32dfe4
This commit is contained in:
@@ -651,12 +651,7 @@ private:
|
||||
|
||||
RulerSelection maHoverSelection;
|
||||
|
||||
Link<> maStartDragHdl;
|
||||
Link<> maDragHdl;
|
||||
Link<> maEndDragHdl;
|
||||
Link<> maClickHdl;
|
||||
Link<> maDoubleClickHdl;
|
||||
Link<> maExtraDownHdl;
|
||||
Link<Ruler*,void> maDoubleClickHdl;
|
||||
|
||||
std::unique_ptr<RulerSelection> mxCurrentHitTest;
|
||||
std::unique_ptr<RulerSelection> mxPreviousHitTest;
|
||||
@@ -792,8 +787,7 @@ public:
|
||||
void SetStyle( WinBits nStyle );
|
||||
WinBits GetStyle() const { return mnWinStyle; }
|
||||
|
||||
const Link<>& GetStartDragHdl() const { return maStartDragHdl; }
|
||||
void SetDoubleClickHdl( const Link<>& rLink ) { maDoubleClickHdl = rLink; }
|
||||
void SetDoubleClickHdl( const Link<Ruler*,void>& rLink ) { maDoubleClickHdl = rLink; }
|
||||
|
||||
void SetTextRTL(bool bRTL);
|
||||
bool GetTextRTL();
|
||||
|
@@ -2282,25 +2282,19 @@ void Ruler::DataChanged( const DataChangedEvent& rDCEvt )
|
||||
|
||||
bool Ruler::StartDrag()
|
||||
{
|
||||
if ( maStartDragHdl.IsSet() )
|
||||
return maStartDragHdl.Call( this );
|
||||
else
|
||||
return false;
|
||||
return false;
|
||||
}
|
||||
|
||||
void Ruler::Drag()
|
||||
{
|
||||
maDragHdl.Call( this );
|
||||
}
|
||||
|
||||
void Ruler::EndDrag()
|
||||
{
|
||||
maEndDragHdl.Call( this );
|
||||
}
|
||||
|
||||
void Ruler::Click()
|
||||
{
|
||||
maClickHdl.Call( this );
|
||||
}
|
||||
|
||||
void Ruler::DoubleClick()
|
||||
@@ -2310,7 +2304,6 @@ void Ruler::DoubleClick()
|
||||
|
||||
void Ruler::ExtraDown()
|
||||
{
|
||||
maExtraDownHdl.Call( this );
|
||||
}
|
||||
|
||||
void Ruler::Activate()
|
||||
|
@@ -3181,9 +3181,6 @@ bool SvxRuler::StartDrag()
|
||||
|
||||
bool bOk = true;
|
||||
|
||||
if(GetStartDragHdl().IsSet())
|
||||
bOk = Ruler::StartDrag();
|
||||
|
||||
if(bOk)
|
||||
{
|
||||
lInitialDragPos = GetDragPos();
|
||||
|
@@ -502,7 +502,7 @@ public:
|
||||
void ExecDraw(SfxRequest&);
|
||||
void ExecTabWin(SfxRequest&);
|
||||
void ExecuteStatusLine(SfxRequest&);
|
||||
DECL_LINK( ExecRulerClick, Ruler * );
|
||||
DECL_LINK_TYPED( ExecRulerClick, Ruler *, void );
|
||||
void ExecSearch(SfxRequest&, bool bNoMessage = false);
|
||||
void ExecViewOptions(SfxRequest &);
|
||||
|
||||
|
@@ -527,7 +527,7 @@ int SwView::KillVRuler()
|
||||
return 1;
|
||||
}
|
||||
|
||||
IMPL_LINK( SwView, ExecRulerClick, Ruler *, pRuler )
|
||||
IMPL_LINK_TYPED( SwView, ExecRulerClick, Ruler *, pRuler, void )
|
||||
{
|
||||
OUString sDefPage;
|
||||
switch( pRuler->GetClickType() )
|
||||
@@ -548,7 +548,6 @@ IMPL_LINK( SwView, ExecRulerClick, Ruler *, pRuler )
|
||||
GetViewFrame()->GetDispatcher()->Execute( SID_PARA_DLG,
|
||||
SfxCallMode::SYNCHRON|SfxCallMode::RECORD,
|
||||
&aDefPage, 0L );
|
||||
return 0;
|
||||
}
|
||||
|
||||
sal_uInt16 SwView::GetMoveType()
|
||||
|
Reference in New Issue
Block a user