diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-10-05 07:56:12 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-10-05 07:56:12 +0200 |
| commit | 106ea87205cfba1bc39dc99ad8c3ee5f8fe350fb (patch) | |
| tree | e55ab4706654d10a5f9b75acfdecec72fda804c3 /dbaccess | |
| parent | starmath: Assert the precondition for OUString#replaceAt() (diff) | |
| download | core-106ea87205cfba1bc39dc99ad8c3ee5f8fe350fb.tar.gz core-106ea87205cfba1bc39dc99ad8c3ee5f8fe350fb.zip | |
Remove _TYPED suffix from tools/link.hxx macros
...which was introduced with 3ead3ad52f9bb2f9d1d6cf8dfc73a0a25e6778ed "Gradually
typed Link" to distinguish the new, typed versions from the old, untyped ones,
but is no longer necessary since 382eb1a23c390154619c385414bdbe6f6e461173
"remove untyped Link<>" removed the old versions.
Change-Id: I494025df486a16a45861fcd8192dfe0275b1103c
Diffstat (limited to 'dbaccess')
129 files changed, 376 insertions, 376 deletions
diff --git a/dbaccess/source/core/dataaccess/intercept.cxx b/dbaccess/source/core/dataaccess/intercept.cxx index ad00847c8c8e..a768615455c0 100644 --- a/dbaccess/source/core/dataaccess/intercept.cxx +++ b/dbaccess/source/core/dataaccess/intercept.cxx @@ -175,7 +175,7 @@ void SAL_CALL OInterceptor::dispatch( const URL& URL,const Sequence<PropertyValu } } -IMPL_LINK_TYPED( OInterceptor, OnDispatch, void*, _pDispatcher, void ) +IMPL_LINK( OInterceptor, OnDispatch, void*, _pDispatcher, void ) { std::unique_ptr<DispatchHelper> pHelper( static_cast< DispatchHelper* >( _pDispatcher ) ); try diff --git a/dbaccess/source/core/dataaccess/intercept.hxx b/dbaccess/source/core/dataaccess/intercept.hxx index 73d8b3c2e6d4..80675245446e 100644 --- a/dbaccess/source/core/dataaccess/intercept.hxx +++ b/dbaccess/source/core/dataaccess/intercept.hxx @@ -37,7 +37,7 @@ class OInterceptor : public ::cppu::WeakImplHelper< css::frame::XDispatchProvide css::frame::XInterceptorInfo, css::frame::XDispatch > { - DECL_LINK_TYPED( OnDispatch, void*, void ); + DECL_LINK( OnDispatch, void*, void ); protected: virtual ~OInterceptor() override; public: diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx index cd94f2110ec9..ab736b1ad026 100644 --- a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx +++ b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx @@ -272,7 +272,7 @@ namespace dbmm return MacroMigrationDialog_Base::onFinish(); } - IMPL_LINK_NOARG_TYPED( MacroMigrationDialog, OnStartMigration, void*, void ) + IMPL_LINK_NOARG( MacroMigrationDialog, OnStartMigration, void*, void ) { // prevent closing m_pData->bMigrationIsRunning = true; diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.hxx b/dbaccess/source/ext/macromigration/macromigrationdialog.hxx index ee65942d0a75..28ef816ec166 100644 --- a/dbaccess/source/ext/macromigration/macromigrationdialog.hxx +++ b/dbaccess/source/ext/macromigration/macromigrationdialog.hxx @@ -65,7 +65,7 @@ namespace dbmm void impl_reloadDocument_nothrow( bool _bMigrationSuccess ); private: - DECL_LINK_TYPED( OnStartMigration, void*, void ); + DECL_LINK( OnStartMigration, void*, void ); private: ::std::unique_ptr< MacroMigrationDialog_Data > m_pData; diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.cxx b/dbaccess/source/ext/macromigration/macromigrationpages.cxx index 9192eb6601a8..c8d58bcdbe07 100644 --- a/dbaccess/source/ext/macromigration/macromigrationpages.cxx +++ b/dbaccess/source/ext/macromigration/macromigrationpages.cxx @@ -112,7 +112,7 @@ namespace dbmm m_pStartMigration->Show(!m_pSaveAsLocation->GetText().isEmpty()); } - IMPL_LINK_NOARG_TYPED( SaveDBDocPage, OnLocationModified, Edit&, void ) + IMPL_LINK_NOARG( SaveDBDocPage, OnLocationModified, Edit&, void ) { impl_updateLocationDependentItems(); } diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.hxx b/dbaccess/source/ext/macromigration/macromigrationpages.hxx index 9115aa34a0bc..ad82d28c54ee 100644 --- a/dbaccess/source/ext/macromigration/macromigrationpages.hxx +++ b/dbaccess/source/ext/macromigration/macromigrationpages.hxx @@ -94,7 +94,7 @@ namespace dbmm virtual bool canAdvance() const override; private: - DECL_LINK_TYPED( OnLocationModified, Edit&, void ); + DECL_LINK( OnLocationModified, Edit&, void ); void impl_updateLocationDependentItems(); }; diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx index b5135f870371..16a21a7ab53d 100644 --- a/dbaccess/source/filter/xml/dbloader2.cxx +++ b/dbaccess/source/filter/xml/dbloader2.cxx @@ -230,7 +230,7 @@ private: OUString m_sCurrentURL; ImplSVEvent * m_nStartWizard; - DECL_LINK_TYPED( OnStartTableWizard, void*, void ); + DECL_LINK( OnStartTableWizard, void*, void ); public: explicit DBContentLoader(const Reference< XComponentContext >&); virtual ~DBContentLoader() override; @@ -560,7 +560,7 @@ void DBContentLoader::cancel() throw(std::exception) { } -IMPL_LINK_NOARG_TYPED( DBContentLoader, OnStartTableWizard, void*, void ) +IMPL_LINK_NOARG( DBContentLoader, OnStartTableWizard, void*, void ) { m_nStartWizard = nullptr; try diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index 18c2fe562bcd..9aa1a837a469 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -1879,14 +1879,14 @@ Reference< XComponent > OApplicationController::openElementWithArguments( const return xRet; } -IMPL_LINK_TYPED( OApplicationController, OnSelectContainer, void*, _pType, void ) +IMPL_LINK( OApplicationController, OnSelectContainer, void*, _pType, void ) { ElementType eType = (ElementType)reinterpret_cast< sal_IntPtr >( _pType ); if (getContainer()) getContainer()->selectContainer(eType); } -IMPL_LINK_TYPED( OApplicationController, OnCreateWithPilot, void*, _pType, void ) +IMPL_LINK( OApplicationController, OnCreateWithPilot, void*, _pType, void ) { ElementType eType = (ElementType)reinterpret_cast< sal_IntPtr >( _pType ); newElementWithPilot( eType ); @@ -2233,7 +2233,7 @@ void OApplicationController::showPreviewFor(const ElementType _eType,const OUStr } } -IMPL_LINK_NOARG_TYPED(OApplicationController, OnClipboardChanged, TransferableDataHelper*, void) +IMPL_LINK_NOARG(OApplicationController, OnClipboardChanged, TransferableDataHelper*, void) { OnInvalidateClipboard(); } diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx index f6f1201c323e..928a46e8aca9 100644 --- a/dbaccess/source/ui/app/AppController.hxx +++ b/dbaccess/source/ui/app/AppController.hxx @@ -537,10 +537,10 @@ namespace dbaui getCurrentSelection( Control& _rControl ) const override; void OnInvalidateClipboard(); - DECL_LINK_TYPED( OnClipboardChanged, TransferableDataHelper*, void ); - DECL_LINK_TYPED( OnAsyncDrop, void*, void ); - DECL_LINK_TYPED( OnCreateWithPilot, void*, void ); - DECL_LINK_TYPED( OnSelectContainer, void*, void ); + DECL_LINK( OnClipboardChanged, TransferableDataHelper*, void ); + DECL_LINK( OnAsyncDrop, void*, void ); + DECL_LINK( OnCreateWithPilot, void*, void ); + DECL_LINK( OnSelectContainer, void*, void ); void OnFirstControllerConnected(); protected: diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx index 692d9868a024..819cbf6372a1 100644 --- a/dbaccess/source/ui/app/AppControllerDnD.cxx +++ b/dbaccess/source/ui/app/AppControllerDnD.cxx @@ -797,7 +797,7 @@ bool OApplicationController::isTableFormat() const return OTableCopyHelper::isTableFormat(getViewClipboard()); } -IMPL_LINK_NOARG_TYPED( OApplicationController, OnAsyncDrop, void*, void ) +IMPL_LINK_NOARG( OApplicationController, OnAsyncDrop, void*, void ) { m_nAsyncDrop = nullptr; SolarMutexGuard aSolarGuard; diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index e8c9f37e19ef..2b2867ec23c6 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -128,7 +128,7 @@ namespace // class OPreviewWindow class OTablePreviewWindow : public vcl::Window { - DECL_LINK_TYPED(OnDisableInput, void*, void); + DECL_LINK(OnDisableInput, void*, void); void ImplInitSettings(); protected: virtual void DataChanged(const DataChangedEvent& rDCEvt) override; @@ -147,7 +147,7 @@ namespace PostUserEvent( LINK( this, OTablePreviewWindow, OnDisableInput), nullptr, true ); return bRet; } - IMPL_LINK_NOARG_TYPED(OTablePreviewWindow, OnDisableInput, void*, void) + IMPL_LINK_NOARG(OTablePreviewWindow, OnDisableInput, void*, void) { EnableInput(false); } @@ -888,33 +888,33 @@ void OAppDetailPageHelper::elementRemoved( ElementType _eType,const OUString& _r } } -IMPL_LINK_TYPED(OAppDetailPageHelper, OnEntryEnterKey, DBTreeListBox*, _pTree, void ) +IMPL_LINK(OAppDetailPageHelper, OnEntryEnterKey, DBTreeListBox*, _pTree, void ) { OnEntryDoubleClick(_pTree); } -IMPL_LINK_TYPED(OAppDetailPageHelper, OnEntryDoubleClick, SvTreeListBox*, _pTree, bool) +IMPL_LINK(OAppDetailPageHelper, OnEntryDoubleClick, SvTreeListBox*, _pTree, bool) { OSL_ENSURE( _pTree, "OAppDetailPageHelper, OnEntryDoubleClick: invalid callback!" ); bool bHandled = ( _pTree != nullptr ) && getBorderWin().getView()->getAppController().onEntryDoubleClick( *_pTree ); return bHandled; } -IMPL_LINK_NOARG_TYPED(OAppDetailPageHelper, OnEntrySelChange, LinkParamNone*, void) +IMPL_LINK_NOARG(OAppDetailPageHelper, OnEntrySelChange, LinkParamNone*, void) { getBorderWin().getView()->getAppController().onSelectionChanged(); } -IMPL_LINK_NOARG_TYPED( OAppDetailPageHelper, OnCopyEntry, LinkParamNone*, void ) +IMPL_LINK_NOARG( OAppDetailPageHelper, OnCopyEntry, LinkParamNone*, void ) { getBorderWin().getView()->getAppController().onCopyEntry(); } -IMPL_LINK_NOARG_TYPED( OAppDetailPageHelper, OnPasteEntry, LinkParamNone*, void ) +IMPL_LINK_NOARG( OAppDetailPageHelper, OnPasteEntry, LinkParamNone*, void ) { getBorderWin().getView()->getAppController().onPasteEntry(); } -IMPL_LINK_NOARG_TYPED( OAppDetailPageHelper, OnDeleteEntry, LinkParamNone*, void ) +IMPL_LINK_NOARG( OAppDetailPageHelper, OnDeleteEntry, LinkParamNone*, void ) { getBorderWin().getView()->getAppController().onDeleteEntry(); } @@ -1136,7 +1136,7 @@ void OAppDetailPageHelper::showPreview( const OUString& _sDataSourceName, } } -IMPL_LINK_NOARG_TYPED(OAppDetailPageHelper, OnDropdownClickHdl, ToolBox*, void) +IMPL_LINK_NOARG(OAppDetailPageHelper, OnDropdownClickHdl, ToolBox*, void) { m_aTBPreview->EndSelection(); diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx index 65426cc027b2..fb933c64e130 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx @@ -149,16 +149,16 @@ namespace dbaui */ DBTreeListBox* createSimpleTree( const OString& _sHelpId, const Image& _rImage); - DECL_LINK_TYPED( OnEntryDoubleClick, SvTreeListBox*, bool ); - DECL_LINK_TYPED( OnEntryEnterKey, DBTreeListBox*, void ); - DECL_LINK_TYPED( OnEntrySelChange, LinkParamNone*, void ); + DECL_LINK( OnEntryDoubleClick, SvTreeListBox*, bool ); + DECL_LINK( OnEntryEnterKey, DBTreeListBox*, void ); + DECL_LINK( OnEntrySelChange, LinkParamNone*, void ); - DECL_LINK_TYPED( OnCopyEntry, LinkParamNone*, void ); - DECL_LINK_TYPED( OnPasteEntry, LinkParamNone*, void ); - DECL_LINK_TYPED( OnDeleteEntry, LinkParamNone*, void ); + DECL_LINK( OnCopyEntry, LinkParamNone*, void ); + DECL_LINK( OnPasteEntry, LinkParamNone*, void ); + DECL_LINK( OnDeleteEntry, LinkParamNone*, void ); // click a TB slot - DECL_LINK_TYPED(OnDropdownClickHdl, ToolBox*, void); + DECL_LINK(OnDropdownClickHdl, ToolBox*, void); inline OAppBorderWindow& getBorderWin() const { return m_rBorderWin; } void ImplInitSettings(); diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx index 0b2e9b9c9b6d..dfa9c280ea2d 100644 --- a/dbaccess/source/ui/app/AppDetailView.cxx +++ b/dbaccess/source/ui/app/AppDetailView.cxx @@ -430,7 +430,7 @@ void OTasksWindow::setHelpText(sal_uInt16 _nId) } -IMPL_LINK_NOARG_TYPED(OTasksWindow, OnEntrySelectHdl, SvTreeListBox*, void) +IMPL_LINK_NOARG(OTasksWindow, OnEntrySelectHdl, SvTreeListBox*, void) { SvTreeListEntry* pEntry = m_aCreation->GetHdlEntry(); if ( pEntry ) diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx index 2471e05d11d0..988be3f003b9 100644 --- a/dbaccess/source/ui/app/AppDetailView.hxx +++ b/dbaccess/source/ui/app/AppDetailView.hxx @@ -117,7 +117,7 @@ namespace dbaui VclPtr<FixedLine> m_aFL; VclPtr<OApplicationDetailView> m_pDetailView; - DECL_LINK_TYPED( OnEntrySelectHdl, SvTreeListBox*, void ); + DECL_LINK( OnEntrySelectHdl, SvTreeListBox*, void ); void ImplInitSettings(); protected: virtual void DataChanged(const DataChangedEvent& rDCEvt) override; diff --git a/dbaccess/source/ui/app/AppSwapWindow.cxx b/dbaccess/source/ui/app/AppSwapWindow.cxx index 6d9b50f5d31e..644b846b86ae 100644 --- a/dbaccess/source/ui/app/AppSwapWindow.cxx +++ b/dbaccess/source/ui/app/AppSwapWindow.cxx @@ -149,7 +149,7 @@ bool OApplicationSwapWindow::onContainerSelected( ElementType _eType ) return false; } -IMPL_LINK_TYPED(OApplicationSwapWindow, OnContainerSelectHdl, SvtIconChoiceCtrl*, _pControl, void) +IMPL_LINK(OApplicationSwapWindow, OnContainerSelectHdl, SvtIconChoiceCtrl*, _pControl, void) { SvxIconChoiceCtrlEntry* pEntry = _pControl->GetSelectedEntry(); ElementType eType = E_NONE; @@ -160,7 +160,7 @@ IMPL_LINK_TYPED(OApplicationSwapWindow, OnContainerSelectHdl, SvtIconChoiceCtrl* } } -IMPL_LINK_NOARG_TYPED(OApplicationSwapWindow, ChangeToLastSelected, void*, void) +IMPL_LINK_NOARG(OApplicationSwapWindow, ChangeToLastSelected, void*, void) { selectContainer(m_eLastType); } diff --git a/dbaccess/source/ui/app/AppSwapWindow.hxx b/dbaccess/source/ui/app/AppSwapWindow.hxx index 0fabc5329020..a902bdae1df9 100644 --- a/dbaccess/source/ui/app/AppSwapWindow.hxx +++ b/dbaccess/source/ui/app/AppSwapWindow.hxx @@ -37,8 +37,8 @@ namespace dbaui void ImplInitSettings(); - DECL_LINK_TYPED( OnContainerSelectHdl, SvtIconChoiceCtrl*, void ); - DECL_LINK_TYPED( ChangeToLastSelected, void*, void ); + DECL_LINK( OnContainerSelectHdl, SvtIconChoiceCtrl*, void ); + DECL_LINK( ChangeToLastSelected, void*, void ); protected: virtual void DataChanged(const DataChangedEvent& rDCEvt) override; public: diff --git a/dbaccess/source/ui/browser/AsynchronousLink.cxx b/dbaccess/source/ui/browser/AsynchronousLink.cxx index 7381437bd0ac..2fbedc81d1f9 100644 --- a/dbaccess/source/ui/browser/AsynchronousLink.cxx +++ b/dbaccess/source/ui/browser/AsynchronousLink.cxx @@ -65,7 +65,7 @@ void OAsynchronousLink::CancelCall() m_nEventId = nullptr; } -IMPL_LINK_TYPED(OAsynchronousLink, OnAsyncCall, void*, _pArg, void) +IMPL_LINK(OAsynchronousLink, OnAsyncCall, void*, _pArg, void) { { ::osl::MutexGuard aDestructionGuard( m_aDestructionSafety ); diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index 23b613c5cb60..a95e5ec6adc2 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -1262,7 +1262,7 @@ void SbaXDataBrowserController::frameAction(const css::frame::FrameActionEvent& } } -IMPL_LINK_NOARG_TYPED( SbaXDataBrowserController, OnAsyncDisplayError, void*, void ) +IMPL_LINK_NOARG( SbaXDataBrowserController, OnAsyncDisplayError, void*, void ) { if ( m_aCurrentError.isValid() ) { @@ -2272,13 +2272,13 @@ void SbaXDataBrowserController::CellDeactivated() OnInvalidateClipboard( nullptr ); } -IMPL_LINK_NOARG_TYPED(SbaXDataBrowserController, OnClipboardChanged, TransferableDataHelper*, void) +IMPL_LINK_NOARG(SbaXDataBrowserController, OnClipboardChanged, TransferableDataHelper*, void) { SolarMutexGuard aGuard; OnInvalidateClipboard( nullptr ); } -IMPL_LINK_TYPED(SbaXDataBrowserController, OnInvalidateClipboard, Timer*, _pTimer, void) +IMPL_LINK(SbaXDataBrowserController, OnInvalidateClipboard, Timer*, _pTimer, void) { InvalidateFeature(ID_BROWSER_CUT); InvalidateFeature(ID_BROWSER_COPY); @@ -2315,7 +2315,7 @@ Reference< XPropertySet > SbaXDataBrowserController::getBoundField() const return xEmptyReturn; } -IMPL_LINK_TYPED(SbaXDataBrowserController, OnSearchContextRequest, FmSearchContext&, rContext, sal_uInt32) +IMPL_LINK(SbaXDataBrowserController, OnSearchContextRequest, FmSearchContext&, rContext, sal_uInt32) { Reference< css::container::XIndexAccess > xPeerContainer(getBrowserView()->getGridControl(), UNO_QUERY); @@ -2361,7 +2361,7 @@ IMPL_LINK_TYPED(SbaXDataBrowserController, OnSearchContextRequest, FmSearchConte return rContext.arrFields.size(); } -IMPL_LINK_TYPED(SbaXDataBrowserController, OnFoundData, FmFoundRecordInformation&, rInfo, void) +IMPL_LINK(SbaXDataBrowserController, OnFoundData, FmFoundRecordInformation&, rInfo, void) { Reference< css::sdbcx::XRowLocate > xCursor(getRowSet(), UNO_QUERY); OSL_ENSURE(xCursor.is(), "SbaXDataBrowserController::OnFoundData : xCursor is empty"); @@ -2396,7 +2396,7 @@ IMPL_LINK_TYPED(SbaXDataBrowserController, OnFoundData, FmFoundRecordInformation xGrid->setCurrentColumnPosition(nViewPos); } -IMPL_LINK_TYPED(SbaXDataBrowserController, OnCanceledNotFound, FmFoundRecordInformation&, rInfo, void) +IMPL_LINK(SbaXDataBrowserController, OnCanceledNotFound, FmFoundRecordInformation&, rInfo, void) { Reference< css::sdbcx::XRowLocate > xCursor(getRowSet(), UNO_QUERY); @@ -2426,7 +2426,7 @@ IMPL_LINK_TYPED(SbaXDataBrowserController, OnCanceledNotFound, FmFoundRecordInfo } } -IMPL_LINK_NOARG_TYPED(SbaXDataBrowserController, OnAsyncGetCellFocus, void*, void) +IMPL_LINK_NOARG(SbaXDataBrowserController, OnAsyncGetCellFocus, void*, void) { SbaGridControl* pVclGrid = getBrowserView() ? getBrowserView()->getVclControl() : nullptr; // if we have a controller, but the window for the controller doesn't have the focus, we correct this diff --git a/dbaccess/source/ui/browser/brwview.cxx b/dbaccess/source/ui/browser/brwview.cxx index dec8db487258..d041f10fcec4 100644 --- a/dbaccess/source/ui/browser/brwview.cxx +++ b/dbaccess/source/ui/browser/brwview.cxx @@ -138,7 +138,7 @@ void UnoDataBrowserView::dispose() ODataView::dispose(); } -IMPL_LINK_NOARG_TYPED( UnoDataBrowserView, SplitHdl, Splitter*, void ) +IMPL_LINK_NOARG( UnoDataBrowserView, SplitHdl, Splitter*, void ) { long nYPos = m_pSplitter->GetPosPixel().Y(); m_pSplitter->SetPosPixel( Point( m_pSplitter->GetSplitPosPixel(), nYPos ) ); diff --git a/dbaccess/source/ui/browser/dsbrowserDnD.cxx b/dbaccess/source/ui/browser/dsbrowserDnD.cxx index 6591a859ac0e..95dd2906d97f 100644 --- a/dbaccess/source/ui/browser/dsbrowserDnD.cxx +++ b/dbaccess/source/ui/browser/dsbrowserDnD.cxx @@ -194,7 +194,7 @@ namespace dbaui return nullptr != pTransfer; } - IMPL_LINK_NOARG_TYPED(SbaTableQueryBrowser, OnCopyEntry, LinkParamNone*, void) + IMPL_LINK_NOARG(SbaTableQueryBrowser, OnCopyEntry, LinkParamNone*, void) { SvTreeListEntry* pSelected = m_pTreeView->getListBox().FirstSelected(); if( isEntryCopyAllowed( pSelected ) ) @@ -215,7 +215,7 @@ namespace dbaui if (pTransfer) pTransfer->CopyToClipboard(getView()); } - IMPL_LINK_NOARG_TYPED( SbaTableQueryBrowser, OnAsyncDrop, void*, void ) + IMPL_LINK_NOARG( SbaTableQueryBrowser, OnAsyncDrop, void*, void ) { m_nAsyncDrop = nullptr; SolarMutexGuard aSolarGuard; diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx index 011b5c0dda9a..7526a6a3e31d 100644 --- a/dbaccess/source/ui/browser/genericcontroller.cxx +++ b/dbaccess/source/ui/browser/genericcontroller.cxx @@ -251,7 +251,7 @@ bool OGenericUnoController::Construct(vcl::Window* /*pParent*/) return true; } -IMPL_LINK_NOARG_TYPED(OGenericUnoController, OnAsyncInvalidateAll, void*, void) +IMPL_LINK_NOARG(OGenericUnoController, OnAsyncInvalidateAll, void*, void) { if ( !OGenericUnoController_Base::rBHelper.bInDispose && !OGenericUnoController_Base::rBHelper.bDisposed ) InvalidateFeature_Impl(); @@ -1028,7 +1028,7 @@ void OGenericUnoController::closeTask() m_aAsyncCloseTask.Call(); } -IMPL_LINK_NOARG_TYPED(OGenericUnoController, OnAsyncCloseTask, void*, void) +IMPL_LINK_NOARG(OGenericUnoController, OnAsyncCloseTask, void*, void) { if ( !OGenericUnoController_Base::rBHelper.bInDispose ) { diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index e0225324aabc..7092450fb83b 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -361,7 +361,7 @@ Reference< css::frame::XDispatch > SAL_CALL SbaXGridPeer::queryDispatch(const c return FmXGridPeer::queryDispatch(aURL, aTargetFrameName, nSearchFlags); } -IMPL_LINK_NOARG_TYPED( SbaXGridPeer, OnDispatchEvent, void*, void ) +IMPL_LINK_NOARG( SbaXGridPeer, OnDispatchEvent, void*, void ) { VclPtr< SbaGridControl > pGrid = GetAs< SbaGridControl >(); if ( pGrid ) // if this fails, we were disposing before arriving here @@ -1438,7 +1438,7 @@ Reference< XPropertySet > SbaGridControl::getDataSource() const return xReturn; } -IMPL_LINK_NOARG_TYPED(SbaGridControl, AsynchDropEvent, void*, void) +IMPL_LINK_NOARG(SbaGridControl, AsynchDropEvent, void*, void) { m_nAsyncDropEvent = nullptr; diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index 6069119ee8f8..da2d7c9d275c 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -2146,7 +2146,7 @@ SvTreeListEntry* SbaTableQueryBrowser::implAppendEntry( SvTreeListEntry* _pParen return pNewEntry; } -IMPL_LINK_TYPED(SbaTableQueryBrowser, OnExpandEntry, SvTreeListEntry*, _pParent, bool) +IMPL_LINK(SbaTableQueryBrowser, OnExpandEntry, SvTreeListEntry*, _pParent, bool) { if (_pParent->HasChildren()) // nothing to do... @@ -2479,7 +2479,7 @@ bool SbaTableQueryBrowser::implSelect(const OUString& _rDataSourceName, const OU return false; } -IMPL_LINK_NOARG_TYPED(SbaTableQueryBrowser, OnSelectionChange, LinkParamNone*, void) +IMPL_LINK_NOARG(SbaTableQueryBrowser, OnSelectionChange, LinkParamNone*, void) { implSelect( m_pTreeView->getListBox().FirstSelected() ); } @@ -3344,7 +3344,7 @@ bool SbaTableQueryBrowser::ensureConnection( SvTreeListEntry* _pDSEntry, void* p return _rConnection.is(); } -IMPL_LINK_TYPED( SbaTableQueryBrowser, OnTreeEntryCompare, const SvSortData&, _rSortData, sal_Int32 ) +IMPL_LINK( SbaTableQueryBrowser, OnTreeEntryCompare, const SvSortData&, _rSortData, sal_Int32 ) { const SvTreeListEntry* pLHS = static_cast<const SvTreeListEntry*>(_rSortData.pLeft); const SvTreeListEntry* pRHS = static_cast<const SvTreeListEntry*>(_rSortData.pRight); diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index 9752c627252d..b9735ec0c03b 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -241,7 +241,7 @@ void OFieldDescControl::Init() ::dbaui::setEvalDateFormatForFormatter(xFormatter); } -IMPL_LINK_TYPED(OFieldDescControl, OnScroll, ScrollBar*, /*pBar*/, void) +IMPL_LINK(OFieldDescControl, OnScroll, ScrollBar*, /*pBar*/, void) { ScrollAllAggregates(); } @@ -525,7 +525,7 @@ void OFieldDescControl::SetControlText( sal_uInt16 nControlId, const OUString& r } } -IMPL_LINK_NOARG_TYPED( OFieldDescControl, FormatClickHdl, Button *, void ) +IMPL_LINK_NOARG( OFieldDescControl, FormatClickHdl, Button *, void ) { // Create temporary Column, which is used for data exchange with Dialog if( !pActFieldDescr ) @@ -565,7 +565,7 @@ void OFieldDescControl::SetModified(bool /*bModified*/) { } -IMPL_LINK_TYPED( OFieldDescControl, ChangeHdl, ListBox&, rListBox, void ) +IMPL_LINK( OFieldDescControl, ChangeHdl, ListBox&, rListBox, void ) { if ( !pActFieldDescr ) return; @@ -1380,7 +1380,7 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr ) SetReadOnly( bRead ); } -IMPL_LINK_TYPED(OFieldDescControl, OnControlFocusGot, Control&, rControl, void ) +IMPL_LINK(OFieldDescControl, OnControlFocusGot, Control&, rControl, void ) { OUString strHelpText; OPropNumericEditCtrl* pNumeric = dynamic_cast< OPropNumericEditCtrl* >( &rControl ); @@ -1420,7 +1420,7 @@ IMPL_LINK_TYPED(OFieldDescControl, OnControlFocusGot, Control&, rControl, void ) m_pActFocusWindow = &rControl; } -IMPL_LINK_TYPED(OFieldDescControl, OnControlFocusLost, Control&, rControl, void ) +IMPL_LINK(OFieldDescControl, OnControlFocusLost, Control&, rControl, void ) { if ((&rControl == pLength) || (&rControl == pTextLen) || (&rControl == pScale)) { diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx index e892251ecc3f..ea6987518c1e 100644 --- a/dbaccess/source/ui/control/RelationControl.cxx +++ b/dbaccess/source/ui/control/RelationControl.cxx @@ -119,10 +119,10 @@ namespace dbaui virtual void CellModified() override; - DECL_LINK_TYPED( AsynchDeactivate, void*, void ); + DECL_LINK( AsynchDeactivate, void*, void ); private: - DECL_LINK_TYPED( AsynchActivate, void*, void ); + DECL_LINK( AsynchActivate, void*, void ); }; @@ -199,12 +199,12 @@ namespace dbaui return EditBrowseBox::PreNotify(rNEvt); } - IMPL_LINK_NOARG_TYPED(ORelationControl, AsynchActivate, void*, void) + IMPL_LINK_NOARG(ORelationControl, AsynchActivate, void*, void) { ActivateCell(); } - IMPL_LINK_NOARG_TYPED(ORelationControl, AsynchDeactivate, void*, void) + IMPL_LINK_NOARG(ORelationControl, AsynchDeactivate, void*, void) { DeactivateCell(); } @@ -514,7 +514,7 @@ namespace dbaui m_pLeftTable->GrabFocus(); } - IMPL_LINK_TYPED( OTableListBoxControl, OnTableChanged, ListBox&, rListBox, void ) + IMPL_LINK( OTableListBoxControl, OnTableChanged, ListBox&, rListBox, void ) { OUString strSelected(rListBox.GetSelectEntry()); OTableWindow* pLeft = nullptr; diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx index f696857f512b..a077cda997d3 100644 --- a/dbaccess/source/ui/control/TableGrantCtrl.cxx +++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx @@ -162,13 +162,13 @@ bool OTableGrantControl::PreNotify(NotifyEvent& rNEvt) return EditBrowseBox::PreNotify(rNEvt); } -IMPL_LINK_NOARG_TYPED(OTableGrantControl, AsynchActivate, void*, void) +IMPL_LINK_NOARG(OTableGrantControl, AsynchActivate, void*, void) { m_nDeactivateEvent = nullptr; ActivateCell(); } -IMPL_LINK_NOARG_TYPED(OTableGrantControl, AsynchDeactivate, void*, void) +IMPL_LINK_NOARG(OTableGrantControl, AsynchDeactivate, void*, void) { m_nDeactivateEvent = nullptr; DeactivateCell(); diff --git a/dbaccess/source/ui/control/VertSplitView.cxx b/dbaccess/source/ui/control/VertSplitView.cxx index 8425a281435d..45e11a6c20e1 100644 --- a/dbaccess/source/ui/control/VertSplitView.cxx +++ b/dbaccess/source/ui/control/VertSplitView.cxx @@ -49,7 +49,7 @@ void OSplitterView::dispose() vcl::Window::dispose(); } -IMPL_LINK_NOARG_TYPED( OSplitterView, SplitHdl, Splitter*, void ) +IMPL_LINK_NOARG( OSplitterView, SplitHdl, Splitter*, void ) { OSL_ENSURE(m_pSplitter, "Splitter is NULL!"); m_pSplitter->SetPosPixel( Point( m_pSplitter->GetPosPixel().X(),m_pSplitter->GetSplitPosPixel() ) ); diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx index 305383b348aa..6c0562a7cb84 100644 --- a/dbaccess/source/ui/control/dbtreelistbox.cxx +++ b/dbaccess/source/ui/control/dbtreelistbox.cxx @@ -176,7 +176,7 @@ void DBTreeListBox::MouseButtonDown( const MouseEvent& rMEvt ) SvTreeListBox::MouseButtonDown(rMEvt); } -IMPL_LINK_TYPED(DBTreeListBox, OnResetEntry, void*, p, void) +IMPL_LINK(DBTreeListBox, OnResetEntry, void*, p, void) { SvTreeListEntry* pEntry = static_cast<SvTreeListEntry*>(p); // set the flag which allows if the entry can be expanded @@ -395,12 +395,12 @@ void scrollWindow(DBTreeListBox* _pListBox, const Point& _rPos,bool _bUp) } } -IMPL_LINK_NOARG_TYPED( DBTreeListBox, ScrollUpHdl, LinkParamNone*, void ) +IMPL_LINK_NOARG( DBTreeListBox, ScrollUpHdl, LinkParamNone*, void ) { scrollWindow(this,m_aMousePos,true); } -IMPL_LINK_NOARG_TYPED( DBTreeListBox, ScrollDownHdl, LinkParamNone*, void ) +IMPL_LINK_NOARG( DBTreeListBox, ScrollDownHdl, LinkParamNone*, void ) { scrollWindow(this,m_aMousePos,false); } @@ -638,7 +638,7 @@ void DBTreeListBox::ExecuteContextMenuAction( sal_uInt16 _nSelectedPopupEntry ) m_pContextMenuProvider->getCommandController().executeChecked( _nSelectedPopupEntry, Sequence< PropertyValue >() ); } -IMPL_LINK_NOARG_TYPED(DBTreeListBox, OnTimeOut, Timer*, void) +IMPL_LINK_NOARG(DBTreeListBox, OnTimeOut, Timer*, void) { implStopSelectionTimer(); diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx index d06125abc262..1e2237d66203 100644 --- a/dbaccess/source/ui/control/sqledit.cxx +++ b/dbaccess/source/ui/control/sqledit.cxx @@ -149,7 +149,7 @@ void OSqlEdit::GetFocus() MultiLineEditSyntaxHighlight::GetFocus(); } -IMPL_LINK_NOARG_TYPED(OSqlEdit, OnUndoActionTimer, Timer *, void) +IMPL_LINK_NOARG(OSqlEdit, OnUndoActionTimer, Timer *, void) { OUString aText = GetText(); if(aText != m_strOrigText) @@ -168,7 +168,7 @@ IMPL_LINK_NOARG_TYPED(OSqlEdit, OnUndoActionTimer, Timer *, void) } } -IMPL_LINK_NOARG_TYPED(OSqlEdit, OnInvalidateTimer, Timer *, void) +IMPL_LINK_NOARG(OSqlEdit, OnInvalidateTimer, Timer *, void) { OJoinController& rController = m_pView->getContainerWindow()->getDesignView()->getController(); rController.InvalidateFeature(SID_CUT); @@ -177,7 +177,7 @@ IMPL_LINK_NOARG_TYPED(OSqlEdit, OnInvalidateTimer, Timer *, void) m_timerInvalidate.Start(); } -IMPL_LINK_NOARG_TYPED(OSqlEdit, ModifyHdl, Edit&, void) +IMPL_LINK_NOARG(OSqlEdit, ModifyHdl, Edit&, void) { if (m_timerUndoActionCreation.IsActive()) m_timerUndoActionCreation.Stop(); diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx index 256515258bac..65cf5de52a44 100644 --- a/dbaccess/source/ui/dlg/CollectionView.cxx +++ b/dbaccess/source/ui/dlg/CollectionView.cxx @@ -107,7 +107,7 @@ void OCollectionView::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG_TYPED(OCollectionView, Save_Click, Button*, void) +IMPL_LINK_NOARG(OCollectionView, Save_Click, Button*, void) { OUString sName = m_pName->GetText(); if ( sName.isEmpty() ) @@ -194,7 +194,7 @@ IMPL_LINK_NOARG_TYPED(OCollectionView, Save_Click, Button*, void) } } -IMPL_LINK_NOARG_TYPED(OCollectionView, NewFolder_Click, Button*, void) +IMPL_LINK_NOARG(OCollectionView, NewFolder_Click, Button*, void) { try { @@ -212,7 +212,7 @@ IMPL_LINK_NOARG_TYPED(OCollectionView, NewFolder_Click, Button*, void) } } -IMPL_LINK_NOARG_TYPED(OCollectionView, Up_Click, Button*, void) +IMPL_LINK_NOARG(OCollectionView, Up_Click, Button*, void) { try { @@ -236,7 +236,7 @@ IMPL_LINK_NOARG_TYPED(OCollectionView, Up_Click, Button*, void) } } -IMPL_LINK_NOARG_TYPED(OCollectionView, Dbl_Click_FileView, SvTreeListBox*, bool) +IMPL_LINK_NOARG(OCollectionView, Dbl_Click_FileView, SvTreeListBox*, bool) { try { diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx index 7efded163552..b9c0bd70df4a 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx @@ -164,7 +164,7 @@ namespace dbaui m_pAdminDialog->enableConfirmSettings( !getURLNoPrefix().isEmpty() ); } - IMPL_LINK_NOARG_TYPED(OConnectionHelper, OnBrowseConnections, Button*, void) + IMPL_LINK_NOARG(OConnectionHelper, OnBrowseConnections, Button*, void) { OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF"); const ::dbaccess::DATASOURCE_TYPE eType = m_pCollection->determineType(m_eType); @@ -337,7 +337,7 @@ namespace dbaui checkTestConnection(); } - IMPL_LINK_NOARG_TYPED(OConnectionHelper, OnCreateDatabase, Button*, void) + IMPL_LINK_NOARG(OConnectionHelper, OnCreateDatabase, Button*, void) { OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF"); const ::dbaccess::DATASOURCE_TYPE eType = m_pCollection->determineType(m_eType); diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.hxx b/dbaccess/source/ui/dlg/ConnectionHelper.hxx index 53afdc9c3e3a..f8b6ac1a87e5 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.hxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.hxx @@ -91,8 +91,8 @@ namespace dbaui virtual bool checkTestConnection(); private: - DECL_LINK_TYPED(OnBrowseConnections, Button*, void); - DECL_LINK_TYPED(OnCreateDatabase, Button*, void); + DECL_LINK(OnBrowseConnections, Button*, void); + DECL_LINK(OnCreateDatabase, Button*, void); OUString impl_getURL() const; void impl_setURL( const OUString& _rURL, bool _bPrefix ); void implUpdateURLDependentStates() const; diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx index 7eb9d3cc0466..03e094ec4b26 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx @@ -287,7 +287,7 @@ namespace dbaui return bChangedSomething; } - IMPL_LINK_NOARG_TYPED(OConnectionTabPage, OnTestJavaClickHdl, Button*, void) + IMPL_LINK_NOARG(OConnectionTabPage, OnTestJavaClickHdl, Button*, void) { OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF"); bool bSuccess = false; @@ -320,7 +320,7 @@ namespace dbaui m_pTestConnection->Enable(bEnableTestConnection); return true; } - IMPL_LINK_TYPED(OConnectionTabPage, OnEditModified, Edit&, _rEdit, void) + IMPL_LINK(OConnectionTabPage, OnEditModified, Edit&, _rEdit, void) { if ( &_rEdit == m_pJavaDriver ) m_pTestJavaDriver->Enable( !m_pJavaDriver->GetText().trim().isEmpty() ); diff --git a/dbaccess/source/ui/dlg/ConnectionPage.hxx b/dbaccess/source/ui/dlg/ConnectionPage.hxx index 7ee50279fda3..5eee03ec4d6f 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.hxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.hxx @@ -52,8 +52,8 @@ namespace dbaui VclPtr<PushButton> m_pTestConnection; // called when the test connection button was clicked - DECL_LINK_TYPED(OnTestJavaClickHdl, Button*, void); - DECL_LINK_TYPED(OnEditModified, Edit&, void); + DECL_LINK(OnTestJavaClickHdl, Button*, void); + DECL_LINK(OnEditModified, Edit&, void); public: virtual ~OConnectionTabPage() override; diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx index 864b4066baa9..7341eb3897a2 100644 --- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx @@ -176,7 +176,7 @@ namespace dbaui return !m_pConnectionURL->IsVisible() || !m_pConnectionURL->GetTextNoPrefix().isEmpty(); } - IMPL_LINK_NOARG_TYPED(OConnectionTabPageSetup, OnEditModified, Edit&, void) + IMPL_LINK_NOARG(OConnectionTabPageSetup, OnEditModified, Edit&, void) { SetRoadmapStateValue(checkTestConnection()); callModifiedHdl(); diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx index e2246b3db336..3a34c73f4b8d 100644 --- a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx +++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx @@ -43,7 +43,7 @@ namespace dbaui VclPtr<FixedText> m_pHeaderText; // called when the test connection button was clicked - DECL_LINK_TYPED(OnEditModified, Edit&, void); + DECL_LINK(OnEditModified, Edit&, void); public: virtual ~OConnectionTabPageSetup() override; diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx index 8d6a0405d494..729acc566df7 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx @@ -85,7 +85,7 @@ using namespace ::com::sun::star; OConnectionTabPageSetup::dispose(); } - IMPL_LINK_NOARG_TYPED(OTextConnectionPageSetup, ImplGetExtensionHdl, OTextConnectionHelper*, void) + IMPL_LINK_NOARG(OTextConnectionPageSetup, ImplGetExtensionHdl, OTextConnectionHelper*, void) { SetRoadmapStateValue(!m_pTextConnectionHelper->GetExtension().isEmpty() && OConnectionTabPageSetup::checkTestConnection()); callModifiedHdl(); @@ -269,7 +269,7 @@ using namespace ::com::sun::star; OGenericAdministrationPage::dispose(); } - IMPL_LINK_NOARG_TYPED(OMySQLIntroPageSetup, OnSetupModeSelected, RadioButton&, void) + IMPL_LINK_NOARG(OMySQLIntroPageSetup, OnSetupModeSelected, RadioButton&, void) { maClickHdl.Call( this ); } @@ -532,7 +532,7 @@ using namespace ::com::sun::star; SetRoadmapStateValue(bRoadmapState); } - IMPL_LINK_NOARG_TYPED(OGeneralSpecialJDBCConnectionPageSetup, OnTestJavaClickHdl, Button*, void) + IMPL_LINK_NOARG(OGeneralSpecialJDBCConnectionPageSetup, OnTestJavaClickHdl, Button*, void) { OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF"); @@ -654,7 +654,7 @@ using namespace ::com::sun::star; return bEnableTestConnection; } - IMPL_LINK_NOARG_TYPED(OJDBCConnectionPageSetup, OnTestJavaClickHdl, Button*, void) + IMPL_LINK_NOARG(OJDBCConnectionPageSetup, OnTestJavaClickHdl, Button*, void) { OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF"); bool bSuccess = false; @@ -678,7 +678,7 @@ using namespace ::com::sun::star; aMsg->Execute(); } - IMPL_LINK_TYPED(OJDBCConnectionPageSetup, OnEditModified, Edit&, _rEdit, void) + IMPL_LINK(OJDBCConnectionPageSetup, OnEditModified, Edit&, _rEdit, void) { if ( &_rEdit == m_pETDriverClass ) m_pPBTestJavaDriver->Enable( !m_pETDriverClass->GetText().isEmpty() ); @@ -899,7 +899,7 @@ using namespace ::com::sun::star; return true; } - IMPL_LINK_TYPED(OFinalDBPageSetup, OnOpenSelected, Button*, _pBox, void) + IMPL_LINK(OFinalDBPageSetup, OnOpenSelected, Button*, _pBox, void) { m_pCBStartTableWizard->Enable( _pBox->IsEnabled() && static_cast<CheckBox*>(_pBox)->IsChecked() ); callModifiedHdl(); diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx index 8961cadeaf60..3a4c168b4dfc 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx @@ -74,7 +74,7 @@ namespace dbaui bool checkTestConnection() override; private: - DECL_LINK_TYPED(ImplGetExtensionHdl, OTextConnectionHelper*, void); + DECL_LINK(ImplGetExtensionHdl, OTextConnectionHelper*, void); }; // OLDAPConnectionPageSetup @@ -152,7 +152,7 @@ namespace dbaui virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; virtual void callModifiedHdl(void* pControl = nullptr) override; - DECL_LINK_TYPED(OnTestJavaClickHdl, Button*, void); + DECL_LINK(OnTestJavaClickHdl, Button*, void); VclPtr<FixedText> m_pHeaderText; VclPtr<FixedText> m_pFTHelpText; VclPtr<FixedText> m_pFTDatabasename; @@ -188,8 +188,8 @@ namespace dbaui virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; - DECL_LINK_TYPED(OnTestJavaClickHdl, Button*, void); - DECL_LINK_TYPED(OnEditModified, Edit&, void); + DECL_LINK(OnTestJavaClickHdl, Button*, void); + DECL_LINK(OnEditModified, Edit&, void); VclPtr<FixedText> m_pFTDriverClass; VclPtr<Edit> m_pETDriverClass; VclPtr<PushButton> m_pPBTestJavaDriver; @@ -226,7 +226,7 @@ namespace dbaui VclPtr<RadioButton> m_pNATIVEDatabase; Link<OMySQLIntroPageSetup *, void> maClickHdl; - DECL_LINK_TYPED(OnSetupModeSelected, RadioButton&, void); + DECL_LINK(OnSetupModeSelected, RadioButton&, void); }; @@ -277,7 +277,7 @@ namespace dbaui bool IsTableWizardToBeStarted(); void enableTableWizardCheckBox( bool _bSupportsTableCreation); - DECL_LINK_TYPED(OnOpenSelected, Button*, void); + DECL_LINK(OnOpenSelected, Button*, void); protected: virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; diff --git a/dbaccess/source/ui/dlg/RelationDlg.cxx b/dbaccess/source/ui/dlg/RelationDlg.cxx index 547e5bcb7b91..98bbba66ae03 100644 --- a/dbaccess/source/ui/dlg/RelationDlg.cxx +++ b/dbaccess/source/ui/dlg/RelationDlg.cxx @@ -152,7 +152,7 @@ void ORelationDialog::Init(const TTableConnectionData::value_type& _pConnectionD } } -IMPL_LINK_NOARG_TYPED( ORelationDialog, OKClickHdl, Button*, void ) +IMPL_LINK_NOARG( ORelationDialog, OKClickHdl, Button*, void ) { // RadioButtons auslesen sal_uInt16 nAttrib = 0; diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx index 00c5be330508..3298d498a004 100644 --- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx @@ -169,12 +169,12 @@ namespace dbaui TabPage::dispose(); } - IMPL_LINK_NOARG_TYPED(OTextConnectionHelper, OnEditModified, Edit&, void) + IMPL_LINK_NOARG(OTextConnectionHelper, OnEditModified, Edit&, void) { m_aGetExtensionHandler.Call(this); } - IMPL_LINK_NOARG_TYPED(OTextConnectionHelper, OnSetExtensionHdl, RadioButton&, void) + IMPL_LINK_NOARG(OTextConnectionHelper, OnSetExtensionHdl, RadioButton&, void) { bool bDoEnable = m_pAccessOtherFiles->IsChecked(); m_pOwnExtension->Enable(bDoEnable); diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx index 47f408f25926..473df12b6fcb 100644 --- a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx +++ b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx @@ -76,8 +76,8 @@ namespace dbaui short m_nAvailableSections; protected: - DECL_LINK_TYPED(OnSetExtensionHdl,RadioButton&,void); - DECL_LINK_TYPED(OnEditModified, Edit&, void); + DECL_LINK(OnSetExtensionHdl,RadioButton&,void); + DECL_LINK(OnEditModified, Edit&, void); private: OUString GetSeparator( const ComboBox& rBox, const OUString& rList ); diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx index c1c828c11acd..a477eb642f30 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.cxx +++ b/dbaccess/source/ui/dlg/UserAdmin.cxx @@ -57,8 +57,8 @@ class OPasswordDialog : public ModalDialog VclPtr<Edit> m_pEDPasswordRepeat; VclPtr<OKButton> m_pOKBtn; - DECL_LINK_TYPED( OKHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ModifiedHdl, Edit&, void ); + DECL_LINK( OKHdl_Impl, Button*, void ); + DECL_LINK( ModifiedHdl, Edit&, void ); public: OPasswordDialog( vcl::Window* pParent,const OUString& _sUserName); @@ -95,7 +95,7 @@ OPasswordDialog::OPasswordDialog(vcl::Window* _pParent,const OUString& _sUserNam m_pEDOldPassword->SetModifyHdl( LINK( this, OPasswordDialog, ModifiedHdl ) ); } -IMPL_LINK_NOARG_TYPED(OPasswordDialog, OKHdl_Impl, Button*, void) +IMPL_LINK_NOARG(OPasswordDialog, OKHdl_Impl, Button*, void) { if( m_pEDPassword->GetText() == m_pEDPasswordRepeat->GetText() ) EndDialog( RET_OK ); @@ -110,7 +110,7 @@ IMPL_LINK_NOARG_TYPED(OPasswordDialog, OKHdl_Impl, Button*, void) } } -IMPL_LINK_TYPED( OPasswordDialog, ModifiedHdl, Edit&, rEdit, void ) +IMPL_LINK( OPasswordDialog, ModifiedHdl, Edit&, rEdit, void ) { m_pOKBtn->Enable(!rEdit.GetText().isEmpty()); } @@ -205,7 +205,7 @@ VclPtr<SfxTabPage> OUserAdmin::Create( vcl::Window* pParent, const SfxItemSet* _ return VclPtr<OUserAdmin>::Create( pParent, *_rAttrSet ); } -IMPL_LINK_TYPED( OUserAdmin, UserHdl, Button *, pButton, void ) +IMPL_LINK( OUserAdmin, UserHdl, Button *, pButton, void ) { try { @@ -274,7 +274,7 @@ IMPL_LINK_TYPED( OUserAdmin, UserHdl, Button *, pButton, void ) } } -IMPL_LINK_NOARG_TYPED( OUserAdmin, ListDblClickHdl, ListBox&, void ) +IMPL_LINK_NOARG( OUserAdmin, ListDblClickHdl, ListBox&, void ) { m_TableCtrl->setUserName(GetUser()); m_TableCtrl->UpdateTables(); diff --git a/dbaccess/source/ui/dlg/UserAdmin.hxx b/dbaccess/source/ui/dlg/UserAdmin.hxx index 2a68deabfaf1..80c536b5714e 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.hxx +++ b/dbaccess/source/ui/dlg/UserAdmin.hxx @@ -55,8 +55,8 @@ protected: OUString m_UserName; // methods - DECL_LINK_TYPED( ListDblClickHdl, ListBox&, void ); - DECL_LINK_TYPED( UserHdl, Button *, void ); + DECL_LINK( ListDblClickHdl, ListBox&, void ); + DECL_LINK( UserHdl, Button *, void ); void FillUserNames(); diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx index 0e5df0670461..8b493c9cd0fa 100644 --- a/dbaccess/source/ui/dlg/admincontrols.cxx +++ b/dbaccess/source/ui/dlg/admincontrols.cxx @@ -169,12 +169,12 @@ namespace dbaui #endif } - IMPL_LINK_TYPED(MySQLNativeSettings, RadioToggleHdl, RadioButton&, rRadioButton, void) + IMPL_LINK(MySQLNativeSettings, RadioToggleHdl, RadioButton&, rRadioButton, void) { m_aControlModificationLink.Call(&rRadioButton); } - IMPL_LINK_TYPED(MySQLNativeSettings, EditModifyHdl, Edit&, rEdit, void) + IMPL_LINK(MySQLNativeSettings, EditModifyHdl, Edit&, rEdit, void) { m_aControlModificationLink.Call(&rEdit); } diff --git a/dbaccess/source/ui/dlg/admincontrols.hxx b/dbaccess/source/ui/dlg/admincontrols.hxx index ae7b7afae1c2..fcd9cd32b9b9 100644 --- a/dbaccess/source/ui/dlg/admincontrols.hxx +++ b/dbaccess/source/ui/dlg/admincontrols.hxx @@ -50,8 +50,8 @@ namespace dbaui Link<void*,void> m_aControlModificationLink; ::svt::ControlDependencyManager m_aControlDependencies; - DECL_LINK_TYPED(RadioToggleHdl, RadioButton&, void); - DECL_LINK_TYPED(EditModifyHdl, Edit&, void); + DECL_LINK(RadioToggleHdl, RadioButton&, void); + DECL_LINK(EditModifyHdl, Edit&, void); public: MySQLNativeSettings( vcl::Window& _rParent, const Link<void*,void>& _rControlModificationLink ); diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx index 3efb3bc15638..0a5f62e811bb 100644 --- a/dbaccess/source/ui/dlg/adminpages.cxx +++ b/dbaccess/source/ui/dlg/adminpages.cxx @@ -102,19 +102,19 @@ namespace dbaui _rReadonly = !_rValid || (pReadonly && pReadonly->GetValue()); } - IMPL_LINK_TYPED(OGenericAdministrationPage, OnControlModified, void*, pCtrl, void) + IMPL_LINK(OGenericAdministrationPage, OnControlModified, void*, pCtrl, void) { callModifiedHdl(pCtrl); } - IMPL_LINK_TYPED(OGenericAdministrationPage, OnControlModifiedClick, Button*, pCtrl, void) + IMPL_LINK(OGenericAdministrationPage, OnControlModifiedClick, Button*, pCtrl, void) { callModifiedHdl(pCtrl); } - IMPL_LINK_TYPED(OGenericAdministrationPage, ControlModifiedCheckBoxHdl, CheckBox&, rCtrl, void) + IMPL_LINK(OGenericAdministrationPage, ControlModifiedCheckBoxHdl, CheckBox&, rCtrl, void) { callModifiedHdl(&rCtrl); } - IMPL_LINK_TYPED(OGenericAdministrationPage, OnControlEditModifyHdl, Edit&, rCtrl, void) + IMPL_LINK(OGenericAdministrationPage, OnControlEditModifyHdl, Edit&, rCtrl, void) { callModifiedHdl(&rCtrl); } @@ -229,7 +229,7 @@ namespace dbaui } } - IMPL_LINK_NOARG_TYPED(OGenericAdministrationPage, OnTestConnectionClickHdl, Button*, void) + IMPL_LINK_NOARG(OGenericAdministrationPage, OnTestConnectionClickHdl, Button*, void) { OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF"); bool bSuccess = false; diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx index f674ffd0bcec..ed0bc5fd4e6c 100644 --- a/dbaccess/source/ui/dlg/adminpages.hxx +++ b/dbaccess/source/ui/dlg/adminpages.hxx @@ -206,12 +206,12 @@ namespace dbaui /** This link be used for controls where the tabpage does not need to take any special action when the control is modified. The implementation just calls callModifiedHdl. */ - DECL_LINK_TYPED(OnControlModified, void*, void); - DECL_LINK_TYPED(OnControlEditModifyHdl, Edit&, void); - DECL_LINK_TYPED(OnControlModifiedClick, Button*, void); - DECL_LINK_TYPED(ControlModifiedCheckBoxHdl, CheckBox&, void); + DECL_LINK(OnControlModified, void*, void); + DECL_LINK(OnControlEditModifyHdl, Edit&, void); + DECL_LINK(OnControlModifiedClick, Button*, void); + DECL_LINK(ControlModifiedCheckBoxHdl, CheckBox&, void); - DECL_LINK_TYPED(OnTestConnectionClickHdl, Button*, void); + DECL_LINK(OnTestConnectionClickHdl, Button*, void); }; // ControlRelation diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx index 5d1cdfb6aef8..71e5f26e9b18 100644 --- a/dbaccess/source/ui/dlg/adtabdlg.cxx +++ b/dbaccess/source/ui/dlg/adtabdlg.cxx @@ -417,12 +417,12 @@ void OAddTableDlg::impl_addTable() } } -IMPL_LINK_NOARG_TYPED( OAddTableDlg, AddClickHdl, Button*, void ) +IMPL_LINK_NOARG( OAddTableDlg, AddClickHdl, Button*, void ) { TableListDoubleClickHdl(nullptr); } -IMPL_LINK_NOARG_TYPED( OAddTableDlg, TableListDoubleClickHdl, SvTreeListBox*, bool ) +IMPL_LINK_NOARG( OAddTableDlg, TableListDoubleClickHdl, SvTreeListBox*, bool ) { if ( impl_isAddAllowed() ) { @@ -435,17 +435,17 @@ IMPL_LINK_NOARG_TYPED( OAddTableDlg, TableListDoubleClickHdl, SvTreeListBox*, bo return false; // not handled } -IMPL_LINK_NOARG_TYPED( OAddTableDlg, TableListSelectHdl, SvTreeListBox*, void ) +IMPL_LINK_NOARG( OAddTableDlg, TableListSelectHdl, SvTreeListBox*, void ) { m_pAddButton->Enable( m_xCurrentList->isLeafSelected() ); } -IMPL_LINK_NOARG_TYPED( OAddTableDlg, CloseClickHdl, Button*, void ) +IMPL_LINK_NOARG( OAddTableDlg, CloseClickHdl, Button*, void ) { Close(); } -IMPL_LINK_NOARG_TYPED( OAddTableDlg, OnTypeSelected, Button*, void ) +IMPL_LINK_NOARG( OAddTableDlg, OnTypeSelected, Button*, void ) { if ( m_pCaseTables->IsChecked() ) impl_switchTo( Tables ); diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx index e6d7160e8b8c..27e0a5db8261 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.cxx +++ b/dbaccess/source/ui/dlg/advancedsettings.cxx @@ -134,7 +134,7 @@ namespace dbaui } } - IMPL_LINK_TYPED(SpecialSettingsPage, BooleanComparisonSelectHdl, ListBox&, rControl, void) + IMPL_LINK(SpecialSettingsPage, BooleanComparisonSelectHdl, ListBox&, rControl, void) { callModifiedHdl(&rControl); } diff --git a/dbaccess/source/ui/dlg/advancedsettings.hxx b/dbaccess/source/ui/dlg/advancedsettings.hxx index a9d9d7a5696a..f7c80977352d 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.hxx +++ b/dbaccess/source/ui/dlg/advancedsettings.hxx @@ -91,7 +91,7 @@ namespace dbaui private: void impl_initBooleanSettings(); - DECL_LINK_TYPED(BooleanComparisonSelectHdl, ListBox&, void); + DECL_LINK(BooleanComparisonSelectHdl, ListBox&, void); }; // GeneratedValuesPage diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx index c9860820633e..3ed234ce954d 100644 --- a/dbaccess/source/ui/dlg/dbfindex.cxx +++ b/dbaccess/source/ui/dlg/dbfindex.cxx @@ -179,7 +179,7 @@ void ODbaseIndexDialog::InsertTableIndex( const OUString& _rTableName, const OTa implInsertIndex(_rIndex, aTablePos->aIndexList, *m_pLB_TableIndexes); } -IMPL_LINK_NOARG_TYPED( ODbaseIndexDialog, OKClickHdl, Button*, void ) +IMPL_LINK_NOARG( ODbaseIndexDialog, OKClickHdl, Button*, void ) { // let all tables write their INF file @@ -192,7 +192,7 @@ IMPL_LINK_NOARG_TYPED( ODbaseIndexDialog, OKClickHdl, Button*, void ) EndDialog(); } -IMPL_LINK_NOARG_TYPED( ODbaseIndexDialog, AddClickHdl, Button*, void ) +IMPL_LINK_NOARG( ODbaseIndexDialog, AddClickHdl, Button*, void ) { OUString aSelection = m_pLB_FreeIndexes->GetSelectEntry(); OUString aTableName = m_pCB_Tables->GetText(); @@ -202,7 +202,7 @@ IMPL_LINK_NOARG_TYPED( ODbaseIndexDialog, AddClickHdl, Button*, void ) checkButtons(); } -IMPL_LINK_NOARG_TYPED( ODbaseIndexDialog, RemoveClickHdl, Button*, void ) +IMPL_LINK_NOARG( ODbaseIndexDialog, RemoveClickHdl, Button*, void ) { OUString aSelection = m_pLB_TableIndexes->GetSelectEntry(); OUString aTableName = m_pCB_Tables->GetText(); @@ -212,7 +212,7 @@ IMPL_LINK_NOARG_TYPED( ODbaseIndexDialog, RemoveClickHdl, Button*, void ) checkButtons(); } -IMPL_LINK_NOARG_TYPED( ODbaseIndexDialog, AddAllClickHdl, Button*, void ) +IMPL_LINK_NOARG( ODbaseIndexDialog, AddAllClickHdl, Button*, void ) { const sal_Int32 nCnt = m_pLB_FreeIndexes->GetEntryCount(); OUString aTableName = m_pCB_Tables->GetText(); @@ -223,7 +223,7 @@ IMPL_LINK_NOARG_TYPED( ODbaseIndexDialog, AddAllClickHdl, Button*, void ) checkButtons(); } -IMPL_LINK_NOARG_TYPED( ODbaseIndexDialog, RemoveAllClickHdl, Button*, void ) +IMPL_LINK_NOARG( ODbaseIndexDialog, RemoveAllClickHdl, Button*, void ) { const sal_Int32 nCnt = m_pLB_TableIndexes->GetEntryCount(); OUString aTableName = m_pCB_Tables->GetText(); @@ -234,12 +234,12 @@ IMPL_LINK_NOARG_TYPED( ODbaseIndexDialog, RemoveAllClickHdl, Button*, void ) checkButtons(); } -IMPL_LINK_NOARG_TYPED( ODbaseIndexDialog, OnListEntrySelected, ListBox&, void ) +IMPL_LINK_NOARG( ODbaseIndexDialog, OnListEntrySelected, ListBox&, void ) { checkButtons(); } -IMPL_LINK_TYPED( ODbaseIndexDialog, TableSelectHdl, ComboBox&, rComboBox, void ) +IMPL_LINK( ODbaseIndexDialog, TableSelectHdl, ComboBox&, rComboBox, void ) { // search the table TableInfoList::iterator aTablePos; diff --git a/dbaccess/source/ui/dlg/dbfindex.hxx b/dbaccess/source/ui/dlg/dbfindex.hxx index b58e1529ee38..d1fa3a04f0cb 100644 --- a/dbaccess/source/ui/dlg/dbfindex.hxx +++ b/dbaccess/source/ui/dlg/dbfindex.hxx @@ -82,13 +82,13 @@ protected: VclPtr<PushButton> m_pAddAll; VclPtr<PushButton> m_pRemoveAll; - DECL_LINK_TYPED( TableSelectHdl, ComboBox&, void ); - DECL_LINK_TYPED( AddClickHdl, Button*, void ); - DECL_LINK_TYPED( RemoveClickHdl, Button*, void ); - DECL_LINK_TYPED( AddAllClickHdl, Button*, void ); - DECL_LINK_TYPED( RemoveAllClickHdl, Button*, void ); - DECL_LINK_TYPED( OKClickHdl, Button*, void ); - DECL_LINK_TYPED( OnListEntrySelected, ListBox&, void ); + DECL_LINK( TableSelectHdl, ComboBox&, void ); + DECL_LINK( AddClickHdl, Button*, void ); + DECL_LINK( RemoveClickHdl, Button*, void ); + DECL_LINK( AddAllClickHdl, Button*, void ); + DECL_LINK( RemoveAllClickHdl, Button*, void ); + DECL_LINK( OKClickHdl, Button*, void ); + DECL_LINK( OnListEntrySelected, ListBox&, void ); OUString m_aDSN; TableInfoList m_aTableInfoList; diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx index 06ce8f6c4919..2062b4269d4f 100644 --- a/dbaccess/source/ui/dlg/dbwiz.cxx +++ b/dbaccess/source/ui/dlg/dbwiz.cxx @@ -107,7 +107,7 @@ void ODbTypeWizDialog::dispose() svt::OWizardMachine::dispose(); } -IMPL_LINK_TYPED(ODbTypeWizDialog, OnTypeSelected, OGeneralPage&, _rTabPage, void) +IMPL_LINK(ODbTypeWizDialog, OnTypeSelected, OGeneralPage&, _rTabPage, void) { m_eType = _rTabPage.GetSelectedType(); const bool bURLRequired = m_pCollection->isConnectionUrlRequired(m_eType); diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx index b9f5e1535920..3e1c2200216b 100644 --- a/dbaccess/source/ui/dlg/dbwizsetup.cxx +++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx @@ -274,7 +274,7 @@ void ODbTypeWizDialogSetup::dispose() svt::RoadmapWizard::dispose(); } -IMPL_LINK_NOARG_TYPED(ODbTypeWizDialogSetup, OnTypeSelected, OGeneralPage&, void) +IMPL_LINK_NOARG(ODbTypeWizDialogSetup, OnTypeSelected, OGeneralPage&, void) { activateDatabasePath(); } @@ -571,7 +571,7 @@ VclPtr<TabPage> ODbTypeWizDialogSetup::createPage(WizardState _nState) return pPage; } -IMPL_LINK_TYPED(ODbTypeWizDialogSetup, ImplModifiedHdl, OGenericAdministrationPage const *, _pConnectionPageSetup, void) +IMPL_LINK(ODbTypeWizDialogSetup, ImplModifiedHdl, OGenericAdministrationPage const *, _pConnectionPageSetup, void) { m_bIsConnectable = _pConnectionPageSetup->GetRoadmapStateValue( ); enableState(PAGE_DBSETUPWIZARD_FINAL, m_bIsConnectable); @@ -583,7 +583,7 @@ IMPL_LINK_TYPED(ODbTypeWizDialogSetup, ImplModifiedHdl, OGenericAdministrationPa enableButtons( WizardButtonFlags::NEXT, m_bIsConnectable && (getCurrentState() != PAGE_DBSETUPWIZARD_FINAL)); } -IMPL_LINK_TYPED(ODbTypeWizDialogSetup, ImplClickHdl, OMySQLIntroPageSetup*, _pMySQLIntroPageSetup, void) +IMPL_LINK(ODbTypeWizDialogSetup, ImplClickHdl, OMySQLIntroPageSetup*, _pMySQLIntroPageSetup, void) { OUString sURLPrefix; switch( _pMySQLIntroPageSetup->getMySQLMode() ) @@ -601,17 +601,17 @@ IMPL_LINK_TYPED(ODbTypeWizDialogSetup, ImplClickHdl, OMySQLIntroPageSetup*, _pMy activatePath( static_cast<PathId>(m_pCollection->getIndexOf(sURLPrefix) + 1), true); } -IMPL_LINK_NOARG_TYPED(ODbTypeWizDialogSetup, OnChangeCreationMode, OGeneralPageWizard&, void) +IMPL_LINK_NOARG(ODbTypeWizDialogSetup, OnChangeCreationMode, OGeneralPageWizard&, void) { activateDatabasePath(); } -IMPL_LINK_NOARG_TYPED(ODbTypeWizDialogSetup, OnRecentDocumentSelected, OGeneralPageWizard&, void) +IMPL_LINK_NOARG(ODbTypeWizDialogSetup, OnRecentDocumentSelected, OGeneralPageWizard&, void) { enableButtons( WizardButtonFlags::FINISH, !m_pGeneralPage->GetSelectedDocument().sURL.isEmpty() ); } -IMPL_LINK_NOARG_TYPED(ODbTypeWizDialogSetup, OnSingleDocumentChosen, OGeneralPageWizard&, void) +IMPL_LINK_NOARG(ODbTypeWizDialogSetup, OnSingleDocumentChosen, OGeneralPageWizard&, void) { if ( prepareLeaveCurrentState( eFinish ) ) onFinish(); @@ -892,7 +892,7 @@ bool ODbTypeWizDialogSetup::SaveDatabaseDocument() virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; private: - DECL_LINK_TYPED( OnOpenDocument, void*, void ); + DECL_LINK( OnOpenDocument, void*, void ); }; AsyncLoader::AsyncLoader( const Reference< XComponentContext >& _rxORB, const OUString& _rURL ) @@ -926,7 +926,7 @@ bool ODbTypeWizDialogSetup::SaveDatabaseDocument() m_aAsyncCaller.Call(); } - IMPL_LINK_NOARG_TYPED( AsyncLoader, OnOpenDocument, void*, void ) + IMPL_LINK_NOARG( AsyncLoader, OnOpenDocument, void*, void ) { try { diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx index b873bb0401e3..c84a438fb6ec 100644 --- a/dbaccess/source/ui/dlg/detailpages.cxx +++ b/dbaccess/source/ui/dlg/detailpages.cxx @@ -94,7 +94,7 @@ namespace dbaui } } - IMPL_LINK_NOARG_TYPED(OCommonBehaviourTabPage, CharsetSelectHdl, ListBox&, void) + IMPL_LINK_NOARG(OCommonBehaviourTabPage, CharsetSelectHdl, ListBox&, void) { callModifiedHdl(); } @@ -248,7 +248,7 @@ namespace dbaui return bChangedSomething; } - IMPL_LINK_TYPED( ODbaseDetailsPage, OnButtonClicked, Button*, pButton, void ) + IMPL_LINK( ODbaseDetailsPage, OnButtonClicked, Button*, pButton, void ) { if (m_pIndexes == pButton) { @@ -519,7 +519,7 @@ namespace dbaui m_pEDDriverClass->SetModifyFlag(); } } - IMPL_LINK_NOARG_TYPED(OGeneralSpecialJDBCDetailsPage, OnTestJavaClickHdl, Button*, void) + IMPL_LINK_NOARG(OGeneralSpecialJDBCDetailsPage, OnTestJavaClickHdl, Button*, void) { OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF"); OSL_ENSURE(m_bUseClass,"Who called me?"); @@ -705,7 +705,7 @@ namespace dbaui fillBool(*_rSet,m_pCBUseSSL,DSID_CONN_LDAP_USESSL,bChangedSomething); return bChangedSomething; } - IMPL_LINK_TYPED( OLDAPDetailsPage, OnCheckBoxClick, Button*, pCheckBox, void ) + IMPL_LINK( OLDAPDetailsPage, OnCheckBoxClick, Button*, pCheckBox, void ) { callModifiedHdl(); if ( pCheckBox == m_pCBUseSSL) diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx index 10bcd9607340..8c5f0ff3f1a8 100644 --- a/dbaccess/source/ui/dlg/detailpages.hxx +++ b/dbaccess/source/ui/dlg/detailpages.hxx @@ -83,7 +83,7 @@ namespace dbaui // <method>OGenericAdministrationPage::fillWindows</method> virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; private: - DECL_LINK_TYPED(CharsetSelectHdl, ListBox&, void); + DECL_LINK(CharsetSelectHdl, ListBox&, void); }; // ODbaseDetailsPage @@ -106,7 +106,7 @@ namespace dbaui virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; private: - DECL_LINK_TYPED( OnButtonClicked, Button *, void ); + DECL_LINK( OnButtonClicked, Button *, void ); }; // OAdoDetailsPage @@ -177,7 +177,7 @@ namespace dbaui virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; virtual void callModifiedHdl(void* pControl = nullptr) override; - DECL_LINK_TYPED(OnTestJavaClickHdl, Button*, void); + DECL_LINK(OnTestJavaClickHdl, Button*, void); VclPtr<Edit> m_pEDHostname; VclPtr<NumericField> m_pNFPortNumber; @@ -237,7 +237,7 @@ namespace dbaui sal_Int32 m_iSSLPort; sal_Int32 m_iNormalPort; - DECL_LINK_TYPED( OnCheckBoxClick, Button*, void ); + DECL_LINK( OnCheckBoxClick, Button*, void ); }; // OTextDetailsPage diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx index 97b79d2e408c..12dcc1773b7f 100644 --- a/dbaccess/source/ui/dlg/directsql.cxx +++ b/dbaccess/source/ui/dlg/directsql.cxx @@ -298,26 +298,26 @@ namespace dbaui OSL_FAIL("DirectSQLDialog::switchToHistory: invalid position!"); } - IMPL_LINK_NOARG_TYPED( DirectSQLDialog, OnStatementModified, Edit&, void ) + IMPL_LINK_NOARG( DirectSQLDialog, OnStatementModified, Edit&, void ) { m_pExecute->Enable(!m_pSQL->GetText().isEmpty()); } - IMPL_LINK_NOARG_TYPED( DirectSQLDialog, OnCloseClick, Button*, void ) + IMPL_LINK_NOARG( DirectSQLDialog, OnCloseClick, Button*, void ) { EndDialog( RET_OK ); } - IMPL_LINK_NOARG_TYPED( DirectSQLDialog, OnClose, void*, void ) + IMPL_LINK_NOARG( DirectSQLDialog, OnClose, void*, void ) { EndDialog( RET_OK ); } - IMPL_LINK_NOARG_TYPED( DirectSQLDialog, OnExecute, Button*, void ) + IMPL_LINK_NOARG( DirectSQLDialog, OnExecute, Button*, void ) { executeCurrent(); } - IMPL_LINK_NOARG_TYPED( DirectSQLDialog, OnListEntrySelected, ListBox&, void ) + IMPL_LINK_NOARG( DirectSQLDialog, OnListEntrySelected, ListBox&, void ) { if (!m_pSQLHistory->IsTravelSelect()) { diff --git a/dbaccess/source/ui/dlg/dlgsave.cxx b/dbaccess/source/ui/dlg/dlgsave.cxx index ff0d5bfc7ee9..37d1cb59b590 100644 --- a/dbaccess/source/ui/dlg/dlgsave.cxx +++ b/dbaccess/source/ui/dlg/dlgsave.cxx @@ -277,7 +277,7 @@ void OSaveAsDlg::dispose() ModalDialog::dispose(); } -IMPL_LINK_TYPED(OSaveAsDlg, ButtonClickHdl, Button *, pButton, void) +IMPL_LINK(OSaveAsDlg, ButtonClickHdl, Button *, pButton, void) { if (pButton == m_pImpl->m_pPB_OK) { m_pImpl->m_aName = m_pImpl->m_pTitle->GetText(); @@ -304,7 +304,7 @@ IMPL_LINK_TYPED(OSaveAsDlg, ButtonClickHdl, Button *, pButton, void) } } -IMPL_LINK_TYPED(OSaveAsDlg, EditModifyHdl, Edit&, rEdit, void ) +IMPL_LINK(OSaveAsDlg, EditModifyHdl, Edit&, rEdit, void ) { if (&rEdit == m_pImpl->m_pTitle) m_pImpl->m_pPB_OK->Enable(!m_pImpl->m_pTitle->GetText().isEmpty()); diff --git a/dbaccess/source/ui/dlg/dlgsize.cxx b/dbaccess/source/ui/dlg/dlgsize.cxx index eee8a4dd2097..6c2293bf44b2 100644 --- a/dbaccess/source/ui/dlg/dlgsize.cxx +++ b/dbaccess/source/ui/dlg/dlgsize.cxx @@ -76,7 +76,7 @@ sal_Int32 DlgSize::GetValue() return (sal_Int32)m_pMF_VALUE->GetValue( FUNIT_CM ); } -IMPL_LINK_TYPED( DlgSize, CbClickHdl, Button *, pButton, void ) +IMPL_LINK( DlgSize, CbClickHdl, Button *, pButton, void ) { if( pButton == m_pCB_STANDARD ) { diff --git a/dbaccess/source/ui/dlg/dsselect.cxx b/dbaccess/source/ui/dlg/dsselect.cxx index 2b8f7286dedf..10231f2ec1d9 100644 --- a/dbaccess/source/ui/dlg/dsselect.cxx +++ b/dbaccess/source/ui/dlg/dsselect.cxx @@ -84,7 +84,7 @@ void ODatasourceSelectDialog::dispose() } -IMPL_LINK_TYPED( ODatasourceSelectDialog, ListDblClickHdl, ListBox&, rListBox, void ) +IMPL_LINK( ODatasourceSelectDialog, ListDblClickHdl, ListBox&, rListBox, void ) { if (rListBox.GetSelectEntryCount()) EndDialog(RET_OK); @@ -101,7 +101,7 @@ bool ODatasourceSelectDialog::Close() } #ifdef HAVE_ODBC_ADMINISTRATION -IMPL_LINK_NOARG_TYPED(ODatasourceSelectDialog, ManageClickHdl, Button*, void) +IMPL_LINK_NOARG(ODatasourceSelectDialog, ManageClickHdl, Button*, void) { if ( !m_pODBCManagement.get() ) m_pODBCManagement.reset( new OOdbcManagement( LINK( this, ODatasourceSelectDialog, ManageProcessFinished ) ) ); @@ -122,7 +122,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_TYPED( ODatasourceSelectDialog, ManageProcessFinished, void*, void ) +IMPL_LINK_NOARG( ODatasourceSelectDialog, ManageProcessFinished, void*, void ) { StringBag aOdbcDatasources; OOdbcEnumeration aEnumeration; diff --git a/dbaccess/source/ui/dlg/dsselect.hxx b/dbaccess/source/ui/dlg/dsselect.hxx index 3640938afe25..0de46b163af3 100644 --- a/dbaccess/source/ui/dlg/dsselect.hxx +++ b/dbaccess/source/ui/dlg/dsselect.hxx @@ -64,10 +64,10 @@ public: virtual bool Close() override; protected: - DECL_LINK_TYPED( ListDblClickHdl, ListBox&, void ); + DECL_LINK( ListDblClickHdl, ListBox&, void ); #ifdef HAVE_ODBC_ADMINISTRATION - DECL_LINK_TYPED(ManageClickHdl, Button*, void); - DECL_LINK_TYPED( ManageProcessFinished, void*, void ); + DECL_LINK(ManageClickHdl, Button*, void); + DECL_LINK( ManageProcessFinished, void*, void ); #endif void fillListBox(const StringBag& _rDatasources); }; diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx index 570302e98ef5..f5821d592028 100644 --- a/dbaccess/source/ui/dlg/generalpage.cxx +++ b/dbaccess/source/ui/dlg/generalpage.cxx @@ -404,7 +404,7 @@ namespace dbaui OGenericAdministrationPage::Reset(_rCoreAttrs); } - IMPL_LINK_TYPED( OGeneralPageWizard, OnEmbeddedDBTypeSelected, ListBox&, _rBox, void ) + IMPL_LINK( OGeneralPageWizard, OnEmbeddedDBTypeSelected, ListBox&, _rBox, void ) { // get the type from the entry data const sal_Int32 nSelected = _rBox.GetSelectEntryPos(); @@ -424,7 +424,7 @@ namespace dbaui return; } - IMPL_LINK_TYPED( OGeneralPage, OnDatasourceTypeSelected, ListBox&, _rBox, void ) + IMPL_LINK( OGeneralPage, OnDatasourceTypeSelected, ListBox&, _rBox, void ) { // get the type from the entry data const sal_Int32 nSelected = _rBox.GetSelectEntryPos(); @@ -695,25 +695,25 @@ namespace dbaui return aDocument; } - IMPL_LINK_NOARG_TYPED( OGeneralPageWizard, OnCreateDatabaseModeSelected, Button*, void ) + IMPL_LINK_NOARG( OGeneralPageWizard, OnCreateDatabaseModeSelected, Button*, void ) { m_aCreationModeHandler.Call( *this ); OnEmbeddedDBTypeSelected( *m_pEmbeddedDBType ); } - IMPL_LINK_NOARG_TYPED( OGeneralPageWizard, OnSetupModeSelected, Button*, void ) + IMPL_LINK_NOARG( OGeneralPageWizard, OnSetupModeSelected, Button*, void ) { m_aCreationModeHandler.Call( *this ); OnDatasourceTypeSelected(*m_pDatasourceType); } - IMPL_LINK_NOARG_TYPED( OGeneralPageWizard, OnDocumentSelected, ListBox&, void ) + IMPL_LINK_NOARG( OGeneralPageWizard, OnDocumentSelected, ListBox&, void ) { m_aDocumentSelectionHandler.Call( *this ); } - IMPL_LINK_NOARG_TYPED( OGeneralPageWizard, OnOpenDocument, Button*, void ) + IMPL_LINK_NOARG( OGeneralPageWizard, OnOpenDocument, Button*, void ) { ::sfx2::FileDialogHelper aFileDlg( ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, diff --git a/dbaccess/source/ui/dlg/generalpage.hxx b/dbaccess/source/ui/dlg/generalpage.hxx index 4f02f191b993..b7a5246dd6f4 100644 --- a/dbaccess/source/ui/dlg/generalpage.hxx +++ b/dbaccess/source/ui/dlg/generalpage.hxx @@ -97,7 +97,7 @@ namespace dbaui /// sets the title of the parent dialog virtual void setParentTitle( const OUString& _sURLPrefix ); - DECL_LINK_TYPED(OnDatasourceTypeSelected, ListBox&, void); + DECL_LINK(OnDatasourceTypeSelected, ListBox&, void); }; // OGeneralPageDialog @@ -185,11 +185,11 @@ namespace dbaui void initializeEmbeddedDBList(); protected: - DECL_LINK_TYPED( OnEmbeddedDBTypeSelected, ListBox&, void ); - DECL_LINK_TYPED( OnCreateDatabaseModeSelected, Button*, void ); - DECL_LINK_TYPED( OnSetupModeSelected, Button*, void ); - DECL_LINK_TYPED( OnDocumentSelected, ListBox&, void ); - DECL_LINK_TYPED( OnOpenDocument, Button*, void ); + DECL_LINK( OnEmbeddedDBTypeSelected, ListBox&, void ); + DECL_LINK( OnCreateDatabaseModeSelected, Button*, void ); + DECL_LINK( OnSetupModeSelected, Button*, void ); + DECL_LINK( OnDocumentSelected, ListBox&, void ); + DECL_LINK( OnOpenDocument, Button*, void ); }; } // namespace dbaui diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx index 0661a95e0e83..53ecfa10e867 100644 --- a/dbaccess/source/ui/dlg/indexdialog.cxx +++ b/dbaccess/source/ui/dlg/indexdialog.cxx @@ -540,7 +540,7 @@ namespace dbaui updateToolbox(); } - IMPL_LINK_NOARG_TYPED( DbaIndexDialog, OnIndexAction, ToolBox*, void ) + IMPL_LINK_NOARG( DbaIndexDialog, OnIndexAction, ToolBox*, void ) { sal_uInt16 nClicked = m_pActions->GetCurItemId(); if (nClicked == mnNewCmdId) @@ -555,7 +555,7 @@ namespace dbaui OnResetIndex(); } - IMPL_LINK_NOARG_TYPED( DbaIndexDialog, OnCloseDialog, Button*, void ) + IMPL_LINK_NOARG( DbaIndexDialog, OnCloseDialog, Button*, void ) { if (m_pIndexList->IsEditingActive()) { @@ -601,14 +601,14 @@ namespace dbaui EndDialog(RET_OK); } - IMPL_LINK_TYPED( DbaIndexDialog, OnEditIndexAgain, void*, p, void ) + IMPL_LINK( DbaIndexDialog, OnEditIndexAgain, void*, p, void ) { SvTreeListEntry* _pEntry = static_cast<SvTreeListEntry*>(p); m_bEditAgain = false; m_pIndexList->EditEntry(_pEntry); } - IMPL_LINK_TYPED( DbaIndexDialog, OnEntryEdited, SvTreeListEntry*, _pEntry, bool ) + IMPL_LINK( DbaIndexDialog, OnEntryEdited, SvTreeListEntry*, _pEntry, bool ) { Indexes::iterator aPosition = m_pIndexes->begin() + reinterpret_cast<sal_IntPtr>(_pEntry->GetUserData()); @@ -729,11 +729,11 @@ namespace dbaui return true; } - IMPL_LINK_NOARG_TYPED( DbaIndexDialog, OnModifiedClick, Button*, void ) + IMPL_LINK_NOARG( DbaIndexDialog, OnModifiedClick, Button*, void ) { OnModified(*m_pFields); } - IMPL_LINK_NOARG_TYPED( DbaIndexDialog, OnModified, IndexFieldsControl&, void ) + IMPL_LINK_NOARG( DbaIndexDialog, OnModified, IndexFieldsControl&, void ) { OSL_ENSURE(m_pPreviousSelection, "DbaIndexDialog, OnModified: invalid call!"); Indexes::iterator aPosition = m_pIndexes->begin() + reinterpret_cast<sal_IntPtr>(m_pPreviousSelection->GetUserData()); @@ -771,7 +771,7 @@ namespace dbaui } } - IMPL_LINK_NOARG_TYPED( DbaIndexDialog, OnIndexSelected, DbaIndexList&, void ) + IMPL_LINK_NOARG( DbaIndexDialog, OnIndexSelected, DbaIndexList&, void ) { m_pIndexList->EndSelection(); diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx index 77e395f025bd..a5f8509d9be1 100644 --- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx +++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx @@ -380,7 +380,7 @@ namespace dbaui } } - IMPL_LINK_TYPED( IndexFieldsControl, OnListEntrySelected, DbaMouseDownListBoxController&, rController, void ) + IMPL_LINK( IndexFieldsControl, OnListEntrySelected, DbaMouseDownListBoxController&, rController, void ) { ListBoxControl& rListBox = rController.GetListBox(); if (!rListBox.IsTravelSelect()) diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx index ee659136ebbb..a32a52f11477 100644 --- a/dbaccess/source/ui/dlg/paramdialog.cxx +++ b/dbaccess/source/ui/dlg/paramdialog.cxx @@ -157,7 +157,7 @@ namespace dbaui m_pParam->GrabFocus(); } - IMPL_LINK_NOARG_TYPED(OParameterDialog, OnValueLoseFocusHdl, Control&, void) + IMPL_LINK_NOARG(OParameterDialog, OnValueLoseFocusHdl, Control&, void) { OnValueLoseFocus(); } @@ -213,7 +213,7 @@ namespace dbaui return false; } - IMPL_LINK_TYPED(OParameterDialog, OnButtonClicked, Button*, pButton, void) + IMPL_LINK(OParameterDialog, OnButtonClicked, Button*, pButton, void) { if (m_pCancelBtn == pButton) { @@ -287,7 +287,7 @@ namespace dbaui } } - IMPL_LINK_NOARG_TYPED(OParameterDialog, OnEntryListBoxSelected, ListBox&, void) + IMPL_LINK_NOARG(OParameterDialog, OnEntryListBoxSelected, ListBox&, void) { OnEntrySelected(); } @@ -329,7 +329,7 @@ namespace dbaui return false; } - IMPL_LINK_NOARG_TYPED(OParameterDialog, OnVisitedTimeout, Timer*, void) + IMPL_LINK_NOARG(OParameterDialog, OnVisitedTimeout, Timer*, void) { OSL_ENSURE(m_nCurrentlySelected != LISTBOX_ENTRY_NOTFOUND, "OParameterDialog::OnVisitedTimeout : invalid call !"); @@ -375,7 +375,7 @@ namespace dbaui } } - IMPL_LINK_NOARG_TYPED(OParameterDialog, OnValueModified, Edit&, void) + IMPL_LINK_NOARG(OParameterDialog, OnValueModified, Edit&, void) { // mark the currently selected entry as dirty OSL_ENSURE(static_cast<size_t>(m_nCurrentlySelected) < m_aVisitedParams.size(), "OParameterDialog::OnValueModified : invalid entry !"); diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx index 5193bf587ede..710c5329ec56 100644 --- a/dbaccess/source/ui/dlg/queryfilter.cxx +++ b/dbaccess/source/ui/dlg/queryfilter.cxx @@ -453,7 +453,7 @@ Reference< XPropertySet > DlgFilterCrit::getMatchingColumn( const Edit& _rValueI return getColumn( sField ); } -IMPL_LINK_TYPED( DlgFilterCrit, PredicateLoseFocus, Control&, rControl, void ) +IMPL_LINK( DlgFilterCrit, PredicateLoseFocus, Control&, rControl, void ) { Edit* _pField = static_cast<Edit*>(&rControl); // retrieve the field affected @@ -644,7 +644,7 @@ void DlgFilterCrit::EnableLines() m_pET_WHEREVALUE3->Disable(); } -IMPL_LINK_TYPED( DlgFilterCrit, ListSelectHdl, ListBox&, rListBox, void ) +IMPL_LINK( DlgFilterCrit, ListSelectHdl, ListBox&, rListBox, void ) { OUString aName; ListBox* pComp; @@ -701,7 +701,7 @@ IMPL_LINK_TYPED( DlgFilterCrit, ListSelectHdl, ListBox&, rListBox, void ) EnableLines(); } -IMPL_LINK_NOARG_TYPED( DlgFilterCrit, ListSelectCompHdl, ListBox&, void ) +IMPL_LINK_NOARG( DlgFilterCrit, ListSelectCompHdl, ListBox&, void ) { EnableLines(); } diff --git a/dbaccess/source/ui/dlg/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx index 7d7828f17a01..b4952833a769 100644 --- a/dbaccess/source/ui/dlg/queryorder.cxx +++ b/dbaccess/source/ui/dlg/queryorder.cxx @@ -143,7 +143,7 @@ void DlgOrderCrit::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG_TYPED( DlgOrderCrit, FieldListSelectHdl, ListBox&, void ) +IMPL_LINK_NOARG( DlgOrderCrit, FieldListSelectHdl, ListBox&, void ) { EnableLines(); } diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx index aa29808b950f..3a5cd53d4c82 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.cxx +++ b/dbaccess/source/ui/dlg/sqlmessage.cxx @@ -295,7 +295,7 @@ public: } protected: - DECL_LINK_TYPED(OnExceptionSelected, SvTreeListBox*, void); + DECL_LINK(OnExceptionSelected, SvTreeListBox*, void); }; OExceptionChainDialog::OExceptionChainDialog(vcl::Window* pParent, const ExceptionDisplayChain& _rExceptions) @@ -350,7 +350,7 @@ OExceptionChainDialog::OExceptionChainDialog(vcl::Window* pParent, const Excepti } } -IMPL_LINK_NOARG_TYPED(OExceptionChainDialog, OnExceptionSelected, SvTreeListBox*, void) +IMPL_LINK_NOARG(OExceptionChainDialog, OnExceptionSelected, SvTreeListBox*, void) { SvTreeListEntry* pSelected = m_pExceptionList->FirstSelected(); OSL_ENSURE(!pSelected || !m_pExceptionList->NextSelected(pSelected), "OExceptionChainDialog::OnExceptionSelected : multi selection ?"); @@ -685,7 +685,7 @@ void OSQLMessageBox::dispose() ButtonDialog::dispose(); } -IMPL_LINK_NOARG_TYPED( OSQLMessageBox, ButtonClickHdl, Button *, void ) +IMPL_LINK_NOARG( OSQLMessageBox, ButtonClickHdl, Button *, void ) { ScopedVclPtrInstance< OExceptionChainDialog > aDlg( this, m_pImpl->aDisplayInfo ); aDlg->Execute(); diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx index 7cacd382dc2c..7886c4483a81 100644 --- a/dbaccess/source/ui/dlg/tablespage.cxx +++ b/dbaccess/source/ui/dlg/tablespage.cxx @@ -397,15 +397,15 @@ namespace dbaui return nResult; } - IMPL_LINK_NOARG_TYPED( OTableSubscriptionPage, OnTreeEntryButtonChecked, SvTreeListBox*, void ) + IMPL_LINK_NOARG( OTableSubscriptionPage, OnTreeEntryButtonChecked, SvTreeListBox*, void ) { callModifiedHdl(); } - IMPL_LINK_TYPED( OTableSubscriptionPage, OnTreeEntryChecked, void*, _pControl, void ) + IMPL_LINK( OTableSubscriptionPage, OnTreeEntryChecked, void*, _pControl, void ) { OnControlModified(_pControl); } - IMPL_LINK_TYPED( OTableSubscriptionPage, OnTreeEntryCompare, const SvSortData&, _rSortData, sal_Int32 ) + IMPL_LINK( OTableSubscriptionPage, OnTreeEntryCompare, const SvSortData&, _rSortData, sal_Int32 ) { const SvTreeListEntry* pLHS = static_cast<const SvTreeListEntry*>(_rSortData.pLeft); const SvTreeListEntry* pRHS = static_cast<const SvTreeListEntry*>(_rSortData.pRight); diff --git a/dbaccess/source/ui/dlg/tablespage.hxx b/dbaccess/source/ui/dlg/tablespage.hxx index fdedfff8cc9e..001248ed203a 100644 --- a/dbaccess/source/ui/dlg/tablespage.hxx +++ b/dbaccess/source/ui/dlg/tablespage.hxx @@ -64,9 +64,9 @@ namespace dbaui virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; - DECL_LINK_TYPED( OnTreeEntryCompare, const SvSortData&, sal_Int32 ); - DECL_LINK_TYPED( OnTreeEntryChecked, void*, void ); - DECL_LINK_TYPED( OnTreeEntryButtonChecked, SvTreeListBox*, void ); + DECL_LINK( OnTreeEntryCompare, const SvSortData&, sal_Int32 ); + DECL_LINK( OnTreeEntryChecked, void*, void ); + DECL_LINK( OnTreeEntryButtonChecked, SvTreeListBox*, void ); private: diff --git a/dbaccess/source/ui/dlg/textconnectionsettings.cxx b/dbaccess/source/ui/dlg/textconnectionsettings.cxx index e52ca7aeec7f..af6d70529a5e 100644 --- a/dbaccess/source/ui/dlg/textconnectionsettings.cxx +++ b/dbaccess/source/ui/dlg/textconnectionsettings.cxx @@ -67,7 +67,7 @@ namespace dbaui return ModalDialog::Execute(); } - IMPL_LINK_NOARG_TYPED( TextConnectionSettingsDialog, OnOK, Button*, void ) + IMPL_LINK_NOARG( TextConnectionSettingsDialog, OnOK, Button*, void ) { if ( m_pTextConnectionHelper->prepareLeave() ) { diff --git a/dbaccess/source/ui/inc/CollectionView.hxx b/dbaccess/source/ui/inc/CollectionView.hxx index f60c345c4383..a4e560b3b163 100644 --- a/dbaccess/source/ui/inc/CollectionView.hxx +++ b/dbaccess/source/ui/inc/CollectionView.hxx @@ -44,10 +44,10 @@ namespace dbaui css::uno::Reference< css::uno::XComponentContext > m_xContext; bool m_bCreateForm; - DECL_LINK_TYPED(Up_Click, Button*, void); - DECL_LINK_TYPED(NewFolder_Click, Button*, void); - DECL_LINK_TYPED(Save_Click, Button*, void); - DECL_LINK_TYPED(Dbl_Click_FileView, SvTreeListBox*, bool); + DECL_LINK(Up_Click, Button*, void); + DECL_LINK(NewFolder_Click, Button*, void); + DECL_LINK(Save_Click, Button*, void); + DECL_LINK(Dbl_Click_FileView, SvTreeListBox*, bool); /// sets the fixedtext to the right content void initCurrentPath(); diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx b/dbaccess/source/ui/inc/FieldDescControl.hxx index 3607e3e0c207..84c821e801b5 100644 --- a/dbaccess/source/ui/inc/FieldDescControl.hxx +++ b/dbaccess/source/ui/inc/FieldDescControl.hxx @@ -114,14 +114,14 @@ namespace dbaui OFieldDescription* pActFieldDescr; - DECL_LINK_TYPED( OnScroll, ScrollBar*, void); + DECL_LINK( OnScroll, ScrollBar*, void); - DECL_LINK_TYPED( FormatClickHdl, Button *, void ); - DECL_LINK_TYPED( ChangeHdl, ListBox&, void ); + DECL_LINK( FormatClickHdl, Button *, void ); + DECL_LINK( ChangeHdl, ListBox&, void ); // used by ActivatePropertyField - DECL_LINK_TYPED( OnControlFocusLost, Control&, void ); - DECL_LINK_TYPED( OnControlFocusGot, Control&, void ); + DECL_LINK( OnControlFocusLost, Control&, void ); + DECL_LINK( OnControlFocusGot, Control&, void ); void UpdateFormatSample(OFieldDescription* pFieldDescr); void ArrangeAggregates(); diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx b/dbaccess/source/ui/inc/JoinTableView.hxx index a25562e7c5e3..03fb8bb71ef4 100644 --- a/dbaccess/source/ui/inc/JoinTableView.hxx +++ b/dbaccess/source/ui/inc/JoinTableView.hxx @@ -103,7 +103,7 @@ namespace dbaui bool m_bTrackingInitiallyMoved; - DECL_LINK_TYPED(OnDragScrollTimer, Idle*, void); + DECL_LINK(OnDragScrollTimer, Idle*, void); protected: VclPtr<OTableWindow> m_pLastFocusTabWin; @@ -126,7 +126,7 @@ namespace dbaui // own methods ScrollBar& GetHScrollBar() { return static_cast<OScrollWindowHelper*>(GetParent())->GetHScrollBar(); } ScrollBar& GetVScrollBar() { return static_cast<OScrollWindowHelper*>(GetParent())->GetVScrollBar(); } - DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void ); + DECL_LINK( ScrollHdl, ScrollBar*, void ); void DrawConnections(vcl::RenderContext& rRenderContext, const Rectangle& rRect); void InvalidateConnections(); diff --git a/dbaccess/source/ui/inc/QueryDesignView.hxx b/dbaccess/source/ui/inc/QueryDesignView.hxx index 52e0a51e3132..a6c2d05deb9b 100644 --- a/dbaccess/source/ui/inc/QueryDesignView.hxx +++ b/dbaccess/source/ui/inc/QueryDesignView.hxx @@ -150,7 +150,7 @@ namespace dbaui protected: // return the Rectangle where I can paint myself virtual void resizeDocumentView(Rectangle& rRect) override; - DECL_LINK_TYPED( SplitHdl, Splitter*, void ); + DECL_LINK( SplitHdl, Splitter*, void ); private: using OJoinDesignView::SaveTabWinUIConfig; diff --git a/dbaccess/source/ui/inc/RelationControl.hxx b/dbaccess/source/ui/inc/RelationControl.hxx index fe2191bdbee3..24b9d2dc7b8a 100644 --- a/dbaccess/source/ui/inc/RelationControl.hxx +++ b/dbaccess/source/ui/inc/RelationControl.hxx @@ -41,7 +41,7 @@ namespace dbaui OUString m_strCurrentLeft; OUString m_strCurrentRight; private: - DECL_LINK_TYPED( OnTableChanged, ListBox&, void ); + DECL_LINK( OnTableChanged, ListBox&, void ); public: OTableListBoxControl(VclBuilderContainer* _pParent, const OJoinTableView::OTableWindowMap* _pTableMap, diff --git a/dbaccess/source/ui/inc/RelationController.hxx b/dbaccess/source/ui/inc/RelationController.hxx index ee2a5e86918d..d1e8df2fcbf9 100644 --- a/dbaccess/source/ui/inc/RelationController.hxx +++ b/dbaccess/source/ui/inc/RelationController.hxx @@ -73,7 +73,7 @@ namespace dbaui virtual void reset() override; virtual void impl_initialize() override; virtual OUString getPrivateTitle( ) const override; - DECL_LINK_TYPED( OnThreadFinished, void*, void ); + DECL_LINK( OnThreadFinished, void*, void ); }; } #endif // INCLUDED_DBACCESS_SOURCE_UI_INC_RELATIONCONTROLLER_HXX diff --git a/dbaccess/source/ui/inc/RelationDlg.hxx b/dbaccess/source/ui/inc/RelationDlg.hxx index 109915570a85..469b5636c33e 100644 --- a/dbaccess/source/ui/inc/RelationDlg.hxx +++ b/dbaccess/source/ui/inc/RelationDlg.hxx @@ -78,7 +78,7 @@ namespace dbaui void Init(const TTableConnectionData::value_type& _pConnectionData); private: - DECL_LINK_TYPED( OKClickHdl, Button*, void ); + DECL_LINK( OKClickHdl, Button*, void ); }; } #endif // INCLUDED_DBACCESS_SOURCE_UI_INC_RELATIONDLG_HXX diff --git a/dbaccess/source/ui/inc/TableDesignView.hxx b/dbaccess/source/ui/inc/TableDesignView.hxx index 9a8dee39c4ae..0d73d19078f1 100644 --- a/dbaccess/source/ui/inc/TableDesignView.hxx +++ b/dbaccess/source/ui/inc/TableDesignView.hxx @@ -37,7 +37,7 @@ namespace dbaui VclPtr<OTableEditorCtrl> m_pEditorCtrl; void ImplInitSettings(); - DECL_LINK_TYPED( SplitHdl, Splitter*, void ); + DECL_LINK( SplitHdl, Splitter*, void ); protected: virtual void DataChanged(const DataChangedEvent& rDCEvt) override; public: diff --git a/dbaccess/source/ui/inc/TableGrantCtrl.hxx b/dbaccess/source/ui/inc/TableGrantCtrl.hxx index 00071512a6f9..ddfd05e8c979 100644 --- a/dbaccess/source/ui/inc/TableGrantCtrl.hxx +++ b/dbaccess/source/ui/inc/TableGrantCtrl.hxx @@ -94,8 +94,8 @@ protected: virtual void CellModified() override; private: - DECL_LINK_TYPED( AsynchActivate, void*, void ); - DECL_LINK_TYPED( AsynchDeactivate, void*, void ); + DECL_LINK( AsynchActivate, void*, void ); + DECL_LINK( AsynchDeactivate, void*, void ); static bool isAllowed(sal_uInt16 _nColumnId,sal_Int32 _nPrivilege); void fillPrivilege(sal_Int32 _nRow) const; diff --git a/dbaccess/source/ui/inc/TableWindowListBox.hxx b/dbaccess/source/ui/inc/TableWindowListBox.hxx index 1629afd4378a..c4aa82e1566c 100644 --- a/dbaccess/source/ui/inc/TableWindowListBox.hxx +++ b/dbaccess/source/ui/inc/TableWindowListBox.hxx @@ -47,11 +47,11 @@ namespace dbaui :public SvTreeListBox ,public IDragTransferableListener { - DECL_LINK_TYPED( OnDoubleClick, SvTreeListBox*, bool ); - DECL_LINK_TYPED( ScrollUpHdl, Timer*, void ); - DECL_LINK_TYPED( ScrollDownHdl, Timer*, void ); - DECL_LINK_TYPED( DropHdl, void*, void ); - DECL_LINK_TYPED( LookForUiHdl, void*, void ); + DECL_LINK( OnDoubleClick, SvTreeListBox*, bool ); + DECL_LINK( ScrollUpHdl, Timer*, void ); + DECL_LINK( ScrollDownHdl, Timer*, void ); + DECL_LINK( DropHdl, void*, void ); + DECL_LINK( LookForUiHdl, void*, void ); Timer m_aScrollTimer; Point m_aMousePos; diff --git a/dbaccess/source/ui/inc/VertSplitView.hxx b/dbaccess/source/ui/inc/VertSplitView.hxx index 572625357365..1ccf6a0683f1 100644 --- a/dbaccess/source/ui/inc/VertSplitView.hxx +++ b/dbaccess/source/ui/inc/VertSplitView.hxx @@ -32,7 +32,7 @@ namespace dbaui VclPtr<vcl::Window> m_pRight; void ImplInitSettings(); - DECL_LINK_TYPED( SplitHdl, Splitter*, void ); + DECL_LINK( SplitHdl, Splitter*, void ); protected: virtual void DataChanged(const DataChangedEvent& rDCEvt) override; public: diff --git a/dbaccess/source/ui/inc/WCPage.hxx b/dbaccess/source/ui/inc/WCPage.hxx index e9969b45358e..c2ee55adf374 100644 --- a/dbaccess/source/ui/inc/WCPage.hxx +++ b/dbaccess/source/ui/inc/WCPage.hxx @@ -51,9 +51,9 @@ namespace dbaui bool m_bPKeyAllowed; bool m_bUseHeaderAllowed; - DECL_LINK_TYPED( AppendDataClickHdl, Button*, void ); - DECL_LINK_TYPED( RadioChangeHdl, Button*, void ); - DECL_LINK_TYPED( KeyClickHdl, Button*, void ); + DECL_LINK( AppendDataClickHdl, Button*, void ); + DECL_LINK( RadioChangeHdl, Button*, void ); + DECL_LINK( KeyClickHdl, Button*, void ); bool checkAppendData(); void SetAppendDataRadio(); diff --git a/dbaccess/source/ui/inc/WColumnSelect.hxx b/dbaccess/source/ui/inc/WColumnSelect.hxx index 5d87bf140f42..df829da3633a 100644 --- a/dbaccess/source/ui/inc/WColumnSelect.hxx +++ b/dbaccess/source/ui/inc/WColumnSelect.hxx @@ -42,8 +42,8 @@ namespace dbaui VclPtr<PushButton> m_pColumns_LH; VclPtr<ListBox> m_pNewColumnNames; // right side - DECL_LINK_TYPED( ButtonClickHdl, Button *, void ); - DECL_LINK_TYPED( ListDoubleClickHdl, ListBox&, void ); + DECL_LINK( ButtonClickHdl, Button *, void ); + DECL_LINK( ListDoubleClickHdl, ListBox&, void ); static void clearListBox(ListBox& _rListBox); static void fillColumns( ListBox* pRight, diff --git a/dbaccess/source/ui/inc/WCopyTable.hxx b/dbaccess/source/ui/inc/WCopyTable.hxx index 8214e43445e2..b24a974c8bfa 100644 --- a/dbaccess/source/ui/inc/WCopyTable.hxx +++ b/dbaccess/source/ui/inc/WCopyTable.hxx @@ -279,10 +279,10 @@ namespace dbaui bool m_bUseHeaderLine; private: - DECL_LINK_TYPED( ImplPrevHdl, Button*, void ); - DECL_LINK_TYPED( ImplNextHdl, Button*, void); - DECL_LINK_TYPED( ImplOKHdl, Button*, void ); - DECL_LINK_TYPED( ImplActivateHdl, WizardDialog*, void ); + DECL_LINK( ImplPrevHdl, Button*, void ); + DECL_LINK( ImplNextHdl, Button*, void); + DECL_LINK( ImplOKHdl, Button*, void ); + DECL_LINK( ImplActivateHdl, WizardDialog*, void ); bool CheckColumns(sal_Int32& _rnBreakPos); void loadData( const ICopyTableSourceObject& _rSourceObject, ODatabaseExport::TColumns& _rColumns, diff --git a/dbaccess/source/ui/inc/WNameMatch.hxx b/dbaccess/source/ui/inc/WNameMatch.hxx index baac1a0eee5a..004a659f4885 100644 --- a/dbaccess/source/ui/inc/WNameMatch.hxx +++ b/dbaccess/source/ui/inc/WNameMatch.hxx @@ -65,11 +65,11 @@ namespace dbaui Image m_aImgUp; Image m_aImgDown; - DECL_LINK_TYPED( ButtonClickHdl, Button *, void ); - DECL_LINK_TYPED( RightButtonClickHdl, Button *, void ); - DECL_LINK_TYPED( AllNoneClickHdl, Button *, void ); - DECL_LINK_TYPED( TableListClickHdl, SvTreeListBox*, void ); - DECL_LINK_TYPED( TableListRightSelectHdl, SvTreeListBox*, void ); + DECL_LINK( ButtonClickHdl, Button *, void ); + DECL_LINK( RightButtonClickHdl, Button *, void ); + DECL_LINK( AllNoneClickHdl, Button *, void ); + DECL_LINK( TableListClickHdl, SvTreeListBox*, void ); + DECL_LINK( TableListRightSelectHdl, SvTreeListBox*, void ); public: virtual void Reset ( ) override; diff --git a/dbaccess/source/ui/inc/WTypeSelect.hxx b/dbaccess/source/ui/inc/WTypeSelect.hxx index ff5f266402a0..f1514761e0a9 100644 --- a/dbaccess/source/ui/inc/WTypeSelect.hxx +++ b/dbaccess/source/ui/inc/WTypeSelect.hxx @@ -91,8 +91,8 @@ namespace dbaui friend class OWizTypeSelectControl; friend class OWizTypeSelectList; - DECL_LINK_TYPED( ColumnSelectHdl, ListBox&, void ); - DECL_LINK_TYPED( ButtonClickHdl, Button *, void ); + DECL_LINK( ColumnSelectHdl, ListBox&, void ); + DECL_LINK( ButtonClickHdl, Button *, void ); protected: VclPtr<OWizTypeSelectList> m_pColumnNames; VclPtr<FixedText> m_pColumns; diff --git a/dbaccess/source/ui/inc/adtabdlg.hxx b/dbaccess/source/ui/inc/adtabdlg.hxx index 69dbae8eb41f..991ac705ca0c 100644 --- a/dbaccess/source/ui/inc/adtabdlg.hxx +++ b/dbaccess/source/ui/inc/adtabdlg.hxx @@ -70,11 +70,11 @@ namespace dbaui IAddTableDialogContext& m_rContext; - DECL_LINK_TYPED( AddClickHdl, Button*, void ); - DECL_LINK_TYPED( CloseClickHdl, Button*, void); - DECL_LINK_TYPED( TableListDoubleClickHdl, SvTreeListBox*, bool ); - DECL_LINK_TYPED( TableListSelectHdl, SvTreeListBox*, void ); - DECL_LINK_TYPED( OnTypeSelected, Button*, void ); + DECL_LINK( AddClickHdl, Button*, void ); + DECL_LINK( CloseClickHdl, Button*, void); + DECL_LINK( TableListDoubleClickHdl, SvTreeListBox*, bool ); + DECL_LINK( TableListSelectHdl, SvTreeListBox*, void ); + DECL_LINK( OnTypeSelected, Button*, void ); public: OAddTableDlg( diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx b/dbaccess/source/ui/inc/brwctrlr.hxx index 8cf693d5389e..2c14d5806a73 100644 --- a/dbaccess/source/ui/inc/brwctrlr.hxx +++ b/dbaccess/source/ui/inc/brwctrlr.hxx @@ -327,16 +327,16 @@ namespace dbaui void impl_checkForCannotSelectUnfiltered( const ::dbtools::SQLExceptionInfo& _rError ); // time to check the CUT/COPY/PASTE-slot-states - DECL_LINK_TYPED( OnInvalidateClipboard, Timer*, void ); - DECL_LINK_TYPED( OnClipboardChanged, TransferableDataHelper*, void ); + DECL_LINK( OnInvalidateClipboard, Timer*, void ); + DECL_LINK( OnClipboardChanged, TransferableDataHelper*, void ); // search callbacks - DECL_LINK_TYPED(OnSearchContextRequest, FmSearchContext&, sal_uInt32); - DECL_LINK_TYPED(OnFoundData, FmFoundRecordInformation&, void); - DECL_LINK_TYPED(OnCanceledNotFound, FmFoundRecordInformation&, void); + DECL_LINK(OnSearchContextRequest, FmSearchContext&, sal_uInt32); + DECL_LINK(OnFoundData, FmFoundRecordInformation&, void); + DECL_LINK(OnCanceledNotFound, FmFoundRecordInformation&, void); - DECL_LINK_TYPED( OnAsyncGetCellFocus, void*, void ); - DECL_LINK_TYPED( OnAsyncDisplayError, void*, void ); + DECL_LINK( OnAsyncGetCellFocus, void*, void ); + DECL_LINK( OnAsyncDisplayError, void*, void ); }; } diff --git a/dbaccess/source/ui/inc/brwview.hxx b/dbaccess/source/ui/inc/brwview.hxx index 8a8ec11a11c4..ad9618f71b0b 100644 --- a/dbaccess/source/ui/inc/brwview.hxx +++ b/dbaccess/source/ui/inc/brwview.hxx @@ -51,7 +51,7 @@ namespace dbaui mutable VclPtr<SbaGridControl> m_pVclControl; // our grid's VCL representation VclPtr<vcl::Window> m_pStatus; - DECL_LINK_TYPED( SplitHdl, Splitter*, void ); + DECL_LINK( SplitHdl, Splitter*, void ); // attribute access public: const css::uno::Reference< css::awt::XControl >& getGridControl() const { return m_xGrid; } diff --git a/dbaccess/source/ui/inc/dbtreelistbox.hxx b/dbaccess/source/ui/inc/dbtreelistbox.hxx index 51cc5f1677fb..4c091dbe7b45 100644 --- a/dbaccess/source/ui/inc/dbtreelistbox.hxx +++ b/dbaccess/source/ui/inc/dbtreelistbox.hxx @@ -70,10 +70,10 @@ namespace dbaui private: void init(); - DECL_LINK_TYPED( OnTimeOut, Timer*, void ); - DECL_LINK_TYPED( OnResetEntry, void*, void ); - DECL_LINK_TYPED( ScrollUpHdl, LinkParamNone*, void ); - DECL_LINK_TYPED( ScrollDownHdl, LinkParamNone*, void ); + DECL_LINK( OnTimeOut, Timer*, void ); + DECL_LINK( OnResetEntry, void*, void ); + DECL_LINK( ScrollUpHdl, LinkParamNone*, void ); + DECL_LINK( ScrollDownHdl, LinkParamNone*, void ); public: DBTreeListBox( vcl::Window* pParent, WinBits nWinStyle=0); diff --git a/dbaccess/source/ui/inc/dbwiz.hxx b/dbaccess/source/ui/inc/dbwiz.hxx index ba68b45a0870..2c85d711de91 100644 --- a/dbaccess/source/ui/inc/dbwiz.hxx +++ b/dbaccess/source/ui/inc/dbwiz.hxx @@ -106,7 +106,7 @@ protected: }; private: - DECL_LINK_TYPED(OnTypeSelected, OGeneralPage&, void); + DECL_LINK(OnTypeSelected, OGeneralPage&, void); }; } // namespace dbaui diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx b/dbaccess/source/ui/inc/dbwizsetup.hxx index 225f26b96a7f..b800dece39e8 100644 --- a/dbaccess/source/ui/inc/dbwizsetup.hxx +++ b/dbaccess/source/ui/inc/dbwizsetup.hxx @@ -166,12 +166,12 @@ private: void updateTypeDependentStates(); bool callSaveAsDialog(); bool IsConnectionUrlRequired(); - DECL_LINK_TYPED(OnTypeSelected, OGeneralPage&, void); - DECL_LINK_TYPED(OnChangeCreationMode, OGeneralPageWizard&, void); - DECL_LINK_TYPED(OnRecentDocumentSelected, OGeneralPageWizard&, void); - DECL_LINK_TYPED(OnSingleDocumentChosen, OGeneralPageWizard&, void); - DECL_LINK_TYPED(ImplClickHdl, OMySQLIntroPageSetup*, void); - DECL_LINK_TYPED(ImplModifiedHdl, OGenericAdministrationPage const *, void); + DECL_LINK(OnTypeSelected, OGeneralPage&, void); + DECL_LINK(OnChangeCreationMode, OGeneralPageWizard&, void); + DECL_LINK(OnRecentDocumentSelected, OGeneralPageWizard&, void); + DECL_LINK(OnSingleDocumentChosen, OGeneralPageWizard&, void); + DECL_LINK(ImplClickHdl, OMySQLIntroPageSetup*, void); + DECL_LINK(ImplModifiedHdl, OGenericAdministrationPage const *, void); }; } // namespace dbaui diff --git a/dbaccess/source/ui/inc/directsql.hxx b/dbaccess/source/ui/inc/directsql.hxx index 4d081adf2365..9e6d74e62dd7 100644 --- a/dbaccess/source/ui/inc/directsql.hxx +++ b/dbaccess/source/ui/inc/directsql.hxx @@ -85,11 +85,11 @@ namespace dbaui virtual void _disposing( const css::lang::EventObject& _rSource ) override; protected: - DECL_LINK_TYPED( OnExecute, Button*, void ); - DECL_LINK_TYPED( OnClose, void*, void ); - DECL_LINK_TYPED( OnCloseClick, Button*, void ); - DECL_LINK_TYPED( OnListEntrySelected, ListBox&, void ); - DECL_LINK_TYPED( OnStatementModified, Edit&, void ); + DECL_LINK( OnExecute, Button*, void ); + DECL_LINK( OnClose, void*, void ); + DECL_LINK( OnCloseClick, Button*, void ); + DECL_LINK( OnListEntrySelected, ListBox&, void ); + DECL_LINK( OnStatementModified, Edit&, void ); private: /// adds a statement to the statement history diff --git a/dbaccess/source/ui/inc/dlgsave.hxx b/dbaccess/source/ui/inc/dlgsave.hxx index 9866fd99fdcb..257117f8a577 100644 --- a/dbaccess/source/ui/inc/dlgsave.hxx +++ b/dbaccess/source/ui/inc/dlgsave.hxx @@ -73,8 +73,8 @@ namespace dbaui OUString getCatalog() const; OUString getSchema() const; private: - DECL_LINK_TYPED(ButtonClickHdl, Button *, void); - DECL_LINK_TYPED(EditModifyHdl, Edit&, void); + DECL_LINK(ButtonClickHdl, Button *, void); + DECL_LINK(EditModifyHdl, Edit&, void); void implInitOnlyTitle(const OUString& _rLabel); void implInit(); diff --git a/dbaccess/source/ui/inc/dlgsize.hxx b/dbaccess/source/ui/inc/dlgsize.hxx index 1c2be2a8a3b9..b0f8a32c0271 100644 --- a/dbaccess/source/ui/inc/dlgsize.hxx +++ b/dbaccess/source/ui/inc/dlgsize.hxx @@ -37,7 +37,7 @@ namespace dbaui void SetValue( sal_Int32 nVal ); protected: - DECL_LINK_TYPED( CbClickHdl, Button *, void ); + DECL_LINK( CbClickHdl, Button *, void ); VclPtr<MetricField> m_pMF_VALUE; VclPtr<CheckBox> m_pCB_STANDARD; diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx index badb6bc235f9..b95418ed3911 100644 --- a/dbaccess/source/ui/inc/indexdialog.hxx +++ b/dbaccess/source/ui/inc/indexdialog.hxx @@ -127,14 +127,14 @@ namespace dbaui void updateControls(const SvTreeListEntry* _pEntry); protected: - DECL_LINK_TYPED( OnIndexSelected, DbaIndexList&, void ); - DECL_LINK_TYPED( OnIndexAction, ToolBox*, void ); - DECL_LINK_TYPED( OnEntryEdited, SvTreeListEntry*, bool ); - DECL_LINK_TYPED( OnModifiedClick, Button*, void ); - DECL_LINK_TYPED( OnModified, IndexFieldsControl&, void ); - DECL_LINK_TYPED( OnCloseDialog, Button*, void ); - - DECL_LINK_TYPED( OnEditIndexAgain, void*, void ); + DECL_LINK( OnIndexSelected, DbaIndexList&, void ); + DECL_LINK( OnIndexAction, ToolBox*, void ); + DECL_LINK( OnEntryEdited, SvTreeListEntry*, bool ); + DECL_LINK( OnModifiedClick, Button*, void ); + DECL_LINK( OnModified, IndexFieldsControl&, void ); + DECL_LINK( OnCloseDialog, Button*, void ); + + DECL_LINK( OnEditIndexAgain, void*, void ); private: sal_uInt16 mnNewCmdId; diff --git a/dbaccess/source/ui/inc/indexfieldscontrol.hxx b/dbaccess/source/ui/inc/indexfieldscontrol.hxx index 7ea0ef629538..68586c62dfb3 100644 --- a/dbaccess/source/ui/inc/indexfieldscontrol.hxx +++ b/dbaccess/source/ui/inc/indexfieldscontrol.hxx @@ -86,7 +86,7 @@ namespace dbaui bool isNewField() const { return GetCurRow() >= (sal_Int32)m_aFields.size(); } - DECL_LINK_TYPED( OnListEntrySelected, DbaMouseDownListBoxController&, void ); + DECL_LINK( OnListEntrySelected, DbaMouseDownListBoxController&, void ); private: using ::svt::EditBrowseBox::Init; diff --git a/dbaccess/source/ui/inc/paramdialog.hxx b/dbaccess/source/ui/inc/paramdialog.hxx index 8e29c278225d..43997f962efe 100644 --- a/dbaccess/source/ui/inc/paramdialog.hxx +++ b/dbaccess/source/ui/inc/paramdialog.hxx @@ -93,11 +93,11 @@ namespace dbaui void Construct(); private: - DECL_LINK_TYPED(OnVisitedTimeout, Timer*, void); - DECL_LINK_TYPED(OnValueModified, Edit&, void); - DECL_LINK_TYPED(OnEntryListBoxSelected, ListBox&, void); - DECL_LINK_TYPED(OnButtonClicked, Button*, void); - DECL_LINK_TYPED(OnValueLoseFocusHdl, Control&, void); + DECL_LINK(OnVisitedTimeout, Timer*, void); + DECL_LINK(OnValueModified, Edit&, void); + DECL_LINK(OnEntryListBoxSelected, ListBox&, void); + DECL_LINK(OnButtonClicked, Button*, void); + DECL_LINK(OnValueLoseFocusHdl, Control&, void); bool OnValueLoseFocus(); bool OnEntrySelected(); }; diff --git a/dbaccess/source/ui/inc/querycontainerwindow.hxx b/dbaccess/source/ui/inc/querycontainerwindow.hxx index 3b112a98cd4f..45f4ecc803af 100644 --- a/dbaccess/source/ui/inc/querycontainerwindow.hxx +++ b/dbaccess/source/ui/inc/querycontainerwindow.hxx @@ -46,7 +46,7 @@ namespace dbaui VclPtr<Splitter> m_pSplitter; css::uno::Reference< css::frame::XFrame2 > m_xBeamer; - DECL_LINK_TYPED( SplitHdl, Splitter*, void ); + DECL_LINK( SplitHdl, Splitter*, void ); public: OQueryContainerWindow(vcl::Window* pParent, OQueryController& _rController,const css::uno::Reference< css::uno::XComponentContext >&); virtual ~OQueryContainerWindow() override; diff --git a/dbaccess/source/ui/inc/querycontroller.hxx b/dbaccess/source/ui/inc/querycontroller.hxx index edad899131f3..966f4f16a027 100644 --- a/dbaccess/source/ui/inc/querycontroller.hxx +++ b/dbaccess/source/ui/inc/querycontroller.hxx @@ -224,7 +224,7 @@ namespace dbaui virtual bool allowQueries() const override; private: - DECL_LINK_TYPED( OnExecuteAddTable, void*, void ); + DECL_LINK( OnExecuteAddTable, void*, void ); private: using OQueryController_PBase::getFastPropertyValue; diff --git a/dbaccess/source/ui/inc/queryfilter.hxx b/dbaccess/source/ui/inc/queryfilter.hxx index 6990b5c028ed..f7253f1fa76a 100644 --- a/dbaccess/source/ui/inc/queryfilter.hxx +++ b/dbaccess/source/ui/inc/queryfilter.hxx @@ -91,8 +91,8 @@ namespace dbaui ::dbtools::OPredicateInputController m_aPredicateInput; static void SelectField( ListBox& rBox, const OUString& rField ); - DECL_LINK_TYPED( ListSelectHdl, ListBox&, void ); - DECL_LINK_TYPED( ListSelectCompHdl, ListBox&, void ); + DECL_LINK( ListSelectHdl, ListBox&, void ); + DECL_LINK( ListSelectCompHdl, ListBox&, void ); void SetLine( sal_uInt16 nIdx,const css::beans::PropertyValue& _rItem,bool _bOr ); void EnableLines(); @@ -118,7 +118,7 @@ namespace dbaui void BuildWherePart(); protected: - DECL_LINK_TYPED( PredicateLoseFocus, Control&, void ); + DECL_LINK( PredicateLoseFocus, Control&, void ); }; } diff --git a/dbaccess/source/ui/inc/queryorder.hxx b/dbaccess/source/ui/inc/queryorder.hxx index e4b885a1496c..71cca836f1b5 100644 --- a/dbaccess/source/ui/inc/queryorder.hxx +++ b/dbaccess/source/ui/inc/queryorder.hxx @@ -75,7 +75,7 @@ namespace dbaui VclPtr<ListBox> m_aColumnList[DOG_ROWS]; VclPtr<ListBox> m_aValueList[DOG_ROWS]; - DECL_LINK_TYPED( FieldListSelectHdl, ListBox&, void ); + DECL_LINK( FieldListSelectHdl, ListBox&, void ); void EnableLines(); public: diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx index f410c1d7f1ca..f7feedcbc2b3 100644 --- a/dbaccess/source/ui/inc/sbagrid.hxx +++ b/dbaccess/source/ui/inc/sbagrid.hxx @@ -144,7 +144,7 @@ namespace dbaui css::uno::Sequence< css::beans::PropertyValue > aArgs; }; ::std::queue< DispatchArgs > m_aDispatchArgs; - DECL_LINK_TYPED( OnDispatchEvent, void*, void ); + DECL_LINK( OnDispatchEvent, void*, void ); // for dynamic states of our 4 dispatchable URLs enum DispatchType @@ -300,7 +300,7 @@ namespace dbaui SvNumberFormatter* GetDatasourceFormatter(); - DECL_LINK_TYPED(AsynchDropEvent, void*, void); + DECL_LINK(AsynchDropEvent, void*, void); private: bool IsReadOnlyDB() const; diff --git a/dbaccess/source/ui/inc/sqledit.hxx b/dbaccess/source/ui/inc/sqledit.hxx index 8bfb22c1664b..4150b22da09c 100644 --- a/dbaccess/source/ui/inc/sqledit.hxx +++ b/dbaccess/source/ui/inc/sqledit.hxx @@ -51,8 +51,8 @@ namespace dbaui osl::Mutex m_mutex; css::uno::Reference< css::beans::XMultiPropertySet > m_notifier; - DECL_LINK_TYPED(OnUndoActionTimer, Timer*, void); - DECL_LINK_TYPED(OnInvalidateTimer, Timer*, void); + DECL_LINK(OnUndoActionTimer, Timer*, void); + DECL_LINK(OnInvalidateTimer, Timer*, void); private: void ImplSetFont(); @@ -61,7 +61,7 @@ namespace dbaui virtual void KeyInput( const KeyEvent& rKEvt ) override; virtual void GetFocus() override; - DECL_LINK_TYPED(ModifyHdl, Edit&, void); + DECL_LINK(ModifyHdl, Edit&, void); public: OSqlEdit( OQueryTextView* pParent); diff --git a/dbaccess/source/ui/inc/sqlmessage.hxx b/dbaccess/source/ui/inc/sqlmessage.hxx index 55426f57f07a..97428cc4fd5f 100644 --- a/dbaccess/source/ui/inc/sqlmessage.hxx +++ b/dbaccess/source/ui/inc/sqlmessage.hxx @@ -95,7 +95,7 @@ public: private: void Construct( WinBits nStyle, MessageType eImage ); - DECL_LINK_TYPED(ButtonClickHdl, Button*, void ); + DECL_LINK(ButtonClickHdl, Button*, void ); private: void impl_positionControls(); diff --git a/dbaccess/source/ui/inc/textconnectionsettings.hxx b/dbaccess/source/ui/inc/textconnectionsettings.hxx index 8d3f538e0416..3bccf4a36a62 100644 --- a/dbaccess/source/ui/inc/textconnectionsettings.hxx +++ b/dbaccess/source/ui/inc/textconnectionsettings.hxx @@ -54,7 +54,7 @@ namespace dbaui SfxItemSet& m_rItems; private: - DECL_LINK_TYPED( OnOK, Button*, void ); + DECL_LINK( OnOK, Button*, void ); }; } // namespace dbaui diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx index 29146bd6a54d..b66d671e877c 100644 --- a/dbaccess/source/ui/inc/unodatbr.hxx +++ b/dbaccess/source/ui/inc/unodatbr.hxx @@ -344,14 +344,14 @@ namespace dbaui OUString GetEntryText( SvTreeListEntry* _pEntry ) const; // is called when a table or a query was selected - DECL_LINK_TYPED( OnSelectionChange, LinkParamNone*, void ); - DECL_LINK_TYPED( OnExpandEntry, SvTreeListEntry*, bool ); + DECL_LINK( OnSelectionChange, LinkParamNone*, void ); + DECL_LINK( OnExpandEntry, SvTreeListEntry*, bool ); - DECL_LINK_TYPED( OnCopyEntry, LinkParamNone*, void ); + DECL_LINK( OnCopyEntry, LinkParamNone*, void ); - DECL_LINK_TYPED( OnTreeEntryCompare, const SvSortData&, sal_Int32 ); + DECL_LINK( OnTreeEntryCompare, const SvSortData&, sal_Int32 ); - DECL_LINK_TYPED( OnAsyncDrop, void*, void ); + DECL_LINK( OnAsyncDrop, void*, void ); void implRemoveStatusListeners(); diff --git a/dbaccess/source/ui/misc/ToolBoxHelper.cxx b/dbaccess/source/ui/misc/ToolBoxHelper.cxx index 00c5df7c6afb..20d60659e778 100644 --- a/dbaccess/source/ui/misc/ToolBoxHelper.cxx +++ b/dbaccess/source/ui/misc/ToolBoxHelper.cxx @@ -63,7 +63,7 @@ namespace dbaui } } - IMPL_LINK_NOARG_TYPED(OToolBoxHelper, ConfigOptionsChanged, LinkParamNone*, void) + IMPL_LINK_NOARG(OToolBoxHelper, ConfigOptionsChanged, LinkParamNone*, void) { if ( m_pToolBox ) { @@ -74,7 +74,7 @@ namespace dbaui m_pToolBox->SetOutStyle(aOptions.GetToolboxStyle()); } } - IMPL_LINK_TYPED(OToolBoxHelper, SettingsChanged, VclSimpleEvent&, _rEvt, void) + IMPL_LINK(OToolBoxHelper, SettingsChanged, VclSimpleEvent&, _rEvt, void) { if ( m_pToolBox && _rEvt.GetId() == VCLEVENT_APPLICATION_DATACHANGED ) { diff --git a/dbaccess/source/ui/misc/WCPage.cxx b/dbaccess/source/ui/misc/WCPage.cxx index db54c29d2e67..96ea1442c38c 100644 --- a/dbaccess/source/ui/misc/WCPage.cxx +++ b/dbaccess/source/ui/misc/WCPage.cxx @@ -122,7 +122,7 @@ void OCopyTable::dispose() OWizardPage::dispose(); } -IMPL_LINK_NOARG_TYPED( OCopyTable, AppendDataClickHdl, Button*, void ) +IMPL_LINK_NOARG( OCopyTable, AppendDataClickHdl, Button*, void ) { SetAppendDataRadio(); } @@ -136,7 +136,7 @@ void OCopyTable::SetAppendDataRadio() m_pParent->setOperation(CopyTableOperation::AppendData); } -IMPL_LINK_TYPED( OCopyTable, RadioChangeHdl, Button*, pButton, void ) +IMPL_LINK( OCopyTable, RadioChangeHdl, Button*, pButton, void ) { m_pParent->EnableNextButton(pButton != m_pRB_View); bool bKey = m_bPKeyAllowed && pButton != m_pRB_View; @@ -154,7 +154,7 @@ IMPL_LINK_TYPED( OCopyTable, RadioChangeHdl, Button*, pButton, void ) m_pParent->setOperation( CopyTableOperation::CreateAsView ); } -IMPL_LINK_NOARG_TYPED( OCopyTable, KeyClickHdl, Button*, void ) +IMPL_LINK_NOARG( OCopyTable, KeyClickHdl, Button*, void ) { m_pEdKeyName->Enable(m_pCB_PrimaryColumn->IsChecked()); m_pFT_KeyName->Enable(m_pCB_PrimaryColumn->IsChecked()); diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx index c0aa281d88ae..a83eb94c9bc7 100644 --- a/dbaccess/source/ui/misc/WColumnSelect.cxx +++ b/dbaccess/source/ui/misc/WColumnSelect.cxx @@ -183,7 +183,7 @@ bool OWizColumnSelect::LeavePage() return true; } -IMPL_LINK_TYPED( OWizColumnSelect, ButtonClickHdl, Button *, pButton, void ) +IMPL_LINK( OWizColumnSelect, ButtonClickHdl, Button *, pButton, void ) { ListBox *pLeft = nullptr; ListBox *pRight = nullptr; @@ -246,7 +246,7 @@ IMPL_LINK_TYPED( OWizColumnSelect, ButtonClickHdl, Button *, pButton, void ) m_pOrgColumnNames->SelectEntryPos(0); } -IMPL_LINK_TYPED( OWizColumnSelect, ListDoubleClickHdl, ListBox&, rListBox, void ) +IMPL_LINK( OWizColumnSelect, ListDoubleClickHdl, ListBox&, rListBox, void ) { ListBox *pLeft,*pRight; if(&rListBox == m_pOrgColumnNames) diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx index 56142ceee651..cd473baa5a50 100644 --- a/dbaccess/source/ui/misc/WCopyTable.cxx +++ b/dbaccess/source/ui/misc/WCopyTable.cxx @@ -717,7 +717,7 @@ void OCopyTableWizard::dispose() WizardDialog::dispose(); } -IMPL_LINK_NOARG_TYPED(OCopyTableWizard, ImplPrevHdl, Button*, void) +IMPL_LINK_NOARG(OCopyTableWizard, ImplPrevHdl, Button*, void) { m_ePressed = WIZARD_PREV; if ( GetCurLevel() ) @@ -734,7 +734,7 @@ IMPL_LINK_NOARG_TYPED(OCopyTableWizard, ImplPrevHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(OCopyTableWizard, ImplNextHdl, Button*, void) +IMPL_LINK_NOARG(OCopyTableWizard, ImplNextHdl, Button*, void) { m_ePressed = WIZARD_NEXT; if ( GetCurLevel() < MAX_PAGES ) @@ -834,7 +834,7 @@ bool OCopyTableWizard::CheckColumns(sal_Int32& _rnBreakPos) return bRet; } -IMPL_LINK_NOARG_TYPED(OCopyTableWizard, ImplOKHdl, Button*, void) +IMPL_LINK_NOARG(OCopyTableWizard, ImplOKHdl, Button*, void) { m_ePressed = WIZARD_FINISH; bool bFinish = DeactivatePage(); @@ -937,7 +937,7 @@ void OCopyTableWizard::setCreatePrimaryKey( bool _bDoCreate, const OUString& _rS pSettingsPage->setCreatePrimaryKey( _bDoCreate, _rSuggestedName ); } -IMPL_LINK_NOARG_TYPED(OCopyTableWizard, ImplActivateHdl, WizardDialog*, void) +IMPL_LINK_NOARG(OCopyTableWizard, ImplActivateHdl, WizardDialog*, void) { OWizardPage* pCurrent = static_cast<OWizardPage*>(GetPage(GetCurLevel())); if(pCurrent) diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx index afb4e1f1956d..477608d8e490 100644 --- a/dbaccess/source/ui/misc/WNameMatch.cxx +++ b/dbaccess/source/ui/misc/WNameMatch.cxx @@ -200,7 +200,7 @@ bool OWizNameMatching::LeavePage() OUString OWizNameMatching::GetTitle() const { return ModuleRes(STR_WIZ_NAME_MATCHING_TITEL); } -IMPL_LINK_TYPED( OWizNameMatching, ButtonClickHdl, Button *, pButton, void ) +IMPL_LINK( OWizNameMatching, ButtonClickHdl, Button *, pButton, void ) { SvTreeListEntry* pEntry = m_pCTRL_LEFT->FirstSelected(); if ( pEntry ) @@ -227,7 +227,7 @@ IMPL_LINK_TYPED( OWizNameMatching, ButtonClickHdl, Button *, pButton, void ) } } -IMPL_LINK_TYPED( OWizNameMatching, RightButtonClickHdl, Button *, pButton, void ) +IMPL_LINK( OWizNameMatching, RightButtonClickHdl, Button *, pButton, void ) { SvTreeListEntry* pEntry = m_pCTRL_RIGHT->FirstSelected(); if ( pEntry ) @@ -250,7 +250,7 @@ IMPL_LINK_TYPED( OWizNameMatching, RightButtonClickHdl, Button *, pButton, void } } -IMPL_LINK_NOARG_TYPED( OWizNameMatching, TableListClickHdl, SvTreeListBox*, void ) +IMPL_LINK_NOARG( OWizNameMatching, TableListClickHdl, SvTreeListBox*, void ) { SvTreeListEntry* pEntry = m_pCTRL_LEFT->FirstSelected(); if(pEntry) @@ -282,7 +282,7 @@ IMPL_LINK_NOARG_TYPED( OWizNameMatching, TableListClickHdl, SvTreeListBox*, void } } -IMPL_LINK_NOARG_TYPED( OWizNameMatching, TableListRightSelectHdl, SvTreeListBox*, void ) +IMPL_LINK_NOARG( OWizNameMatching, TableListRightSelectHdl, SvTreeListBox*, void ) { SvTreeListEntry* pEntry = m_pCTRL_RIGHT->FirstSelected(); if(pEntry) @@ -314,7 +314,7 @@ IMPL_LINK_NOARG_TYPED( OWizNameMatching, TableListRightSelectHdl, SvTreeListBox* } } -IMPL_LINK_TYPED( OWizNameMatching, AllNoneClickHdl, Button *, pButton, void ) +IMPL_LINK( OWizNameMatching, AllNoneClickHdl, Button *, pButton, void ) { bool bAll = pButton == m_pAll; SvTreeListEntry* pEntry = m_pCTRL_LEFT->First(); diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx index 204a33610e46..b85b3e66e2e7 100644 --- a/dbaccess/source/ui/misc/WTypeSelect.cxx +++ b/dbaccess/source/ui/misc/WTypeSelect.cxx @@ -281,7 +281,7 @@ OUString OWizTypeSelect::GetTitle() const return ModuleRes(STR_WIZ_TYPE_SELECT_TITEL); } -IMPL_LINK_NOARG_TYPED( OWizTypeSelect, ColumnSelectHdl, ListBox&, void ) +IMPL_LINK_NOARG( OWizTypeSelect, ColumnSelectHdl, ListBox&, void ) { OUString aColumnName( m_pColumnNames->GetSelectEntry() ); @@ -348,7 +348,7 @@ void OWizTypeSelect::EnableAuto(bool bEnable) m_pAutoType->Show(bEnable); } -IMPL_LINK_NOARG_TYPED( OWizTypeSelect, ButtonClickHdl, Button *, void ) +IMPL_LINK_NOARG( OWizTypeSelect, ButtonClickHdl, Button *, void ) { sal_Int32 nBreakPos; m_pParent->CheckColumns(nBreakPos); diff --git a/dbaccess/source/ui/misc/asyncmodaldialog.cxx b/dbaccess/source/ui/misc/asyncmodaldialog.cxx index a03b51239b46..f92e3af17640 100644 --- a/dbaccess/source/ui/misc/asyncmodaldialog.cxx +++ b/dbaccess/source/ui/misc/asyncmodaldialog.cxx @@ -54,10 +54,10 @@ namespace dbaui } private: - DECL_LINK_TYPED( onExecute, void*, void ); + DECL_LINK( onExecute, void*, void ); }; - IMPL_LINK_NOARG_TYPED( DialogExecutor_Impl, onExecute, void*, void ) + IMPL_LINK_NOARG( DialogExecutor_Impl, onExecute, void*, void ) { try { diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index 657582fde435..52d2de8844e9 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -200,7 +200,7 @@ void OJoinTableView::dispose() vcl::Window::dispose(); } -IMPL_LINK_TYPED( OJoinTableView, ScrollHdl, ScrollBar*, pScrollBar, void ) +IMPL_LINK( OJoinTableView, ScrollHdl, ScrollBar*, pScrollBar, void ) { // move all windows ScrollPane( pScrollBar->GetDelta(), (pScrollBar == &GetHScrollBar()), false ); @@ -1073,7 +1073,7 @@ void OJoinTableView::ScrollWhileDragging() ShowTracking( m_aDragRect, ShowTrackFlags::Small | ShowTrackFlags::TrackWindow ); } -IMPL_LINK_NOARG_TYPED(OJoinTableView, OnDragScrollTimer, Idle *, void) +IMPL_LINK_NOARG(OJoinTableView, OnDragScrollTimer, Idle *, void) { ScrollWhileDragging(); } diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index 1e08467842ec..e5186d843a83 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -2504,7 +2504,7 @@ void OQueryDesignView::dispose() OJoinDesignView::dispose(); } -IMPL_LINK_NOARG_TYPED( OQueryDesignView, SplitHdl, Splitter*, void ) +IMPL_LINK_NOARG( OQueryDesignView, SplitHdl, Splitter*, void ) { if (!getController().isReadOnly()) { diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index fc93f451aa14..bd91b53a3db8 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -2472,7 +2472,7 @@ void OSelectionBrowseBox::appendUndoAction(const OUString& _rOldValue,const OUSt } } -IMPL_LINK_NOARG_TYPED(OSelectionBrowseBox, OnInvalidateTimer, Timer *, void) +IMPL_LINK_NOARG(OSelectionBrowseBox, OnInvalidateTimer, Timer *, void) { static_cast<OQueryController&>(getDesignView()->getController()).InvalidateFeature(SID_CUT); static_cast<OQueryController&>(getDesignView()->getController()).InvalidateFeature(SID_COPY); diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx index c6be5d504e13..d11d45798faa 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx @@ -75,7 +75,7 @@ namespace dbaui bool m_bDisableErrorBox; bool m_bInUndoMode; - DECL_LINK_TYPED(OnInvalidateTimer, Timer*, void); + DECL_LINK(OnInvalidateTimer, Timer*, void); public: explicit OSelectionBrowseBox( vcl::Window* pParent ); virtual ~OSelectionBrowseBox() override; diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx index 6e5ba0670e71..0904e805b329 100644 --- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx @@ -167,7 +167,7 @@ bool OTableWindowListBox::PreNotify(NotifyEvent& rNEvt) return true; } -IMPL_LINK_NOARG_TYPED( OTableWindowListBox, ScrollUpHdl, Timer*, void ) +IMPL_LINK_NOARG( OTableWindowListBox, ScrollUpHdl, Timer*, void ) { SvTreeListEntry* pEntry = GetEntry( m_aMousePos ); if( !pEntry ) @@ -181,7 +181,7 @@ IMPL_LINK_NOARG_TYPED( OTableWindowListBox, ScrollUpHdl, Timer*, void ) } } -IMPL_LINK_NOARG_TYPED( OTableWindowListBox, ScrollDownHdl, Timer*, void ) +IMPL_LINK_NOARG( OTableWindowListBox, ScrollDownHdl, Timer*, void ) { SvTreeListEntry* pEntry = GetEntry( m_aMousePos ); if( !pEntry ) @@ -275,13 +275,13 @@ sal_Int8 OTableWindowListBox::AcceptDrop( const AcceptDropEvent& _rEvt ) return nDND_Action; } -IMPL_LINK_NOARG_TYPED( OTableWindowListBox, LookForUiHdl, void*, void ) +IMPL_LINK_NOARG( OTableWindowListBox, LookForUiHdl, void*, void ) { m_nUiEvent = nullptr; m_pTabWin->getTableView()->lookForUiActivities(); } -IMPL_LINK_NOARG_TYPED( OTableWindowListBox, DropHdl, void*, void ) +IMPL_LINK_NOARG( OTableWindowListBox, DropHdl, void*, void ) { // create the connection m_nDropEvent = nullptr; @@ -342,7 +342,7 @@ void OTableWindowListBox::GetFocus() SvTreeListBox::GetFocus(); } -IMPL_LINK_NOARG_TYPED( OTableWindowListBox, OnDoubleClick, SvTreeListBox *, bool ) +IMPL_LINK_NOARG( OTableWindowListBox, OnDoubleClick, SvTreeListBox *, bool ) { // tell my parent vcl::Window* pParent = Window::GetParent(); diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx index 686963571c27..f78cd420e7ba 100644 --- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx +++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx @@ -133,7 +133,7 @@ namespace dbaui if(m_pViewSwitch) m_pViewSwitch->GrabFocus(); } - IMPL_LINK_NOARG_TYPED( OQueryContainerWindow, SplitHdl, Splitter*, void ) + IMPL_LINK_NOARG( OQueryContainerWindow, SplitHdl, Splitter*, void ) { m_pSplitter->SetPosPixel( Point( m_pSplitter->GetPosPixel().X(),m_pSplitter->GetSplitPosPixel() ) ); Resize(); diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index abdb2f01449f..499aefb19894 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -1939,7 +1939,7 @@ void OQueryController::setEscapeProcessing_fireEvent( const bool _bEscapeProcess fire( &nHandle, &aNewValue, &aOldValue, 1, false ); } -IMPL_LINK_NOARG_TYPED( OQueryController, OnExecuteAddTable, void*, void ) +IMPL_LINK_NOARG( OQueryController, OnExecuteAddTable, void*, void ) { Execute( ID_BROWSER_ADDTABLE,Sequence<PropertyValue>() ); } diff --git a/dbaccess/source/ui/querydesign/querydlg.cxx b/dbaccess/source/ui/querydesign/querydlg.cxx index f329f0b18743..7710a97be15b 100644 --- a/dbaccess/source/ui/querydesign/querydlg.cxx +++ b/dbaccess/source/ui/querydesign/querydlg.cxx @@ -154,7 +154,7 @@ void DlgQryJoin::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG_TYPED( DlgQryJoin, LBChangeHdl, ListBox&, void ) +IMPL_LINK_NOARG( DlgQryJoin, LBChangeHdl, ListBox&, void ) { if (m_pLB_JoinType->GetSelectEntryPos() == m_pLB_JoinType->GetSavedValue() ) return; @@ -240,7 +240,7 @@ IMPL_LINK_NOARG_TYPED( DlgQryJoin, LBChangeHdl, ListBox&, void ) m_pML_HelpText->SetText( sHelpText ); } -IMPL_LINK_NOARG_TYPED( DlgQryJoin, OKClickHdl, Button*, void ) +IMPL_LINK_NOARG( DlgQryJoin, OKClickHdl, Button*, void ) { m_pConnData->Update(); m_pOrigConnData->CopyFrom( *m_pConnData ); @@ -248,7 +248,7 @@ IMPL_LINK_NOARG_TYPED( DlgQryJoin, OKClickHdl, Button*, void ) EndDialog(RET_OK); } -IMPL_LINK_NOARG_TYPED( DlgQryJoin, NaturalToggleHdl, CheckBox&, void ) +IMPL_LINK_NOARG( DlgQryJoin, NaturalToggleHdl, CheckBox&, void ) { bool bChecked = m_pCBNatural->IsChecked(); static_cast<OQueryTableConnectionData*>(m_pConnData.get())->setNatural(bChecked); diff --git a/dbaccess/source/ui/querydesign/querydlg.hxx b/dbaccess/source/ui/querydesign/querydlg.hxx index 82b318efc164..7b5ddf85f96e 100644 --- a/dbaccess/source/ui/querydesign/querydlg.hxx +++ b/dbaccess/source/ui/querydesign/querydlg.hxx @@ -54,9 +54,9 @@ namespace dbaui css::uno::Reference< css::sdbc::XConnection > m_xConnection; - DECL_LINK_TYPED( OKClickHdl, Button*, void ); - DECL_LINK_TYPED( LBChangeHdl, ListBox&, void ); - DECL_LINK_TYPED( NaturalToggleHdl, CheckBox&, void ); + DECL_LINK( OKClickHdl, Button*, void ); + DECL_LINK( LBChangeHdl, ListBox&, void ); + DECL_LINK( NaturalToggleHdl, CheckBox&, void ); /** setJoinType enables and set the new join type @param _eNewJoinType the new jointype diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx index 67690fb4f2cb..91df369e99b2 100644 --- a/dbaccess/source/ui/relationdesign/RelationController.cxx +++ b/dbaccess/source/ui/relationdesign/RelationController.cxx @@ -465,7 +465,7 @@ void ORelationController::mergeData(const TTableConnectionData& _aConnectionData } } -IMPL_LINK_NOARG_TYPED( ORelationController, OnThreadFinished, void*, void ) +IMPL_LINK_NOARG( ORelationController, OnThreadFinished, void*, void ) { ::SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index 686809058d92..23e0bd942c30 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -92,7 +92,7 @@ void OTableEditorCtrl::ClipboardInvalidator::Stop() m_aInvalidateTimer.Stop(); } -IMPL_LINK_NOARG_TYPED(OTableEditorCtrl::ClipboardInvalidator, OnInvalidate, Timer *, void) +IMPL_LINK_NOARG(OTableEditorCtrl::ClipboardInvalidator, OnInvalidate, Timer *, void) { m_pOwner->GetView()->getController().InvalidateFeature(SID_CUT); m_pOwner->GetView()->getController().InvalidateFeature(SID_COPY); @@ -623,7 +623,7 @@ bool OTableEditorCtrl::CursorMoving(long nNewRow, sal_uInt16 nNewCol) return true; } -IMPL_LINK_NOARG_TYPED( OTableEditorCtrl, InvalidateFieldType, void*, void ) +IMPL_LINK_NOARG( OTableEditorCtrl, InvalidateFieldType, void*, void ) { nInvalidateTypeEvent = nullptr; Invalidate( GetFieldRectPixel(nOldDataPos, FIELD_TYPE) ); @@ -1431,13 +1431,13 @@ void OTableEditorCtrl::Command(const CommandEvent& rEvt) } -IMPL_LINK_NOARG_TYPED( OTableEditorCtrl, DelayedCut, void*, void ) +IMPL_LINK_NOARG( OTableEditorCtrl, DelayedCut, void*, void ) { nCutEvent = nullptr; OTableRowView::cut(); } -IMPL_LINK_NOARG_TYPED( OTableEditorCtrl, DelayedPaste, void*, void ) +IMPL_LINK_NOARG( OTableEditorCtrl, DelayedPaste, void*, void ) { nPasteEvent = nullptr; @@ -1463,13 +1463,13 @@ IMPL_LINK_NOARG_TYPED( OTableEditorCtrl, DelayedPaste, void*, void ) GoToRow( nPastePosition ); } -IMPL_LINK_NOARG_TYPED( OTableEditorCtrl, DelayedDelete, void*, void ) +IMPL_LINK_NOARG( OTableEditorCtrl, DelayedDelete, void*, void ) { nDeleteEvent = nullptr; DeleteRows(); } -IMPL_LINK_NOARG_TYPED( OTableEditorCtrl, DelayedInsNewRows, void*, void ) +IMPL_LINK_NOARG( OTableEditorCtrl, DelayedInsNewRows, void*, void ) { nInsNewRowsEvent = nullptr; sal_Int32 nPastePosition = GetView()->getController().getFirstEmptyRowPosition(); diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx b/dbaccess/source/ui/tabledesign/TEditControl.hxx index 9953a6b3b4e9..19efd28419eb 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.hxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.hxx @@ -78,7 +78,7 @@ namespace dbaui void Stop(); protected: - DECL_LINK_TYPED(OnInvalidate, Timer*, void); + DECL_LINK(OnInvalidate, Timer*, void); }; friend class OTableEditorCtrl::ClipboardInvalidator; @@ -171,11 +171,11 @@ namespace dbaui virtual void paste() override; private: - 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 ); + DECL_LINK( DelayedCut, void*, void ); + DECL_LINK( DelayedPaste, void*, void ); + DECL_LINK( DelayedDelete, void*, void ); + DECL_LINK( DelayedInsNewRows, void*, void ); + DECL_LINK( InvalidateFieldType, void*, void ); void InitCellController(); sal_Int32 HasFieldName( const OUString& rFieldName ); diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx index febe92a3a8df..05b30b82bcf9 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx @@ -105,7 +105,7 @@ void OTableBorderWindow::Resize() Size(nOutputWidth, nOutputHeight-nSplitPos-nSplitterHeight) ); } -IMPL_LINK_TYPED( OTableBorderWindow, SplitHdl, Splitter*, pSplit, void ) +IMPL_LINK( OTableBorderWindow, SplitHdl, Splitter*, pSplit, void ) { if(pSplit == m_aHorzSplitter.get()) { |