mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

convert Link<> to typed

Browse Source 
and remove some dead code

Change-Id: I6a42dbaea5053b4aa3c47b3f154410b05f32dfe4
This commit is contained in:
Noel Grandin
2015-08-28 16:35:06 +02:00
parent 410c06bec4
commit b6e95a8c99
5 changed files with 5 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/svtools/ruler.hxx
View File

@@ -651,12 +651,7 @@ private:
RulerSelection maHoverSelection; RulerSelection maHoverSelection;
Link<> maStartDragHdl; Link<Ruler*,void> maDoubleClickHdl;
Link<> maDragHdl;
Link<> maEndDragHdl;
Link<> maClickHdl;
Link<> maDoubleClickHdl;
Link<> maExtraDownHdl;
std::unique_ptr<RulerSelection> mxCurrentHitTest; std::unique_ptr<RulerSelection> mxCurrentHitTest;
std::unique_ptr<RulerSelection> mxPreviousHitTest; std::unique_ptr<RulerSelection> mxPreviousHitTest;
@@ -792,8 +787,7 @@ public:
void SetStyle( WinBits nStyle ); void SetStyle( WinBits nStyle );
WinBits GetStyle() const { return mnWinStyle; } WinBits GetStyle() const { return mnWinStyle; }
const Link<>& GetStartDragHdl() const { return maStartDragHdl; } void SetDoubleClickHdl( const Link<Ruler*,void>& rLink ) { maDoubleClickHdl = rLink; }
void SetDoubleClickHdl( const Link<>& rLink ) { maDoubleClickHdl = rLink; }
void SetTextRTL(bool bRTL); void SetTextRTL(bool bRTL);
bool GetTextRTL(); bool GetTextRTL();

9
svtools/source/control/ruler.cxx
View File

@@ -2282,25 +2282,19 @@ void Ruler::DataChanged( const DataChangedEvent& rDCEvt )
bool Ruler::StartDrag() bool Ruler::StartDrag()
{ {
if ( maStartDragHdl.IsSet() ) return false;
return maStartDragHdl.Call( this );
else
return false;
} }
void Ruler::Drag() void Ruler::Drag()
{ {
maDragHdl.Call( this );
} }
void Ruler::EndDrag() void Ruler::EndDrag()
{ {
maEndDragHdl.Call( this );
} }
void Ruler::Click() void Ruler::Click()
{ {
maClickHdl.Call( this );
} }
void Ruler::DoubleClick() void Ruler::DoubleClick()
@@ -2310,7 +2304,6 @@ void Ruler::DoubleClick()
void Ruler::ExtraDown() void Ruler::ExtraDown()
{ {
maExtraDownHdl.Call( this );
} }
void Ruler::Activate() void Ruler::Activate()

3
svx/source/dialog/svxruler.cxx
View File

@@ -3181,9 +3181,6 @@ bool SvxRuler::StartDrag()
bool bOk = true; bool bOk = true;
if(GetStartDragHdl().IsSet())
bOk = Ruler::StartDrag();
if(bOk) if(bOk)
{ {
lInitialDragPos = GetDragPos(); lInitialDragPos = GetDragPos();

2
sw/inc/view.hxx
View File

@@ -502,7 +502,7 @@ public:
void ExecDraw(SfxRequest&); void ExecDraw(SfxRequest&);
void ExecTabWin(SfxRequest&); void ExecTabWin(SfxRequest&);
void ExecuteStatusLine(SfxRequest&); void ExecuteStatusLine(SfxRequest&);
DECL_LINK( ExecRulerClick, Ruler * ); DECL_LINK_TYPED( ExecRulerClick, Ruler *, void );
void ExecSearch(SfxRequest&, bool bNoMessage = false); void ExecSearch(SfxRequest&, bool bNoMessage = false);
void ExecViewOptions(SfxRequest &); void ExecViewOptions(SfxRequest &);

3
sw/source/uibase/uiview/viewmdi.cxx
View File

@@ -527,7 +527,7 @@ int SwView::KillVRuler()
return 1; return 1;
} }
IMPL_LINK( SwView, ExecRulerClick, Ruler *, pRuler ) IMPL_LINK_TYPED( SwView, ExecRulerClick, Ruler *, pRuler, void )
{ {
OUString sDefPage; OUString sDefPage;
switch( pRuler->GetClickType() ) switch( pRuler->GetClickType() )
@@ -548,7 +548,6 @@ IMPL_LINK( SwView, ExecRulerClick, Ruler *, pRuler )
GetViewFrame()->GetDispatcher()->Execute( SID_PARA_DLG, GetViewFrame()->GetDispatcher()->Execute( SID_PARA_DLG,
SfxCallMode::SYNCHRON|SfxCallMode::RECORD, SfxCallMode::SYNCHRON|SfxCallMode::RECORD,
&aDefPage, 0L ); &aDefPage, 0L );
return 0;
} }
sal_uInt16 SwView::GetMoveType() sal_uInt16 SwView::GetMoveType()