summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--editeng/source/editeng/editeng.cxx8
-rw-r--r--editeng/source/editeng/impedit.hxx12
-rw-r--r--editeng/source/outliner/outliner.cxx4
-rw-r--r--include/editeng/editeng.hxx8
-rw-r--r--include/editeng/outliner.hxx4
-rw-r--r--sd/source/ui/inc/OutlineView.hxx5
-rw-r--r--sd/source/ui/view/outlview.cxx6
7 files changed, 23 insertions, 24 deletions
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 06eb7a2f7e63..d4c0ba53b4a1 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -2687,23 +2687,23 @@ bool EditEngine::HasValidData( const css::uno::Reference< css::datatransfer::XTr
}
/** sets a link that is called at the beginning of a drag operation at an edit view */
-void EditEngine::SetBeginDropHdl( const Link<>& rLink )
+void EditEngine::SetBeginDropHdl( const Link<EditView*,void>& rLink )
{
pImpEditEngine->SetBeginDropHdl( rLink );
}
-Link<> EditEngine::GetBeginDropHdl() const
+Link<EditView*,void> EditEngine::GetBeginDropHdl() const
{
return pImpEditEngine->GetBeginDropHdl();
}
/** sets a link that is called at the end of a drag operation at an edit view */
-void EditEngine::SetEndDropHdl( const Link<>& rLink )
+void EditEngine::SetEndDropHdl( const Link<EditView*,void>& rLink )
{
pImpEditEngine->SetEndDropHdl( rLink );
}
-Link<> EditEngine::GetEndDropHdl() const
+Link<EditView*,void> EditEngine::GetEndDropHdl() const
{
return pImpEditEngine->GetEndDropHdl();
}
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index 50c583f00814..64d58a120272 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -487,8 +487,8 @@ private:
Link<PasteOrDropInfos&,void> aBeginPasteOrDropHdl;
Link<PasteOrDropInfos&,void> aEndPasteOrDropHdl;
Link<LinkParamNone*,void> aModifyHdl;
- Link<> maBeginDropHdl;
- Link<> maEndDropHdl;
+ Link<EditView*,void> maBeginDropHdl;
+ Link<EditView*,void> maEndDropHdl;
rtl::Reference<SvxForbiddenCharactersTable> xForbiddenCharsTable;
@@ -996,12 +996,12 @@ public:
static void SetForbiddenCharsTable( rtl::Reference<SvxForbiddenCharactersTable> xForbiddenChars );
/** sets a link that is called at the beginning of a drag operation at an edit view */
- void SetBeginDropHdl( const Link<>& rLink ) { maBeginDropHdl = rLink; }
- Link<> GetBeginDropHdl() const { return maBeginDropHdl; }
+ void SetBeginDropHdl( const Link<EditView*,void>& rLink ) { maBeginDropHdl = rLink; }
+ Link<EditView*,void> GetBeginDropHdl() const { return maBeginDropHdl; }
/** sets a link that is called at the end of a drag operation at an edit view */
- void SetEndDropHdl( const Link<>& rLink ) { maEndDropHdl = rLink; }
- Link<> GetEndDropHdl() const { return maEndDropHdl; }
+ void SetEndDropHdl( const Link<EditView*,void>& rLink ) { maEndDropHdl = rLink; }
+ Link<EditView*,void> GetEndDropHdl() const { return maEndDropHdl; }
/// specifies if auto-correction should capitalize the first word or not (default is on)
void SetFirstWordCapitalization( bool bCapitalize ) { bFirstWordCapitalization = bCapitalize; }
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index 18ad27cb33a4..8f740b5c1b7d 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -2016,13 +2016,13 @@ IMPL_LINK_TYPED( Outliner, EditEngineNotifyHdl, EENotify&, rNotify, void )
}
/** sets a link that is called at the beginning of a drag operation at an edit view */
-void Outliner::SetBeginDropHdl( const Link<>& rLink )
+void Outliner::SetBeginDropHdl( const Link<EditView*,void>& rLink )
{
pEditEngine->SetBeginDropHdl( rLink );
}
/** sets a link that is called at the end of a drag operation at an edit view */
-void Outliner::SetEndDropHdl( const Link<>& rLink )
+void Outliner::SetEndDropHdl( const Link<EditView*,void>& rLink )
{
pEditEngine->SetEndDropHdl( rLink );
}
diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx
index bb4444b2bf1a..419e1af67165 100644
--- a/include/editeng/editeng.hxx
+++ b/include/editeng/editeng.hxx
@@ -514,12 +514,12 @@ public:
static bool IsPrintable( sal_Unicode c ) { return ( ( c >= 32 ) && ( c != 127 ) ); }
static bool HasValidData( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rTransferable );
/** sets a link that is called at the beginning of a drag operation at an edit view */
- void SetBeginDropHdl( const Link<>& rLink );
- Link<> GetBeginDropHdl() const;
+ void SetBeginDropHdl( const Link<EditView*,void>& rLink );
+ Link<EditView*,void> GetBeginDropHdl() const;
/** sets a link that is called at the end of a drag operation at an edit view */
- void SetEndDropHdl( const Link<>& rLink );
- Link<> GetEndDropHdl() const;
+ void SetEndDropHdl( const Link<EditView*,void>& rLink );
+ Link<EditView*,void> GetEndDropHdl() const;
/// specifies if auto-correction should capitalize the first word or not (default is on)
void SetFirstWordCapitalization( bool bCapitalize );
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index 78fd2dec88fa..1fecde8fa250 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -952,10 +952,10 @@ public:
void ApplyChangedSentence(EditView& rEditView, const svx::SpellPortions& rNewPortions, bool bRecheck );
/** sets a link that is called at the beginning of a drag operation at an edit view */
- void SetBeginDropHdl( const Link<>& rLink );
+ void SetBeginDropHdl( const Link<EditView*,void>& rLink );
/** sets a link that is called at the end of a drag operation at an edit view */
- void SetEndDropHdl( const Link<>& rLink );
+ void SetEndDropHdl( const Link<EditView*,void>& rLink );
/** sets a link that is called before a drop or paste operation. */
void SetBeginPasteOrDropHdl( const Link<PasteOrDropInfos*,void>& rLink );
diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx
index 03d58c596cb9..5279349a4492 100644
--- a/sd/source/ui/inc/OutlineView.hxx
+++ b/sd/source/ui/inc/OutlineView.hxx
@@ -32,6 +32,7 @@ class Outliner;
class SfxProgress;
struct PaintFirstLineInfo;
struct PasteOrDropInfos;
+class EditView;
namespace sd { namespace tools {
class EventMultiplexerEvent;
@@ -103,8 +104,8 @@ public:
DECL_LINK_TYPED( EndMovingHdl, Outliner *, void );
DECL_LINK_TYPED( RemovingPagesHdl, OutlinerView *, bool );
DECL_LINK_TYPED( IndentingPagesHdl, OutlinerView *, bool );
- DECL_LINK( BeginDropHdl, void * );
- DECL_LINK( EndDropHdl, void * );
+ DECL_LINK_TYPED( BeginDropHdl, EditView*, void );
+ DECL_LINK_TYPED( EndDropHdl, EditView*, void );
DECL_LINK_TYPED( PaintingFirstLineHdl, PaintFirstLineInfo*, void );
sal_uLong GetPaperWidth() { return mnPaperWidth;}
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index 1ad94d2b1132..feef14d4b1f6 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -796,18 +796,16 @@ IMPL_LINK_NOARG_TYPED(OutlineView, StatusEventHdl, EditStatus&, void)
}
}
-IMPL_LINK_NOARG(OutlineView, BeginDropHdl)
+IMPL_LINK_NOARG_TYPED(OutlineView, BeginDropHdl, EditView*, void)
{
DBG_ASSERT(maDragAndDropModelGuard.get() == 0, "sd::OutlineView::BeginDropHdl(), prior drag operation not finished correctly!" );
maDragAndDropModelGuard.reset( new OutlineViewModelChangeGuard( *this ) );
- return 0;
}
-IMPL_LINK_NOARG(OutlineView, EndDropHdl)
+IMPL_LINK_NOARG_TYPED(OutlineView, EndDropHdl, EditView*, void)
{
maDragAndDropModelGuard.reset(0);
- return 0;
}
/**