diff options
author | Noel Grandin <noel@peralex.com> | 2015-09-07 13:48:23 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-09-08 08:16:46 +0200 |
commit | 8d927d3f82a33a464662e4b54a8a07d30d4d1a19 (patch) | |
tree | d65da75b786634550eb1e7fa4b1859d63e968dfe /cui/source/inc | |
parent | 61623d5b90510ae6c791a41031d586a9316e74c4 (diff) |
convert Link<> to typed
Change-Id: Ia2706c308c6297d05b2862e9f86fc0f2ee90e4f0
Diffstat (limited to 'cui/source/inc')
-rw-r--r-- | cui/source/inc/backgrnd.hxx | 2 | ||||
-rw-r--r-- | cui/source/inc/border.hxx | 4 | ||||
-rw-r--r-- | cui/source/inc/cuitabarea.hxx | 2 | ||||
-rw-r--r-- | cui/source/inc/hangulhanjadlg.hxx | 1 | ||||
-rw-r--r-- | cui/source/inc/labdlg.hxx | 2 | ||||
-rw-r--r-- | cui/source/inc/numpages.hxx | 21 |
6 files changed, 17 insertions, 15 deletions
diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx index 946d9c24a5de..3e2ca3da014e 100644 --- a/cui/source/inc/backgrnd.hxx +++ b/cui/source/inc/backgrnd.hxx @@ -137,7 +137,7 @@ private: DECL_LINK_TYPED(BrowseHdl_Impl, Button*, void); DECL_LINK_TYPED( RadioClickHdl_Impl, Button*, void ); DECL_LINK_TYPED( FileClickHdl_Impl, Button*, void ); - DECL_LINK(BackgroundColorHdl_Impl, void *); + DECL_LINK_TYPED(BackgroundColorHdl_Impl, ValueSet*, void); DECL_LINK( TblDestinationHdl_Impl, ListBox* ); }; diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx index 2fe47b70afd3..23d107ba5371 100644 --- a/cui/source/inc/border.hxx +++ b/cui/source/inc/border.hxx @@ -118,8 +118,8 @@ private: // Handler DECL_LINK( SelStyleHdl_Impl, ListBox* ); DECL_LINK( SelColHdl_Impl, ListBox* ); - DECL_LINK( SelPreHdl_Impl, void* ); - DECL_LINK( SelSdwHdl_Impl, void* ); + DECL_LINK_TYPED( SelPreHdl_Impl, ValueSet*, void ); + DECL_LINK_TYPED( SelSdwHdl_Impl, ValueSet*, void ); DECL_LINK( LinesChanged_Impl, void* ); DECL_LINK( ModifyDistanceHdl_Impl, MetricField*); DECL_LINK( ModifyWidthHdl_Impl, void*); diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index df64bd8f4731..f3b003dd0ab9 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -720,7 +720,7 @@ private: DECL_LINK_TYPED( ClickWorkOnHdl_Impl, Button*, void ); DECL_LINK( SelectColorLBHdl_Impl, void * ); - DECL_LINK( SelectValSetHdl_Impl, void * ); + DECL_LINK_TYPED( SelectValSetHdl_Impl, ValueSet*, void ); DECL_LINK( SelectColorModelHdl_Impl, void * ); void ChangeColor(const Color &rNewColor); DECL_LINK( ModifiedHdl_Impl, void * ); diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx index 5598a59d4773..711a03763590 100644 --- a/cui/source/inc/hangulhanjadlg.hxx +++ b/cui/source/inc/hangulhanjadlg.hxx @@ -80,6 +80,7 @@ namespace svx virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; DECL_LINK( SelectSuggestionHdl, Control* ); + DECL_LINK_TYPED( SelectSuggestionValueSetHdl, ValueSet*, void ); void SetHelpIds(); diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx index 7355781b4482..14469df96bd6 100644 --- a/cui/source/inc/labdlg.hxx +++ b/cui/source/inc/labdlg.hxx @@ -68,7 +68,7 @@ private: DECL_LINK( AnsatzSelectHdl_Impl, ListBox * ); DECL_LINK( AnsatzRelSelectHdl_Impl, ListBox * ); DECL_LINK_TYPED( LineOptHdl_Impl, Button *, void ); - DECL_LINK( SelectCaptTypeHdl_Impl, void * ); + DECL_LINK_TYPED( SelectCaptTypeHdl_Impl, ValueSet*, void ); const SfxItemSet& rOutAttrs; const SdrView* pView; diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index 37453a66a1aa..790915fc703e 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -37,6 +37,7 @@ class SvxNumRule; class SvxBmpNumValueSet; class SvxNumValueSet; class SvxBrushItem; +class ValueSet; class SvxNumberingPreview : public vcl::Window { @@ -96,8 +97,8 @@ class SvxSingleNumPickTabPage : public SfxTabPage sal_uInt16 nNumItemId; protected: - DECL_LINK(NumSelectHdl_Impl, void *); - DECL_LINK(DoubleClickHdl_Impl, void *); + DECL_LINK_TYPED(NumSelectHdl_Impl, ValueSet*, void); + DECL_LINK_TYPED(DoubleClickHdl_Impl, ValueSet*, void); public: SvxSingleNumPickTabPage(vcl::Window* pParent, @@ -125,15 +126,15 @@ class SvxBulletPickTabPage : public SfxTabPage VclPtr<SvxNumValueSet> m_pExamplesVS; SvxNumRule* pActNum; SvxNumRule* pSaveNum; - sal_uInt16 nActNumLvl; + sal_uInt16 nActNumLvl; bool bModified : 1; bool bPreset : 1; - sal_uInt16 nNumItemId; + sal_uInt16 nNumItemId; OUString sBulletCharFormatName; protected: - DECL_LINK(NumSelectHdl_Impl, void *); - DECL_LINK(DoubleClickHdl_Impl, void *); + DECL_LINK_TYPED(NumSelectHdl_Impl, ValueSet*, void); + DECL_LINK_TYPED(DoubleClickHdl_Impl, ValueSet*, void); public: SvxBulletPickTabPage(vcl::Window* pParent, const SfxItemSet& rSet); @@ -175,8 +176,8 @@ class SvxNumPickTabPage : public SfxTabPage protected: - DECL_LINK(NumSelectHdl_Impl, void *); - DECL_LINK(DoubleClickHdl_Impl, void *); + DECL_LINK_TYPED(NumSelectHdl_Impl, ValueSet*, void); + DECL_LINK_TYPED(DoubleClickHdl_Impl, ValueSet*, void); public: SvxNumPickTabPage(vcl::Window* pParent, @@ -221,8 +222,8 @@ class SvxBitmapPickTabPage : public SfxTabPage bool bPreset : 1; protected: - DECL_LINK(NumSelectHdl_Impl, void *); - DECL_LINK(DoubleClickHdl_Impl, void *); + DECL_LINK_TYPED(NumSelectHdl_Impl, ValueSet*, void); + DECL_LINK_TYPED(DoubleClickHdl_Impl, ValueSet*, void); DECL_LINK_TYPED(ClickAddBrowseHdl_Impl, Button*, void ); |