ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

make PostUserEvent Link<> typed

Browse Source 
Change-Id: I13f10bda985d55d419a5bff481130a456ae2db8a
This commit is contained in:
Noel Grandin
2015-08-28 09:49:56 +02:00
parent 1b9c3a17e8
commit bd8b93fdff
272 changed files with 603 additions and 838 deletions
Download Patch File Download Diff File Expand all files Collapse all files
avmedia/source/gstreamer/gstplayer.cxx
+3 -5
View File
@@ -108,8 +108,7 @@ public:
private:
void processQueue();
DECL_STATIC_LINK(
MissingPluginInstaller, launchUi, MissingPluginInstallerThread *);
DECL_STATIC_LINK_TYPED(MissingPluginInstaller, launchUi, void*, void);
osl::Mutex mutex_;
std::set<OString> reported_;
@@ -236,9 +235,9 @@ void MissingPluginInstaller::processQueue() {
queued_.clear();
}
IMPL_STATIC_LINK(
MissingPluginInstaller, launchUi, MissingPluginInstallerThread *, thread)
IMPL_STATIC_LINK_TYPED(MissingPluginInstaller, launchUi, void *, p, void)
{
MissingPluginInstallerThread* thread = static_cast<MissingPluginInstallerThread*>(p);
rtl::Reference<MissingPluginInstallerThread> ref(thread, SAL_NO_ACQUIRE);
gst_pb_utils_init();
// not thread safe; hopefully fine to consistently call from our event
@@ -249,7 +248,6 @@ IMPL_STATIC_LINK(
// gst_missing_plugin_message_get_installer_detail before calling
// gst_pb_utils_init
ref->launch();
return 0;
}
struct TheMissingPluginInstaller:
basctl/source/basicide/basobj2.cxx
+4 -5
View File
@@ -207,12 +207,13 @@ namespace
class MacroExecution
{
public:
DECL_STATIC_LINK( MacroExecution, ExecuteMacroEvent, MacroExecutionData* );
DECL_STATIC_LINK_TYPED( MacroExecution, ExecuteMacroEvent, void*, void );
};
IMPL_STATIC_LINK( MacroExecution, ExecuteMacroEvent, MacroExecutionData*, i_pData )
IMPL_STATIC_LINK_TYPED( MacroExecution, ExecuteMacroEvent, void*, p, void )
{
ENSURE_OR_RETURN( i_pData, "wrong MacroExecutionData", 0L );
MacroExecutionData* i_pData = static_cast<MacroExecutionData*>(p);
ENSURE_OR_RETURN_VOID( i_pData, "wrong MacroExecutionData" );
// take ownership of the data
boost::scoped_ptr< MacroExecutionData > pData( i_pData );
@@ -225,8 +226,6 @@ namespace
pUndoGuard.reset( new ::framework::DocumentUndoGuard( pData->aDocument.getDocument() ) );
RunMethod(pData->xMethod);
return 1L;
}
}
basic/source/classes/sbxmod.cxx
+2 -3
View File
@@ -469,13 +469,12 @@ public:
uno::Reference< frame::XDesktop2 > xDeskTop = frame::Desktop::create( comphelper::getProcessComponentContext() );
xDeskTop->terminate();
}
DECL_STATIC_LINK( AsyncQuitHandler, OnAsyncQuit, void* );
DECL_STATIC_LINK_TYPED( AsyncQuitHandler, OnAsyncQuit, void*, void );
};
IMPL_STATIC_LINK_NOARG( AsyncQuitHandler, OnAsyncQuit )
IMPL_STATIC_LINK_NOARG_TYPED( AsyncQuitHandler, OnAsyncQuit, void*, void )
{
QuitApplication();
return 0L;
}
// A Basic module has set EXTSEARCH, so that the elements, that the modul contains,
cui/source/customize/cfg.cxx
+1 -5
View File
@@ -2113,16 +2113,12 @@ SvTreeListEntry* SvxConfigPage::InsertEntryIntoUI(
return pNewEntry;
}
IMPL_LINK( SvxConfigPage, AsyncInfoMsg, OUString*, pMsg )
IMPL_LINK_NOARG_TYPED( SvxConfigPage, AsyncInfoMsg, void*, void )
{
(void)pMsg;
// Asynchronous msg because of D&D
ScopedVclPtr<MessageDialog>::Create( this,
CUI_RES( RID_SVXSTR_MNUCFG_ALREADY_INCLUDED ),
VCL_MESSAGE_INFO )->Execute();
return 0;
}
IMPL_LINK_TYPED( SvxConfigPage, MoveHdl, Button *, pButton, void )
cui/source/dialogs/SpellDialog.cxx
+1 -2
View File
@@ -441,7 +441,7 @@ void SpellDialog::SpellContinue_Impl(bool bUseSavedSentence, bool bIgnoreCurrent
/* Initialize, asynchronous to prevent virtial calls
from a constructor
*/
IMPL_LINK( SpellDialog, InitHdl, SpellDialog *, )
IMPL_LINK_NOARG_TYPED( SpellDialog, InitHdl, void*, void)
{
SetUpdateMode( false );
//show or hide AutoCorrect depending on the modules abilities
@@ -468,7 +468,6 @@ IMPL_LINK( SpellDialog, InitHdl, SpellDialog *, )
m_pCheckGrammarCB->Check( rParent.IsGrammarChecking() );
SetUpdateMode( true );
Show();
return 0;
};
cui/source/dialogs/cuigaldlg.cxx
+2 -4
View File
@@ -245,7 +245,7 @@ IMPL_LINK_NOARG_TYPED(SearchProgress, ClickCancelBtn, Button*, void)
IMPL_LINK_NOARG(SearchProgress, CleanUpHdl)
IMPL_LINK_NOARG_TYPED(SearchProgress, CleanUpHdl, void*, void)
{
if (maSearchThread.is())
maSearchThread->join();
@@ -253,7 +253,6 @@ IMPL_LINK_NOARG(SearchProgress, CleanUpHdl)
EndDialog( RET_OK );
disposeOnce();
return 0L;
}
@@ -381,7 +380,7 @@ IMPL_LINK_NOARG_TYPED(TakeProgress, ClickCancelBtn, Button*, void)
Terminate();
}
IMPL_LINK_NOARG(TakeProgress, CleanUpHdl)
IMPL_LINK_NOARG_TYPED(TakeProgress, CleanUpHdl, void*, void)
{
if (maTakeThread.is())
maTakeThread->join();
@@ -430,7 +429,6 @@ IMPL_LINK_NOARG(TakeProgress, CleanUpHdl)
EndDialog( RET_OK );
disposeOnce();
return 0L;
}
cui/source/dialogs/scriptdlg.cxx
+2 -4
View File
@@ -1480,9 +1480,9 @@ short SvxScriptErrorDialog::Execute()
return 0;
}
IMPL_STATIC_LINK(
SvxScriptErrorDialog, ShowDialog, OUString*, pMessage )
IMPL_STATIC_LINK_TYPED( SvxScriptErrorDialog, ShowDialog, void*, p, void )
{
OUString* pMessage = static_cast<OUString*>(p);
OUString message;
if ( pMessage && !pMessage->isEmpty() )
@@ -1499,8 +1499,6 @@ IMPL_STATIC_LINK(
pBox->Execute();
delete pMessage;
return 0;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
cui/source/dialogs/thesdlg.cxx
+2 -2
View File
@@ -437,11 +437,11 @@ IMPL_LINK( SvxThesaurusDialog, AlternativesDoubleClickHdl_Impl, SvxCheckListBox
return 0;
}
IMPL_STATIC_LINK( SvxThesaurusDialog, SelectFirstHdl_Impl, SvxCheckListBox *, pBox )
IMPL_STATIC_LINK_TYPED( SvxThesaurusDialog, SelectFirstHdl_Impl, void *, p, void )
{
SvxCheckListBox* pBox = static_cast<SvxCheckListBox*>(p);
if (pBox && pBox->GetEntryCount() >= 2)
pBox->SelectEntryPos( 1 ); // pos 0 is a 'header' that is not selectable
return 0;
}
// class SvxThesaurusDialog ----------------------------------------------
cui/source/inc/SpellDialog.hxx
+1 -1
View File
@@ -187,7 +187,7 @@ private:
DECL_LINK( DialogUndoHdl, SpellUndoAction_Impl* );
DECL_LINK( HandleHyperlink, FixedHyperlink * );
DECL_LINK( InitHdl, SpellDialog * );
DECL_LINK_TYPED( InitHdl, void*, void );
int AddToDictionaryExecute( sal_uInt16 ItemId, PopupMenu *pMenu );
void StartSpellOptDlg_Impl();
cui/source/inc/cfg.hxx
+1 -1
View File
@@ -327,7 +327,7 @@ private:
SaveInData* pCurrentSaveInData;
DECL_LINK( SelectSaveInLocation, ListBox * );
DECL_LINK( AsyncInfoMsg, OUString* );
DECL_LINK_TYPED( AsyncInfoMsg, void*, void );
protected:
cui/source/inc/cuigaldlg.hxx
+2 -2
View File
@@ -96,7 +96,7 @@ public:
virtual ~SearchProgress();
virtual void dispose() SAL_OVERRIDE;
DECL_LINK( CleanUpHdl, void* );
DECL_LINK_TYPED( CleanUpHdl, void*, void );
virtual short Execute() SAL_OVERRIDE;
virtual void StartExecuteModal( const Link<>& rEndDialogHdl ) SAL_OVERRIDE;
@@ -142,7 +142,7 @@ public:
virtual ~TakeProgress();
virtual void dispose() SAL_OVERRIDE;
DECL_LINK( CleanUpHdl, void* );
DECL_LINK_TYPED( CleanUpHdl, void*, void );
void SetFile( const INetURLObject& rURL ) { m_pFtTakeFile->SetText( GetReducedString( rURL, 30 ) ); }
virtual short Execute() SAL_OVERRIDE;
cui/source/inc/optlingu.hxx
+1 -1
View File
@@ -140,7 +140,7 @@ private:
DECL_LINK_TYPED( ClickHdl_Impl, Button *, void );
DECL_LINK( BoxDoubleClickHdl_Impl, SvTreeListBox * );
DECL_LINK( BoxCheckButtonHdl_Impl, SvTreeListBox * );
DECL_LINK(PostDblClickHdl_Impl, void *);
DECL_LINK_TYPED(PostDblClickHdl_Impl, void *, void);
DECL_LINK(OpenURLHdl_Impl, void *);
void UpdateModulesBox_Impl();
cui/source/inc/scriptdlg.hxx
+1 -1
View File
@@ -189,7 +189,7 @@ private:
OUString m_sMessage;
DECL_STATIC_LINK( SvxScriptErrorDialog, ShowDialog, OUString* );
DECL_STATIC_LINK_TYPED( SvxScriptErrorDialog, ShowDialog, void*, void );
public:
cui/source/inc/thesdlg.hxx
+1 -1
View File
@@ -149,7 +149,7 @@ public:
DECL_LINK( AlternativesSelectHdl_Impl, SvxCheckListBox * );
DECL_LINK( AlternativesDoubleClickHdl_Impl, SvxCheckListBox * );
DECL_STATIC_LINK( SvxThesaurusDialog, SelectFirstHdl_Impl, SvxCheckListBox * );
DECL_STATIC_LINK_TYPED( SvxThesaurusDialog, SelectFirstHdl_Impl, void*, void );
css::uno::Sequence< css::uno::Reference< css::linguistic2::XMeaning > >
queryMeanings_Impl( OUString& rTerm, const css::lang::Locale& rLocale, const css::beans::PropertyValues& rProperties ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException);
cui/source/options/optjava.cxx
+1 -3
View File
@@ -396,7 +396,7 @@ IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, ResetHdl_Impl, Idle *, void)
IMPL_LINK_NOARG(SvxJavaOptionsPage, StartFolderPickerHdl)
IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, StartFolderPickerHdl, void*, void)
{
try
{
@@ -410,8 +410,6 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, StartFolderPickerHdl)
{
SAL_WARN( "cui.options", "SvxJavaOptionsPage::StartFolderPickerHdl(): caught exception" );
}
return 0L;
}
cui/source/options/optjava.hxx
+8 -8
View File
@@ -84,18 +84,18 @@ private:
css::uno::Reference< ::svt::DialogClosedListener > xDialogListener;
css::uno::Reference< css::ui::dialogs::XFolderPicker2 > xFolderPicker;
DECL_LINK_TYPED(EnableHdl_Impl, Button*, void);
DECL_LINK_TYPED( EnableHdl_Impl, Button*, void);
DECL_LINK( CheckHdl_Impl, SvSimpleTable * );
DECL_LINK(SelectHdl_Impl, void *);
DECL_LINK_TYPED(AddHdl_Impl, Button*, void);
DECL_LINK_TYPED(ParameterHdl_Impl, Button*, void);
DECL_LINK_TYPED(ClassPathHdl_Impl, Button*, void);
DECL_LINK_TYPED(ResetHdl_Impl, Idle *, void);
DECL_LINK( SelectHdl_Impl, void *);
DECL_LINK_TYPED( AddHdl_Impl, Button*, void);
DECL_LINK_TYPED( ParameterHdl_Impl, Button*, void);
DECL_LINK_TYPED( ClassPathHdl_Impl, Button*, void);
DECL_LINK_TYPED( ResetHdl_Impl, Idle *, void);
DECL_LINK( StartFolderPickerHdl, void * );
DECL_LINK_TYPED( StartFolderPickerHdl, void *, void );
DECL_LINK_TYPED( DialogClosedHdl, css::ui::dialogs::DialogClosedEvent*, void );
DECL_LINK_TYPED(ExpertConfigHdl_Impl, Button*, void);
DECL_LINK_TYPED( ExpertConfigHdl_Impl, Button*, void);
void ClearJavaInfo();
void ClearJavaList();
cui/source/options/optlingu.cxx
+1 -2
View File
@@ -1534,10 +1534,9 @@ IMPL_LINK( SvxLinguTabPage, BoxDoubleClickHdl_Impl, SvTreeListBox *, pBox )
IMPL_LINK_NOARG(SvxLinguTabPage, PostDblClickHdl_Impl)
IMPL_LINK_NOARG_TYPED(SvxLinguTabPage, PostDblClickHdl_Impl, void*, void)
{
ClickHdl_Impl(m_pLinguModulesEditPB);
return 0;
}
dbaccess/source/core/dataaccess/intercept.cxx
+1 -3
View File
@@ -177,7 +177,7 @@ void SAL_CALL OInterceptor::dispatch( const URL& _URL,const Sequence<PropertyVal
}
}
IMPL_LINK( OInterceptor, OnDispatch, void*, _pDispatcher )
IMPL_LINK_TYPED( OInterceptor, OnDispatch, void*, _pDispatcher, void )
{
boost::scoped_ptr<DispatchHelper> pHelper( static_cast< DispatchHelper* >( _pDispatcher ) );
try
@@ -200,8 +200,6 @@ IMPL_LINK( OInterceptor, OnDispatch, void*, _pDispatcher )
{
DBG_UNHANDLED_EXCEPTION();
}
return 0L;
}
void SAL_CALL OInterceptor::addStatusListener(
dbaccess/source/core/dataaccess/intercept.hxx
+1 -1
View File
@@ -39,7 +39,7 @@ class OInterceptor : public ::cppu::WeakImplHelper< css::frame::XDispatchProvide
css::frame::XDispatch,
css::document::XDocumentEventListener>
{
DECL_LINK( OnDispatch, void* );
DECL_LINK_TYPED( OnDispatch, void*, void );
protected:
virtual ~OInterceptor();
public:
dbaccess/source/ext/macromigration/macromigrationdialog.cxx
+1 -4
View File
@@ -278,7 +278,7 @@ namespace dbmm
return MacroMigrationDialog_Base::onFinish();
}
IMPL_LINK_NOARG( MacroMigrationDialog, OnStartMigration )
IMPL_LINK_NOARG_TYPED( MacroMigrationDialog, OnStartMigration, void*, void )
{
// prevent closing
m_pData->bMigrationIsRunning = true;
@@ -307,9 +307,6 @@ namespace dbmm
{ // if there was an error, show the summary automatically
travelNext();
}
// outta here
return 0L;
}
void MacroMigrationDialog::impl_showCloseDocsError( bool _bShow )
dbaccess/source/ext/macromigration/macromigrationdialog.hxx
+1 -1
View File
@@ -65,7 +65,7 @@ namespace dbmm
void impl_reloadDocument_nothrow( bool _bMigrationSuccess );
private:
DECL_LINK( OnStartMigration, void* );
DECL_LINK_TYPED( OnStartMigration, void*, void );
private:
::std::unique_ptr< MacroMigrationDialog_Data > m_pData;
dbaccess/source/filter/xml/dbloader2.cxx
+2 -3
View File
@@ -231,7 +231,7 @@ private:
OUString m_sCurrentURL;
ImplSVEvent * m_nStartWizard;
DECL_LINK( OnStartTableWizard, void* );
DECL_LINK_TYPED( OnStartTableWizard, void*, void );
public:
explicit DBContentLoader(const Reference< XComponentContext >&);
virtual ~DBContentLoader();
@@ -562,7 +562,7 @@ void DBContentLoader::cancel() throw(std::exception)
{
}
IMPL_LINK_NOARG( DBContentLoader, OnStartTableWizard )
IMPL_LINK_NOARG_TYPED( DBContentLoader, OnStartTableWizard, void*, void )
{
m_nStartWizard = 0;
try
@@ -583,7 +583,6 @@ IMPL_LINK_NOARG( DBContentLoader, OnStartTableWizard )
OSL_FAIL("caught an exception while starting the table wizard!");
}
m_xMySelf = NULL;
return 0L;
}
}
dbaccess/source/ui/app/AppController.cxx
+1 -2
View File
@@ -1897,11 +1897,10 @@ IMPL_LINK( OApplicationController, OnSelectContainer, void*, _pType )
return 0L;
}
IMPL_LINK( OApplicationController, OnCreateWithPilot, void*, _pType )
IMPL_LINK_TYPED( OApplicationController, OnCreateWithPilot, void*, _pType, void )
{
ElementType eType = (ElementType)reinterpret_cast< sal_IntPtr >( _pType );
newElementWithPilot( eType );
return 0L;
}
void OApplicationController::newElementWithPilot( ElementType _eType )
dbaccess/source/ui/app/AppController.hxx
+2 -2
View File
@@ -525,8 +525,8 @@ namespace dbaui
void OnInvalidateClipboard();
DECL_LINK_TYPED( OnClipboardChanged, TransferableDataHelper*, void );
DECL_LINK( OnAsyncDrop, void* );
DECL_LINK( OnCreateWithPilot, void* );
DECL_LINK_TYPED( OnAsyncDrop, void*, void );
DECL_LINK_TYPED( OnCreateWithPilot, void*, void );
DECL_LINK( OnSelectContainer, void* );
void OnFirstControllerConnected();
dbaccess/source/ui/app/AppControllerDnD.cxx
+1 -3
View File
@@ -796,7 +796,7 @@ bool OApplicationController::isTableFormat() const
return OTableCopyHelper::isTableFormat(getViewClipboard());
}
IMPL_LINK_NOARG( OApplicationController, OnAsyncDrop )
IMPL_LINK_NOARG_TYPED( OApplicationController, OnAsyncDrop, void*, void )
{
m_nAsyncDrop = 0;
SolarMutexGuard aSolarGuard;
@@ -828,8 +828,6 @@ IMPL_LINK_NOARG( OApplicationController, OnAsyncDrop )
}
m_aAsyncDrop.aDroppedData.clear();
return 0L;
}
} // namespace dbaui
dbaccess/source/ui/app/AppDetailPageHelper.cxx
+2 -3
View File
@@ -127,7 +127,7 @@ namespace
// class OPreviewWindow
class OTablePreviewWindow : public vcl::Window
{
DECL_LINK(OnDisableInput, void*);
DECL_LINK_TYPED(OnDisableInput, void*, void);
void ImplInitSettings( bool bFont, bool bForeground, bool bBackground );
protected:
virtual void DataChanged(const DataChangedEvent& rDCEvt) SAL_OVERRIDE;
@@ -146,10 +146,9 @@ namespace
PostUserEvent( LINK( this, OTablePreviewWindow, OnDisableInput), NULL, true );
return nRet;
}
IMPL_LINK_NOARG(OTablePreviewWindow, OnDisableInput)
IMPL_LINK_NOARG_TYPED(OTablePreviewWindow, OnDisableInput, void*, void)
{
EnableInput(false);
return 0L;
}
void OTablePreviewWindow::DataChanged( const DataChangedEvent& rDCEvt )
{
dbaccess/source/ui/app/AppSwapWindow.cxx
+1 -2
View File
@@ -170,10 +170,9 @@ IMPL_LINK(OApplicationSwapWindow, OnContainerSelectHdl, SvtIconChoiceCtrl*, _pCo
return 1L;
}
IMPL_LINK_NOARG(OApplicationSwapWindow, ChangeToLastSelected)
IMPL_LINK_NOARG_TYPED(OApplicationSwapWindow, ChangeToLastSelected, void*, void)
{
selectContainer(m_eLastType);
return 0L;
}
void OApplicationSwapWindow::selectContainer(ElementType _eType)
dbaccess/source/ui/app/AppSwapWindow.hxx
+1 -1
View File
@@ -38,7 +38,7 @@ namespace dbaui
void ImplInitSettings( bool bFont, bool bForeground, bool bBackground );
DECL_LINK( OnContainerSelectHdl, SvtIconChoiceCtrl* );
DECL_LINK( ChangeToLastSelected, void* );
DECL_LINK_TYPED( ChangeToLastSelected, void*, void );
protected:
virtual void DataChanged(const DataChangedEvent& rDCEvt) SAL_OVERRIDE;
public:
dbaccess/source/ui/browser/AsynchronousLink.cxx
+3 -5
View File
@@ -65,7 +65,7 @@ void OAsynchronousLink::CancelCall()
m_nEventId = 0;
}
IMPL_LINK(OAsynchronousLink, OnAsyncCall, void*, _pArg)
IMPL_LINK_TYPED(OAsynchronousLink, OnAsyncCall, void*, _pArg, void)
{
{
::osl::MutexGuard aDestructionGuard( m_aDestructionSafety );
@@ -74,14 +74,12 @@ IMPL_LINK(OAsynchronousLink, OnAsyncCall, void*, _pArg)
if (!m_nEventId)
// our destructor deleted the event just while we are waiting for m_aEventSafety
// -> get outta here
return 0;
return;
m_nEventId = 0;
}
}
if (m_aHandler.IsSet())
return m_aHandler.Call(_pArg);
return 0L;
m_aHandler.Call(_pArg);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
dbaccess/source/ui/browser/dsbrowserDnD.cxx
+1 -3
View File
@@ -215,7 +215,7 @@ namespace dbaui
if (pTransfer)
pTransfer->CopyToClipboard(getView());
}
IMPL_LINK_NOARG( SbaTableQueryBrowser, OnAsyncDrop )
IMPL_LINK_NOARG_TYPED( SbaTableQueryBrowser, OnAsyncDrop, void*, void )
{
m_nAsyncDrop = 0;
SolarMutexGuard aSolarGuard;
@@ -232,8 +232,6 @@ namespace dbaui
}
m_aAsyncDrop.aDroppedData.clear();
return 0L;
}
void SbaTableQueryBrowser::clearTreeModel()
{
dbaccess/source/ui/browser/sbagrid.cxx
+2 -6
View File
@@ -361,7 +361,7 @@ Reference< css::frame::XDispatch > SAL_CALL SbaXGridPeer::queryDispatch(const c
return FmXGridPeer::queryDispatch(aURL, aTargetFrameName, nSearchFlags);
}
IMPL_LINK_NOARG( SbaXGridPeer, OnDispatchEvent )
IMPL_LINK_NOARG_TYPED( SbaXGridPeer, OnDispatchEvent, void*, void )
{
VclPtr< SbaGridControl > pGrid = GetAs< SbaGridControl >();
if ( pGrid ) // if this fails, we were disposing before arriving here
@@ -380,8 +380,6 @@ IMPL_LINK_NOARG( SbaXGridPeer, OnDispatchEvent )
SbaXGridPeer::dispatch( aArgs.aURL, aArgs.aArgs );
}
}
return 0;
}
SbaXGridPeer::DispatchType SbaXGridPeer::classifyDispatchURL( const URL& _rURL )
@@ -1444,7 +1442,7 @@ Reference< XPropertySet > SbaGridControl::getDataSource() const
return xReturn;
}
IMPL_LINK_NOARG(SbaGridControl, AsynchDropEvent)
IMPL_LINK_NOARG_TYPED(SbaGridControl, AsynchDropEvent, void*, void)
{
m_nAsyncDropEvent = 0;
@@ -1487,8 +1485,6 @@ IMPL_LINK_NOARG(SbaGridControl, AsynchDropEvent)
setDataSource(Reference< XRowSet >(xDataSource,UNO_QUERY));
}
m_aDataDescriptor.clear();
return 0L;
}
OUString SbaGridControl::GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition) const
dbaccess/source/ui/control/RelationControl.cxx
+4 -6
View File
@@ -120,10 +120,10 @@ namespace dbaui
virtual void CellModified() SAL_OVERRIDE;
DECL_LINK( AsynchDeactivate, void* );
DECL_LINK_TYPED( AsynchDeactivate, void*, void );
private:
DECL_LINK( AsynchActivate, void* );
DECL_LINK_TYPED( AsynchActivate, void*, void );
};
@@ -200,16 +200,14 @@ namespace dbaui
return EditBrowseBox::PreNotify(rNEvt);
}
IMPL_LINK_NOARG(ORelationControl, AsynchActivate)
IMPL_LINK_NOARG_TYPED(ORelationControl, AsynchActivate, void*, void)
{
ActivateCell();
return 0L;
}
IMPL_LINK_NOARG(ORelationControl, AsynchDeactivate)
IMPL_LINK_NOARG_TYPED(ORelationControl, AsynchDeactivate, void*, void)
{
DeactivateCell();
return 0L;
}
bool ORelationControl::IsTabAllowed(bool bForward) const
dbaccess/source/ui/control/TableGrantCtrl.cxx
+2 -4
View File
@@ -167,18 +167,16 @@ bool OTableGrantControl::PreNotify(NotifyEvent& rNEvt)
return EditBrowseBox::PreNotify(rNEvt);
}
IMPL_LINK_NOARG(OTableGrantControl, AsynchActivate)
IMPL_LINK_NOARG_TYPED(OTableGrantControl, AsynchActivate, void*, void)
{
m_nDeactivateEvent = 0;
ActivateCell();
return 0L;
}
IMPL_LINK_NOARG(OTableGrantControl, AsynchDeactivate)
IMPL_LINK_NOARG_TYPED(OTableGrantControl, AsynchDeactivate, void*, void)
{
m_nDeactivateEvent = 0;
DeactivateCell();
return 0L;
}
bool OTableGrantControl::IsTabAllowed(bool bForward) const
dbaccess/source/ui/control/dbtreelistbox.cxx
+2 -2
View File
@@ -181,13 +181,13 @@ void DBTreeListBox::MouseButtonDown( const MouseEvent& rMEvt )
SvTreeListBox::MouseButtonDown(rMEvt);
}
IMPL_LINK(DBTreeListBox, OnResetEntry, SvTreeListEntry*, pEntry)
IMPL_LINK_TYPED(DBTreeListBox, OnResetEntry, void*, p, void)
{
SvTreeListEntry* pEntry = static_cast<SvTreeListEntry*>(p);
// set the flag which allows if the entry can be expanded
pEntry->SetFlags( (pEntry->GetFlags() & ~SvTLEntryFlags(SvTLEntryFlags::NO_NODEBMP | SvTLEntryFlags::HAD_CHILDREN)) | SvTLEntryFlags::CHILDREN_ON_DEMAND );
// redraw the entry
GetModel()->InvalidateEntry( pEntry );
return 0L;
}
void DBTreeListBox::ModelHasEntryInvalidated( SvTreeListEntry* _pEntry )
dbaccess/source/ui/dlg/directsql.cxx
+1 -2
View File
@@ -318,10 +318,9 @@ namespace dbaui
{
EndDialog( RET_OK );
}
IMPL_LINK_NOARG( DirectSQLDialog, OnClose )
IMPL_LINK_NOARG_TYPED( DirectSQLDialog, OnClose, void*, void )
{
EndDialog( RET_OK );
return 0L;
}
IMPL_LINK_NOARG_TYPED( DirectSQLDialog, OnExecute, Button*, void )
dbaccess/source/ui/dlg/dsselect.cxx
+1 -3
View File
@@ -123,7 +123,7 @@ IMPL_LINK_NOARG_TYPED(ODatasourceSelectDialog, ManageClickHdl, Button*, void)
SAL_WARN_IF( !m_pODBCManagement->isRunning(), "dbaccess.ui", "ODatasourceSelectDialog::ManageClickHdl: success, but not running - you were *fast*!" );
}
IMPL_LINK_NOARG( ODatasourceSelectDialog, ManageProcessFinished )
IMPL_LINK_NOARG_TYPED( ODatasourceSelectDialog, ManageProcessFinished, void*, void )
{
StringBag aOdbcDatasources;
OOdbcEnumeration aEnumeration;
@@ -134,8 +134,6 @@ IMPL_LINK_NOARG( ODatasourceSelectDialog, ManageProcessFinished )
m_pOk->Enable();
m_pCancel->Enable();
m_pManageDatasources->Enable();
return 0L;
}
#endif
dbaccess/source/ui/dlg/dsselect.hxx
+1 -1
View File
@@ -64,7 +64,7 @@ protected:
DECL_LINK( ListDblClickHdl, ListBox * );
#ifdef HAVE_ODBC_ADMINISTRATION
DECL_LINK_TYPED(ManageClickHdl, Button*, void);
DECL_LINK( ManageProcessFinished, void* );
DECL_LINK_TYPED( ManageProcessFinished, void*, void );
#endif
void fillListBox(const StringBag& _rDatasources);
};
dbaccess/source/ui/dlg/indexdialog.cxx
+2 -2
View File
@@ -603,11 +603,11 @@ namespace dbaui
EndDialog(RET_OK);
}
IMPL_LINK( DbaIndexDialog, OnEditIndexAgain, SvTreeListEntry*, _pEntry )
IMPL_LINK_TYPED( DbaIndexDialog, OnEditIndexAgain, void*, p, void )
{
SvTreeListEntry* _pEntry = static_cast<SvTreeListEntry*>(p);
m_bEditAgain = false;
m_pIndexList->EditEntry(_pEntry);
return 0L;
}
IMPL_LINK( DbaIndexDialog, OnEntryEdited, SvTreeListEntry*, _pEntry )
dbaccess/source/ui/dlg/odbcconfig.cxx
+4 -4
View File
@@ -240,11 +240,11 @@ void OOdbcEnumeration::getDatasourceNames(StringBag& _rNames)
// ProcessTerminationWait
class ProcessTerminationWait : public ::osl::Thread
{
oslProcess m_hProcessHandle;
Link<> m_aFinishHdl;
oslProcess m_hProcessHandle;
Link<void*,void> m_aFinishHdl;
public:
ProcessTerminationWait( oslProcess _hProcessHandle, const Link<>& _rFinishHdl )
ProcessTerminationWait( oslProcess _hProcessHandle, const Link<void*,void>& _rFinishHdl )
:m_hProcessHandle( _hProcessHandle )
,m_aFinishHdl( _rFinishHdl )
{
@@ -262,7 +262,7 @@ protected:
};
// OOdbcManagement
OOdbcManagement::OOdbcManagement(const Link<>& rAsyncFinishCallback)
OOdbcManagement::OOdbcManagement(const Link<void*,void>& rAsyncFinishCallback)
: m_aAsyncFinishCallback(rAsyncFinishCallback)
{
}
dbaccess/source/ui/dlg/odbcconfig.hxx
+2 -2
View File
@@ -105,10 +105,10 @@ class ProcessTerminationWait;
class OOdbcManagement
{
::std::unique_ptr< ProcessTerminationWait > m_pProcessWait;
Link<> m_aAsyncFinishCallback;
Link<void*,void> m_aAsyncFinishCallback;
public:
explicit OOdbcManagement( const Link<>& _rAsyncFinishCallback );
explicit OOdbcManagement( const Link<void*,void>& _rAsyncFinishCallback );
~OOdbcManagement();
bool manageDataSources_async();
dbaccess/source/ui/inc/RelationController.hxx
+1 -1
View File
@@ -77,7 +77,7 @@ namespace dbaui
virtual void reset() SAL_OVERRIDE;
virtual void impl_initialize() SAL_OVERRIDE;
virtual OUString getPrivateTitle( ) const SAL_OVERRIDE;
DECL_LINK( OnThreadFinished, void* );
DECL_LINK_TYPED( OnThreadFinished, void*, void );
};
}
#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_RELATIONCONTROLLER_HXX
dbaccess/source/ui/inc/TableGrantCtrl.hxx
+2 -2
View File
@@ -96,8 +96,8 @@ protected:
virtual void CellModified() SAL_OVERRIDE;
private:
DECL_LINK( AsynchActivate, void* );
DECL_LINK( AsynchDeactivate, void* );
DECL_LINK_TYPED( AsynchActivate, void*, void );
DECL_LINK_TYPED( AsynchDeactivate, void*, void );
static bool isAllowed(sal_uInt16 _nColumnId,sal_Int32 _nPrivilege);
void fillPrivilege(sal_Int32 _nRow) const;
dbaccess/source/ui/inc/TableWindowListBox.hxx
+2 -2
View File
@@ -50,8 +50,8 @@ namespace dbaui
DECL_LINK( OnDoubleClick, SvTreeListBox* );
DECL_LINK_TYPED( ScrollUpHdl, Timer*, void );
DECL_LINK_TYPED( ScrollDownHdl, Timer*, void );
DECL_LINK( DropHdl, void* );
DECL_LINK( LookForUiHdl, void* );
DECL_LINK_TYPED( DropHdl, void*, void );
DECL_LINK_TYPED( LookForUiHdl, void*, void );
Timer m_aScrollTimer;
Point m_aMousePos;
dbaccess/source/ui/inc/dbtreelistbox.hxx
+1 -1
View File
@@ -75,7 +75,7 @@ namespace dbaui
private:
void init();
DECL_LINK_TYPED( OnTimeOut, Timer*, void );
DECL_LINK( OnResetEntry, SvTreeListEntry* );
DECL_LINK_TYPED( OnResetEntry, void*, void );
DECL_LINK( ScrollUpHdl, SvTreeListBox* );
DECL_LINK( ScrollDownHdl, SvTreeListBox* );
dbaccess/source/ui/inc/directsql.hxx
+1 -1
View File
@@ -86,7 +86,7 @@ namespace dbaui
protected:
DECL_LINK_TYPED( OnExecute, Button*, void );
DECL_LINK( OnClose, void* );
DECL_LINK_TYPED( OnClose, void*, void );
DECL_LINK_TYPED( OnCloseClick, Button*, void );
DECL_LINK( OnListEntrySelected, void* );
DECL_LINK( OnStatementModified, void* );
dbaccess/source/ui/inc/indexdialog.hxx
+1 -1
View File
@@ -137,7 +137,7 @@ namespace dbaui
DECL_LINK( OnModified, void* );
DECL_LINK_TYPED( OnCloseDialog, Button*, void );
DECL_LINK( OnEditIndexAgain, SvTreeListEntry* );
DECL_LINK_TYPED( OnEditIndexAgain, void*, void );
private:
sal_uInt16 mnNewCmdId;
dbaccess/source/ui/inc/querycontroller.hxx
+1 -1
View File
@@ -236,7 +236,7 @@ namespace dbaui
virtual bool allowQueries() const SAL_OVERRIDE;
private:
DECL_LINK( OnExecuteAddTable, void* );
DECL_LINK_TYPED( OnExecuteAddTable, void*, void );
private:
using OQueryController_PBase::getFastPropertyValue;
dbaccess/source/ui/inc/sbagrid.hxx
+2 -2
View File
@@ -144,7 +144,7 @@ namespace dbaui
css::uno::Sequence< css::beans::PropertyValue > aArgs;
};
::std::queue< DispatchArgs > m_aDispatchArgs;
DECL_LINK( OnDispatchEvent, void* );
DECL_LINK_TYPED( OnDispatchEvent, void*, void );
// for dynamic states of our 4 dispatchable URLs
enum DispatchType
@@ -304,7 +304,7 @@ namespace dbaui
SvNumberFormatter* GetDatasourceFormatter();
DECL_LINK(AsynchDropEvent, void*);
DECL_LINK_TYPED(AsynchDropEvent, void*, void);
private:
bool IsReadOnlyDB() const;
dbaccess/source/ui/inc/unodatbr.hxx
+1 -1
View File
@@ -354,7 +354,7 @@ namespace dbaui
DECL_LINK( OnTreeEntryCompare, const SvSortData* );
DECL_LINK( OnAsyncDrop, void* );
DECL_LINK_TYPED( OnAsyncDrop, void*, void );
void implRemoveStatusListeners();
dbaccess/source/ui/misc/asyncmodaldialog.cxx
+2 -3
View File
@@ -54,10 +54,10 @@ namespace dbaui
}
private:
DECL_LINK( onExecute, void* );
DECL_LINK_TYPED( onExecute, void*, void );
};
IMPL_LINK_NOARG( DialogExecutor_Impl, onExecute )
IMPL_LINK_NOARG_TYPED( DialogExecutor_Impl, onExecute, void*, void )
{
try
{
@@ -69,7 +69,6 @@ namespace dbaui
}
delete this;
return 0L;
}
// AsyncDialogExecutor
dbaccess/source/ui/querydesign/TableWindowListBox.cxx
+2 -4
View File
@@ -275,14 +275,13 @@ sal_Int8 OTableWindowListBox::AcceptDrop( const AcceptDropEvent& _rEvt )
return nDND_Action;
}
IMPL_LINK_NOARG( OTableWindowListBox, LookForUiHdl )
IMPL_LINK_NOARG_TYPED( OTableWindowListBox, LookForUiHdl, void*, void )
{
m_nUiEvent = 0;
m_pTabWin->getTableView()->lookForUiActivities();
return 0L;
}
IMPL_LINK_NOARG( OTableWindowListBox, DropHdl )
IMPL_LINK_NOARG_TYPED( OTableWindowListBox, DropHdl, void*, void )
{
// create the connection
m_nDropEvent = 0;
@@ -298,7 +297,6 @@ IMPL_LINK_NOARG( OTableWindowListBox, DropHdl )
// remember the exception so that we can show them later when d&d is finished
m_pTabWin->getDesignView()->getController().setErrorOccurred(::dbtools::SQLExceptionInfo(e));
}
return 0L;
}
sal_Int8 OTableWindowListBox::ExecuteDrop( const ExecuteDropEvent& _rEvt )
dbaccess/source/ui/querydesign/querycontroller.cxx
+1 -2
View File
@@ -1967,10 +1967,9 @@ void OQueryController::setEscapeProcessing_fireEvent( const bool _bEscapeProcess
fire( &nHandle, &aNewValue, &aOldValue, 1, sal_False );
}
IMPL_LINK_NOARG( OQueryController, OnExecuteAddTable )
IMPL_LINK_NOARG_TYPED( OQueryController, OnExecuteAddTable, void*, void )
{
Execute( ID_BROWSER_ADDTABLE,Sequence<PropertyValue>() );
return 0L;
}
bool OQueryController::allowViews() const
dbaccess/source/ui/relationdesign/RelationController.cxx
+1 -2
View File
@@ -467,7 +467,7 @@ void ORelationController::mergeData(const TTableConnectionData& _aConnectionData
}
}
IMPL_LINK_NOARG( ORelationController, OnThreadFinished )
IMPL_LINK_NOARG_TYPED( ORelationController, OnThreadFinished, void*, void )
{
::SolarMutexGuard aSolarGuard;
::osl::MutexGuard aGuard( getMutex() );
@@ -486,7 +486,6 @@ IMPL_LINK_NOARG( ORelationController, OnThreadFinished )
DBG_UNHANDLED_EXCEPTION();
}
m_pWaitObject.reset();
return 0L;
}
void ORelationController::loadData()
dbaccess/source/ui/tabledesign/TEditControl.cxx
+5 -13
View File
@@ -630,12 +630,10 @@ bool OTableEditorCtrl::CursorMoving(long nNewRow, sal_uInt16 nNewCol)
return true;
}
IMPL_LINK_NOARG( OTableEditorCtrl, InvalidateFieldType )
IMPL_LINK_NOARG_TYPED( OTableEditorCtrl, InvalidateFieldType, void*, void )
{
nInvalidateTypeEvent = 0;
Invalidate( GetFieldRectPixel(nOldDataPos, FIELD_TYPE) );
return 0;
}
void OTableEditorCtrl::CellModified( long nRow, sal_uInt16 nColId )
@@ -1462,14 +1460,13 @@ void OTableEditorCtrl::Command(const CommandEvent& rEvt)
}
IMPL_LINK_NOARG( OTableEditorCtrl, DelayedCut )
IMPL_LINK_NOARG_TYPED( OTableEditorCtrl, DelayedCut, void*, void )
{
nCutEvent = 0;
OTableRowView::cut();
return 0;
}
IMPL_LINK_NOARG( OTableEditorCtrl, DelayedPaste )
IMPL_LINK_NOARG_TYPED( OTableEditorCtrl, DelayedPaste, void*, void )
{
nPasteEvent = 0;
@@ -1493,18 +1490,15 @@ IMPL_LINK_NOARG( OTableEditorCtrl, DelayedPaste )
OTableRowView::Paste( nPastePosition );
SetNoSelection();
GoToRow( nPastePosition );
return 0;
}
IMPL_LINK_NOARG( OTableEditorCtrl, DelayedDelete )
IMPL_LINK_NOARG_TYPED( OTableEditorCtrl, DelayedDelete, void*, void )
{
nDeleteEvent = 0;
DeleteRows();
return 0;
}
IMPL_LINK_NOARG( OTableEditorCtrl, DelayedInsNewRows )
IMPL_LINK_NOARG_TYPED( OTableEditorCtrl, DelayedInsNewRows, void*, void )
{
nInsNewRowsEvent = 0;
sal_Int32 nPastePosition = GetView()->getController().getFirstEmptyRowPosition();
@@ -1514,8 +1508,6 @@ IMPL_LINK_NOARG( OTableEditorCtrl, DelayedInsNewRows )
InsertNewRows( nPastePosition );
SetNoSelection();
GoToRow( nPastePosition );
return 0;
}
void OTableEditorCtrl::AdjustFieldDescription(OFieldDescription* _pFieldDesc,
dbaccess/source/ui/tabledesign/TEditControl.hxx
+5 -5
View File
@@ -176,11 +176,11 @@ namespace dbaui
private:
DECL_LINK( StartIndexing, void* );
DECL_LINK( DelayedCut, void* );
DECL_LINK( DelayedPaste, void* );
DECL_LINK( DelayedDelete, void* );
DECL_LINK( DelayedInsNewRows, void* );
DECL_LINK( InvalidateFieldType, void* );
DECL_LINK_TYPED( DelayedCut, void*, void );
DECL_LINK_TYPED( DelayedPaste, void*, void );
DECL_LINK_TYPED( DelayedDelete, void*, void );
DECL_LINK_TYPED( DelayedInsNewRows, void*, void );
DECL_LINK_TYPED( InvalidateFieldType, void*, void );
void InitCellController();
sal_Int32 HasFieldName( const OUString& rFieldName );
desktop/inc/app.hxx
+2 -2
View File
@@ -79,12 +79,12 @@ class Desktop : public Application
virtual void OverrideSystemSettings( AllSettings& rSettings ) SAL_OVERRIDE;
virtual void AppEvent( const ApplicationEvent& rAppEvent ) SAL_OVERRIDE;
DECL_LINK( OpenClients_Impl, void* );
DECL_LINK_TYPED( OpenClients_Impl, void*, void );
static void OpenClients();
static void OpenDefault();
DECL_STATIC_LINK( Desktop, EnableAcceptors_Impl, void*);
DECL_STATIC_LINK_TYPED( Desktop, EnableAcceptors_Impl, void*, void);
static void HandleAppEvent( const ApplicationEvent& rAppEvent );
static ResMgr* GetDesktopResManager();
desktop/source/app/app.cxx
+2 -4
View File
@@ -1870,7 +1870,7 @@ class ExitTimer : public Timer
}
};
IMPL_LINK_NOARG(Desktop, OpenClients_Impl)
IMPL_LINK_NOARG_TYPED(Desktop, OpenClients_Impl, void*, void)
{
try {
OpenClients();
@@ -1892,14 +1892,12 @@ IMPL_LINK_NOARG(Desktop, OpenClients_Impl)
OUString a( "UNO exception during client open:\n" );
Application::Abort( a + e.Message );
}
return 0;
}
// enable acceptors
IMPL_STATIC_LINK_NOARG(Desktop, EnableAcceptors_Impl)
IMPL_STATIC_LINK_NOARG_TYPED(Desktop, EnableAcceptors_Impl, void*, void)
{
enableAcceptors();
return 0;
}
desktop/source/app/officeipcthread.cxx
+4 -6
View File
@@ -282,19 +282,18 @@ OUString CreateMD5FromString( const OUString& aMsg )
class ProcessEventsClass_Impl
{
public:
DECL_STATIC_LINK( ProcessEventsClass_Impl, CallEvent, void* pEvent );
DECL_STATIC_LINK( ProcessEventsClass_Impl, ProcessDocumentsEvent, void* pEvent );
DECL_STATIC_LINK_TYPED( ProcessEventsClass_Impl, CallEvent, void*, void );
DECL_STATIC_LINK_TYPED( ProcessEventsClass_Impl, ProcessDocumentsEvent, void*, void );
};
IMPL_STATIC_LINK( ProcessEventsClass_Impl, CallEvent, void*, pEvent )
IMPL_STATIC_LINK_TYPED( ProcessEventsClass_Impl, CallEvent, void*, pEvent, void )
{
// Application events are processed by the Desktop::HandleAppEvent implementation.
Desktop::HandleAppEvent( *static_cast<ApplicationEvent*>(pEvent) );
delete static_cast<ApplicationEvent*>(pEvent);
return 0;
}
IMPL_STATIC_LINK( ProcessEventsClass_Impl, ProcessDocumentsEvent, void*, pEvent )
IMPL_STATIC_LINK_TYPED( ProcessEventsClass_Impl, ProcessDocumentsEvent, void*, pEvent, void )
{
// Documents requests are processed by the OfficeIPCThread implementation
ProcessDocumentsRequest* pDocsRequest = static_cast<ProcessDocumentsRequest*>(pEvent);
@@ -304,7 +303,6 @@ IMPL_STATIC_LINK( ProcessEventsClass_Impl, ProcessDocumentsEvent, void*, pEvent
OfficeIPCThread::ExecuteCmdLineRequests( *pDocsRequest );
delete pDocsRequest;
}
return 0;
}
void ImplPostForeignAppEvent( ApplicationEvent* pEvent )
desktop/source/deployment/gui/dp_gui_dialog2.cxx
+3 -7
View File
@@ -655,7 +655,7 @@ bool DialogHelper::installForAllUsers( bool &bInstallForAll ) const
return true;
}
void DialogHelper::PostUserEvent( const Link<>& rLink, void* pCaller, bool bReferenceLink )
void DialogHelper::PostUserEvent( const Link<void*,void>& rLink, void* pCaller, bool bReferenceLink )
{
if ( m_nEventID )
Application::RemoveUserEvent( m_nEventID );
@@ -967,7 +967,7 @@ IMPL_LINK_NOARG_TYPED(ExtMgrDialog, HandleCloseBtn, Button*, void)
IMPL_LINK( ExtMgrDialog, startProgress, void*, _bLockInterface )
IMPL_LINK_TYPED( ExtMgrDialog, startProgress, void*, _bLockInterface, void )
{
::osl::MutexGuard aGuard( m_aMutex );
bool bLockInterface = (bool) _bLockInterface;
@@ -994,8 +994,6 @@ IMPL_LINK( ExtMgrDialog, startProgress, void*, _bLockInterface )
m_pExtensionBox->enableButtons( !bLockInterface );
clearEventID();
return 0;
}
@@ -1287,7 +1285,7 @@ IMPL_LINK_NOARG_TYPED(UpdateRequiredDialog, HandleCancelBtn, Button*, void)
}
IMPL_LINK( UpdateRequiredDialog, startProgress, void*, _bLockInterface )
IMPL_LINK_TYPED( UpdateRequiredDialog, startProgress, void*, _bLockInterface, void )
{
::osl::MutexGuard aGuard( m_aMutex );
bool bLockInterface = (bool) _bLockInterface;
@@ -1310,8 +1308,6 @@ IMPL_LINK( UpdateRequiredDialog, startProgress, void*, _bLockInterface )
m_pCancelBtn->Enable( bLockInterface );
m_pUpdateBtn->Enable( false );
clearEventID();
return 0;
}
desktop/source/deployment/gui/dp_gui_dialog2.hxx
+3 -3
View File
@@ -68,7 +68,7 @@ public:
void openWebBrowser( const OUString & sURL, const OUString & sTitle ) const;
Dialog* getWindow() const { return m_pVCLWindow; };
void PostUserEvent( const Link<>& rLink, void* pCaller, bool bReferenceLink = false );
void PostUserEvent( const Link<void*,void>& rLink, void* pCaller, bool bReferenceLink = false );
void clearEventID() { m_nEventID = 0; }
virtual void showProgress( bool bStart ) = 0;
@@ -138,7 +138,7 @@ class ExtMgrDialog : public ModelessDialog,
DECL_DLLPRIVATE_LINK_TYPED( HandleExtTypeCbx, Button*, void );
DECL_DLLPRIVATE_LINK( HandleHyperlink, FixedHyperlink * );
DECL_DLLPRIVATE_LINK_TYPED(TimeOutHdl, Idle *, void);
DECL_DLLPRIVATE_LINK( startProgress, void * );
DECL_DLLPRIVATE_LINK_TYPED( startProgress, void *, void );
public:
ExtMgrDialog( vcl::Window * pParent, TheExtensionManager *pManager, Dialog::InitFlag eFlag = Dialog::InitFlag::Default );
@@ -201,7 +201,7 @@ class UpdateRequiredDialog : public ModalDialog,
DECL_DLLPRIVATE_LINK_TYPED( HandleCloseBtn, Button*, void );
DECL_DLLPRIVATE_LINK_TYPED( HandleCancelBtn, Button*, void );
DECL_DLLPRIVATE_LINK_TYPED(TimeOutHdl, Idle *, void);
DECL_DLLPRIVATE_LINK( startProgress, void * );
DECL_DLLPRIVATE_LINK_TYPED( startProgress, void *, void );
DECL_DLLPRIVATE_LINK( HandleHyperlink, FixedHyperlink * );
static bool isEnabled( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage );
extensions/source/bibliography/bibbeam.cxx
+1 -2
View File
@@ -272,11 +272,10 @@ namespace bib
pGridWin->GrabFocus();
}
IMPL_LINK_NOARG( BibBeamer, RecalcLayout_Impl )
IMPL_LINK_NOARG_TYPED( BibBeamer, RecalcLayout_Impl, void*, void )
{
long nHeight = pToolBar->GetSizePixel().Height();
SetItemSize( ID_TOOLBAR, nHeight );
return 0L;
}
} // namespace bib
extensions/source/bibliography/bibbeam.hxx
+1 -1
View File
@@ -54,7 +54,7 @@ namespace bib
VclPtr<BibToolBar> pToolBar;
VclPtr<BibGridwin> pGridWin;
DECL_LINK( RecalcLayout_Impl, void* );
DECL_LINK_TYPED( RecalcLayout_Impl, void*, void );
protected:
extensions/source/bibliography/bibview.cxx
+1 -2
View File
@@ -176,10 +176,9 @@ namespace bib
mpBibView->Resize();
}
IMPL_LINK( BibView, CallMappingHdl, BibView*, )
IMPL_LINK_NOARG_TYPED( BibView, CallMappingHdl, void*, void)
{
m_pDatMan->CreateMappingDialog( this );
return 0;
}
void BibView::Resize()
extensions/source/bibliography/bibview.hxx
+1 -1
View File
@@ -63,7 +63,7 @@ namespace bib
BibViewFormControlContainer m_aFormControlContainer;
private:
DECL_LINK(CallMappingHdl, BibView*);
DECL_LINK_TYPED(CallMappingHdl, void*, void);
public:
// Window overridables
extensions/source/bibliography/framectr.cxx
+1 -2
View File
@@ -630,10 +630,9 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen
}
}
}
IMPL_LINK_NOARG( BibFrameController_Impl, DisposeHdl )
IMPL_LINK_NOARG_TYPED( BibFrameController_Impl, DisposeHdl, void*, void )
{
xFrame->dispose();
return 0;
};
void BibFrameController_Impl::addStatusListener(
extensions/source/bibliography/framectr.hxx
+1 -1
View File
@@ -69,7 +69,7 @@ friend class BibFrameCtrl_Impl;
BibDataManager* pDatMan;
HdlBibModul pBibMod;
DECL_LINK( DisposeHdl, void* );
DECL_LINK_TYPED( DisposeHdl, void*, void );
static bool SaveModified(const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController>& xController);
public:
extensions/source/bibliography/toolbar.cxx
+1 -1
View File
@@ -176,7 +176,7 @@ void BibTBEditListener::statusChanged(const frame::FeatureStateEvent& rEvt)throw
}
}
BibToolBar::BibToolBar(vcl::Window* pParent, Link<> aLink, WinBits nStyle):
BibToolBar::BibToolBar(vcl::Window* pParent, Link<void*,void> aLink, WinBits nStyle):
ToolBox(pParent,BibResId(RID_BIB_TOOLBAR)),
aImgLst(BibResId( RID_TOOLBAR_IMGLIST )),
aBigImgLst(BibResId( RID_TOOLBAR_BIGIMGLIST )),
extensions/source/bibliography/toolbar.hxx
+2 -2
View File
@@ -123,7 +123,7 @@ class BibToolBar: public ToolBox
sal_uInt16 nMenuId;
sal_uInt16 nSelMenuItem;
OUString aQueryField;
Link<> aLayoutManager;
Link<void*,void> aLayoutManager;
sal_Int16 nSymbolsSize;
sal_Int16 nOutStyle;
@@ -148,7 +148,7 @@ class BibToolBar: public ToolBox
public:
BibToolBar(vcl::Window* pParent, Link<> aLink, WinBits nStyle = WB_3DLOOK );
BibToolBar(vcl::Window* pParent, Link<void*,void> aLink, WinBits nStyle = WB_3DLOOK );
virtual ~BibToolBar();
virtual void dispose() SAL_OVERRIDE;
extensions/source/plugin/base/nfuncs.cxx
+3 -3
View File
@@ -177,11 +177,12 @@ struct AsynchronousGetURL
OUString aTarget;
Reference< XEventListener > xListener;
DECL_LINK( getURL, XPlugin_Impl* );
DECL_LINK_TYPED( getURL, void*, void );
};
IMPL_LINK( AsynchronousGetURL, getURL, XPlugin_Impl*, pImpl )
IMPL_LINK_TYPED( AsynchronousGetURL, getURL, void*, p, void )
{
XPlugin_Impl* pImpl = static_cast<XPlugin_Impl*>(p);
try
{
pImpl->enterPluginCallback();
@@ -202,7 +203,6 @@ IMPL_LINK( AsynchronousGetURL, getURL, XPlugin_Impl*, pImpl )
}
pImpl->leavePluginCallback();
delete this;
return 0;
}
extensions/source/plugin/base/xplugin.cxx
+2 -3
View File
@@ -189,7 +189,7 @@ void XPlugin_Impl::checkListeners( const char* normalizedURL )
}
}
IMPL_LINK( XPlugin_Impl, secondLevelDispose, XPlugin_Impl*, /*pThis*/ )
IMPL_LINK_NOARG_TYPED( XPlugin_Impl, secondLevelDispose, void*, void )
{
Guard< Mutex > aGuard( m_aMutex );
@@ -206,7 +206,7 @@ IMPL_LINK( XPlugin_Impl, secondLevelDispose, XPlugin_Impl*, /*pThis*/ )
break;
}
if( iter == rList.end() || ! isDisposable() )
return 0;
return;
}
if (m_pDisposer)
@@ -229,7 +229,6 @@ IMPL_LINK( XPlugin_Impl, secondLevelDispose, XPlugin_Impl*, /*pThis*/ )
#endif
destroyInstance();
PluginControl_Impl::dispose();
return 0;
}
void XPlugin_Impl::dispose() throw(std::exception)
extensions/source/plugin/inc/plugin/impl.hxx
+1 -1
View File
@@ -201,7 +201,7 @@ public:
void enterPluginCallback() { m_nCalledFromPlugin++; }
void leavePluginCallback() { m_nCalledFromPlugin--; }
bool isDisposable() { return m_nCalledFromPlugin < 1; }
DECL_LINK( secondLevelDispose, XPlugin_Impl* );
DECL_LINK_TYPED( secondLevelDispose, void*, void );
void addPluginEventListener( PluginEventListener* pListener )
{ m_aPEventListeners.push_back( pListener ); }
extensions/source/plugin/inc/plugin/unx/plugcon.hxx
+1 -1
View File
@@ -133,7 +133,7 @@ protected:
static std::vector<PluginConnector*> allConnectors;
DECL_LINK( NewMessageHdl, Mediator* );
DECL_LINK( WorkOnNewMessageHdl, Mediator* );
DECL_LINK_TYPED( WorkOnNewMessageHdl, void*, void );
std::vector<NPStream*> m_aNPWrapStreams;
std::vector<ConnectorInstance*> m_aInstances;
extensions/source/plugin/unx/npnapi.cxx
+1 -2
View File
@@ -520,7 +520,7 @@ PluginConnector::~PluginConnector()
{
}
IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
IMPL_LINK_NOARG_TYPED( PluginConnector, WorkOnNewMessageHdl, void*, void )
{
MediatorMessage* pMessage;
CommandAtoms nCommand;
@@ -928,7 +928,6 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
}
delete pMessage;
}
return 0;
}
void LoadAdditionalLibs( const char* _pPluginLib )
extensions/source/plugin/unx/nppapi.cxx
+2 -3
View File
@@ -80,7 +80,7 @@ IMPL_LINK( PluginConnector, NewMessageHdl, Mediator*, /*pMediator*/ )
return 0;
}
IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
IMPL_LINK_NOARG_TYPED( PluginConnector, WorkOnNewMessageHdl, void*, void )
{
bool bFound = false;
for( std::vector< PluginConnector* >::iterator it = allConnectors.begin();
@@ -90,7 +90,7 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
bFound = true;
}
if( ! bFound )
return 0;
return;
MediatorMessage* pMessage;
CommandAtoms nCommand;
@@ -323,7 +323,6 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
delete pMessage;
}
return 0;
}
#define GET_INSTANCE() \
extensions/source/propctrlr/formlinkdialog.cxx
+1 -2
View File
@@ -673,13 +673,12 @@ namespace pcr
}
IMPL_LINK_NOARG( FormLinkDialog, OnInitialize )
IMPL_LINK_NOARG_TYPED( FormLinkDialog, OnInitialize, void*, void )
{
initializeColumnLabels();
initializeFieldLists();
initializeLinks();
initializeSuggest();
return 0L;
}
} // namespace pcr
extensions/source/propctrlr/formlinkdialog.hxx
+1 -1
View File
@@ -88,7 +88,7 @@ namespace pcr
private:
DECL_LINK_TYPED( OnSuggest, Button*, void );
DECL_LINK( OnFieldChanged, FieldLinkRow* );
DECL_LINK( OnInitialize, void* );
DECL_LINK_TYPED( OnInitialize, void*, void);
void updateOkButton();
void initializeFieldLists();
extensions/source/propctrlr/standardcontrol.cxx
+1 -3
View File
@@ -460,15 +460,13 @@ namespace pcr
}
IMPL_LINK_NOARG( OHyperlinkControl, OnHyperlinkClicked )
IMPL_LINK_NOARG_TYPED( OHyperlinkControl, OnHyperlinkClicked, void*, void )
{
ActionEvent aEvent( *this, OUString( "clicked" ) );
m_aActionListeners.forEach< XActionListener >(
boost::bind(
&XActionListener::actionPerformed,
_1, boost::cref(aEvent) ) );
return 0;
}
extensions/source/propctrlr/standardcontrol.hxx
+4 -4
View File
@@ -165,8 +165,8 @@ namespace pcr
class HyperlinkInput : public Edit
{
private:
Point m_aMouseButtonDownPos;
Link<> m_aClickHandler;
Point m_aMouseButtonDownPos;
Link<void*,void> m_aClickHandler;
public:
HyperlinkInput( vcl::Window* _pParent, WinBits _nWinStyle );
@@ -174,7 +174,7 @@ namespace pcr
/** sets the handler which will (asynchronously, with locked SolarMutex) be called
when the hyperlink has been clicked by the user
*/
void SetClickHdl( const Link<>& _rHdl ) { m_aClickHandler = _rHdl; }
void SetClickHdl( const Link<void*,void>& _rHdl ) { m_aClickHandler = _rHdl; }
protected:
virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
@@ -213,7 +213,7 @@ namespace pcr
virtual void SAL_CALL disposing() SAL_OVERRIDE;
protected:
DECL_LINK( OnHyperlinkClicked, void* );
DECL_LINK_TYPED( OnHyperlinkClicked, void*, void );
};
extensions/source/scanner/scanwin.cxx
+4 -8
View File
@@ -104,8 +104,8 @@ class ImpTwain : public ::cppu::WeakImplHelper< util::XCloseListener >
uno::Reference< frame::XFrame > ImplGetActiveFrame();
uno::Reference< util::XCloseBroadcaster > ImplGetActiveFrameCloseBroadcaster();
DECL_LINK( ImplFallbackHdl, void* );
DECL_LINK( ImplDestroyHdl, void* );
DECL_LINK_TYPED( ImplFallbackHdl, void*, void );
DECL_LINK_TYPED( ImplDestroyHdl, void*, void );
// from util::XCloseListener
virtual void SAL_CALL queryClosing( const lang::EventObject& Source, sal_Bool GetsOwnership ) throw (util::CloseVetoException, uno::RuntimeException);
@@ -421,7 +421,7 @@ void ImpTwain::ImplFallback( ULONG_PTR nEvent )
Application::PostUserEvent( LINK( this, ImpTwain, ImplFallbackHdl ), (void*) nEvent );
}
IMPL_LINK( ImpTwain, ImplFallbackHdl, void*, pData )
IMPL_LINK_TYPED( ImpTwain, ImplFallbackHdl, void*, pData, void )
{
const sal_uIntPtr nEvent = (sal_uIntPtr) pData;
bool bFallback = true;
@@ -489,11 +489,9 @@ IMPL_LINK( ImpTwain, ImplFallbackHdl, void*, pData )
if( bFallback )
ImplFallback( nEvent );
return 0L;
}
IMPL_LINK_NOARG( ImpTwain, ImplDestroyHdl )
IMPL_LINK_NOARG_TYPED( ImpTwain, ImplDestroyHdl, void*, void )
{
if( hTwainWnd )
DestroyWindow( hTwainWnd );
@@ -505,8 +503,6 @@ IMPL_LINK_NOARG( ImpTwain, ImplDestroyHdl )
// should drop to zero exactly here)
mxSelfRef = NULL;
pImpTwainInstance = NULL;
return 0L;
}
uno::Reference< frame::XFrame > ImpTwain::ImplGetActiveFrame()
extensions/source/update/ui/updatecheckui.cxx
+2 -4
View File
@@ -147,7 +147,7 @@ private:
DECL_LINK( HighlightHdl, MenuBar::MenuBarButtonCallbackArg* );
DECL_LINK_TYPED(WaitTimeOutHdl, Idle *, void);
DECL_LINK_TYPED(TimeOutHdl, Timer *, void);
DECL_LINK(UserEventHdl, void *);
DECL_LINK_TYPED(UserEventHdl, void *, void);
DECL_LINK( WindowEventHdl, VclWindowEvent* );
DECL_LINK( ApplicationEventHdl, VclSimpleEvent* );
@@ -631,7 +631,7 @@ IMPL_LINK_NOARG_TYPED(UpdateCheckUI, TimeOutHdl, Timer *, void)
}
IMPL_LINK_NOARG(UpdateCheckUI, UserEventHdl)
IMPL_LINK_NOARG_TYPED(UpdateCheckUI, UserEventHdl, void*, void)
{
SolarMutexGuard aGuard;
@@ -659,8 +659,6 @@ IMPL_LINK_NOARG(UpdateCheckUI, UserEventHdl)
if ( pActiveSysWin )
AddMenuBarIcon( pActiveSysWin, true );
return 0;
}
forms/source/component/Button.cxx
+3 -4
View File
@@ -415,7 +415,7 @@ void SAL_CALL OButtonControl::disposing( const EventObject& _rSource ) throw( Ru
void OButtonControl::actionPerformed(const ActionEvent& /*rEvent*/) throw ( ::com::sun::star::uno::RuntimeException, std::exception)
{
// Asynchronous for css::util::URL-Button
ImplSVEvent * n = Application::PostUserEvent( LINK(this, OButtonControl,OnClick) );
ImplSVEvent * n = Application::PostUserEvent( LINK(this, OButtonControl, OnClick) );
{
::osl::MutexGuard aGuard( m_aMutex );
m_nClickEvent = n;
@@ -423,7 +423,7 @@ void OButtonControl::actionPerformed(const ActionEvent& /*rEvent*/) throw ( ::co
}
IMPL_LINK_NOARG(OButtonControl, OnClick)
IMPL_LINK_NOARG_TYPED(OButtonControl, OnClick, void*, void)
{
::osl::ClearableMutexGuard aGuard( m_aMutex );
m_nClickEvent = 0;
@@ -443,7 +443,7 @@ IMPL_LINK_NOARG(OButtonControl, OnClick)
// recognize the button type
Reference<XPropertySet> xSet(getModel(), UNO_QUERY);
if (!xSet.is())
return 0L;
return;
if (FormButtonType_PUSH == *static_cast<FormButtonType const *>(xSet->getPropertyValue(PROPERTY_BUTTONTYPE).getValue()))
{
@@ -474,7 +474,6 @@ IMPL_LINK_NOARG(OButtonControl, OnClick)
else
actionPerformed_Impl( false, ::com::sun::star::awt::MouseEvent() );
}
return 0L;
}
forms/source/component/Button.hxx
+1 -1
View File
@@ -181,7 +181,7 @@ protected:
virtual void actionPerformed_Impl( bool bNotifyListener, const ::com::sun::star::awt::MouseEvent& _rEvt ) SAL_OVERRIDE;
private:
DECL_LINK( OnClick, void* );
DECL_LINK_TYPED( OnClick, void*, void );
/// to be called whenever the feature URL represented by our model has potentially changed
void modelFeatureUrlPotentiallyChanged( );
forms/source/component/Edit.cxx
+2 -3
View File
@@ -238,7 +238,7 @@ void OEditControl::keyPressed(const ::com::sun::star::awt::KeyEvent& e) throw (
// Because we're still in the header, trigger submit asynchronously
if( m_nKeyEvent )
Application::RemoveUserEvent( m_nKeyEvent );
m_nKeyEvent = Application::PostUserEvent( LINK(this, OEditControl,OnKeyPressed) );
m_nKeyEvent = Application::PostUserEvent( LINK(this, OEditControl, OnKeyPressed) );
}
@@ -247,7 +247,7 @@ void OEditControl::keyReleased(const ::com::sun::star::awt::KeyEvent& /*e*/) thr
}
IMPL_LINK_NOARG(OEditControl, OnKeyPressed)
IMPL_LINK_NOARG_TYPED(OEditControl, OnKeyPressed, void*, void)
{
m_nKeyEvent = 0;
@@ -256,7 +256,6 @@ IMPL_LINK_NOARG(OEditControl, OnKeyPressed)
Reference<XSubmit> xSubmit(xParent, UNO_QUERY);
if (xSubmit.is())
xSubmit->submit( Reference<XControl>(), ::com::sun::star::awt::MouseEvent() );
return 0L;
}
forms/source/component/Edit.hxx
+1 -1
View File
@@ -170,7 +170,7 @@ public:
virtual void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& _rxToolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& _rxParent ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
private:
DECL_LINK( OnKeyPressed, void* );
DECL_LINK_TYPED( OnKeyPressed, void*, void );
};
}
forms/source/component/FormattedField.cxx
+1 -2
View File
@@ -240,7 +240,7 @@ void OFormattedControl::keyReleased(const ::com::sun::star::awt::KeyEvent& /*e*/
{
}
IMPL_LINK_NOARG(OFormattedControl, OnKeyPressed)
IMPL_LINK_NOARG_TYPED(OFormattedControl, OnKeyPressed, void*, void)
{
m_nKeyEvent = 0;
Reference<XFormComponent> xFComp(getModel(), UNO_QUERY);
@@ -248,7 +248,6 @@ IMPL_LINK_NOARG(OFormattedControl, OnKeyPressed)
Reference<XSubmit> xSubmit(xParent, UNO_QUERY);
if (xSubmit.is())
xSubmit->submit( Reference<XControl> (), ::com::sun::star::awt::MouseEvent() );
return 0L;
}
css::uno::Sequence<OUString> OFormattedControl::getSupportedServiceNames() throw(std::exception)
forms/source/component/FormattedField.hxx
+1 -1
View File
@@ -181,7 +181,7 @@ class OFormattedModel
using OBoundControl::disposing;
private:
DECL_LINK( OnKeyPressed, void* );
DECL_LINK_TYPED( OnKeyPressed, void*, void );
};
}
#endif // INCLUDED_FORMS_SOURCE_COMPONENT_FORMATTEDFIELD_HXX
formula/source/ui/dlg/ControlHelper.hxx
+1 -1
View File
@@ -34,7 +34,7 @@ private:
Selection aOldSel;
bool bMouseFlag;
DECL_LINK(ChangedHdl, void *);
DECL_LINK_TYPED(ChangedHdl, void *, void);
protected:
formula/source/ui/dlg/funcutl.cxx
+1 -2
View File
@@ -437,7 +437,7 @@ bool EditBox::PreNotify( NotifyEvent& rNEvt )
//When an Event cleared wurde, this routine is
//first called.
IMPL_LINK_NOARG(EditBox, ChangedHdl)
IMPL_LINK_NOARG_TYPED(EditBox, ChangedHdl, void*, void)
{
if(pMEdit!=nullptr)
{
@@ -449,7 +449,6 @@ IMPL_LINK_NOARG(EditBox, ChangedHdl)
aOldSel=aNewSel;
}
}
return 0;
}
void EditBox::UpdateOldSel()
fpicker/source/office/asyncfilepicker.cxx
+3 -5
View File
@@ -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;
}
fpicker/source/office/asyncfilepicker.hxx
+1 -1
View File
@@ -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;
fpicker/source/office/commonpicker.cxx
+2 -4
View File
@@ -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;
}
fpicker/source/office/commonpicker.hxx
+1 -1
View File
@@ -186,7 +186,7 @@ namespace svt
private:
void stopWindowListening();
DECL_LINK( OnCancelPicker, void* );
DECL_LINK_TYPED( OnCancelPicker, void*, void );
};
} // namespace svt
framework/inc/services/layoutmanager.hxx
+1 -1
View File
@@ -168,7 +168,7 @@ namespace framework
virtual void SAL_CALL addLayoutManagerEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManagerListener >& aLayoutManagerListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removeLayoutManagerEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManagerListener >& aLayoutManagerListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
DECL_LINK(MenuBarClose, void *);
DECL_LINK_TYPED( MenuBarClose, void *, void);
DECL_LINK( WindowEventListener, VclSimpleEvent* );
// ILayoutNotifications
framework/inc/uielement/complextoolbarcontroller.hxx
+2 -2
View File
@@ -71,8 +71,8 @@ class ComplexToolbarController : public svt::ToolboxController
// XStatusListener
virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
DECL_STATIC_LINK( ComplexToolbarController, ExecuteHdl_Impl, ExecuteInfo* );
DECL_STATIC_LINK( ComplexToolbarController, Notify_Impl, NotifyInfo* );
DECL_STATIC_LINK_TYPED( ComplexToolbarController, ExecuteHdl_Impl, void*, void );
DECL_STATIC_LINK_TYPED( ComplexToolbarController, Notify_Impl, void*, void);
protected:
static sal_Int32 getFontSizePixel( const vcl::Window* pWindow );
framework/inc/uielement/generictoolbarcontroller.hxx
+1 -1
View File
@@ -51,7 +51,7 @@ class GenericToolbarController : public svt::ToolboxController
// XStatusListener
virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
DECL_STATIC_LINK( GenericToolbarController, ExecuteHdl_Impl, ExecuteInfo* );
DECL_STATIC_LINK_TYPED( GenericToolbarController, ExecuteHdl_Impl, void*, void );
protected:
VclPtr<ToolBox> m_pToolbar;
framework/inc/uielement/newmenucontroller.hxx
+1 -1
View File
@@ -77,7 +77,7 @@ namespace framework
// XEventListener
virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
DECL_STATIC_LINK( NewMenuController, ExecuteHdl_Impl, NewDocument* );
DECL_STATIC_LINK_TYPED( NewMenuController, ExecuteHdl_Impl, void*, void );
private:
virtual void impl_setPopupMenu() SAL_OVERRIDE;
framework/inc/uielement/toolbarmanager.hxx
+1 -1
View File
@@ -140,7 +140,7 @@ class ToolBarManager : public ToolbarManager_Base
DECL_LINK( MenuSelect, Menu * );
DECL_LINK_TYPED( MenuDeactivate, Menu *, bool );
DECL_LINK_TYPED(AsyncUpdateControllersHdl, Timer *, void);
DECL_STATIC_LINK( ToolBarManager, ExecuteHdl_Impl, ExecuteInfo* );
DECL_STATIC_LINK_TYPED( ToolBarManager, ExecuteHdl_Impl, void*, void );
virtual bool MenuItemAllowed( sal_uInt16 ) const;
framework/inc/uielement/toolbarsmenucontroller.hxx
+1 -1
View File
@@ -80,7 +80,7 @@ namespace framework
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs;
};
DECL_STATIC_LINK( ToolbarsMenuController, ExecuteHdl_Impl, ExecuteInfo* );
DECL_STATIC_LINK_TYPED( ToolbarsMenuController, ExecuteHdl_Impl, void*, void );
private:
void fillPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu );
framework/source/fwe/classes/addonsoptions.cxx
+1 -2
View File
@@ -1651,11 +1651,10 @@ Mutex& AddonsOptions::GetOwnStaticMutex()
return *pMutex;
}
IMPL_STATIC_LINK_NOARG( AddonsOptions, Notify )
IMPL_STATIC_LINK_NOARG_TYPED( AddonsOptions, Notify, void*, void )
{
MutexGuard aGuard( GetOwnStaticMutex() );
m_pDataContainer->ReadConfigurationData();
return 0;
}
}
framework/source/layoutmanager/layoutmanager.cxx
+2 -4
View File
@@ -2595,7 +2595,7 @@ bool LayoutManager::implts_resetMenuBar()
return false;
}
IMPL_LINK_NOARG(LayoutManager, MenuBarClose)
IMPL_LINK_NOARG_TYPED(LayoutManager, MenuBarClose, void*, void)
{
SolarMutexClearableGuard aReadLock;
uno::Reference< frame::XDispatchProvider > xProvider(m_xFrame, uno::UNO_QUERY);
@@ -2603,7 +2603,7 @@ IMPL_LINK_NOARG(LayoutManager, MenuBarClose)
aReadLock.clear();
if ( !xProvider.is())
return 0;
return;
uno::Reference< frame::XDispatchHelper > xDispatcher = frame::DispatchHelper::create( xContext );
@@ -2613,8 +2613,6 @@ IMPL_LINK_NOARG(LayoutManager, MenuBarClose)
OUString("_self"),
0,
uno::Sequence< beans::PropertyValue >());
return 0;
}
// XLayoutManagerEventBroadcaster

Some files were not shown because too many files have changed in this diff Show More