diff options
Diffstat (limited to 'filter')
-rw-r--r-- | filter/source/pdf/impdialog.cxx | 2 | ||||
-rw-r--r-- | filter/source/pdf/impdialog.hxx | 2 | ||||
-rw-r--r-- | filter/source/xsltdialog/xmlfiltertabdialog.cxx | 7 | ||||
-rw-r--r-- | filter/source/xsltdialog/xmlfiltertabdialog.hxx | 2 |
4 files changed, 7 insertions, 6 deletions
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index af2e7e7c8a73..ed1a5b4ba1a9 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -1737,7 +1737,7 @@ IMPL_LINK_NOARG( ImpPDFTabSigningPage, ClickmaPbSignCertClear ) } -IMPL_LINK_NOARG( ImpPDFTabSigningPage, SelectLBSignTSA ) +IMPL_STATIC_LINK_NOINSTANCE_NOARG( ImpPDFTabSigningPage, SelectLBSignTSA ) { return 0; } diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx index dc2f9d35d0fa..e82872176ef2 100644 --- a/filter/source/pdf/impdialog.hxx +++ b/filter/source/pdf/impdialog.hxx @@ -432,7 +432,7 @@ class ImpPDFTabSigningPage : public SfxTabPage DECL_LINK( ClickmaPbSignCertSelect, void* ); DECL_LINK( ClickmaPbSignCertClear, void* ); - DECL_LINK( SelectLBSignTSA, 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 46abda73bcaf..ed400201b3c8 100644 --- a/filter/source/xsltdialog/xmlfiltertabdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltertabdialog.cxx @@ -68,7 +68,7 @@ XMLFilterTabDialog::XMLFilterTabDialog(vcl::Window *pParent, ResMgr& rResMgr, m_nXSLTPageId = m_pTabCtrl->GetPageId("transformation"); m_pTabCtrl->SetTabPage(m_nXSLTPageId, mpXSLTPage); - ActivatePageHdl(m_pTabCtrl); + ActivatePageHdl(nullptr, m_pTabCtrl); } @@ -250,7 +250,7 @@ bool XMLFilterTabDialog::onOk() if( 0 != nErrorId ) { m_pTabCtrl->SetCurPageId((sal_uInt16)nErrorPage); - ActivatePageHdl(m_pTabCtrl); + ActivatePageHdl(nullptr, m_pTabCtrl); ResId aResId( nErrorId, mrResMgr ); OUString aMessage( aResId ); @@ -294,7 +294,8 @@ IMPL_LINK_NOARG(XMLFilterTabDialog, OkHdl) -IMPL_LINK( XMLFilterTabDialog, ActivatePageHdl, TabControl *, pTabCtrl ) +IMPL_STATIC_LINK_NOINSTANCE( + XMLFilterTabDialog, ActivatePageHdl, TabControl *, pTabCtrl ) { const sal_uInt16 nId = pTabCtrl->GetCurPageId(); TabPage* pTabPage = pTabCtrl->GetTabPage( nId ); diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.hxx b/filter/source/xsltdialog/xmlfiltertabdialog.hxx index cd835435bc54..47a2e6712517 100644 --- a/filter/source/xsltdialog/xmlfiltertabdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltertabdialog.hxx @@ -45,7 +45,7 @@ public: private: com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxContext; - DECL_LINK( ActivatePageHdl, TabControl * ); + DECL_STATIC_LINK( XMLFilterTabDialog, ActivatePageHdl, TabControl * ); DECL_STATIC_LINK_TYPED( XMLFilterTabDialog, DeactivatePageHdl, TabControl *, bool ); DECL_LINK(OkHdl, void *); |