diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-05-08 19:11:38 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-05-08 19:15:32 +0200 |
commit | 5eb6bd4db7fb3d43672c386ac9cde58e981c8aa2 (patch) | |
tree | dadf670246d763449c3bacef4acfdd2c6251d198 /cui | |
parent | e6fa865b4d5c7eb0576f7b1510077bca081ce4fb (diff) |
lopluign:staticmethods: Handle DECL_LINK
Change-Id: Ib27854a8470f3ff5b208cb949a7bd02f2a86c969
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/dialogs/hlmailtp.cxx | 2 | ||||
-rw-r--r-- | cui/source/dialogs/scriptdlg.cxx | 3 | ||||
-rw-r--r-- | cui/source/inc/chardlg.hxx | 2 | ||||
-rw-r--r-- | cui/source/inc/cuitabarea.hxx | 2 | ||||
-rw-r--r-- | cui/source/inc/hlmailtp.hxx | 3 | ||||
-rw-r--r-- | cui/source/inc/paragrph.hxx | 2 | ||||
-rw-r--r-- | cui/source/inc/scriptdlg.hxx | 2 | ||||
-rw-r--r-- | cui/source/inc/treeopt.hxx | 2 | ||||
-rw-r--r-- | cui/source/options/optinet2.cxx | 6 | ||||
-rw-r--r-- | cui/source/options/optinet2.hxx | 6 | ||||
-rw-r--r-- | cui/source/options/treeopt.cxx | 3 | ||||
-rw-r--r-- | cui/source/tabpages/chardlg.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/paragrph.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/tparea.cxx | 3 |
14 files changed, 22 insertions, 18 deletions
diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx index 10336197a848..ce07304b2115 100644 --- a/cui/source/dialogs/hlmailtp.cxx +++ b/cui/source/dialogs/hlmailtp.cxx @@ -244,7 +244,7 @@ IMPL_LINK_NOARG(SvxHyperlinkMailTp, ModifiedReceiverHdl_Impl) |* |************************************************************************/ -IMPL_LINK_NOARG(SvxHyperlinkMailTp, ClickAdrBookHdl_Impl) +IMPL_STATIC_LINK_NOINSTANCE_NOARG(SvxHyperlinkMailTp, ClickAdrBookHdl_Impl) { SfxViewFrame* pViewFrame = SfxViewFrame::Current(); if( pViewFrame ) diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index 858cc35969a4..215278ae7ed2 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -1485,7 +1485,8 @@ short SvxScriptErrorDialog::Execute() return 0; } -IMPL_LINK( SvxScriptErrorDialog, ShowDialog, OUString*, pMessage ) +IMPL_STATIC_LINK_NOINSTANCE( + SvxScriptErrorDialog, ShowDialog, OUString*, pMessage ) { OUString message; diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index 4431ef6a3ce6..9611af4c268f 100644 --- a/cui/source/inc/chardlg.hxx +++ b/cui/source/inc/chardlg.hxx @@ -304,7 +304,7 @@ private: DECL_LINK( FitToLineHdl_Impl, CheckBox* ); DECL_LINK(KerningSelectHdl_Impl, void *); DECL_LINK(KerningModifyHdl_Impl, void *); - DECL_LINK(PairKerningHdl_Impl, void *); + DECL_STATIC_LINK(SvxCharPositionPage, PairKerningHdl_Impl, void *); DECL_LINK( LoseFocusHdl_Impl, MetricField* ); DECL_LINK(ScaleWidthModifyHdl_Impl, void *); diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index 871b5be5d692..73ec463d231b 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -148,7 +148,7 @@ class SvxTransparenceTabPage : public SvxTabPage DECL_LINK(ClickTransLinearHdl_Impl, void * ); DECL_LINK(ClickTransGradientHdl_Impl, void * ); DECL_LINK(ModifyTransparentHdl_Impl, void*); - DECL_LINK(ChangeTrgrTypeHdl_Impl, void*); + DECL_STATIC_LINK(SvxTransparenceTabPage, ChangeTrgrTypeHdl_Impl, void*); DECL_LINK(ModifiedTrgrHdl_Impl, void*); void ActivateLinear(bool bActivate); diff --git a/cui/source/inc/hlmailtp.hxx b/cui/source/inc/hlmailtp.hxx index 705a9a3a8fda..6c560279da8b 100644 --- a/cui/source/inc/hlmailtp.hxx +++ b/cui/source/inc/hlmailtp.hxx @@ -35,7 +35,8 @@ private: VclPtr<FixedText> m_pFtSubject; VclPtr<Edit> m_pEdSubject; - DECL_LINK (ClickAdrBookHdl_Impl , void * ); ///< Button : Address book + DECL_STATIC_LINK(SvxHyperlinkMailTp, ClickAdrBookHdl_Impl, void *); + ///< Button : Address book DECL_LINK (ModifiedReceiverHdl_Impl, void * ); ///< Combobox "receiver" modified void SetScheme(const OUString& rScheme); diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx index 80b2536aed21..2dda7749cd5d 100644 --- a/cui/source/inc/paragrph.hxx +++ b/cui/source/inc/paragrph.hxx @@ -272,7 +272,7 @@ class SvxAsianTabPage : public SfxTabPage SvxAsianTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); - DECL_LINK( ClickHdl_Impl, CheckBox* ); + DECL_STATIC_LINK( SvxAsianTabPage, ClickHdl_Impl, CheckBox* ); public: virtual ~SvxAsianTabPage(); diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx index 94f888191036..5abe86f4a2ea 100644 --- a/cui/source/inc/scriptdlg.hxx +++ b/cui/source/inc/scriptdlg.hxx @@ -190,7 +190,7 @@ private: OUString m_sMessage; - DECL_LINK( ShowDialog, OUString* ); + DECL_STATIC_LINK( SvxScriptErrorDialog, ShowDialog, OUString* ); public: diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx index bc85919aad8a..86f7af92fbec 100644 --- a/cui/source/inc/treeopt.hxx +++ b/cui/source/inc/treeopt.hxx @@ -184,7 +184,7 @@ private: void InsertNodes( const VectorOfNodes& rNodeList ); protected: - DECL_LINK(ExpandedHdl_Impl, SvTreeListBox* ); + DECL_STATIC_LINK(OfaTreeOptionsDialog, ExpandedHdl_Impl, SvTreeListBox* ); DECL_LINK(ShowPageHdl_Impl, void *); DECL_LINK(BackHdl_Impl, void *); DECL_LINK(OKHdl_Impl, void *); diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index ad149150abd7..32bcd13ff615 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -548,7 +548,7 @@ IMPL_LINK( SvxProxyTabPage, ProxyHdl_Impl, ListBox *, pBox ) -IMPL_LINK( SvxProxyTabPage, LoseFocusHdl_Impl, Edit *, pEdit ) +IMPL_STATIC_LINK_NOINSTANCE( SvxProxyTabPage, LoseFocusHdl_Impl, Edit *, pEdit ) { OUString aValue = pEdit->GetText(); @@ -736,7 +736,7 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, SavePasswordHdl) return 0; } -IMPL_LINK_NOARG(SvxSecurityTabPage, MasterPasswordHdl) +IMPL_STATIC_LINK_NOINSTANCE_NOARG(SvxSecurityTabPage, MasterPasswordHdl) { try { @@ -843,7 +843,7 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, TSAURLsPBHdl) return 0; } -IMPL_LINK_NOARG(SvxSecurityTabPage, MacroSecPBHdl) +IMPL_STATIC_LINK_NOINSTANCE_NOARG(SvxSecurityTabPage, MacroSecPBHdl) { try { diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx index d1b4362794ea..15403a16082a 100644 --- a/cui/source/options/optinet2.hxx +++ b/cui/source/options/optinet2.hxx @@ -96,7 +96,7 @@ private: void RestoreConfigDefaults_Impl(); DECL_LINK( ProxyHdl_Impl, ListBox * ); - DECL_LINK( LoseFocusHdl_Impl, Edit * ); + DECL_STATIC_LINK( SvxProxyTabPage, LoseFocusHdl_Impl, Edit * ); public: SvxProxyTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); @@ -157,10 +157,10 @@ private: DECL_LINK(SecurityOptionsHdl, void *); DECL_LINK(SavePasswordHdl, void* ); - DECL_LINK(MasterPasswordHdl, void *); + DECL_STATIC_LINK(SvxSecurityTabPage, MasterPasswordHdl, void *); DECL_LINK(MasterPasswordCBHdl, void* ); DECL_LINK(ShowPasswordsHdl, void *); - DECL_LINK(MacroSecPBHdl, void* ); + DECL_STATIC_LINK(SvxSecurityTabPage, MacroSecPBHdl, void* ); DECL_LINK(CertPathPBHdl, void* ); DECL_LINK(TSAURLsPBHdl, void* ); diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 37680845ac73..7644fbfd348b 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -728,7 +728,8 @@ IMPL_LINK_NOARG(OfaTreeOptionsDialog, OKHdl_Impl) } // an opened group shall be completely visible -IMPL_LINK(OfaTreeOptionsDialog, ExpandedHdl_Impl, SvTreeListBox*, pBox ) +IMPL_STATIC_LINK_NOINSTANCE( + OfaTreeOptionsDialog, ExpandedHdl_Impl, SvTreeListBox*, pBox ) { pBox->Update(); pBox->InitStartEntry(); diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 412c6d5efb28..97b6a957c873 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -2905,7 +2905,7 @@ IMPL_LINK_NOARG(SvxCharPositionPage, KerningModifyHdl_Impl) -IMPL_LINK_NOARG(SvxCharPositionPage, PairKerningHdl_Impl) +IMPL_STATIC_LINK_NOINSTANCE_NOARG(SvxCharPositionPage, PairKerningHdl_Impl) { return 0; } diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index 72c80d8506a6..46c204a24e06 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -2262,7 +2262,7 @@ void SvxAsianTabPage::Reset( const SfxItemSet* rSet ) lcl_SetBox(*rSet, SID_ATTR_PARA_SCRIPTSPACE, *m_pScriptSpaceCB ); } -IMPL_LINK( SvxAsianTabPage, ClickHdl_Impl, CheckBox*, pBox ) +IMPL_STATIC_LINK_NOINSTANCE( SvxAsianTabPage, ClickHdl_Impl, CheckBox*, pBox ) { pBox->EnableTriState( false ); return 0; diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index a0a7abbf0db2..2e344e9bd77d 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -202,7 +202,8 @@ void SvxTransparenceTabPage::ActivateGradient(bool bActivate) } } -IMPL_LINK_NOARG(SvxTransparenceTabPage, ChangeTrgrTypeHdl_Impl) +IMPL_STATIC_LINK_NOINSTANCE_NOARG( + SvxTransparenceTabPage, ChangeTrgrTypeHdl_Impl) { return 0L; } |