make PostUserEvent Link<> typed

Change-Id: I13f10bda985d55d419a5bff481130a456ae2db8a

4 files changed, 7 insertions, 11 deletions

diff --git a/fpicker/source/office/asyncfilepicker.cxx b/fpicker/source/office/asyncfilepicker.cxx
index 8e4c9e3d2ff6..6150b44f6a8a 100644
--- a/fpicker/source/office/asyncfilepicker.cxx
+++ b/fpicker/source/office/asyncfilepicker.cxx
@@ -125,7 +125,7 @@ namespace svt
     }
 
 
-    IMPL_LINK( AsyncPickerAction, OnActionDone, void*, pEmptyArg )
+    IMPL_LINK_TYPED( AsyncPickerAction, OnActionDone, void*, pEmptyArg, void )
     {
         DBG_TESTSOLARMUTEX();
             // if this asserts, we'd need to have an own mutex per instance
@@ -143,12 +143,12 @@ namespace svt
 
         if ( eFailure == eResult )
             // TODO: do we need some kind of cleanup here?
-            return 0L;
+            return;
 
         if ( eTimeout == eResult )
         {
             SvtFileDialog::displayIOException( m_sURL, ::com::sun::star::ucb::IOErrorCode_CANT_READ );
-            return 0L;
+            return;
         }
 
         OSL_ENSURE( eSuccess == eResult, "AsyncPickerAction::OnActionDone: what else valid results are there?" );
@@ -173,8 +173,6 @@ namespace svt
             OSL_FAIL( "AsyncPickerAction::OnActionDone: unknown action!" );
             break;
         }
-
-        return 1L;
     }
 
 
diff --git a/fpicker/source/office/asyncfilepicker.hxx b/fpicker/source/office/asyncfilepicker.hxx
index bd40153ea8a8..0778d979760c 100644
--- a/fpicker/source/office/asyncfilepicker.hxx
+++ b/fpicker/source/office/asyncfilepicker.hxx
@@ -88,7 +88,7 @@ namespace svt
         virtual ~AsyncPickerAction();
 
     private:
-        DECL_LINK( OnActionDone, void* );
+        DECL_LINK_TYPED( OnActionDone, void*, void );
 
         AsyncPickerAction( const AsyncPickerAction& ) SAL_DELETED_FUNCTION;
         AsyncPickerAction& operator=( const AsyncPickerAction& ) SAL_DELETED_FUNCTION;
diff --git a/fpicker/source/office/commonpicker.cxx b/fpicker/source/office/commonpicker.cxx
index 451231e362e9..553214ebe3fa 100644
--- a/fpicker/source/office/commonpicker.cxx
+++ b/fpicker/source/office/commonpicker.cxx
@@ -389,7 +389,7 @@ namespace svt
     }
 
 
-    IMPL_LINK_NOARG(OCommonPicker, OnCancelPicker)
+    IMPL_LINK_NOARG_TYPED(OCommonPicker, OnCancelPicker, void*, void)
     {
         // By definition, the solar mutex is locked when we arrive here. Note that this
         // is important, as for instance the consistency of m_pDlg depends on this mutex.
@@ -400,13 +400,11 @@ namespace svt
             // nothing to do. This may be because the dialog was canceled after our cancel method
             // posted this async event, or because somebody called cancel without the dialog
             // being executed at this time.
-            return 0;
+            return;
 
         OSL_ENSURE( getDialog(), "OCommonPicker::OnCancelPicker: executing, but no dialog!" );
         if ( getDialog() )
             getDialog()->EndDialog();
-
-        return 0L;
     }
 
 
diff --git a/fpicker/source/office/commonpicker.hxx b/fpicker/source/office/commonpicker.hxx
index 30c1ed72db18..6573de0579f0 100644
--- a/fpicker/source/office/commonpicker.hxx
+++ b/fpicker/source/office/commonpicker.hxx
@@ -186,7 +186,7 @@ namespace svt
     private:
         void        stopWindowListening();
 
-        DECL_LINK( OnCancelPicker, void* );
+        DECL_LINK_TYPED( OnCancelPicker, void*, void );
     };
 
 }   // namespace svt