diff options
54 files changed, 46 insertions, 388 deletions
diff --git a/avmedia/inc/mediacontrol.hxx b/avmedia/inc/mediacontrol.hxx index 0348d29d1706..9e91b1b0816b 100644 --- a/avmedia/inc/mediacontrol.hxx +++ b/avmedia/inc/mediacontrol.hxx @@ -82,7 +82,6 @@ private: DECL_LINK( implTimeHdl, Slider* ); DECL_LINK( implTimeEndHdl, Slider* ); DECL_LINK( implVolumeHdl, Slider* ); - DECL_STATIC_LINK(MediaControl, implVolumeEndHdl, void *); DECL_LINK_TYPED( implSelectHdl, ToolBox*, void ); DECL_LINK( implZoomSelectHdl, ListBox* ); DECL_LINK_TYPED(implTimeoutHdl, Idle *, void); diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx index a05c54bacd3f..fe8283369e7c 100644 --- a/avmedia/source/framework/mediacontrol.cxx +++ b/avmedia/source/framework/mediacontrol.cxx @@ -156,7 +156,6 @@ MediaControl::MediaControl( vcl::Window* pParent, MediaControlStyle eControlStyl maMinSize.Width() += maMuteToolBox->GetSizePixel().Width(); maVolumeSlider->SetSlideHdl( LINK( this, MediaControl, implVolumeHdl ) ); - maVolumeSlider->SetEndSlideHdl( LINK( this, MediaControl, implVolumeEndHdl ) ); maVolumeSlider->SetRange( Range( AVMEDIA_DB_RANGE, 0 ) ); maVolumeSlider->SetUpdateMode( true ); maVolumeSlider->SetHelpId( HID_AVMEDIA_VOLUMESLIDER ); @@ -479,13 +478,6 @@ IMPL_LINK( MediaControl, implVolumeHdl, Slider*, p ) -IMPL_STATIC_LINK_NOARG(MediaControl, implVolumeEndHdl) -{ - return 0; -} - - - IMPL_LINK_TYPED( MediaControl, implSelectHdl, ToolBox*, p, void ) { if( p ) diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx index 53088a50a9a3..9b9e0b067208 100644 --- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx +++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx @@ -70,7 +70,6 @@ DataEditor::DataEditor(vcl::Window* pParent, m_pTbxData->SetSelectHdl( LINK( this, DataEditor, ToolboxHdl )); m_xBrwData->SetCursorMovedHdl( LINK( this, DataEditor, BrowserCursorMovedHdl )); - m_xBrwData->SetCellModifiedHdl( LINK( this, DataEditor, CellModified )); UpdateData(); GrabFocus(); @@ -180,11 +179,6 @@ IMPL_LINK_NOARG(DataEditor, MiscHdl) return 0L; } -IMPL_STATIC_LINK_NOARG(DataEditor, CellModified) -{ - return 0; -} - void DataEditor::UpdateData() { m_xBrwData->SetDataFromModel( m_xChartDoc, m_xContext ); diff --git a/chart2/source/controller/inc/dlg_DataEditor.hxx b/chart2/source/controller/inc/dlg_DataEditor.hxx index 82d7500881e7..72606abe5e85 100644 --- a/chart2/source/controller/inc/dlg_DataEditor.hxx +++ b/chart2/source/controller/inc/dlg_DataEditor.hxx @@ -79,8 +79,6 @@ private: DECL_LINK( BrowserCursorMovedHdl, void*); /// this is called if MiscOptions change, esp. High-Contrast mode DECL_LINK( MiscHdl, void* ); - /// is called when the contents of the edit cell changes - DECL_STATIC_LINK( DataEditor, CellModified, void* ); /// is called when the width of any column in the edit browsebox has changed DECL_LINK( BrowserColumnResized, void* ); /// is called when the browser view was scrolled, @todo: only call on horizontal scroll diff --git a/compilerplugins/clang/store/constantfunction.cxx b/compilerplugins/clang/store/constantfunction.cxx index 4f367fc709fb..064d97850483 100644 --- a/compilerplugins/clang/store/constantfunction.cxx +++ b/compilerplugins/clang/store/constantfunction.cxx @@ -144,7 +144,7 @@ bool ConstantFunction::VisitFunctionDecl(const FunctionDecl * pFunctionDecl) { return true; } // static with inline body will be optimised at compile-time to a constant anyway - if (pCXXMethodDecl->isStatic() && pCXXMethodDecl->hasInlineBody()) { + if (pCXXMethodDecl->isStatic() && (pCXXMethodDecl->hasInlineBody() || pCXXMethodDecl->isInlineSpecified())) { return true; } // this catches some stuff in templates @@ -412,6 +412,11 @@ bool ConstantFunction::VisitFunctionDecl(const FunctionDecl * pFunctionDecl) { { return true; } + // LINK callback which supplies a return value which means something + if (aFunctionName == "SfxVirtualMenu::Highlight" || aFunctionName == "framework::MenuManager::Highlight" + || aFunctionName == "framework::MenuBarManager::Highlight") { + return true; + } // can't mess with the TYPEINIT macros in include/tools/rtti.hxx or the LINK macros in include/tools/link.hxx std::string aImmediateMacro = ""; diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index 9611af4c268f..604935024c93 100644 --- a/cui/source/inc/chardlg.hxx +++ b/cui/source/inc/chardlg.hxx @@ -299,14 +299,13 @@ private: DECL_LINK( PositionHdl_Impl, RadioButton* ); DECL_LINK( RotationHdl_Impl, RadioButton* ); - DECL_LINK(FontModifyHdl_Impl, void *); + DECL_LINK( FontModifyHdl_Impl, void *); DECL_LINK( AutoPositionHdl_Impl, CheckBox* ); DECL_LINK( FitToLineHdl_Impl, CheckBox* ); - DECL_LINK(KerningSelectHdl_Impl, void *); - DECL_LINK(KerningModifyHdl_Impl, void *); - DECL_STATIC_LINK(SvxCharPositionPage, PairKerningHdl_Impl, void *); + DECL_LINK( KerningSelectHdl_Impl, void *); + DECL_LINK( KerningModifyHdl_Impl, void *); DECL_LINK( LoseFocusHdl_Impl, MetricField* ); - DECL_LINK(ScaleWidthModifyHdl_Impl, void *); + DECL_LINK( ScaleWidthModifyHdl_Impl, void *); public: virtual ~SvxCharPositionPage(); diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index 73ec463d231b..f91b78f0227a 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -148,7 +148,6 @@ class SvxTransparenceTabPage : public SvxTabPage DECL_LINK(ClickTransLinearHdl_Impl, void * ); DECL_LINK(ClickTransGradientHdl_Impl, void * ); DECL_LINK(ModifyTransparentHdl_Impl, void*); - DECL_STATIC_LINK(SvxTransparenceTabPage, ChangeTrgrTypeHdl_Impl, void*); DECL_LINK(ModifiedTrgrHdl_Impl, void*); void ActivateLinear(bool bActivate); diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index ec30ed37a87e..ac6b7c56a8c0 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -2717,7 +2717,6 @@ void SvxCharPositionPage::Initialize() m_pFitToLineCB->SetClickHdl( LINK( this, SvxCharPositionPage, FitToLineHdl_Impl ) ); m_pKerningLB->SetSelectHdl( LINK( this, SvxCharPositionPage, KerningSelectHdl_Impl ) ); m_pKerningMF->SetModifyHdl( LINK( this, SvxCharPositionPage, KerningModifyHdl_Impl ) ); - m_pPairKerningBtn->SetClickHdl( LINK( this, SvxCharPositionPage, PairKerningHdl_Impl ) ); m_pScaleWidthMF->SetModifyHdl( LINK( this, SvxCharPositionPage, ScaleWidthModifyHdl_Impl ) ); } @@ -2905,13 +2904,6 @@ IMPL_LINK_NOARG(SvxCharPositionPage, KerningModifyHdl_Impl) -IMPL_STATIC_LINK_NOARG(SvxCharPositionPage, PairKerningHdl_Impl) -{ - return 0; -} - - - IMPL_LINK( SvxCharPositionPage, LoseFocusHdl_Impl, MetricField*, pField ) { #ifdef DBG_UTIL diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index 441fecb0928b..a46b634f4135 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -202,12 +202,6 @@ void SvxTransparenceTabPage::ActivateGradient(bool bActivate) } } -IMPL_STATIC_LINK_NOARG( - SvxTransparenceTabPage, ChangeTrgrTypeHdl_Impl) -{ - return 0L; -} - void SvxTransparenceTabPage::SetControlState_Impl(css::awt::GradientStyle eXGS) { switch(eXGS) @@ -301,7 +295,6 @@ SvxTransparenceTabPage::SvxTransparenceTabPage(vcl::Window* pParent, const SfxIt // gradient transparency m_pMtrTrgrEndValue->SetValue( 100 ); m_pMtrTrgrStartValue->SetValue( 0 ); - m_pLbTrgrGradientType->SetSelectHdl(LINK(this, SvxTransparenceTabPage, ChangeTrgrTypeHdl_Impl)); Link<> aLink = LINK( this, SvxTransparenceTabPage, ModifiedTrgrHdl_Impl); m_pLbTrgrGradientType->SetSelectHdl( aLink ); m_pMtrTrgrCenterX->SetModifyHdl( aLink ); diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx index 5c6b708270df..ccab1f996963 100644 --- a/desktop/inc/app.hxx +++ b/desktop/inc/app.hxx @@ -152,7 +152,6 @@ class Desktop : public Application void OpenSplashScreen(); void CloseSplashScreen(); - static void EnableOleAutomation(); DECL_STATIC_LINK( Desktop, ImplInitFilterHdl, ConvertData* ); DECL_STATIC_LINK_TYPED( Desktop, AsyncInitFirstRun, Timer*, void ); /** checks if the office is run the first time diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 504275222dd4..5c775ca873c7 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1894,8 +1894,12 @@ IMPL_LINK_NOARG(Desktop, OpenClients_Impl) CloseSplashScreen(); CheckFirstRun( ); - EnableOleAutomation(); - +#ifdef WNT + // Registers a COM class factory of the service manager with the windows operating system. + Reference< XMultiServiceFactory > xSMgr= comphelper::getProcessServiceFactory(); + xSMgr->createInstance("com.sun.star.bridge.OleApplicationRegistration"); + xSMgr->createInstance("com.sun.star.comp.ole.EmbedServer"); +#endif const char *pExitPostStartup = getenv ("OOO_EXIT_POST_STARTUP"); if (pExitPostStartup && *pExitPostStartup) new ExitTimer(); @@ -1914,16 +1918,6 @@ IMPL_STATIC_LINK_NOARG(Desktop, EnableAcceptors_Impl) } -// Registers a COM class factory of the service manager with the windows operating system. -void Desktop::EnableOleAutomation() -{ -#ifdef WNT - Reference< XMultiServiceFactory > xSMgr= comphelper::getProcessServiceFactory(); - xSMgr->createInstance("com.sun.star.bridge.OleApplicationRegistration"); - xSMgr->createInstance("com.sun.star.comp.ole.EmbedServer"); -#endif -} - void Desktop::PreloadModuleData( const CommandLineArgs& rArgs ) { Sequence < com::sun::star::beans::PropertyValue > args(1); diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index 7a7ff0c7a095..6211602d94b7 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -1661,7 +1661,6 @@ ImpPDFTabSigningPage::ImpPDFTabSigningPage(vcl::Window* pParent, const SfxItemSe mpPbSignCertSelect->Enable( true ); mpPbSignCertSelect->SetClickHdl( LINK( this, ImpPDFTabSigningPage, ClickmaPbSignCertSelect ) ); mpPbSignCertClear->SetClickHdl( LINK( this, ImpPDFTabSigningPage, ClickmaPbSignCertClear ) ); - mpLBSignTSA->SetSelectHdl( LINK( this, ImpPDFTabSigningPage, SelectLBSignTSA ) ); } @@ -1737,11 +1736,6 @@ IMPL_LINK_NOARG( ImpPDFTabSigningPage, ClickmaPbSignCertClear ) } -IMPL_STATIC_LINK_NOARG( ImpPDFTabSigningPage, SelectLBSignTSA ) -{ - return 0; -} - VclPtr<SfxTabPage> ImpPDFTabSigningPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx index e82872176ef2..ffc8acc10b9d 100644 --- a/filter/source/pdf/impdialog.hxx +++ b/filter/source/pdf/impdialog.hxx @@ -432,7 +432,6 @@ class ImpPDFTabSigningPage : public SfxTabPage DECL_LINK( ClickmaPbSignCertSelect, void* ); DECL_LINK( ClickmaPbSignCertClear, void* ); - DECL_STATIC_LINK( ImpPDFTabSigningPage, SelectLBSignTSA, void* ); public: ImpPDFTabSigningPage( vcl::Window* pParent, diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.cxx b/filter/source/xsltdialog/xmlfiltertabdialog.cxx index 21948e9eb37c..9309ef173b1b 100644 --- a/filter/source/xsltdialog/xmlfiltertabdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltertabdialog.cxx @@ -54,7 +54,6 @@ XMLFilterTabDialog::XMLFilterTabDialog(vcl::Window *pParent, ResMgr& rResMgr, m_pOKBtn->SetClickHdl( LINK( this, XMLFilterTabDialog, OkHdl ) ); m_pTabCtrl->SetActivatePageHdl( LINK( this, XMLFilterTabDialog, ActivatePageHdl ) ); - m_pTabCtrl->SetDeactivatePageHdl( LINK( this, XMLFilterTabDialog, DeactivatePageHdl ) ); mpBasicPage = VclPtr<XMLFilterTabPageBasic>::Create(m_pTabCtrl); mpBasicPage->SetInfo( mpNewInfo ); @@ -306,9 +305,4 @@ IMPL_STATIC_LINK( -IMPL_STATIC_LINK_NOARG_TYPED( XMLFilterTabDialog, DeactivatePageHdl, TabControl *, bool ) -{ - return true; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.hxx b/filter/source/xsltdialog/xmlfiltertabdialog.hxx index 47a2e6712517..a3501e1ceac0 100644 --- a/filter/source/xsltdialog/xmlfiltertabdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltertabdialog.hxx @@ -46,7 +46,6 @@ private: com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxContext; DECL_STATIC_LINK( XMLFilterTabDialog, ActivatePageHdl, TabControl * ); - DECL_STATIC_LINK_TYPED( XMLFilterTabDialog, DeactivatePageHdl, TabControl *, bool ); DECL_LINK(OkHdl, void *); ResMgr& mrResMgr; diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx index 2fe1b25df5b1..6209f572855a 100644 --- a/framework/inc/services/layoutmanager.hxx +++ b/framework/inc/services/layoutmanager.hxx @@ -256,7 +256,6 @@ namespace framework void implts_notifyListeners(short nEvent, const css::uno::Any& rInfoParam); DECL_LINK( OptionsChanged, void* ); - DECL_STATIC_LINK( LayoutManager, SettingsChanged, void* ); // OPropertySetHelper diff --git a/framework/inc/uielement/addonstoolbarmanager.hxx b/framework/inc/uielement/addonstoolbarmanager.hxx index f01093fa02e8..ec5f69856b83 100644 --- a/framework/inc/uielement/addonstoolbarmanager.hxx +++ b/framework/inc/uielement/addonstoolbarmanager.hxx @@ -60,12 +60,9 @@ class AddonsToolBarManager : public ToolBarManager protected: DECL_LINK_TYPED(Click, ToolBox *, void); DECL_LINK_TYPED(DoubleClick, ToolBox *, void); - DECL_LINK_TYPED(Command, CommandEvent const *, void); DECL_LINK_TYPED(Select, ToolBox *, void); - DECL_LINK_TYPED(Activate, ToolBox *, void); - DECL_LINK_TYPED(Deactivate, ToolBox *, void); - DECL_LINK_TYPED( StateChanged, StateChangedType const *, void ); - DECL_LINK_TYPED( DataChanged, DataChangedEvent const *, void ); + DECL_LINK_TYPED(StateChanged, StateChangedType const *, void ); + DECL_LINK_TYPED(DataChanged, DataChangedEvent const *, void ); virtual bool MenuItemAllowed( sal_uInt16 ) const SAL_OVERRIDE; }; diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx index 78fb5a03f0c6..9fc9803ad897 100644 --- a/framework/inc/uielement/toolbarmanager.hxx +++ b/framework/inc/uielement/toolbarmanager.hxx @@ -132,8 +132,6 @@ class ToolBarManager : public ToolbarManager_Base DECL_LINK_TYPED(DropdownClick, ToolBox *, void); DECL_LINK_TYPED(DoubleClick, ToolBox *, void); DECL_LINK_TYPED(Select, ToolBox *, void); - DECL_LINK_TYPED(Activate, ToolBox *, void); - DECL_LINK_TYPED(Deactivate, ToolBox *, void); DECL_LINK_TYPED( StateChanged, StateChangedType const *, void ); DECL_LINK_TYPED( DataChanged, DataChangedEvent const *, void ); DECL_LINK( MiscOptionsChanged, void* ); diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index 9f0b811f6668..cd6932451f11 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -146,8 +146,6 @@ LayoutManager::LayoutManager( const Reference< XComponentContext >& xContext ) : m_xToolbarManager = uno::Reference< ui::XUIConfigurationListener >( static_cast< OWeakObject* >( m_pToolbarManager ), uno::UNO_QUERY ); } - Application::AddEventListener( LINK( this, LayoutManager, SettingsChanged ) ); - m_aAsyncLayoutTimer.SetTimeout( 50 ); m_aAsyncLayoutTimer.SetTimeoutHdl( LINK( this, LayoutManager, AsyncLayoutHdl ) ); @@ -161,7 +159,6 @@ LayoutManager::LayoutManager( const Reference< XComponentContext >& xContext ) : LayoutManager::~LayoutManager() { - Application::RemoveEventListener( LINK( this, LayoutManager, SettingsChanged ) ); m_aAsyncLayoutTimer.Stop(); setDockingAreaAcceptor(NULL); delete m_pGlobalSettings; @@ -2620,11 +2617,6 @@ IMPL_LINK_NOARG(LayoutManager, MenuBarClose) return 0; } -IMPL_STATIC_LINK_NOARG(LayoutManager, SettingsChanged) -{ - return 1; -} - // XLayoutManagerEventBroadcaster void SAL_CALL LayoutManager::addLayoutManagerEventListener( const uno::Reference< frame::XLayoutManagerListener >& xListener ) @@ -2819,7 +2811,6 @@ throw( RuntimeException, std::exception ) if ( rEvent.Source == Reference< XInterface >( m_xFrame, UNO_QUERY )) { // Our frame gets disposed, release all our references that depends on a working frame reference. - Application::RemoveEventListener( LINK( this, LayoutManager, SettingsChanged ) ); setDockingAreaAcceptor( Reference< ui::XDockingAreaAcceptor >() ); diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx index f89563055c2d..1e5fbf9f4d89 100644 --- a/framework/source/uielement/addonstoolbarmanager.cxx +++ b/framework/source/uielement/addonstoolbarmanager.cxx @@ -82,8 +82,6 @@ AddonsToolBarManager::AddonsToolBarManager( const Reference< XComponentContext > { m_pToolBar->SetMenuType( TOOLBOX_MENUTYPE_CLIPPEDITEMS ); m_pToolBar->SetSelectHdl( LINK( this, AddonsToolBarManager, Select) ); - m_pToolBar->SetActivateHdl( LINK( this, AddonsToolBarManager, Activate) ); - m_pToolBar->SetDeactivateHdl( LINK( this, AddonsToolBarManager, Deactivate) ); m_pToolBar->SetClickHdl( LINK( this, AddonsToolBarManager, Click ) ); m_pToolBar->SetDoubleClickHdl( LINK( this, AddonsToolBarManager, DoubleClick ) ); m_pToolBar->SetCommandHdl( LINK( this, AddonsToolBarManager, Command ) ); @@ -413,9 +411,6 @@ IMPL_LINK_NOARG_TYPED(AddonsToolBarManager, DoubleClick, ToolBox *, void) } } -IMPL_LINK_NOARG_TYPED(AddonsToolBarManager, Command, CommandEvent const *, void) -{} - IMPL_LINK_NOARG_TYPED(AddonsToolBarManager, Select, ToolBox *, void) { if ( m_bDisposed ) @@ -433,12 +428,6 @@ IMPL_LINK_NOARG_TYPED(AddonsToolBarManager, Select, ToolBox *, void) } } -IMPL_LINK_NOARG_TYPED(AddonsToolBarManager, Activate, ToolBox *, void) -{} - -IMPL_LINK_NOARG_TYPED(AddonsToolBarManager, Deactivate, ToolBox *, void) -{} - IMPL_LINK_TYPED( AddonsToolBarManager, StateChanged, StateChangedType const *, pStateChangedType, void ) { if ( *pStateChangedType == StateChangedType::ControlBackground ) diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index a0492af406c4..ee1fe47c8927 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -207,8 +207,6 @@ ToolBarManager::ToolBarManager( const Reference< XComponentContext >& rxContext, m_xURLTransformer = URLTransformer::create( m_xContext ); m_pToolBar->SetSelectHdl( LINK( this, ToolBarManager, Select) ); - m_pToolBar->SetActivateHdl( LINK( this, ToolBarManager, Activate) ); - m_pToolBar->SetDeactivateHdl( LINK( this, ToolBarManager, Deactivate) ); m_pToolBar->SetClickHdl( LINK( this, ToolBarManager, Click ) ); m_pToolBar->SetDropdownClickHdl( LINK( this, ToolBarManager, DropdownClick ) ); m_pToolBar->SetDoubleClickHdl( LINK( this, ToolBarManager, DoubleClick ) ); @@ -2024,12 +2022,6 @@ IMPL_LINK_NOARG_TYPED(ToolBarManager, Select, ToolBox *, void) } } -IMPL_LINK_NOARG_TYPED(ToolBarManager, Activate, ToolBox *, void) -{} - -IMPL_LINK_NOARG_TYPED(ToolBarManager, Deactivate, ToolBox *, void) -{} - IMPL_LINK_TYPED( ToolBarManager, StateChanged, StateChangedType const *, pStateChangedType, void ) { if ( m_bDisposed ) diff --git a/include/sfx2/sidebar/SidebarToolBox.hxx b/include/sfx2/sidebar/SidebarToolBox.hxx index 21a9a7f9d47e..a3959698278e 100644 --- a/include/sfx2/sidebar/SidebarToolBox.hxx +++ b/include/sfx2/sidebar/SidebarToolBox.hxx @@ -80,8 +80,6 @@ private: DECL_LINK_TYPED(ClickHandler, ToolBox*, void); DECL_LINK_TYPED(DoubleClickHandler, ToolBox*, void); DECL_LINK_TYPED(SelectHandler, ToolBox*, void); - DECL_STATIC_LINK_TYPED(SidebarToolBox, ActivateToolBox, ToolBox*, void); - DECL_STATIC_LINK_TYPED(SidebarToolBox, DeactivateToolBox, ToolBox*, void); void CreateController(const sal_uInt16 nItemId, const css::uno::Reference<css::frame::XFrame>& rxFrame, diff --git a/include/svx/float3d.hxx b/include/svx/float3d.hxx index 1a7a5f509af5..778327099501 100644 --- a/include/svx/float3d.hxx +++ b/include/svx/float3d.hxx @@ -198,7 +198,6 @@ private: DECL_LINK( ModifyHdl, void * ); void ClickLight(PushButton &rBtn); - DECL_STATIC_LINK( Svx3DWin, ChangeLightCallbackHdl, void * ); DECL_LINK( ChangeSelectionCallbackHdl, void * ); SVX_DLLPRIVATE void Construct(); diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index ff786a5fce33..f272491c3b87 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -116,11 +116,8 @@ public: virtual ~OFieldExpressionControl(); virtual void dispose() SAL_OVERRIDE; - // XEventListener - static void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XContainerListener void SAL_CALL elementInserted(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception); - static void SAL_CALL elementReplaced(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception); void SAL_CALL elementRemoved(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception); virtual Size GetOptimalSize() const SAL_OVERRIDE; @@ -182,14 +179,14 @@ public: }; -void OFieldExpressionControlContainerListener::disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException, std::exception ) -{ OFieldExpressionControl::disposing(Source); } +void OFieldExpressionControlContainerListener::disposing(const ::com::sun::star::lang::EventObject& ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) +{} void OFieldExpressionControlContainerListener::elementInserted(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception) { mpParent->elementInserted(rEvent); } -void OFieldExpressionControlContainerListener::elementReplaced(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception) -{ OFieldExpressionControl::elementReplaced(rEvent); } +void OFieldExpressionControlContainerListener::elementReplaced(const ::com::sun::star::container::ContainerEvent& ) throw(::com::sun::star::uno::RuntimeException, std::exception) +{} void OFieldExpressionControlContainerListener::elementRemoved(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception) { mpParent->elementRemoved(rEvent); } @@ -623,11 +620,6 @@ EditBrowseBox::RowStatus OFieldExpressionControl::GetRowStatus(long nRow) const } return EditBrowseBox::CLEAN; } -// XEventListener - -void SAL_CALL OFieldExpressionControl::disposing(const lang::EventObject& /*e*/) throw( uno::RuntimeException, std::exception ) -{ -} // XContainerListener @@ -671,10 +663,6 @@ void SAL_CALL OFieldExpressionControl::elementInserted(const container::Containe } } -void SAL_CALL OFieldExpressionControl::elementReplaced(const container::ContainerEvent& /*evt*/) throw(uno::RuntimeException, std::exception) -{ -} - void SAL_CALL OFieldExpressionControl::elementRemoved(const container::ContainerEvent& evt) throw(uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx index 9af6eef3765d..369066b6dd1d 100644 --- a/sc/inc/externalrefmgr.hxx +++ b/sc/inc/externalrefmgr.hxx @@ -78,8 +78,6 @@ private: ScExternalRefLink() SAL_DELETED_FUNCTION; ScExternalRefLink(const ScExternalRefLink&) SAL_DELETED_FUNCTION; - DECL_STATIC_LINK( ScExternalRefLink, ExternalRefEndEditHdl, void* ); - sal_uInt16 mnFileId; OUString maFilterName; ScDocument* mpDoc; diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx index 9f4d30277f3c..4027ff79448e 100644 --- a/sc/source/ui/condformat/condformatdlg.cxx +++ b/sc/source/ui/condformat/condformatdlg.cxx @@ -463,7 +463,6 @@ ScCondFormatDlg::ScCondFormatDlg(SfxBindings* pB, SfxChildWindow* pCW, mpBtnCancel->SetClickHdl( LINK(this, ScCondFormatDlg, BtnPressedHdl ) ); mpEdRange->SetModifyHdl( LINK( this, ScCondFormatDlg, EdRangeModifyHdl ) ); mpEdRange->SetGetFocusHdl( LINK( this, ScCondFormatDlg, RangeGetFocusHdl ) ); - mpEdRange->SetLoseFocusHdl( LINK( this, ScCondFormatDlg, RangeLoseFocusHdl ) ); mpEdRange->SetText(aRangeString); } @@ -776,12 +775,6 @@ IMPL_LINK( ScCondFormatDlg, RangeGetFocusHdl, formula::RefEdit*, pEdit ) return 0; } -IMPL_STATIC_LINK_NOARG( ScCondFormatDlg, RangeLoseFocusHdl ) -{ - //mpLastEdit = NULL; - return 0; -} - // ------------------------------------------------------ // Conditional Format Dialog button click event handler. // diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index 069aed3e0e39..8c4ddb196c46 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -265,8 +265,6 @@ void ScConditionFrmtEntry::Init(ScCondFormatDlg* pDialogParent) { maEdVal1->SetGetFocusHdl( LINK( pDialogParent, ScCondFormatDlg, RangeGetFocusHdl ) ); maEdVal2->SetGetFocusHdl( LINK( pDialogParent, ScCondFormatDlg, RangeGetFocusHdl ) ); - maEdVal1->SetLoseFocusHdl( LINK( pDialogParent, ScCondFormatDlg, RangeLoseFocusHdl ) ); - maEdVal2->SetLoseFocusHdl( LINK( pDialogParent, ScCondFormatDlg, RangeLoseFocusHdl ) ); maEdVal1->SetStyle( maEdVal1->GetStyle() | WB_FORCECTRLBACKGROUND ); maEdVal2->SetStyle( maEdVal2->GetStyle() | WB_FORCECTRLBACKGROUND ); @@ -598,7 +596,6 @@ void ScFormulaFrmtEntry::dispose() void ScFormulaFrmtEntry::Init(ScCondFormatDlg* pDialogParent) { maEdFormula->SetGetFocusHdl( LINK( pDialogParent, ScCondFormatDlg, RangeGetFocusHdl ) ); - maEdFormula->SetLoseFocusHdl( LINK( pDialogParent, ScCondFormatDlg, RangeLoseFocusHdl ) ); FillStyleListBox( mpDoc, *maLbStyle.get() ); maLbStyle->SetSelectHdl( LINK( this, ScFormulaFrmtEntry, StyleSelectHdl ) ); diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index 36dc18d2142e..be0f447af37e 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -1329,7 +1329,7 @@ void ScExternalRefLink::Closed() void ScExternalRefLink::Edit(vcl::Window* pParent, const Link<>& /*rEndEditHdl*/) { - SvBaseLink::Edit(pParent, LINK(this, ScExternalRefLink, ExternalRefEndEditHdl)); + SvBaseLink::Edit(pParent, Link<>()); } void ScExternalRefLink::SetDoReferesh(bool b) @@ -1337,11 +1337,6 @@ void ScExternalRefLink::SetDoReferesh(bool b) mbDoRefresh = b; } -IMPL_STATIC_LINK_NOARG(ScExternalRefLink, ExternalRefEndEditHdl) -{ - return 0; -} - static FormulaToken* convertToToken( ScDocument* pHostDoc, ScDocument* pSrcDoc, ScRefCellValue& rCell ) { if (rCell.hasEmptyValue()) diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx index f85567083fda..da61f5a9da84 100644 --- a/sc/source/ui/inc/acredlin.hxx +++ b/sc/source/ui/inc/acredlin.hxx @@ -139,7 +139,6 @@ private: DECL_LINK( FilterHandle, SvxTPFilter* ); DECL_LINK( RefHandle, void* ); - DECL_STATIC_LINK( ScAcceptChgDlg, FilterModified, void* ); DECL_LINK( RejectHandle, SvxTPView*); DECL_LINK( AcceptHandle, SvxTPView*); DECL_LINK( RejectAllHandle, void*); diff --git a/sc/source/ui/inc/condformatdlg.hxx b/sc/source/ui/inc/condformatdlg.hxx index 5d8391c0cd17..1438510b8fcb 100644 --- a/sc/source/ui/inc/condformatdlg.hxx +++ b/sc/source/ui/inc/condformatdlg.hxx @@ -146,7 +146,6 @@ public: DECL_LINK( BtnPressedHdl, Button* ); DECL_LINK( RangeGetFocusHdl, formula::RefEdit* ); - DECL_STATIC_LINK( ScCondFormatDlg, RangeLoseFocusHdl, void* ); }; #endif diff --git a/sc/source/ui/inc/opredlin.hxx b/sc/source/ui/inc/opredlin.hxx index 477422f6203e..6f3fae1051d1 100644 --- a/sc/source/ui/inc/opredlin.hxx +++ b/sc/source/ui/inc/opredlin.hxx @@ -40,8 +40,7 @@ class ScRedlineOptionsTabPage : public SfxTabPage VclPtr<ColorListBox> m_pRemoveColorLB; VclPtr<ColorListBox> m_pInsertColorLB; VclPtr<ColorListBox> m_pMoveColorLB; - OUString aAuthorStr; - DECL_STATIC_LINK(ScRedlineOptionsTabPage, ColorHdl, void *); + OUString aAuthorStr; public: diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx index 43124921d407..ceb73ce51289 100644 --- a/sc/source/ui/miscdlgs/acredlin.cxx +++ b/sc/source/ui/miscdlgs/acredlin.cxx @@ -125,7 +125,6 @@ ScAcceptChgDlg::ScAcceptChgDlg(SfxBindings* pB, SfxChildWindow* pCW, vcl::Window pTPFilter->SetReadyHdl(LINK( this, ScAcceptChgDlg, FilterHandle )); pTPFilter->SetRefHdl(LINK( this, ScAcceptChgDlg, RefHandle )); - pTPFilter->SetModifyHdl(LINK( this, ScAcceptChgDlg, FilterModified)); pTPFilter->HideRange(false); pTPView->InsertCalcHeader(); pTPView->SetRejectClickHdl( LINK( this, ScAcceptChgDlg,RejectHandle)); @@ -1864,11 +1863,6 @@ void ScAcceptChgDlg::InitFilter() } } -IMPL_STATIC_LINK_NOARG(ScAcceptChgDlg, FilterModified) -{ - return 0; -} - #define CALC_DATE 3 #define CALC_POS 1 diff --git a/sc/source/ui/optdlg/opredlin.cxx b/sc/source/ui/optdlg/opredlin.cxx index a64726346311..360836ea0cda 100644 --- a/sc/source/ui/optdlg/opredlin.cxx +++ b/sc/source/ui/optdlg/opredlin.cxx @@ -47,12 +47,6 @@ ScRedlineOptionsTabPage::ScRedlineOptionsTabPage( vcl::Window* pParent, get(m_pRemoveColorLB, "deletions"); get(m_pInsertColorLB, "entries"); get(m_pMoveColorLB, "insertions"); - - Link<> aLk = LINK(this, ScRedlineOptionsTabPage, ColorHdl); - m_pContentColorLB->SetSelectHdl( aLk ); - m_pMoveColorLB->SetSelectHdl( aLk ); - m_pInsertColorLB->SetSelectHdl( aLk ); - m_pRemoveColorLB->SetSelectHdl( aLk ); } ScRedlineOptionsTabPage::~ScRedlineOptionsTabPage() @@ -194,9 +188,4 @@ void ScRedlineOptionsTabPage::Reset( const SfxItemSet* /* rSet */ ) } -IMPL_STATIC_LINK_NOARG(ScRedlineOptionsTabPage, ColorHdl) -{ - return 0; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index bcad03da6ab8..da40225e5eb8 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -361,7 +361,6 @@ void AnnotationWindow::InitControls() Engine()->ClearModifyFlag(); Engine()->GetUndoManager().Clear(); Engine()->EnableUndo( true ); - Engine()->SetModifyHdl( LINK( this, AnnotationWindow, ModifyHdl ) ); Invalidate(); @@ -486,7 +485,6 @@ void AnnotationWindow::SetLanguage(const SvxLanguageItem &aNewItem) getView()->SetAttribs( aEditAttr ); getView()->SetSelection(aOld); - Engine()->SetModifyHdl( LINK( this, AnnotationWindow, ModifyHdl ) ); Invalidate(); } @@ -513,11 +511,6 @@ IMPL_LINK(AnnotationWindow, ScrollHdl, ScrollBar*, pScroll) return 0; } -IMPL_STATIC_LINK_NOARG(AnnotationWindow, ModifyHdl) -{ - return 0; -} - SvxLanguageItem AnnotationWindow::GetLanguage() { return SvxLanguageItem( Doc()->GetLanguage( EE_CHAR_LANGUAGE ), SID_ATTR_LANGUAGE ); @@ -553,7 +546,6 @@ void AnnotationWindow::setAnnotation( const Reference< XAnnotation >& xAnnotatio Engine()->SetText( *pOPO.get() ); } - Engine()->SetModifyHdl( LINK( this, AnnotationWindow, ModifyHdl ) ); Engine()->ClearModifyFlag(); Engine()->GetUndoManager().Clear(); diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx index 4eb3525af5c9..2981dc632818 100644 --- a/sd/source/ui/annotations/annotationwindow.hxx +++ b/sd/source/ui/annotations/annotationwindow.hxx @@ -97,7 +97,6 @@ class AnnotationWindow : public FloatingWindow protected: void SetSizePixel( const Size& rNewSize ) SAL_OVERRIDE; - DECL_STATIC_LINK(AnnotationWindow, ModifyHdl, void*); DECL_LINK(ScrollHdl, ScrollBar*); public: diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx index 3bd44379df63..6cd66862d7d3 100644 --- a/sd/source/ui/dlg/headerfooterdlg.cxx +++ b/sd/source/ui/dlg/headerfooterdlg.cxx @@ -223,7 +223,6 @@ HeaderFooterDialog::HeaderFooterDialog( ViewShell* pViewShell, vcl::Window* pPar ActivatePageHdl( mpTabCtrl ); mpTabCtrl->SetActivatePageHdl( LINK( this, HeaderFooterDialog, ActivatePageHdl ) ); - mpTabCtrl->SetDeactivatePageHdl( LINK( this, HeaderFooterDialog, DeactivatePageHdl ) ); maPBApplyToAll->SetClickHdl( LINK( this, HeaderFooterDialog, ClickApplyToAllHdl ) ); maPBApply->SetClickHdl( LINK( this, HeaderFooterDialog, ClickApplyHdl ) ); @@ -267,11 +266,6 @@ IMPL_LINK( HeaderFooterDialog, ActivatePageHdl, TabControl *, pTabCtrl ) return 0; } -IMPL_STATIC_LINK_NOARG_TYPED(HeaderFooterDialog, DeactivatePageHdl, TabControl *, bool) -{ - return true; -} - IMPL_LINK_NOARG(HeaderFooterDialog, ClickApplyToAllHdl) { ApplyToAll(); diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index 016f9a10720f..ae200c609e1e 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -90,7 +90,6 @@ SdNavigatorWin::SdNavigatorWin( Size aTbxSize( maToolbox->CalcWindowSizePixel() ); maToolbox->SetOutputSizePixel( aTbxSize ); maToolbox->SetSelectHdl( LINK( this, SdNavigatorWin, SelectToolboxHdl ) ); - maToolbox->SetClickHdl( LINK( this, SdNavigatorWin, ClickToolboxHdl ) ); maToolbox->SetDropdownClickHdl( LINK(this, SdNavigatorWin, DropdownClickToolBoxHdl) ); maToolbox->SetItemBits( TBI_DRAGTYPE, maToolbox->GetItemBits( TBI_DRAGTYPE ) | ToolBoxItemBits::DROPDOWNONLY ); @@ -313,10 +312,6 @@ IMPL_LINK_NOARG_TYPED(SdNavigatorWin, SelectToolboxHdl, ToolBox *, void) } } -IMPL_STATIC_LINK_NOARG_TYPED( - SdNavigatorWin, ClickToolboxHdl, ToolBox *, void) -{} - IMPL_LINK_TYPED( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox, void ) { sal_uInt16 nId = maToolbox->GetCurItemId(); diff --git a/sd/source/ui/inc/headerfooterdlg.hxx b/sd/source/ui/inc/headerfooterdlg.hxx index 64165760a9e3..a9c34b484577 100644 --- a/sd/source/ui/inc/headerfooterdlg.hxx +++ b/sd/source/ui/inc/headerfooterdlg.hxx @@ -38,8 +38,6 @@ class HeaderFooterDialog : public TabDialog { private: DECL_LINK( ActivatePageHdl, TabControl * ); - DECL_STATIC_LINK_TYPED( HeaderFooterDialog, DeactivatePageHdl, TabControl *, bool ); - DECL_LINK( ClickApplyToAllHdl, void * ); DECL_LINK( ClickApplyHdl, void * ); DECL_LINK( ClickCancelHdl, void * ); diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx index e16e21e3aa9f..493cebcda495 100644 --- a/sd/source/ui/inc/navigatr.hxx +++ b/sd/source/ui/inc/navigatr.hxx @@ -146,7 +146,6 @@ private: DECL_LINK( GetFocusObjectsHdl, void * ); DECL_LINK_TYPED( SelectToolboxHdl, ToolBox *, void ); - DECL_STATIC_LINK_TYPED(SdNavigatorWin, ClickToolboxHdl, ToolBox *, void); DECL_LINK_TYPED( DropdownClickToolBoxHdl, ToolBox *, void ); DECL_LINK( ClickPageHdl, void * ); DECL_LINK( ClickObjectHdl, void * ); diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx b/sfx2/source/sidebar/SidebarToolBox.cxx index 46297a31501e..18ae5db91a76 100644 --- a/sfx2/source/sidebar/SidebarToolBox.cxx +++ b/sfx2/source/sidebar/SidebarToolBox.cxx @@ -214,8 +214,6 @@ void SidebarToolBox::RegisterHandlers() SetClickHdl(LINK(this, SidebarToolBox, ClickHandler)); SetDoubleClickHdl(LINK(this, SidebarToolBox, DoubleClickHandler)); SetSelectHdl(LINK(this, SidebarToolBox, SelectHandler)); - SetActivateHdl(LINK(this, SidebarToolBox, ActivateToolBox)); - SetDeactivateHdl(LINK(this, SidebarToolBox, DeactivateToolBox)); } } @@ -263,14 +261,6 @@ IMPL_LINK_TYPED(SidebarToolBox, SelectHandler, ToolBox*, pToolBox, void) xController->execute((sal_Int16)pToolBox->GetModifier()); } -IMPL_STATIC_LINK_NOARG_TYPED( - SidebarToolBox, ActivateToolBox, ToolBox*, void) -{} - -IMPL_STATIC_LINK_NOARG_TYPED( - SidebarToolBox, DeactivateToolBox, ToolBox*, void) -{} - } } // end of namespace sfx2::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx index 0980f0c0f6c6..6161d61f0ca0 100644 --- a/svtools/source/contnr/imivctl.hxx +++ b/svtools/source/contnr/imivctl.hxx @@ -228,7 +228,6 @@ class SvxIconChoiceCtrl_Impl DECL_LINK( ScrollLeftRightHdl, ScrollBar * ); DECL_LINK_TYPED(EditTimeoutHdl, Idle *, void); DECL_LINK( UserEventHdl, void* ); - DECL_STATIC_LINK( SvxIconChoiceCtrl_Impl, EndScrollHdl, void* ); DECL_LINK_TYPED( AutoArrangeHdl, Idle*, void ); DECL_LINK_TYPED( DocRectChangedHdl, Idle*, void ); DECL_LINK_TYPED( VisRectChangedHdl, Idle*, void ); diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx index 5459f49ca873..44e3096b2ab2 100644 --- a/svtools/source/contnr/imivctl1.cxx +++ b/svtools/source/contnr/imivctl1.cxx @@ -130,9 +130,6 @@ SvxIconChoiceCtrl_Impl::SvxIconChoiceCtrl_Impl( aVerSBar->SetScrollHdl( LINK( this, SvxIconChoiceCtrl_Impl, ScrollUpDownHdl ) ); aHorSBar->SetScrollHdl( LINK( this, SvxIconChoiceCtrl_Impl, ScrollLeftRightHdl ) ); - Link<> aEndScrollHdl( LINK( this, SvxIconChoiceCtrl_Impl, EndScrollHdl ) ); - aVerSBar->SetEndScrollHdl( aEndScrollHdl ); - aHorSBar->SetEndScrollHdl( aEndScrollHdl ); nHorSBarHeight = aHorSBar->GetSizePixel().Height(); nVerSBarWidth = aVerSBar->GetSizePixel().Width(); @@ -253,11 +250,6 @@ IMPL_LINK( SvxIconChoiceCtrl_Impl, ScrollLeftRightHdl, ScrollBar*, pScrollBar ) return 0; } -IMPL_STATIC_LINK_NOARG(SvxIconChoiceCtrl_Impl, EndScrollHdl) -{ - return 0; -} - void SvxIconChoiceCtrl_Impl::FontModified() { StopEditTimer(); diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index 356bf4c39381..0e539ac85a3a 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -297,8 +297,6 @@ Svx3DWin::Svx3DWin(SfxBindings* pInBindings, SfxChildWindow *pCW, vcl::Window* p m_pMtrSlant->SetModifyHdl( aLink ); // Preview callback - aLink = LINK( this, Svx3DWin, ChangeLightCallbackHdl ); - m_pCtlLightPreview->SetUserInteractiveChangeCallback(aLink); aLink = LINK( this, Svx3DWin, ChangeSelectionCallbackHdl ); m_pCtlLightPreview->SetUserSelectionChangeCallback(aLink); @@ -2641,14 +2639,6 @@ void Svx3DWin::ClickLight(PushButton& rBtn) -IMPL_STATIC_LINK_NOARG(Svx3DWin, ChangeLightCallbackHdl) -{ - return 0L; -} - - - - IMPL_LINK_NOARG(Svx3DWin, ChangeSelectionCallbackHdl) { const sal_uInt32 nLight(m_pCtlLightPreview->GetSvx3DLightControl().GetSelectedLight()); diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index b2bc81e08cbd..42760d17958f 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -1549,8 +1549,6 @@ SwInsertSectionTabPage::SwInsertSectionTabPage( m_pPasswdCB->SetClickHdl ( LINK( this, SwInsertSectionTabPage, ChangePasswdHdl)); m_pPasswdPB->SetClickHdl ( LINK( this, SwInsertSectionTabPage, ChangePasswdHdl)); m_pHideCB->SetClickHdl ( LINK( this, SwInsertSectionTabPage, ChangeHideHdl)); - // edit in readonly sections - m_pEditInReadonlyCB->SetClickHdl ( LINK( this, SwInsertSectionTabPage, ChangeEditInReadonlyHdl)); m_pFileCB->SetClickHdl ( LINK( this, SwInsertSectionTabPage, UseFileHdl )); m_pFilePB->SetClickHdl ( LINK( this, SwInsertSectionTabPage, FileSearchHdl )); m_pCurName->SetModifyHdl ( LINK( this, SwInsertSectionTabPage, NameEditHdl)); @@ -1700,12 +1698,6 @@ IMPL_LINK( SwInsertSectionTabPage, ChangeHideHdl, CheckBox *, pBox ) return 0; } -IMPL_STATIC_LINK_NOARG( - SwInsertSectionTabPage, ChangeEditInReadonlyHdl) -{ - return 0; -} - IMPL_LINK( SwInsertSectionTabPage, ChangeProtectHdl, CheckBox *, pBox ) { bool bCheck = pBox->IsChecked(); diff --git a/sw/source/uibase/dbui/dbui.cxx b/sw/source/uibase/dbui/dbui.cxx index 3d72d3e3aee8..e410558e47d3 100644 --- a/sw/source/uibase/dbui/dbui.cxx +++ b/sw/source/uibase/dbui/dbui.cxx @@ -135,14 +135,9 @@ void CancelableDialog::SetCancelHdl( const Link<>& rLink ) void CancelableDialog::Show() { if (mbModal) - StartExecuteModal( LINK(this, CancelableDialog, DlgClosedHdl) ); + StartExecuteModal( Link<>() ); else Dialog::Show(); } -IMPL_STATIC_LINK_NOARG(CancelableDialog, DlgClosedHdl) -{ - return 0; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/inc/dbui.hxx b/sw/source/uibase/inc/dbui.hxx index 519fad0c9562..3d9c2d9d47f2 100644 --- a/sw/source/uibase/inc/dbui.hxx +++ b/sw/source/uibase/inc/dbui.hxx @@ -33,8 +33,6 @@ protected: CancelableDialog( vcl::Window *pParent, bool modal, const OUString& rID, const OUString& rUIXMLDescription ); - DECL_STATIC_LINK(CancelableDialog, DlgClosedHdl, void *); - using Dialog::Execute; using Dialog::StartExecuteModal; diff --git a/sw/source/uibase/inc/regionsw.hxx b/sw/source/uibase/inc/regionsw.hxx index 08fc1c6e9c8f..c231eed0c8f6 100644 --- a/sw/source/uibase/inc/regionsw.hxx +++ b/sw/source/uibase/inc/regionsw.hxx @@ -172,8 +172,6 @@ class SwInsertSectionTabPage : public SfxTabPage VclPtr<vcl::Window> m_pOldDefDlgParent; DECL_LINK( ChangeHideHdl, CheckBox * ); - // #114856# edit in readonly sections - DECL_STATIC_LINK(SwInsertSectionTabPage, ChangeEditInReadonlyHdl, void *); DECL_LINK( ChangeProtectHdl, CheckBox * ); DECL_LINK( ChangePasswdHdl, Button * ); DECL_LINK(NameEditHdl, void *); diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx index b5968bc47d4d..be090bceca9c 100644 --- a/unotools/source/ucbhelper/ucblockbytes.cxx +++ b/unotools/source/ucbhelper/ucblockbytes.cxx @@ -121,24 +121,6 @@ public: }; /** - Helper class for progress handling while executing UCB commands - */ -class ProgressHandler_Impl: public ::cppu::WeakImplHelper1< XProgressHandler > -{ - Link<> m_aProgress; - -public: - ProgressHandler_Impl( const Link<>& rLink ) - : m_aProgress( rLink ) - {} - // XProgressHandler - virtual void SAL_CALL push(const Any & /*rStatus*/) throw (RuntimeException, std::exception) SAL_OVERRIDE {} - virtual void SAL_CALL pop() throw (RuntimeException, std::exception) SAL_OVERRIDE {} - virtual void SAL_CALL update(const Any & /*rStatus*/) throw (RuntimeException, std::exception) SAL_OVERRIDE - { if ( m_aProgress.IsSet() ) m_aProgress.Call( 0 ); } -}; - -/** Helper class for managing interactions and progress when executing UCB commands */ class UcbTaskEnvironment : public ::cppu::WeakImplHelper1< XCommandEnvironment > @@ -241,7 +223,6 @@ public: Moderator( Reference < XContent >& xContent, Reference < XInteractionHandler >& xInteract, - Reference < XProgressHandler >& xProgress, const Command& rArg ) throw( @@ -328,9 +309,6 @@ public: void setReply(ReplyType); void handle( const Reference<XInteractionRequest >& Request ); - void push( const Any& Status ); - void update( const Any& Status ); - void pop( ); void setStream(const Reference< XStream >& aStream); void setInputStream(const Reference<XInputStream> &rxInputStream); @@ -495,56 +473,6 @@ private: Moderator& m_aModerator; }; -class ModeratorsProgressHandler - : public ::cppu::WeakImplHelper1<XProgressHandler> -{ -public: - ModeratorsProgressHandler(Moderator &theModerator); - - virtual ~ModeratorsProgressHandler(); - - virtual void SAL_CALL push( const Any& Status ) - throw ( - RuntimeException, std::exception) SAL_OVERRIDE; - - virtual void SAL_CALL update( const Any& Status ) - throw (RuntimeException, std::exception) SAL_OVERRIDE; - - virtual void SAL_CALL pop( ) - throw (RuntimeException, std::exception) SAL_OVERRIDE; - -private: - Moderator& m_aModerator; -}; - -ModeratorsProgressHandler::ModeratorsProgressHandler(Moderator &theModerator) - : m_aModerator(theModerator) -{ -} - -ModeratorsProgressHandler::~ModeratorsProgressHandler() -{ -} - -void SAL_CALL ModeratorsProgressHandler::push( const Any& Status ) - throw ( - RuntimeException, std::exception) -{ - m_aModerator.push(Status); -} - -void SAL_CALL ModeratorsProgressHandler::update( const Any& Status ) - throw (RuntimeException, std::exception) -{ - m_aModerator.update(Status); -} - -void SAL_CALL ModeratorsProgressHandler::pop( ) - throw (RuntimeException, std::exception) -{ - m_aModerator.pop(); -} - ModeratorsInteractionHandler::ModeratorsInteractionHandler( Moderator &aModerator) : m_aModerator(aModerator) @@ -570,7 +498,6 @@ ModeratorsInteractionHandler::handle( Moderator::Moderator( Reference < XContent >& xContent, Reference < XInteractionHandler >& xInteract, - Reference < XProgressHandler >& xProgress, const Command& rArg ) throw( @@ -592,7 +519,7 @@ Moderator::Moderator( xContent, new UcbTaskEnvironment( xInteract.is() ? new ModeratorsInteractionHandler(*this) : 0, - xProgress.is() ? new ModeratorsProgressHandler(*this) : 0), + 0), comphelper::getProcessComponentContext()) { // now exchange the whole data sink stuff @@ -698,56 +625,6 @@ void Moderator::handle( const Reference<XInteractionRequest >& Request ) } while(aReplyType != REQUESTHANDLED); } -void Moderator::push( const Any& Status ) -{ - { - salhelper::ConditionModifier aMod(m_aRes); - m_aResultType = PROGRESSPUSH; - m_aResult = Status; - } - ReplyType aReplyType; - { - salhelper::ConditionWaiter aWait(m_aRep); - aReplyType = m_aReplyType; - m_aReplyType = NOREPLY; - } - if(aReplyType == EXIT) - setReply(EXIT); -} - -void Moderator::update( const Any& Status ) -{ - { - salhelper::ConditionModifier aMod(m_aRes); - m_aResultType = PROGRESSUPDATE; - m_aResult = Status; - } - ReplyType aReplyType; - { - salhelper::ConditionWaiter aWait(m_aRep); - aReplyType = m_aReplyType; - m_aReplyType = NOREPLY; - } - if(aReplyType == EXIT) - setReply(EXIT); -} - -void Moderator::pop( ) -{ - { - salhelper::ConditionModifier aMod(m_aRes); - m_aResultType = PROGRESSPOP; - } - ReplyType aReplyType; - { - salhelper::ConditionWaiter aWait(m_aRep); - aReplyType = m_aReplyType; - m_aReplyType = NOREPLY; - } - if(aReplyType == EXIT) - setReply(EXIT); -} - void Moderator::setStream(const Reference< XStream >& aStream) { { @@ -842,16 +719,14 @@ static bool _UCBOpenContentSync( Reference < XContent > xContent, const Command& rArg, Reference < XInterface > xSink, - Reference < XInteractionHandler > xInteract, - Reference < XProgressHandler > xProgress ); + Reference < XInteractionHandler > xInteract ); static bool UCBOpenContentSync( UcbLockBytesRef xLockBytes, Reference < XContent > xContent, const Command& rArg, Reference < XInterface > xSink, - Reference < XInteractionHandler > xInteract, - Reference < XProgressHandler > xProgress ) + Reference < XInteractionHandler > xInteract ) { // http protocol must be handled in a special way: // during the opening process the input stream may change @@ -871,7 +746,7 @@ static bool UCBOpenContentSync( ! aScheme.equalsIgnoreAsciiCase("vnd.sun.star.webdav") && ! aScheme.equalsIgnoreAsciiCase("ftp")) return _UCBOpenContentSync( - xLockBytes,xContent,rArg,xSink,xInteract,xProgress); + xLockBytes,xContent,rArg,xSink,xInteract); if ( !aScheme.equalsIgnoreAsciiCase( "http" ) && !aScheme.equalsIgnoreAsciiCase( "https" ) ) @@ -895,7 +770,7 @@ static bool UCBOpenContentSync( Moderator* pMod = 0; try { - pMod = new Moderator(xContent,xInteract,xProgress,rArg); + pMod = new Moderator(xContent,xInteract,rArg); pMod->create(); } catch (const ContentCreationException&) @@ -914,22 +789,16 @@ static bool UCBOpenContentSync( switch(res.type) { case Moderator::PROGRESSPUSH: { - if(xProgress.is()) - xProgress->push(res.result); pMod->setReply(Moderator::REQUESTHANDLED); break; } case Moderator::PROGRESSUPDATE: { - if(xProgress.is()) - xProgress->update(res.result); pMod->setReply(Moderator::REQUESTHANDLED); break; } case Moderator::PROGRESSPOP: { - if(xProgress.is()) - xProgress->pop(); pMod->setReply(Moderator::REQUESTHANDLED); break; } @@ -1094,11 +963,10 @@ static bool _UCBOpenContentSync( Reference < XContent > xContent, const Command& rArg, Reference < XInterface > xSink, - Reference < XInteractionHandler > xInteract, - Reference < XProgressHandler > xProgress ) + Reference < XInteractionHandler > xInteract ) { ::ucbhelper::Content aContent( - xContent, new UcbTaskEnvironment( xInteract, xProgress ), + xContent, new UcbTaskEnvironment( xInteract, 0 ), comphelper::getProcessComponentContext() ); Reference < XContentIdentifier > xIdent = xContent->getIdentifier(); OUString aScheme = xIdent->getContentProviderScheme(); @@ -1505,11 +1373,6 @@ ErrCode UcbLockBytes::Stat( SvLockBytesStat *pStat, SvLockBytesStatFlag) const return ERRCODE_NONE; } -IMPL_STATIC_LINK_NOARG(UcbLockBytes, DataAvailHdl) -{ - return 0; -} - UcbLockBytesRef UcbLockBytes::CreateInputLockBytes( const Reference< XInputStream >& xInputStream ) { if( !xInputStream.is() ) @@ -1566,14 +1429,11 @@ UcbLockBytesRef UcbLockBytes::CreateLockBytes( const Reference < XContent >& xCo aCommand.Name = "open"; aCommand.Argument <<= aArgument; - Reference< XProgressHandler > xProgressHdl = new ProgressHandler_Impl( LINK( &xLockBytes, UcbLockBytes, DataAvailHdl ) ); - bool bError = UCBOpenContentSync( xLockBytes, xContent, aCommand, xSink, - xInteractionHandler, - xProgressHdl ); + xInteractionHandler ); if ( xLockBytes->GetError() == ERRCODE_NONE && ( bError || !xLockBytes->getInputStream().is() ) ) { diff --git a/unotools/source/ucbhelper/ucblockbytes.hxx b/unotools/source/ucbhelper/ucblockbytes.hxx index 2808a3a8a529..e84600af28a0 100644 --- a/unotools/source/ucbhelper/ucblockbytes.hxx +++ b/unotools/source/ucbhelper/ucblockbytes.hxx @@ -103,8 +103,6 @@ class UcbLockBytes : public virtual SvLockBytes bool m_bDontClose; bool m_bStreamValid; - DECL_STATIC_LINK( UcbLockBytes, DataAvailHdl, void * ); - UcbLockBytes( UcbLockBytesHandler* pHandler ); protected: virtual ~UcbLockBytes(); diff --git a/vcl/generic/fontmanager/fontconfig.cxx b/vcl/generic/fontmanager/fontconfig.cxx index fe978cdc24ad..756173607afb 100644 --- a/vcl/generic/fontmanager/fontconfig.cxx +++ b/vcl/generic/fontmanager/fontconfig.cxx @@ -885,9 +885,9 @@ namespace #endif } +#if defined(ENABLE_DBUS) && defined(ENABLE_PACKAGEKIT) IMPL_LINK_NOARG_TYPED(PrintFontManager, autoInstallFontLangSupport, Timer *, void) { -#if defined(ENABLE_DBUS) && defined(ENABLE_PACKAGEKIT) guint xid = get_xid_for_dbus(); if (!xid) @@ -939,8 +939,8 @@ IMPL_LINK_NOARG_TYPED(PrintFontManager, autoInstallFontLangSupport, Timer *, voi g_free(fonts); g_object_unref(G_OBJECT (proxy)); m_aCurrentRequests.clear(); -#endif } +#endif bool PrintFontManager::Substitute( FontSelectPattern &rPattern, OUString& rMissingCodes ) { diff --git a/vcl/generic/fontmanager/fontmanager.cxx b/vcl/generic/fontmanager/fontmanager.cxx index 87027d41e8cb..d4782562622e 100644 --- a/vcl/generic/fontmanager/fontmanager.cxx +++ b/vcl/generic/fontmanager/fontmanager.cxx @@ -675,8 +675,10 @@ PrintFontManager::PrintFontManager() } } +#if defined(ENABLE_DBUS) && defined(ENABLE_PACKAGEKIT) m_aFontInstallerTimer.SetTimeoutHdl(LINK(this, PrintFontManager, autoInstallFontLangSupport)); m_aFontInstallerTimer.SetTimeout(5000); +#endif } PrintFontManager::~PrintFontManager() diff --git a/vcl/inc/fontmanager.hxx b/vcl/inc/fontmanager.hxx index 13bd05fd1622..fd0d13a2096c 100644 --- a/vcl/inc/fontmanager.hxx +++ b/vcl/inc/fontmanager.hxx @@ -327,8 +327,9 @@ class VCL_PLUGIN_PUBLIC PrintFontManager std::vector<OString> m_aCurrentRequests; Timer m_aFontInstallerTimer; +#if defined(ENABLE_DBUS) && defined(ENABLE_PACKAGEKIT) DECL_LINK_TYPED( autoInstallFontLangSupport, Timer*, void ); - +#endif PrintFontManager(); ~PrintFontManager(); public: diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index f4c81ad02eff..d76063938fe3 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -941,9 +941,11 @@ void Dialog::EndDialog( long nResult ) if ( mpDialogImpl->mbStartedModal ) { ImplEndExecuteModal(); - mpDialogImpl->maEndDialogHdl.Call( this ); - - mpDialogImpl->maEndDialogHdl = Link<>(); + if (mpDialogImpl->maEndDialogHdl.IsSet()) + { + mpDialogImpl->maEndDialogHdl.Call( this ); + mpDialogImpl->maEndDialogHdl = Link<>(); + } mpDialogImpl->mbStartedModal = false; mpDialogImpl->mnResult = -1; } diff --git a/writerperfect/source/common/WPFTEncodingDialog.cxx b/writerperfect/source/common/WPFTEncodingDialog.cxx index de521c61e881..18b7b0473853 100644 --- a/writerperfect/source/common/WPFTEncodingDialog.cxx +++ b/writerperfect/source/common/WPFTEncodingDialog.cxx @@ -30,7 +30,7 @@ struct EncodingImplementation static OUString const(s_encodings[]); - static int numEncodings(); + static inline int numEncodings(); static void insertEncodings(ListBox *box); static void selectEncoding(ListBox *box, const OUString &encoding); static OUString getEncoding(ListBox *box); @@ -84,7 +84,7 @@ OUString const(EncodingImplementation::s_encodings[])= "CP1252", "Western Europe (Windows-1252/WinLatin 1)" }; -int EncodingImplementation::numEncodings() +inline int EncodingImplementation::numEncodings() { return int(sizeof(s_encodings)/(2*sizeof(const OUString *))); } |