diff options
author | Noel Grandin <noel@peralex.com> | 2015-09-07 09:35:04 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-09-08 08:16:46 +0200 |
commit | 61623d5b90510ae6c791a41031d586a9316e74c4 (patch) | |
tree | 0b5a8115ae6d603cbe6208b958d8b440ea8fd06f /cui/source/inc | |
parent | d7efea29cdc2faa57d172d7e4d8def18fd49536c (diff) |
convert Link<> to typed
Change-Id: I365a81a0a960f5da736c9a97aa056da16c99452f
Diffstat (limited to 'cui/source/inc')
-rw-r--r-- | cui/source/inc/acccfg.hxx | 2 | ||||
-rw-r--r-- | cui/source/inc/autocdlg.hxx | 6 | ||||
-rw-r--r-- | cui/source/inc/cfg.hxx | 6 | ||||
-rw-r--r-- | cui/source/inc/dbregister.hxx | 2 | ||||
-rw-r--r-- | cui/source/inc/hangulhanjadlg.hxx | 2 | ||||
-rw-r--r-- | cui/source/inc/linkdlg.hxx | 2 | ||||
-rw-r--r-- | cui/source/inc/macroass.hxx | 8 | ||||
-rw-r--r-- | cui/source/inc/macropg.hxx | 4 | ||||
-rw-r--r-- | cui/source/inc/multipat.hxx | 4 | ||||
-rw-r--r-- | cui/source/inc/numfmt.hxx | 1 | ||||
-rw-r--r-- | cui/source/inc/optdict.hxx | 2 | ||||
-rw-r--r-- | cui/source/inc/optlingu.hxx | 12 | ||||
-rw-r--r-- | cui/source/inc/optpath.hxx | 2 | ||||
-rw-r--r-- | cui/source/inc/scriptdlg.hxx | 2 | ||||
-rw-r--r-- | cui/source/inc/selector.hxx | 2 | ||||
-rw-r--r-- | cui/source/inc/thesdlg.hxx | 2 | ||||
-rw-r--r-- | cui/source/inc/treeopt.hxx | 4 |
17 files changed, 33 insertions, 30 deletions
diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx index ba7fc27e559f..df4b62dcd42a 100644 --- a/cui/source/inc/acccfg.hxx +++ b/cui/source/inc/acccfg.hxx @@ -149,7 +149,7 @@ private: DECL_LINK_TYPED(ChangeHdl, Button *, void); DECL_LINK_TYPED(RemoveHdl, Button *, void); - DECL_LINK( SelectHdl, Control * ); + DECL_LINK_TYPED(SelectHdl, SvTreeListBox*, void ); DECL_LINK_TYPED(Save, Button *, void); DECL_LINK_TYPED(Load, Button *, void); DECL_LINK_TYPED(Default, Button *, void); diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index 2261a5824cfa..1ad068dcf41b 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -160,7 +160,7 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage SvLBoxButtonData* pCheckButtonData; - DECL_LINK(SelectHdl, OfaACorrCheckListBox*); + DECL_LINK_TYPED(SelectHdl, SvTreeListBox*, void); DECL_LINK_TYPED(EditHdl, Button*, void); DECL_LINK(DoubleClickEditHdl, void*); SvTreeListEntry* CreateEntry(OUString& rTxt, sal_uInt16 nCol); @@ -252,7 +252,7 @@ private: bool bReplaceEditChanged:1; bool bSWriter:1; - DECL_LINK(SelectHdl, SvTabListBox*); + DECL_LINK_TYPED(SelectHdl, SvTreeListBox*, void); DECL_LINK_TYPED(NewDelHdl, Button*, void); DECL_LINK(NewDelActionHdl, PushButton*); DECL_LINK(ModifyHdl, Edit*); @@ -506,7 +506,7 @@ private: Enables/disables the properties push button if selection in the smart tag types list box changes. */ - DECL_LINK(SelectHdl, void *); + DECL_LINK_TYPED(SelectHdl, SvTreeListBox*, void); public: /// construction via Create() diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index f73b6349e14b..e036f1c5cb46 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -441,7 +441,7 @@ class SvxMenuConfigPage : public SvxConfigPage private: DECL_LINK( SelectMenu, ListBox * ); - DECL_LINK( SelectMenuEntry, Control * ); + DECL_LINK_TYPED( SelectMenuEntry, SvTreeListBox *, void ); DECL_LINK_TYPED( NewMenuHdl, Button *, void ); DECL_LINK_TYPED( MenuSelectHdl, MenuButton *, void ); DECL_LINK_TYPED( EntrySelectHdl, MenuButton *, void ); @@ -484,7 +484,7 @@ class SvxMainMenuOrganizerDialog : public ModalDialog DECL_LINK_TYPED( MoveHdl, Button *, void ); DECL_LINK( ModifyHdl, Edit * ); - DECL_LINK( SelectHdl, Control* ); + DECL_LINK_TYPED( SelectHdl, SvTreeListBox*, void ); public: SvxMainMenuOrganizerDialog ( @@ -533,7 +533,7 @@ class SvxToolbarConfigPage : public SvxConfigPage private: DECL_LINK( SelectToolbar, ListBox * ); - DECL_LINK( SelectToolbarEntry, Control * ); + DECL_LINK_TYPED( SelectToolbarEntry, SvTreeListBox*, void ); DECL_LINK_TYPED( ToolbarSelectHdl, MenuButton *, void ); DECL_LINK_TYPED( EntrySelectHdl, MenuButton *, void ); DECL_LINK_TYPED( NewToolbarHdl, Button *, void ); diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx index 879b6cd765eb..23d4bc638ed9 100644 --- a/cui/source/inc/dbregister.hxx +++ b/cui/source/inc/dbregister.hxx @@ -57,7 +57,7 @@ namespace svx DECL_LINK_TYPED( DeleteHdl, Button*, void ); DECL_LINK(PathBoxDoubleClickHdl, void *); - DECL_LINK(PathSelect_Impl, void *); + DECL_LINK_TYPED(PathSelect_Impl, SvTreeListBox*, void); DECL_LINK_TYPED( HeaderSelect_Impl, HeaderBar *, void ); DECL_LINK_TYPED( HeaderEndDrag_Impl, HeaderBar *, void ); diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx index ca8fadfd0a2a..5598a59d4773 100644 --- a/cui/source/inc/hangulhanjadlg.hxx +++ b/cui/source/inc/hangulhanjadlg.hxx @@ -211,7 +211,7 @@ namespace svx css::uno::Reference< css::linguistic2::XConversionDictionaryList > m_xConversionDictionaryList; DECL_LINK_TYPED( OkHdl, Button*, void ); - DECL_LINK( DictsLB_SelectHdl, void* ); + DECL_LINK_TYPED( DictsLB_SelectHdl, SvTreeListBox*, void ); DECL_LINK_TYPED( NewDictHdl, Button*, void ); DECL_LINK_TYPED( EditDictHdl, Button*, void ); DECL_LINK_TYPED( DeleteDictHdl, Button*, void ); diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx index 9af5b0dacb01..beffb1cadf5a 100644 --- a/cui/source/inc/linkdlg.hxx +++ b/cui/source/inc/linkdlg.hxx @@ -64,7 +64,7 @@ class SvBaseLinksDlg : public ModalDialog bool bHtmlMode; Idle aUpdateIdle; - DECL_LINK( LinksSelectHdl, SvTabListBox * ); + DECL_LINK_TYPED( LinksSelectHdl, SvTreeListBox*, void ); DECL_LINK( LinksDoubleClickHdl, SvTabListBox * ); DECL_LINK_TYPED( AutomaticClickHdl, Button *, void ); DECL_LINK_TYPED( ManualClickHdl, Button *, void ); diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx index 3fb037e5f0cb..5d99c58149d6 100644 --- a/cui/source/inc/macroass.hxx +++ b/cui/source/inc/macroass.hxx @@ -29,15 +29,15 @@ class _SfxMacroTabPage; class SvTabListBox; - +class SvTreeListBox; class _SfxMacroTabPage_Impl; class _SfxMacroTabPage : public SfxTabPage { SvxMacroTableDtor aTbl; - DECL_DLLPRIVATE_LINK( SelectEvent_Impl, SvTabListBox * ); - DECL_DLLPRIVATE_LINK( SelectGroup_Impl, ListBox * ); - DECL_DLLPRIVATE_LINK( SelectMacro_Impl, ListBox * ); + DECL_DLLPRIVATE_LINK_TYPED( SelectEvent_Impl, SvTreeListBox*, void ); + DECL_DLLPRIVATE_LINK_TYPED( SelectGroup_Impl, SvTreeListBox*, void ); + DECL_DLLPRIVATE_LINK_TYPED( SelectMacro_Impl, SvTreeListBox*, void ); DECL_DLLPRIVATE_LINK( AssignDeleteHdl_Impl, PushButton * ); DECL_DLLPRIVATE_LINK_TYPED( AssignDeleteClickHdl_Impl, Button *, void ); diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx index de7d4a70825d..bf19996bbd99 100644 --- a/cui/source/inc/macropg.hxx +++ b/cui/source/inc/macropg.hxx @@ -33,6 +33,8 @@ #include <unordered_map> #include <vector> +class SvTreeListBox; + typedef std::unordered_map< OUString, std::pair< OUString, OUString >, OUStringHash, std::equal_to< OUString > > EventsHash; @@ -57,7 +59,7 @@ class _SvxMacroTabPage_Impl; class _SvxMacroTabPage : public SfxTabPage { - DECL_LINK( SelectEvent_Impl, SvTabListBox * ); + DECL_LINK_TYPED( SelectEvent_Impl, SvTreeListBox*, void ); DECL_LINK_TYPED( AssignDeleteHdl_Impl, Button *, void ); DECL_LINK( DoubleClickHdl_Impl, SvTabListBox * ); diff --git a/cui/source/inc/multipat.hxx b/cui/source/inc/multipat.hxx index 566974177943..5415fb23a0ad 100644 --- a/cui/source/inc/multipat.hxx +++ b/cui/source/inc/multipat.hxx @@ -45,8 +45,8 @@ private: DECL_LINK_TYPED(AddHdl_Impl, Button*, void); DECL_LINK_TYPED(DelHdl_Impl, Button*, void); - DECL_LINK(SelectHdl_Impl, void *); - DECL_LINK(CheckHdl_Impl, svx::SvxRadioButtonListBox*); + DECL_LINK_TYPED(SelectHdl_Impl, SvTreeListBox*, void); + DECL_LINK_TYPED(CheckHdl_Impl, SvTreeListBox*, void); public: SvxMultiPathDialog(vcl::Window* pParent); diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx index f2a72c1d7088..87a8e1ddd2ce 100644 --- a/cui/source/inc/numfmt.hxx +++ b/cui/source/inc/numfmt.hxx @@ -154,6 +154,7 @@ private: DECL_LINK( LostFocusHdl_Impl, Edit* ); DECL_LINK( DoubleClickHdl_Impl, SvxFontListBox* ); DECL_LINK( SelFormatHdl_Impl, void * ); + DECL_LINK_TYPED( SelFormatListBoxHdl_Impl, SvTreeListBox*, void ); DECL_LINK_TYPED( SelFormatClickHdl_Impl, Button*, void ); DECL_LINK_TYPED( ClickHdl_Impl, Button*, void ); DECL_LINK( EditHdl_Impl, Edit* ); diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx index b8028ca9146a..17226165297d 100644 --- a/cui/source/inc/optdict.hxx +++ b/cui/source/inc/optdict.hxx @@ -131,7 +131,7 @@ private: DECL_LINK(SelectBookHdl_Impl, void *); DECL_LINK(SelectLangHdl_Impl, void *); - DECL_LINK(SelectHdl, SvTabListBox*); + DECL_LINK_TYPED(SelectHdl, SvTreeListBox*, void); DECL_LINK_TYPED(NewDelHdl, Button*, void); DECL_LINK(NewDelActionHdl, PushButton*); DECL_LINK(ModifyHdl, Edit*); diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx index 36ae80a2d074..d3768a44f0d6 100644 --- a/cui/source/inc/optlingu.hxx +++ b/cui/source/inc/optlingu.hxx @@ -74,13 +74,13 @@ class SvxEditModulesDlg : public ModalDialog SvTreeListEntry* CreateEntry(OUString& rTxt, sal_uInt16 nCol); - DECL_LINK(SelectHdl_Impl, SvxCheckListBox *); + DECL_LINK_TYPED(SelectHdl_Impl, SvTreeListBox*, void); DECL_LINK_TYPED(UpDownHdl_Impl, Button*, void); DECL_LINK_TYPED(ClickHdl_Impl, Button*, void); DECL_LINK_TYPED(BackHdl_Impl, Button*, void); DECL_LINK( LangSelectHdl_Impl, ListBox* ); DECL_LINK_TYPED( BoxCheckButtonHdl_Impl2, SvLBoxButtonData*, void ); - DECL_LINK( BoxCheckButtonHdl_Impl, SvTreeListBox * ); + DECL_LINK_TYPED( BoxCheckButtonHdl_Impl, SvTreeListBox*, void ); DECL_LINK(OpenURLHdl_Impl, void *); public: @@ -137,12 +137,12 @@ private: void AddDicBoxEntry( const css::uno::Reference< css::linguistic2::XDictionary > &rxDic, sal_uInt16 nIdx ); static sal_uLong GetDicUserData( const css::uno::Reference< css::linguistic2::XDictionary > &rxDic, sal_uInt16 nIdx ); - DECL_LINK( SelectHdl_Impl, SvxCheckListBox * ); + DECL_LINK_TYPED( SelectHdl_Impl, SvTreeListBox*, void ); DECL_LINK_TYPED( ClickHdl_Impl, Button *, void ); DECL_LINK( BoxDoubleClickHdl_Impl, SvTreeListBox * ); - DECL_LINK( BoxCheckButtonHdl_Impl, SvTreeListBox * ); - DECL_LINK_TYPED(PostDblClickHdl_Impl, void *, void); - DECL_LINK(OpenURLHdl_Impl, void *); + DECL_LINK_TYPED( BoxCheckButtonHdl_Impl, SvTreeListBox*, void ); + DECL_LINK_TYPED( PostDblClickHdl_Impl, void *, void); + DECL_LINK( OpenURLHdl_Impl, void *); void UpdateModulesBox_Impl(); void UpdateDicBox_Impl(); diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx index 384a89ec0e97..fcce075ea686 100644 --- a/cui/source/inc/optpath.hxx +++ b/cui/source/inc/optpath.hxx @@ -57,7 +57,7 @@ private: DECL_LINK(DoubleClickPathHdl_Impl, void *); DECL_LINK_TYPED( StandardHdl_Impl, Button*, void); - DECL_LINK(PathSelect_Impl, void *); + DECL_LINK_TYPED(PathSelect_Impl, SvTreeListBox*, void); DECL_LINK_TYPED( HeaderSelect_Impl, HeaderBar *, void ); DECL_LINK_TYPED( HeaderEndDrag_Impl, HeaderBar *, void ); diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx index 9224bb6d2494..1d77c270571a 100644 --- a/cui/source/inc/scriptdlg.hxx +++ b/cui/source/inc/scriptdlg.hxx @@ -156,7 +156,7 @@ protected: const OUString m_renameDupStr; const OUString m_renameErrTitleStr; - DECL_LINK( ScriptSelectHdl, SvTreeListBox * ); + DECL_LINK_TYPED( ScriptSelectHdl, SvTreeListBox *, void ); DECL_LINK_TYPED( ButtonHdl, Button *, void ); static bool getBoolProperty( css::uno::Reference< css::beans::XPropertySet >& xProps, OUString& propName ); void CheckButtons( css::uno::Reference< css::script::browse::XBrowseNode >& node ); diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx index ff7e5f21a731..c88e47286747 100644 --- a/cui/source/inc/selector.hxx +++ b/cui/source/inc/selector.hxx @@ -185,7 +185,7 @@ class SvxScriptSelectorDialog : public ModelessDialog Link<> m_aAddHdl; DECL_LINK_TYPED( ClickHdl, Button *, void ); - DECL_LINK( SelectHdl, Control* ); + DECL_LINK_TYPED( SelectHdl, SvTreeListBox*, void ); DECL_LINK( FunctionDoubleClickHdl, Control* ); void UpdateUI(); diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx index af209a197a7d..2a6b5c5ce245 100644 --- a/cui/source/inc/thesdlg.hxx +++ b/cui/source/inc/thesdlg.hxx @@ -146,7 +146,7 @@ public: DECL_LINK_TYPED( LeftBtnHdl_Impl, Button *, void ); DECL_LINK( LanguageHdl_Impl, ListBox * ); DECL_LINK( WordSelectHdl_Impl, ComboBox * ); - DECL_LINK( AlternativesSelectHdl_Impl, SvxCheckListBox * ); + DECL_LINK_TYPED( AlternativesSelectHdl_Impl, SvTreeListBox*, void ); DECL_LINK( AlternativesDoubleClickHdl_Impl, SvxCheckListBox * ); DECL_STATIC_LINK_TYPED( SvxThesaurusDialog, SelectFirstHdl_Impl, void*, void ); diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx index 08a7d2fb1b7e..a1c7a363a052 100644 --- a/cui/source/inc/treeopt.hxx +++ b/cui/source/inc/treeopt.hxx @@ -183,8 +183,8 @@ private: void InsertNodes( const VectorOfNodes& rNodeList ); protected: - DECL_STATIC_LINK(OfaTreeOptionsDialog, ExpandedHdl_Impl, SvTreeListBox* ); - DECL_LINK(ShowPageHdl_Impl, void *); + DECL_STATIC_LINK_TYPED(OfaTreeOptionsDialog, ExpandedHdl_Impl, SvTreeListBox*, void ); + DECL_LINK_TYPED(ShowPageHdl_Impl, SvTreeListBox*, void); DECL_LINK_TYPED(BackHdl_Impl, Button*, void); DECL_LINK_TYPED(OKHdl_Impl, Button*, void); void SelectHdl_Impl(); |