diff options
69 files changed, 156 insertions, 175 deletions
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx index 0a819d64d3e7..211703e4a83f 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.cxx +++ b/chart2/source/controller/dialogs/tp_ChartType.cxx @@ -882,7 +882,7 @@ ChartTypeDialogController* ChartTypeTabPage::getSelectedMainType() pTypeController = m_aChartTypeDialogControllerList[nM]; return pTypeController; } -IMPL_LINK_NOARG(ChartTypeTabPage, SelectSubTypeHdl) +IMPL_LINK_NOARG_TYPED(ChartTypeTabPage, SelectSubTypeHdl, ValueSet*, void) { if( m_pCurrentMainType ) { @@ -892,7 +892,6 @@ IMPL_LINK_NOARG(ChartTypeTabPage, SelectSubTypeHdl) if( m_bDoLiveUpdate ) commitToModel( aParameter ); } - return 0; } IMPL_LINK_NOARG(ChartTypeTabPage, SelectMainTypeHdl) diff --git a/chart2/source/controller/dialogs/tp_ChartType.hxx b/chart2/source/controller/dialogs/tp_ChartType.hxx index 4ed830b10535..fb9311403c33 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.hxx +++ b/chart2/source/controller/dialogs/tp_ChartType.hxx @@ -75,7 +75,7 @@ protected: void selectMainType(); DECL_LINK( SelectMainTypeHdl, void* ); - DECL_LINK( SelectSubTypeHdl, void* ); + DECL_LINK_TYPED( SelectSubTypeHdl, ValueSet*, void ); protected: VclPtr<FixedText> m_pFT_ChooseType; diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index 5144fddf3794..3892484a9836 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -369,7 +369,7 @@ namespace svx , m_aListBox( VclPtr<ListBox>::Create(this,GetStyle() | WB_BORDER) ) , m_bInSelectionUpdate( false ) { - m_aValueSet->SetSelectHdl( LINK( this, SuggestionDisplay, SelectSuggestionHdl ) ); + m_aValueSet->SetSelectHdl( LINK( this, SuggestionDisplay, SelectSuggestionValueSetHdl ) ); m_aListBox->SetSelectHdl( LINK( this, SuggestionDisplay, SelectSuggestionHdl ) ); m_aValueSet->SetLineCount( LINE_CNT ); @@ -479,6 +479,10 @@ namespace svx } } + IMPL_LINK_TYPED( SuggestionDisplay, SelectSuggestionValueSetHdl, ValueSet*, pControl, void ) + { + SelectSuggestionHdl(pControl); + } IMPL_LINK( SuggestionDisplay, SelectSuggestionHdl, Control*, pControl ) { if( m_bInSelectionUpdate ) 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 ); diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx index 04193d1d5b53..9f12dc047dc6 100644 --- a/cui/source/options/optchart.cxx +++ b/cui/source/options/optchart.cxx @@ -261,7 +261,7 @@ IMPL_LINK( SvxDefaultColorOptPage, ListClickedHdl, ColorLB*, _pColorList ) return 0L; } -IMPL_LINK_NOARG(SvxDefaultColorOptPage, BoxClickedHdl) +IMPL_LINK_NOARG_TYPED(SvxDefaultColorOptPage, BoxClickedHdl, ValueSet*, void) { sal_Int32 nIdx = m_pLbChartColors->GetSelectEntryPos(); if( nIdx != LISTBOX_ENTRY_NOTFOUND ) @@ -273,8 +273,6 @@ IMPL_LINK_NOARG(SvxDefaultColorOptPage, BoxClickedHdl) m_pLbChartColors->SelectEntryPos( nIdx ); // reselect entry } - - return 0L; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx index 17f6af34a627..8046c1daa42f 100644 --- a/cui/source/options/optchart.hxx +++ b/cui/source/options/optchart.hxx @@ -47,7 +47,7 @@ private: DECL_LINK_TYPED( AddChartColor, Button *, void ); DECL_LINK_TYPED( RemoveChartColor, Button *, void ); DECL_LINK( ListClickedHdl, ColorLB * ); - DECL_LINK(BoxClickedHdl, void *); + DECL_LINK_TYPED(BoxClickedHdl, ValueSet*, void); void FillColorBox(); long GetColorIndex( const Color& rCol ); diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 10764588a3c5..9939e630d5a7 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -1141,13 +1141,12 @@ SvxGraphicPosition SvxBackgroundTabPage::GetGraphicPosition_Impl() // Handler /** Handler, called when color selection is changed */ -IMPL_LINK_NOARG(SvxBackgroundTabPage, BackgroundColorHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxBackgroundTabPage, BackgroundColorHdl_Impl, ValueSet*, void) { sal_uInt16 nItemId = m_pBackgroundColorSet->GetSelectItemId(); Color aColor = nItemId ? ( m_pBackgroundColorSet->GetItemColor( nItemId ) ) : Color( COL_TRANSPARENT ); aBgdColor = aColor; m_pPreviewWin1->NotifyChange( aBgdColor ); - return 0; } IMPL_LINK_NOARG(SvxBackgroundTabPage, SelectHdl_Impl) diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index bcd3846fd139..8a6839d35bf6 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -770,7 +770,7 @@ void SvxBorderTabPage::HideShadowControls() -IMPL_LINK_NOARG(SvxBorderTabPage, SelPreHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxBorderTabPage, SelPreHdl_Impl, ValueSet*, void) { const svx::FrameBorderState SHOW = svx::FRAMESTATE_SHOW; const svx::FrameBorderState HIDE = svx::FRAMESTATE_HIDE; @@ -837,19 +837,17 @@ IMPL_LINK_NOARG(SvxBorderTabPage, SelPreHdl_Impl) m_pWndPresets->SetNoSelection(); LinesChanged_Impl( 0 ); - return 0; } -IMPL_LINK_NOARG(SvxBorderTabPage, SelSdwHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxBorderTabPage, SelSdwHdl_Impl, ValueSet*, void) { bool bEnable = m_pWndShadows->GetSelectItemId() > 1; m_pFtShadowSize->Enable(bEnable); m_pEdShadowSize->Enable(bEnable); m_pFtShadowColor->Enable(bEnable); m_pLbShadowColor->Enable(bEnable); - return 0; } diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx index f26fe3c287c3..3a1c7fbaaca6 100644 --- a/cui/source/tabpages/labdlg.cxx +++ b/cui/source/tabpages/labdlg.cxx @@ -459,10 +459,9 @@ IMPL_LINK_TYPED( SvxCaptionTabPage, LineOptHdl_Impl, Button *, pButton, void ) -IMPL_LINK_NOARG(SvxCaptionTabPage, SelectCaptTypeHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxCaptionTabPage, SelectCaptTypeHdl_Impl, ValueSet*, void) { SetupType_Impl( m_pCT_CAPTTYPE->GetSelectItemId() ); - return 0; } void SvxCaptionTabPage::SetupType_Impl( sal_uInt16 nType ) diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index f1f525769b41..61c3d6fc56cf 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -327,7 +327,7 @@ void SvxSingleNumPickTabPage::Reset( const SfxItemSet* rSet ) *pActNum = *pSaveNum; } -IMPL_LINK_NOARG(SvxSingleNumPickTabPage, NumSelectHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxSingleNumPickTabPage, NumSelectHdl_Impl, ValueSet*, void) { if(pActNum) { @@ -336,7 +336,7 @@ IMPL_LINK_NOARG(SvxSingleNumPickTabPage, NumSelectHdl_Impl) sal_uInt16 nIdx = m_pExamplesVS->GetSelectItemId() - 1; DBG_ASSERT(aNumSettingsArr.size() > nIdx, "wrong index"); if(aNumSettingsArr.size() <= nIdx) - return 0; + return; SvxNumSettings_Impl* _pSet = &aNumSettingsArr[nIdx]; sal_Int16 eNewType = _pSet->nNumberType; const sal_Unicode cLocalPrefix = !_pSet->sPrefix.isEmpty() ? _pSet->sPrefix[0] : 0; @@ -362,18 +362,16 @@ IMPL_LINK_NOARG(SvxSingleNumPickTabPage, NumSelectHdl_Impl) aFmt.SetBulletRelSize(100); pActNum->SetLevel(i, aFmt); } - nMask <<= 1 ; + nMask <<= 1; } } - return 0; } -IMPL_LINK_NOARG(SvxSingleNumPickTabPage, DoubleClickHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxSingleNumPickTabPage, DoubleClickHdl_Impl, ValueSet*, void) { NumSelectHdl_Impl(m_pExamplesVS); PushButton& rOk = GetTabDialog()->GetOKButton(); rOk.GetClickHdl().Call(&rOk); - return 0; } @@ -494,7 +492,7 @@ void SvxBulletPickTabPage::Reset( const SfxItemSet* rSet ) *pActNum = *pSaveNum; } -IMPL_LINK_NOARG(SvxBulletPickTabPage, NumSelectHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxBulletPickTabPage, NumSelectHdl_Impl, ValueSet*, void) { if(pActNum) { @@ -523,17 +521,14 @@ IMPL_LINK_NOARG(SvxBulletPickTabPage, NumSelectHdl_Impl) nMask <<= 1; } } - - return 0; } -IMPL_LINK_NOARG(SvxBulletPickTabPage, DoubleClickHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxBulletPickTabPage, DoubleClickHdl_Impl, ValueSet*, void) { NumSelectHdl_Impl(m_pExamplesVS); PushButton& rOk = GetTabDialog()->GetOKButton(); rOk.GetClickHdl().Call(&rOk); - return 0; } @@ -702,7 +697,7 @@ void SvxNumPickTabPage::Reset( const SfxItemSet* rSet ) } // all levels are changed here -IMPL_LINK_NOARG(SvxNumPickTabPage, NumSelectHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxNumPickTabPage, NumSelectHdl_Impl, ValueSet*, void) { if(pActNum) { @@ -785,15 +780,13 @@ IMPL_LINK_NOARG(SvxNumPickTabPage, NumSelectHdl_Impl) pActNum->SetLevel(i, aFmt); } } - return 0; } -IMPL_LINK_NOARG(SvxNumPickTabPage, DoubleClickHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxNumPickTabPage, DoubleClickHdl_Impl, ValueSet*, void) { NumSelectHdl_Impl(m_pExamplesVS); PushButton& rOk = GetTabDialog()->GetOKButton(); rOk.GetClickHdl().Call(&rOk); - return 0; } void SvxNumPickTabPage::PageCreated(const SfxAllItemSet& aSet) @@ -962,7 +955,7 @@ void SvxBitmapPickTabPage::Reset( const SfxItemSet* rSet ) *pActNum = *pSaveNum; } -IMPL_LINK_NOARG(SvxBitmapPickTabPage, NumSelectHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxBitmapPickTabPage, NumSelectHdl_Impl, ValueSet*, void) { if(pActNum) { @@ -995,19 +988,16 @@ IMPL_LINK_NOARG(SvxBitmapPickTabPage, NumSelectHdl_Impl) aFmt.SetGraphic( aGrfNames[nIdx] ); pActNum->SetLevel(i, aFmt); } - nMask <<= 1 ; + nMask <<= 1; } } - - return 0; } -IMPL_LINK_NOARG(SvxBitmapPickTabPage, DoubleClickHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxBitmapPickTabPage, DoubleClickHdl_Impl, ValueSet*, void) { NumSelectHdl_Impl(m_pExamplesVS); PushButton& rOk = GetTabDialog()->GetOKButton(); rOk.GetClickHdl().Call(&rOk); - return 0; } IMPL_LINK_NOARG_TYPED(SvxBitmapPickTabPage, ClickAddBrowseHdl_Impl, Button*, void) diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index 3d1391afa996..a1c4174764cf 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -938,7 +938,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, SelectColorLBHdl_Impl) -IMPL_LINK_NOARG(SvxColorTabPage, SelectValSetHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxColorTabPage, SelectValSetHdl_Impl, ValueSet*, void) { sal_Int32 nPos = m_pValSetColorList->GetSelectItemId(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) @@ -957,7 +957,6 @@ IMPL_LINK_NOARG(SvxColorTabPage, SelectValSetHdl_Impl) XColorEntry* pEntry = pColorList->GetColor(nPos-1); ChangeColor(pEntry->GetColor()); } - return 0; } diff --git a/include/svtools/toolbarmenu.hxx b/include/svtools/toolbarmenu.hxx index c027f0486b62..5cbf6099ecaa 100644 --- a/include/svtools/toolbarmenu.hxx +++ b/include/svtools/toolbarmenu.hxx @@ -105,7 +105,7 @@ protected: void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; private: - DECL_LINK( HighlightHdl, Control * ); + DECL_LINK_TYPED( HighlightHdl, ValueSet*, void ); void initStatusListener(); diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx index 3ad941c28bb2..7215a2c4a0ff 100644 --- a/include/svtools/valueset.hxx +++ b/include/svtools/valueset.hxx @@ -222,9 +222,9 @@ private: sal_uInt16 mnSpacing; DrawFrameStyle mnFrameStyle; Color maColor; - Link<> maDoubleClickHdl; - Link<> maSelectHdl; - Link<> maHighlightHdl; + Link<ValueSet*,void> maDoubleClickHdl; + Link<ValueSet*,void> maSelectHdl; + Link<ValueSet*,void> maHighlightHdl; // bitfield bool mbFormat : 1; @@ -386,16 +386,16 @@ public: Size CalcItemSizePixel(const Size& rSize, bool bOut = true) const; long GetScrollWidth() const; - void SetSelectHdl(const Link<>& rLink) + void SetSelectHdl(const Link<ValueSet*,void>& rLink) { maSelectHdl = rLink; } - void SetDoubleClickHdl(const Link<>& rLink) + void SetDoubleClickHdl(const Link<ValueSet*,void>& rLink) { maDoubleClickHdl = rLink; } - void SetHighlightHdl(const Link<>& rLink); + void SetHighlightHdl(const Link<ValueSet*,void>& rLink); bool GetEdgeBlending() const { diff --git a/include/svx/colrctrl.hxx b/include/svx/colrctrl.hxx index 556f5e82e790..2af321b25283 100644 --- a/include/svx/colrctrl.hxx +++ b/include/svx/colrctrl.hxx @@ -86,7 +86,7 @@ private: void FillValueSet(); void SetSize(); - DECL_LINK( SelectHdl, void * ); + DECL_LINK_TYPED( SelectHdl, ValueSet*, void ); /** This function is called when the window gets the focus. It grabs the focus to the color value set so that it can be controlled with diff --git a/include/svx/fontworkgallery.hxx b/include/svx/fontworkgallery.hxx index 7ecd2a075801..e6c9e1c5f6ab 100644 --- a/include/svx/fontworkgallery.hxx +++ b/include/svx/fontworkgallery.hxx @@ -69,7 +69,7 @@ class SVX_DLLPUBLIC SAL_WARN_UNUSED FontWorkGalleryDialog : public ModalDialog SdrView* mpSdrView; - DECL_LINK( DoubleClickFavoriteHdl, void * ); + DECL_LINK_TYPED( DoubleClickFavoriteHdl, ValueSet*, void ); DECL_LINK_TYPED( ClickOKHdl, Button*, void ); SdrObject** mppSdrObject; diff --git a/include/svx/linectrl.hxx b/include/svx/linectrl.hxx index 2c6b4e8bd16c..0751fde46d83 100644 --- a/include/svx/linectrl.hxx +++ b/include/svx/linectrl.hxx @@ -92,7 +92,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame; - DECL_LINK( SelectHdl, void * ); + DECL_LINK_TYPED( SelectHdl, ValueSet*, void ); void FillValueSet(); void SetSize(); void implInit(); diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx index d5b04a130688..bf7e664bd519 100644 --- a/reportdesign/source/ui/dlg/Condition.cxx +++ b/reportdesign/source/ui/dlg/Condition.cxx @@ -95,9 +95,9 @@ IMPL_LINK_TYPED( ConditionField, OnFormula, Button*, _pClickedButton, void ) #define PALETTE_SIZE (PALETTE_X * PALETTE_Y) class OColorPopup : public FloatingWindow { - DECL_LINK( SelectHdl, void * ); + DECL_LINK_TYPED( SelectHdl, ValueSet*, void ); VclPtr<Condition> m_pCondition; - sal_uInt16 m_nSlotId; + sal_uInt16 m_nSlotId; public: OColorPopup(vcl::Window* _pParent,Condition* _pCondition); virtual ~OColorPopup(); @@ -194,7 +194,7 @@ void OColorPopup::SetSlotId(sal_uInt16 _nSlotId) } } -IMPL_LINK_NOARG(OColorPopup, SelectHdl) +IMPL_LINK_NOARG_TYPED(OColorPopup, SelectHdl, ValueSet*, void) { sal_uInt16 nItemId = m_aColorSet->GetSelectItemId(); Color aColor( nItemId == 0 ? Color( COL_TRANSPARENT ) : m_aColorSet->GetItemColor( nItemId ) ); @@ -208,7 +208,6 @@ IMPL_LINK_NOARG(OColorPopup, SelectHdl) EndPopupMode(); m_pCondition->ApplyCommand( m_nSlotId, aColor ); - return 0; } diff --git a/sc/source/ui/inc/tabbgcolordlg.hxx b/sc/source/ui/inc/tabbgcolordlg.hxx index b0576cac3332..a598549dd6d4 100644 --- a/sc/source/ui/inc/tabbgcolordlg.hxx +++ b/sc/source/ui/inc/tabbgcolordlg.hxx @@ -63,7 +63,7 @@ private: void FillColorValueSets_Impl(); - DECL_LINK(TabBgColorDblClickHdl_Impl, void *); + DECL_LINK_TYPED(TabBgColorDblClickHdl_Impl, ValueSet*, void); DECL_LINK_TYPED(TabBgColorOKHdl_Impl, Button*, void); }; diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx index 337cf71762f5..fc2373ed8675 100644 --- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx +++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx @@ -117,16 +117,13 @@ void ScTabBgColorDlg::FillColorValueSets_Impl() m_pTabBgColorSet->SelectItem(nSelectedItem); } -IMPL_LINK_NOARG(ScTabBgColorDlg, TabBgColorDblClickHdl_Impl) -/* - Handler, called when color selection is changed -*/ +/// Handler, called when color selection is changed +IMPL_LINK_NOARG_TYPED(ScTabBgColorDlg, TabBgColorDblClickHdl_Impl, ValueSet*, void) { sal_uInt16 nItemId = m_pTabBgColorSet->GetSelectItemId(); Color aColor = nItemId ? ( m_pTabBgColorSet->GetItemColor( nItemId ) ) : Color( COL_AUTO ); m_aTabBgColor = aColor; EndDialog( RET_OK ); - return 0; } // Handler, called when the OK button is pushed diff --git a/sc/source/ui/sidebar/CellLineStyleControl.cxx b/sc/source/ui/sidebar/CellLineStyleControl.cxx index 141027f14f08..c4f9c718bfe6 100644 --- a/sc/source/ui/sidebar/CellLineStyleControl.cxx +++ b/sc/source/ui/sidebar/CellLineStyleControl.cxx @@ -111,7 +111,7 @@ void CellLineStyleControl::SetAllNoSel() maCellLineStyleValueSet->StartSelection(); } -IMPL_LINK(CellLineStyleControl, VSSelectHdl, void *, pControl) +IMPL_LINK_TYPED(CellLineStyleControl, VSSelectHdl, ValueSet*, pControl, void) { if(pControl == maCellLineStyleValueSet.get()) { @@ -180,8 +180,6 @@ IMPL_LINK(CellLineStyleControl, VSSelectHdl, void *, pControl) SetAllNoSel(); mrCellAppearancePropertyPanel.EndCellLineStylePopupMode(); } - - return 0L; } IMPL_LINK_TYPED(CellLineStyleControl, PBClickHdl, Button *, pPBtn, void) diff --git a/sc/source/ui/sidebar/CellLineStyleControl.hxx b/sc/source/ui/sidebar/CellLineStyleControl.hxx index 5647f0e96425..36d2347ac379 100644 --- a/sc/source/ui/sidebar/CellLineStyleControl.hxx +++ b/sc/source/ui/sidebar/CellLineStyleControl.hxx @@ -41,7 +41,7 @@ private: void Initialize(); void SetAllNoSel(); - DECL_LINK(VSSelectHdl, void*); + DECL_LINK_TYPED(VSSelectHdl, ValueSet*, void); DECL_LINK_TYPED(PBClickHdl, Button*, void); public: diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index 03c79109ebfb..22e011986f11 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -1061,11 +1061,10 @@ IMPL_LINK_TYPED( SdPublishingDlg, ResolutionHdl, Button *, pButton, void ) } // Clickhandler for the ValueSet with the bitmap-buttons -IMPL_LINK_NOARG(SdPublishingDlg, ButtonsHdl) +IMPL_LINK_NOARG_TYPED(SdPublishingDlg, ButtonsHdl, ValueSet*, void) { // if one bitmap-button is chosen, then disable TextOnly pPage5_TextOnly->Check(false); - return 0; } // Fill the SfxItemSet with the settings of the dialog diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index 8d628912c285..288260f83e2b 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -71,6 +71,7 @@ public: protected: DECL_LINK( SelectHdl, void * ); + DECL_LINK_TYPED( SelectValueSetHdl, ValueSet*, void ); private: SlideLayoutController& mrController; @@ -184,7 +185,7 @@ LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, const SetSelectHdl( LINK( this, LayoutToolbarMenu, SelectHdl ) ); mpLayoutSet1 = createEmptyValueSetControl(); - mpLayoutSet1->SetSelectHdl( LINK( this, LayoutToolbarMenu, SelectHdl ) ); + mpLayoutSet1->SetSelectHdl( LINK( this, LayoutToolbarMenu, SelectValueSetHdl ) ); const snewfoil_value_info* pInfo = 0; sal_Int16 nColCount = 4; @@ -213,7 +214,7 @@ LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, const { mpLayoutSet2 = VclPtr<ValueSet>::Create( this, WB_TABSTOP | WB_MENUSTYLEVALUESET | WB_FLATVALUESET | WB_NOBORDER | WB_NO_DIRECTSELECT ); - mpLayoutSet2->SetSelectHdl( LINK( this, LayoutToolbarMenu, SelectHdl ) ); + mpLayoutSet2->SetSelectHdl( LINK( this, LayoutToolbarMenu, SelectValueSetHdl ) ); mpLayoutSet2->SetColCount( 4 ); mpLayoutSet2->EnableFullItemMode( false ); mpLayoutSet2->SetColor( GetControlBackground() ); @@ -267,6 +268,10 @@ void LayoutToolbarMenu::dispose() svtools::ToolbarMenu::dispose(); } +IMPL_LINK_TYPED( LayoutToolbarMenu, SelectValueSetHdl, ValueSet*, pControl, void ) +{ + SelectHdl(pControl); +} IMPL_LINK( LayoutToolbarMenu, SelectHdl, void *, pControl ) { if ( IsInPopupMode() ) diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx index 86e742a38456..0776519fadb1 100644 --- a/sd/source/ui/dlg/sdpreslt.cxx +++ b/sd/source/ui/dlg/sdpreslt.cxx @@ -168,10 +168,9 @@ void SdPresLayoutDlg::FillValueSet() /** * DoubleClick handler */ -IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLayoutHdl) +IMPL_LINK_NOARG_TYPED(SdPresLayoutDlg, ClickLayoutHdl, ValueSet*, void) { EndDialog(RET_OK); - return 0; } /** diff --git a/sd/source/ui/inc/pubdlg.hxx b/sd/source/ui/inc/pubdlg.hxx index 1514594cae75..a4bb07f14601 100644 --- a/sd/source/ui/inc/pubdlg.hxx +++ b/sd/source/ui/inc/pubdlg.hxx @@ -188,7 +188,7 @@ private: DECL_LINK_TYPED( ContentHdl, Button*, void ); DECL_LINK_TYPED( GfxFormatHdl, Button *, void ); DECL_LINK_TYPED( ResolutionHdl, Button*, void ); - DECL_LINK( ButtonsHdl, void * ); + DECL_LINK_TYPED( ButtonsHdl, ValueSet*, void ); DECL_LINK_TYPED( ColorHdl, Button*, void ); DECL_LINK_TYPED( WebServerHdl, Button *, void ); DECL_LINK_TYPED( SlideChgHdl, Button*, void ); diff --git a/sd/source/ui/inc/sdpreslt.hxx b/sd/source/ui/inc/sdpreslt.hxx index 2c88259dc8e7..69b83cec9135 100644 --- a/sd/source/ui/inc/sdpreslt.hxx +++ b/sd/source/ui/inc/sdpreslt.hxx @@ -46,7 +46,7 @@ public: void GetAttr(SfxItemSet& rOutAttrs); - DECL_LINK(ClickLayoutHdl, void *); + DECL_LINK_TYPED(ClickLayoutHdl, ValueSet*, void); DECL_LINK_TYPED(ClickLoadHdl, Button*, void); private: diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx index 0494f47a3b17..3eda44c82c08 100644 --- a/sd/source/ui/sidebar/LayoutMenu.cxx +++ b/sd/source/ui/sidebar/LayoutMenu.cxx @@ -368,10 +368,9 @@ int LayoutMenu::CalculateRowCount (const Size&, int nColumnCount) return nRowCount; } -IMPL_LINK_NOARG(LayoutMenu, ClickHandler) +IMPL_LINK_NOARG_TYPED(LayoutMenu, ClickHandler, ValueSet*, void) { - AssignLayoutToSelectedSlides (GetSelectedAutoLayout()); - return 0; + AssignLayoutToSelectedSlides( GetSelectedAutoLayout() ); } /** The specified layout is assigned to the current page of the view shell diff --git a/sd/source/ui/sidebar/LayoutMenu.hxx b/sd/source/ui/sidebar/LayoutMenu.hxx index 917c5541b4bc..813682f361df 100644 --- a/sd/source/ui/sidebar/LayoutMenu.hxx +++ b/sd/source/ui/sidebar/LayoutMenu.hxx @@ -188,7 +188,7 @@ private: /** When clicked then set the current page of the view in the center pane. */ - DECL_LINK(ClickHandler, void *); + DECL_LINK_TYPED(ClickHandler, ValueSet*, void); DECL_LINK(RightClickHandler, MouseEvent*); DECL_LINK(StateChangeHandler, void *); DECL_LINK(EventMultiplexerListener, ::sd::tools::EventMultiplexerEvent*); diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx index 014787244fd0..716fc9ef4495 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx @@ -170,14 +170,12 @@ ResId MasterPagesSelector::GetContextMenuResId() const return SdResId(RID_TASKPANE_MASTERPAGESSELECTOR_POPUP); } -IMPL_LINK_NOARG(MasterPagesSelector, ClickHandler) +IMPL_LINK_NOARG_TYPED(MasterPagesSelector, ClickHandler, ValueSet*, void) { // We use the framework to assign the clicked-on master page because we // so use the same mechanism as the context menu does (where we do not // have the option to call the assignment method directly.) ExecuteCommand(mnDefaultClickAction); - - return 0; } IMPL_LINK(MasterPagesSelector, RightClickHandler, MouseEvent*, pEvent) diff --git a/sd/source/ui/sidebar/MasterPagesSelector.hxx b/sd/source/ui/sidebar/MasterPagesSelector.hxx index 5f6819a522f2..df32909486d6 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.hxx @@ -191,7 +191,7 @@ private: last seen. This value is used heuristically to speed up the lookup of an index for a token. */ - DECL_LINK(ClickHandler, void *); + DECL_LINK_TYPED(ClickHandler, ValueSet*, void); DECL_LINK(RightClickHandler, MouseEvent*); DECL_LINK(ContextMenuCallback, CommandEvent*); DECL_LINK(ContainerChangeListener, MasterPageContainerChangeEvent*); diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx index 910aa9e44f54..85eb63f46224 100644 --- a/sd/source/ui/table/TableDesignPane.cxx +++ b/sd/source/ui/table/TableDesignPane.cxx @@ -161,12 +161,11 @@ static SfxDispatcher* getDispatcher( ViewShellBase& rBase ) return 0; } -IMPL_LINK_NOARG(TableDesignWidget, implValueSetHdl) +IMPL_LINK_NOARG_TYPED(TableDesignWidget, implValueSetHdl, ValueSet*, void) { mbStyleSelected = true; if( !mbModal ) ApplyStyle(); - return 0; } void TableDesignWidget::ApplyStyle() diff --git a/sd/source/ui/table/TableDesignPane.hxx b/sd/source/ui/table/TableDesignPane.hxx index 64fb0070d23a..065e124f514b 100644 --- a/sd/source/ui/table/TableDesignPane.hxx +++ b/sd/source/ui/table/TableDesignPane.hxx @@ -86,7 +86,7 @@ private: void FillDesignPreviewControl(); DECL_LINK(EventMultiplexerListener, tools::EventMultiplexerEvent*); - DECL_LINK(implValueSetHdl, void *); + DECL_LINK_TYPED(implValueSetHdl, ValueSet*, void); DECL_LINK_TYPED(implCheckBoxHdl, Button*, void); private: diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx index 9384e8f02516..2be2370e9fd1 100644 --- a/svtools/source/control/toolbarmenu.cxx +++ b/svtools/source/control/toolbarmenu.cxx @@ -426,11 +426,9 @@ ToolbarMenuEntry* ToolbarMenu_Impl::implGetEntry( int nEntry ) const -IMPL_LINK( ToolbarMenu, HighlightHdl, Control *, pControl ) +IMPL_LINK_NOARG_TYPED( ToolbarMenu, HighlightHdl, ValueSet*, void ) { - (void)pControl; mpImpl->notifyHighlightedEntry(); - return 0; } ToolbarMenu::ToolbarMenu( const Reference< XFrame >& rFrame, vcl::Window* pParentWindow, WinBits nBits ) diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx index f05e6be9a073..c88042d13984 100644 --- a/svtools/source/control/valueset.cxx +++ b/svtools/source/control/valueset.cxx @@ -2281,7 +2281,7 @@ long ValueSet::GetScrollWidth() const return 0; } -void ValueSet::SetHighlightHdl( const Link<>& rLink ) +void ValueSet::SetHighlightHdl( const Link<ValueSet*,void>& rLink ) { maHighlightHdl = rLink; } diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx index 9bced5a872cc..58f60218b4ee 100644 --- a/svx/inc/galbrws2.hxx +++ b/svx/inc/galbrws2.hxx @@ -138,6 +138,7 @@ private: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; DECL_LINK( SelectObjectHdl, void* ); + DECL_LINK_TYPED( SelectObjectValueSetHdl, ValueSet*, void ); DECL_LINK_TYPED( SelectTbxHdl, ToolBox*, void ); DECL_LINK( MiscHdl, void* ); diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index 857e0b1e9520..afc98d03a0aa 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -433,9 +433,8 @@ GalleryBrowser2::GalleryBrowser2( vcl::Window* pParent, Gallery* pGallery ) : OUString( "com.sun.star.util.URLTransformer" ), m_xContext ), css::uno::UNO_QUERY ); - Image aDummyImage; - const Link<> aSelectHdl( LINK( this, GalleryBrowser2, SelectObjectHdl ) ); - vcl::Font aInfoFont( maInfoBar->GetControlFont() ); + Image aDummyImage; + vcl::Font aInfoFont( maInfoBar->GetControlFont() ); maMiscOptions.AddListenerLink( LINK( this, GalleryBrowser2, MiscHdl ) ); @@ -459,8 +458,8 @@ GalleryBrowser2::GalleryBrowser2( vcl::Window* pParent, Gallery* pGallery ) : maInfoBar->Show(); maSeparator->Show(); - mpIconView->SetSelectHdl( aSelectHdl ); - mpListView->SetSelectHdl( aSelectHdl ); + mpIconView->SetSelectHdl( LINK( this, GalleryBrowser2, SelectObjectValueSetHdl ) ); + mpListView->SetSelectHdl( LINK( this, GalleryBrowser2, SelectObjectHdl ) ); InitSettings(); @@ -758,10 +757,8 @@ void GalleryBrowser2::SelectTheme( const OUString& rThemeName ) mpListView->SetAccessibleName(SVX_RESSTR(RID_SVXSTR_GALLERY_THEMEITEMS)); mpPreview->SetAccessibleName(SVX_RESSTR(RID_SVXSTR_GALLERY_PREVIEW)); - const Link<> aSelectHdl( LINK( this, GalleryBrowser2, SelectObjectHdl ) ); - - mpIconView->SetSelectHdl( aSelectHdl ); - mpListView->SetSelectHdl( aSelectHdl ); + mpIconView->SetSelectHdl( LINK( this, GalleryBrowser2, SelectObjectValueSetHdl ) ); + mpListView->SetSelectHdl( LINK( this, GalleryBrowser2, SelectObjectHdl ) ); if( GALLERYBROWSERMODE_PREVIEW == GetMode() ) meMode = meLastMode; @@ -1316,6 +1313,11 @@ OUString GalleryBrowser2::GetFilterName() const +IMPL_LINK_NOARG_TYPED(GalleryBrowser2, SelectObjectValueSetHdl, ValueSet*, void) +{ + ImplUpdateInfoBar(); +} + IMPL_LINK_NOARG(GalleryBrowser2, SelectObjectHdl) { ImplUpdateInfoBar(); diff --git a/svx/source/sidebar/line/LineWidthControl.cxx b/svx/source/sidebar/line/LineWidthControl.cxx index 62a517018fcd..7983b6ba1dcf 100644 --- a/svx/source/sidebar/line/LineWidthControl.cxx +++ b/svx/source/sidebar/line/LineWidthControl.cxx @@ -168,9 +168,9 @@ void LineWidthControl::Initialize() maVSWidth->SetImage(maIMGCusGray); maVSWidth->SetSelItem(0); - Link<> aLink = LINK( this, LineWidthControl, VSSelectHdl ) ; - maVSWidth->SetSelectHdl(aLink); - aLink = LINK(this, LineWidthControl, MFModifyHdl); + + maVSWidth->SetSelectHdl(LINK( this, LineWidthControl, VSSelectHdl )); + Link<> aLink = LINK(this, LineWidthControl, MFModifyHdl); maMFWidth->SetModifyHdl(aLink); maVSWidth->StartSelection(); @@ -256,7 +256,7 @@ void LineWidthControl::SetWidthSelect( long lValue, bool bValuable, SfxMapUnit e maVSWidth->StartSelection(); } -IMPL_LINK(LineWidthControl, VSSelectHdl, void *, pControl) +IMPL_LINK_TYPED(LineWidthControl, VSSelectHdl, ValueSet*, pControl, void) { if (pControl == maVSWidth.get()) { @@ -298,7 +298,6 @@ IMPL_LINK(LineWidthControl, VSSelectHdl, void *, pControl) if ((iPos >= 1 && iPos <= 8) || (iPos == 9 && mbCustom)) //add mrLinePropertyPanel.EndLineWidthPopupMode(); } - return 0L; } IMPL_LINK(LineWidthControl, MFModifyHdl, void *, pControl) diff --git a/svx/source/sidebar/line/LineWidthControl.hxx b/svx/source/sidebar/line/LineWidthControl.hxx index 4a2874969c83..96bc0f73b8e1 100644 --- a/svx/source/sidebar/line/LineWidthControl.hxx +++ b/svx/source/sidebar/line/LineWidthControl.hxx @@ -71,7 +71,7 @@ private: Image maIMGCusGray; void Initialize(); - DECL_LINK(VSSelectHdl, void *); + DECL_LINK_TYPED(VSSelectHdl, ValueSet*, void); DECL_LINK(MFModifyHdl, void *); }; diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx index 3b59b6aad38e..f2e029b05895 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx +++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx @@ -146,8 +146,7 @@ void TextCharacterSpacingControl::initial() maVSSpacing->AddItem( maImgCus, 0, maStrCus, 0 ); maVSSpacing->SetNoSelection(); - Link<> aLink = LINK(this, TextCharacterSpacingControl,VSSelHdl ); - maVSSpacing->SetSelectHdl(aLink); + maVSSpacing->SetSelectHdl(LINK(this, TextCharacterSpacingControl,VSSelHdl )); maVSSpacing->StartSelection(); maVSSpacing->Show(); } @@ -305,7 +304,7 @@ void TextCharacterSpacingControl::Rearrange(bool bLBAvailable,bool bAvailable, l maVSSpacing->StartSelection(); } -IMPL_LINK(TextCharacterSpacingControl, VSSelHdl, void *, pControl) +IMPL_LINK_TYPED(TextCharacterSpacingControl, VSSelHdl, ValueSet*, pControl, void) { mnLastCus = SPACING_CLOSE_BY_CLICK_ICON; @@ -378,10 +377,6 @@ IMPL_LINK(TextCharacterSpacingControl, VSSelHdl, void *, pControl) if(iPos < 6 || (iPos == 6 && mbCusEnable)) //add mrTextPropertyPanel.EndSpacingPopupMode(); } - - - - return 0; } IMPL_LINK(TextCharacterSpacingControl, KerningSelectHdl, ListBox*,) diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.hxx b/svx/source/sidebar/text/TextCharacterSpacingControl.hxx index 7d5289f8d52f..f838c480d8a6 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingControl.hxx +++ b/svx/source/sidebar/text/TextCharacterSpacingControl.hxx @@ -86,7 +86,7 @@ private: bool mbVS; void initial(); - DECL_LINK(VSSelHdl, void*); + DECL_LINK_TYPED(VSSelHdl, ValueSet*, void); DECL_LINK(KerningSelectHdl, ListBox*); DECL_LINK(KerningModifyHdl, MetricField*); }; diff --git a/svx/source/sidebar/text/TextUnderlineControl.cxx b/svx/source/sidebar/text/TextUnderlineControl.cxx index 6acfd14a7bde..99bfab2e3342 100644 --- a/svx/source/sidebar/text/TextUnderlineControl.cxx +++ b/svx/source/sidebar/text/TextUnderlineControl.cxx @@ -126,8 +126,7 @@ void TextUnderlineControl::initial() maVSUnderline->SetItemData(10, reinterpret_cast<void*>(UNDERLINE_WAVE)); maVSUnderline->SetColCount(); - Link<> aLink2 = LINK( this, TextUnderlineControl, VSSelectHdl ) ; - maVSUnderline->SetSelectHdl(aLink2); + maVSUnderline->SetSelectHdl(LINK( this, TextUnderlineControl, VSSelectHdl )); maVSUnderline->StartSelection(); maVSUnderline->Show(); @@ -210,7 +209,7 @@ void TextUnderlineControl::Rearrange(FontUnderline eLine) maVSUnderline->StartSelection(); } -IMPL_LINK(TextUnderlineControl, VSSelectHdl, void *, pControl) +IMPL_LINK_TYPED(TextUnderlineControl, VSSelectHdl, ValueSet*, pControl, void) { if ( pControl == maVSUnderline.get() ) { @@ -225,7 +224,6 @@ IMPL_LINK(TextUnderlineControl, VSSelectHdl, void *, pControl) mpBindings->GetDispatcher()->Execute(SID_ATTR_CHAR_UNDERLINE, SfxCallMode::RECORD, &aLineItem, 0L); mrTextPropertyPanel.EndUnderlinePopupMode(); } - return 0L; } IMPL_LINK_TYPED(TextUnderlineControl, PBClickHdl, Button *, pPBtn, void) diff --git a/svx/source/sidebar/text/TextUnderlineControl.hxx b/svx/source/sidebar/text/TextUnderlineControl.hxx index 4c0f124d7ed0..a8e3fc0c31d1 100644 --- a/svx/source/sidebar/text/TextUnderlineControl.hxx +++ b/svx/source/sidebar/text/TextUnderlineControl.hxx @@ -71,7 +71,7 @@ private: void initial(); DECL_LINK_TYPED( PBClickHdl, Button*, void); - DECL_LINK(VSSelectHdl, void *); + DECL_LINK_TYPED(VSSelectHdl, ValueSet*, void); }; }} diff --git a/svx/source/tbxctrls/bulletsnumbering.cxx b/svx/source/tbxctrls/bulletsnumbering.cxx index b61ec20dfc49..d00606f59926 100644 --- a/svx/source/tbxctrls/bulletsnumbering.cxx +++ b/svx/source/tbxctrls/bulletsnumbering.cxx @@ -39,6 +39,7 @@ class NumberingPopup : public svtools::ToolbarMenu NumberingToolBoxControl& mrController; VclPtr<SvxNumValueSet> mpValueSet; DECL_LINK( VSSelectHdl, void * ); + DECL_LINK_TYPED( VSSelectValueSetHdl, ValueSet*, void ); public: NumberingPopup( NumberingToolBoxControl& rController, @@ -122,9 +123,8 @@ NumberingPopup::NumberingPopup( NumberingToolBoxControl& rController, appendEntry( 1, SVX_RESSTR( RID_SVXSTR_MORENUMBERING ), ::GetImage( rFrame, ".uno:OutlineBullet", false ) ); SetOutputSizePixel( getMenuSize() ); - Link<> aLink = LINK( this, NumberingPopup, VSSelectHdl ); - mpValueSet->SetSelectHdl( aLink ); - SetSelectHdl( aLink ); + mpValueSet->SetSelectHdl( LINK( this, NumberingPopup, VSSelectValueSetHdl ) ); + SetSelectHdl( LINK( this, NumberingPopup, VSSelectHdl ) ); if ( mbBulletItem ) AddStatusListener( ".uno:CurrentBulletListType" ); @@ -153,6 +153,10 @@ void NumberingPopup::statusChanged( const css::frame::FeatureStateEvent& rEvent mpValueSet->SelectItem( nSelItem ); } +IMPL_LINK_TYPED( NumberingPopup, VSSelectValueSetHdl, ValueSet*, pControl, void ) +{ + VSSelectHdl(pControl); +} IMPL_LINK( NumberingPopup, VSSelectHdl, void *, pControl ) { if ( IsInPopupMode() ) diff --git a/svx/source/tbxctrls/colorwindow.hxx b/svx/source/tbxctrls/colorwindow.hxx index 82df5e198bb0..096f95a2e0b3 100644 --- a/svx/source/tbxctrls/colorwindow.hxx +++ b/svx/source/tbxctrls/colorwindow.hxx @@ -54,7 +54,7 @@ private: std::function<void(const OUString&, const Color&)> maColorSelectFunction; - DECL_LINK( SelectHdl, SvxColorValueSet* ); + DECL_LINK_TYPED( SelectHdl, ValueSet*, void ); DECL_LINK( SelectPaletteHdl, void *); DECL_LINK_TYPED( AutoColorClickHdl, Button*, void ); DECL_LINK_TYPED( OpenPickerClickHdl, Button*, void ); diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx index 7200055bb5b1..dfc2903725b1 100644 --- a/svx/source/tbxctrls/colrctrl.cxx +++ b/svx/source/tbxctrls/colrctrl.cxx @@ -340,7 +340,7 @@ bool SvxColorDockingWindow::Close() return true; } -IMPL_LINK_NOARG(SvxColorDockingWindow, SelectHdl) +IMPL_LINK_NOARG_TYPED(SvxColorDockingWindow, SelectHdl, ValueSet*, void) { SfxDispatcher* pDispatcher = GetBindings().GetDispatcher(); sal_uInt16 nPos = aColorSet->GetSelectItemId(); @@ -432,8 +432,6 @@ IMPL_LINK_NOARG(SvxColorDockingWindow, SelectHdl) pDispatcher->Execute( nRightSlot, SfxCallMode::RECORD, &aRightColorItem, 0L ); } } - - return 0; } void SvxColorDockingWindow::Resizing( Size& rNewSize ) diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index 80575617116b..48043929eb44 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -81,7 +81,7 @@ ExtrusionDirectionWindow::ExtrusionDirectionWindow( SetSelectHdl( LINK( this, ExtrusionDirectionWindow, SelectHdl ) ); mpDirectionSet = createEmptyValueSetControl(); - mpDirectionSet->SetSelectHdl( LINK( this, ExtrusionDirectionWindow, SelectHdl ) ); + mpDirectionSet->SetSelectHdl( LINK( this, ExtrusionDirectionWindow, SelectValueSetHdl ) ); mpDirectionSet->SetColCount( 3 ); mpDirectionSet->EnableFullItemMode( false ); @@ -202,6 +202,10 @@ void ExtrusionDirectionWindow::statusChanged( +IMPL_LINK_TYPED( ExtrusionDirectionWindow, SelectValueSetHdl, ValueSet*, pControl, void ) +{ + SelectHdl(pControl); +} IMPL_LINK( ExtrusionDirectionWindow, SelectHdl, void *, pControl ) { if ( IsInPopupMode() ) @@ -570,7 +574,7 @@ ExtrusionLightingWindow::ExtrusionLightingWindow(svt::ToolboxController& rContro mpLightingSet = createEmptyValueSetControl(); mpLightingSet->SetHelpId( HID_VALUESET_EXTRUSION_LIGHTING ); - mpLightingSet->SetSelectHdl( LINK( this, ExtrusionLightingWindow, SelectHdl ) ); + mpLightingSet->SetSelectHdl( LINK( this, ExtrusionLightingWindow, SelectValueSetHdl ) ); mpLightingSet->SetColCount( 3 ); mpLightingSet->EnableFullItemMode( false ); @@ -699,6 +703,10 @@ void ExtrusionLightingWindow::DataChanged( const DataChangedEvent& rDCEvt ) +IMPL_LINK_TYPED( ExtrusionLightingWindow, SelectValueSetHdl, ValueSet*, pControl, void ) +{ + SelectHdl(pControl); +} IMPL_LINK( ExtrusionLightingWindow, SelectHdl, void *, pControl ) { if ( IsInPopupMode() ) diff --git a/svx/source/tbxctrls/extrusioncontrols.hxx b/svx/source/tbxctrls/extrusioncontrols.hxx index 793d7f641510..07a8a9f19446 100644 --- a/svx/source/tbxctrls/extrusioncontrols.hxx +++ b/svx/source/tbxctrls/extrusioncontrols.hxx @@ -59,6 +59,7 @@ private: const OUString msExtrusionProjection; DECL_LINK( SelectHdl, void * ); + DECL_LINK_TYPED( SelectValueSetHdl, ValueSet*, void ); void implSetDirection( sal_Int32 nSkew, bool bEnabled = true ); void implSetProjection( sal_Int32 nProjection, bool bEnabled = true ); @@ -160,6 +161,7 @@ private: void implSetDirection( int nDirection, bool bEnabled ); DECL_LINK( SelectHdl, void * ); + DECL_LINK_TYPED( SelectValueSetHdl, ValueSet*, void ); public: ExtrusionLightingWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, vcl::Window* pParentWindow ); virtual ~ExtrusionLightingWindow(); diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index 8e3cb432f887..4f9b5b86553a 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -249,11 +249,10 @@ IMPL_LINK_NOARG_TYPED(FontWorkGalleryDialog, ClickOKHdl, Button*, void) -IMPL_LINK_NOARG(FontWorkGalleryDialog, DoubleClickFavoriteHdl) +IMPL_LINK_NOARG_TYPED(FontWorkGalleryDialog, DoubleClickFavoriteHdl, ValueSet*, void) { insertSelectedFontwork(); EndDialog( RET_OK ); - return 0L; } diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index c764c6710f66..b6a757476c08 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -331,7 +331,7 @@ void SvxLineEndWindow::dispose() SfxPopupWindow::dispose(); } -IMPL_LINK_NOARG(SvxLineEndWindow, SelectHdl) +IMPL_LINK_NOARG_TYPED(SvxLineEndWindow, SelectHdl, ValueSet*, void) { boost::scoped_ptr<XLineEndItem> pLineEndItem; boost::scoped_ptr<XLineStartItem> pLineStartItem; @@ -383,8 +383,6 @@ IMPL_LINK_NOARG(SvxLineEndWindow, SelectHdl) SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ), OUString( ".uno:LineEndStyle" ), aArgs ); - - return 0; } diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 81fad3205235..30732a1e0f8d 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -249,7 +249,7 @@ private: ImageList aImgList; bool bParagraphMode; - DECL_LINK( SelectHdl, void * ); + DECL_LINK_TYPED( SelectHdl, ValueSet*, void ); protected: virtual void Resize() SAL_OVERRIDE; @@ -1349,7 +1349,7 @@ void SvxColorWindow_Impl::KeyInput( const KeyEvent& rKEvt ) mpColorSet->KeyInput(rKEvt); } -IMPL_LINK(SvxColorWindow_Impl, SelectHdl, SvxColorValueSet*, pColorSet) +IMPL_LINK_TYPED(SvxColorWindow_Impl, SelectHdl, ValueSet*, pColorSet, void) { Color aColor = pColorSet->GetItemColor( pColorSet->GetSelectItemId() ); /* #i33380# DR 2004-09-03 Moved the following line above the Dispatch() calls. @@ -1371,7 +1371,6 @@ IMPL_LINK(SvxColorWindow_Impl, SelectHdl, SvxColorValueSet*, pColorSet) maSelectedLink.Call(&aColor); maColorSelectFunction(maCommand, aColor); - return 0; } IMPL_LINK_NOARG(SvxColorWindow_Impl, SelectPaletteHdl) @@ -1666,7 +1665,7 @@ void SvxFrameWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt ) // By default unset lines remain unchanged. // Via Shift unset lines are reset -IMPL_LINK_NOARG(SvxFrameWindow_Impl, SelectHdl) +IMPL_LINK_NOARG_TYPED(SvxFrameWindow_Impl, SelectHdl, ValueSet*, void) { SvxBoxItem aBorderOuter( SID_ATTR_BORDER_OUTER ); SvxBoxInfoItem aBorderInner( SID_ATTR_BORDER_INNER ); @@ -1675,9 +1674,9 @@ IMPL_LINK_NOARG(SvxFrameWindow_Impl, SelectHdl) *pRight = 0, *pTop = 0, *pBottom = 0; - sal_uInt16 nSel = aFrameSet->GetSelectItemId(); - sal_uInt16 nModifier = aFrameSet->GetModifier(); - sal_uInt8 nValidFlags = 0; + sal_uInt16 nSel = aFrameSet->GetSelectItemId(); + sal_uInt16 nModifier = aFrameSet->GetModifier(); + sal_uInt8 nValidFlags = 0; theDefLine.GuessLinesWidths(theDefLine.GetBorderLineStyle(), DEF_LINE_WIDTH_0); @@ -1775,7 +1774,6 @@ IMPL_LINK_NOARG(SvxFrameWindow_Impl, SelectHdl) SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( GetFrame()->getController(), UNO_QUERY ), OUString( ".uno:SetBorderStyle" ), aArgs ); - return 0; } void SvxFrameWindow_Impl::Resize() diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index bd2c1faaacdf..ead5720a322e 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -1297,7 +1297,7 @@ SfxTabPage::sfxpg SwColumnPage::DeactivatePage(SfxItemSet *_pSet) return LEAVE_PAGE; } -IMPL_LINK( SwColumnPage, SetDefaultsHdl, ValueSet *, pVS ) +IMPL_LINK_TYPED( SwColumnPage, SetDefaultsHdl, ValueSet *, pVS, void ) { const sal_uInt16 nItem = pVS->GetSelectItemId(); if( nItem < 4 ) @@ -1330,7 +1330,6 @@ IMPL_LINK( SwColumnPage, SetDefaultsHdl, ValueSet *, pVS ) Timeout(); } - return 0; } void SwColumnPage::SetFrmMode(bool bMod) diff --git a/sw/source/uibase/inc/column.hxx b/sw/source/uibase/inc/column.hxx index 18985b33ed1b..0d043bf574a1 100644 --- a/sw/source/uibase/inc/column.hxx +++ b/sw/source/uibase/inc/column.hxx @@ -142,7 +142,7 @@ class SwColumnPage : public SfxTabPage DECL_LINK( GapModify, MetricField * ); DECL_LINK( EdModify, MetricField * ); DECL_LINK_TYPED( AutoWidthHdl, Button *, void ); - DECL_LINK( SetDefaultsHdl, ValueSet * ); + DECL_LINK_TYPED( SetDefaultsHdl, ValueSet *, void ); DECL_LINK_TYPED(Up, Button *, void); DECL_LINK_TYPED(Down, Button *, void); diff --git a/sw/source/uibase/sidebar/PageColumnControl.cxx b/sw/source/uibase/sidebar/PageColumnControl.cxx index 6c9e7bd3e89d..bfcdd2dc36d0 100644 --- a/sw/source/uibase/sidebar/PageColumnControl.cxx +++ b/sw/source/uibase/sidebar/PageColumnControl.cxx @@ -88,7 +88,7 @@ void PageColumnControl::dispose() svx::sidebar::PopupControl::dispose(); } -IMPL_LINK(PageColumnControl, ImplColumnHdl, void *, pControl) +IMPL_LINK_TYPED(PageColumnControl, ImplColumnHdl, ValueSet*, pControl, void) { mpColumnValueSet->SetNoSelection(); if ( pControl == mpColumnValueSet ) @@ -102,7 +102,6 @@ IMPL_LINK(PageColumnControl, ImplColumnHdl, void *, pControl) } mrPagePropPanel.ClosePageColumnPopup(); - return 0; } IMPL_LINK_NOARG_TYPED(PageColumnControl, MoreButtonClickHdl_Impl, Button*, void) diff --git a/sw/source/uibase/sidebar/PageColumnControl.hxx b/sw/source/uibase/sidebar/PageColumnControl.hxx index 3989ea9ae2d6..c7671c144d31 100644 --- a/sw/source/uibase/sidebar/PageColumnControl.hxx +++ b/sw/source/uibase/sidebar/PageColumnControl.hxx @@ -29,6 +29,7 @@ namespace svx { namespace sidebar { class ValueSetWithTextControl; } } +class ValueSet; namespace sw { namespace sidebar { @@ -55,7 +56,7 @@ private: PagePropertyPanel& mrPagePropPanel; - DECL_LINK(ImplColumnHdl, void*); + DECL_LINK_TYPED(ImplColumnHdl, ValueSet*, void); DECL_LINK_TYPED(MoreButtonClickHdl_Impl, Button*, void); }; diff --git a/sw/source/uibase/sidebar/PageMarginControl.cxx b/sw/source/uibase/sidebar/PageMarginControl.cxx index 7d5fe569f41d..7e3a206c63ac 100644 --- a/sw/source/uibase/sidebar/PageMarginControl.cxx +++ b/sw/source/uibase/sidebar/PageMarginControl.cxx @@ -323,7 +323,7 @@ void PageMarginControl::SelectValueSetItem() mpMarginValueSet->StartSelection(); }; -IMPL_LINK(PageMarginControl, ImplMarginHdl, void *, pControl) +IMPL_LINK_TYPED(PageMarginControl, ImplMarginHdl, ValueSet*, pControl, void) { if ( pControl == mpMarginValueSet ) { @@ -397,8 +397,6 @@ IMPL_LINK(PageMarginControl, ImplMarginHdl, void *, pControl) SelectValueSetItem(); } } - - return 0; } IMPL_LINK( PageMarginControl, ModifyLRMarginHdl, MetricField *, ) diff --git a/sw/source/uibase/sidebar/PageMarginControl.hxx b/sw/source/uibase/sidebar/PageMarginControl.hxx index 12a6754b83aa..be2ded8d722c 100644 --- a/sw/source/uibase/sidebar/PageMarginControl.hxx +++ b/sw/source/uibase/sidebar/PageMarginControl.hxx @@ -39,6 +39,7 @@ namespace svx { namespace sidebar { class ValueSetWithTextControl; } } +class ValueSet; static const long MINBODY = 284; //0.5 cm in twips @@ -100,7 +101,7 @@ private: PagePropertyPanel& mrPagePropPanel; - DECL_LINK( ImplMarginHdl, void* ); + DECL_LINK_TYPED( ImplMarginHdl, ValueSet*, void ); DECL_LINK( ModifyLRMarginHdl, MetricField* ); DECL_LINK( ModifyULMarginHdl, MetricField* ); diff --git a/sw/source/uibase/sidebar/PageOrientationControl.cxx b/sw/source/uibase/sidebar/PageOrientationControl.cxx index 18da73a34ba5..73ff9eb676f9 100644 --- a/sw/source/uibase/sidebar/PageOrientationControl.cxx +++ b/sw/source/uibase/sidebar/PageOrientationControl.cxx @@ -48,8 +48,7 @@ PageOrientationControl::PageOrientationControl( SW_RES(STR_LANDSCAPE), 0 ); } - Link<> aLink = LINK(this, PageOrientationControl,ImplOrientationHdl ); - mpOrientationValueSet->SetSelectHdl(aLink); + mpOrientationValueSet->SetSelectHdl(LINK(this, PageOrientationControl,ImplOrientationHdl )); mpOrientationValueSet->SetNoSelection(); mpOrientationValueSet->StartSelection(); mpOrientationValueSet->Show(); @@ -73,7 +72,7 @@ void PageOrientationControl::dispose() svx::sidebar::PopupControl::dispose(); } -IMPL_LINK(PageOrientationControl, ImplOrientationHdl, void *, pControl) +IMPL_LINK_TYPED(PageOrientationControl, ImplOrientationHdl, ValueSet*, pControl, void) { mpOrientationValueSet->SetNoSelection(); if ( pControl == mpOrientationValueSet ) @@ -89,7 +88,6 @@ IMPL_LINK(PageOrientationControl, ImplOrientationHdl, void *, pControl) } mrPagePropPanel.ClosePageOrientationPopup(); - return 0; } } } // end of namespace sw::sidebar diff --git a/sw/source/uibase/sidebar/PageOrientationControl.hxx b/sw/source/uibase/sidebar/PageOrientationControl.hxx index a2ceecff2a5a..69dc50074848 100644 --- a/sw/source/uibase/sidebar/PageOrientationControl.hxx +++ b/sw/source/uibase/sidebar/PageOrientationControl.hxx @@ -24,6 +24,8 @@ namespace svx { namespace sidebar { class ValueSetWithTextControl; } } +class ValueSet; + namespace sw { namespace sidebar { @@ -47,7 +49,7 @@ private: PagePropertyPanel& mrPagePropPanel; - DECL_LINK(ImplOrientationHdl, void*); + DECL_LINK_TYPED(ImplOrientationHdl, ValueSet*, void); }; } } // end of namespace sw::sidebar diff --git a/sw/source/uibase/sidebar/PageSizeControl.cxx b/sw/source/uibase/sidebar/PageSizeControl.cxx index 88484f26b143..e43cd140850a 100644 --- a/sw/source/uibase/sidebar/PageSizeControl.cxx +++ b/sw/source/uibase/sidebar/PageSizeControl.cxx @@ -155,7 +155,7 @@ void PageSizeControl::dispose() svx::sidebar::PopupControl::dispose(); } -IMPL_LINK(PageSizeControl, ImplSizeHdl, void *, pControl) +IMPL_LINK_TYPED(PageSizeControl, ImplSizeHdl, ValueSet*, pControl, void) { mpSizeValueSet->SetNoSelection(); if ( pControl == mpSizeValueSet ) @@ -170,7 +170,6 @@ IMPL_LINK(PageSizeControl, ImplSizeHdl, void *, pControl) } mrPagePropPanel.ClosePageSizePopup(); - return 0; } IMPL_LINK_NOARG_TYPED(PageSizeControl, MoreButtonClickHdl_Impl, Button*, void) diff --git a/sw/source/uibase/sidebar/PageSizeControl.hxx b/sw/source/uibase/sidebar/PageSizeControl.hxx index 7bb7e08ccdd2..59ce8845cdd2 100644 --- a/sw/source/uibase/sidebar/PageSizeControl.hxx +++ b/sw/source/uibase/sidebar/PageSizeControl.hxx @@ -32,6 +32,7 @@ namespace svx { namespace sidebar { class ValueSetWithTextControl; } } +class ValueSet; namespace sw { namespace sidebar { @@ -61,7 +62,7 @@ private: PagePropertyPanel& mrPagePropPanel; - DECL_LINK(ImplSizeHdl, void*); + DECL_LINK_TYPED(ImplSizeHdl, ::ValueSet*, void); DECL_LINK_TYPED(MoreButtonClickHdl_Impl, Button*, void); }; diff --git a/sw/source/uibase/sidebar/StylePresetsPanel.cxx b/sw/source/uibase/sidebar/StylePresetsPanel.cxx index 51137958338b..da36ab5378a1 100644 --- a/sw/source/uibase/sidebar/StylePresetsPanel.cxx +++ b/sw/source/uibase/sidebar/StylePresetsPanel.cxx @@ -207,7 +207,7 @@ void StylePresetsPanel::dispose() PanelLayout::dispose(); } -IMPL_LINK_NOARG(StylePresetsPanel, DoubleClickHdl) +IMPL_LINK_NOARG_TYPED(StylePresetsPanel, DoubleClickHdl, ValueSet*, void) { sal_Int32 nItemId = mpValueSet->GetSelectItemId(); TemplateEntry* pEntry = static_cast<TemplateEntry*>(mpValueSet->GetItemData(nItemId)); @@ -220,8 +220,6 @@ IMPL_LINK_NOARG(StylePresetsPanel, DoubleClickHdl) aOption.SetNumRules(true); pDocSh->LoadStylesFromFile(pEntry->maURL, aOption, false); } - - return 0; } void StylePresetsPanel::NotifyItemUpdate(const sal_uInt16 /*nSId*/, diff --git a/sw/source/uibase/sidebar/StylePresetsPanel.hxx b/sw/source/uibase/sidebar/StylePresetsPanel.hxx index c86276728bcf..f30d560667cc 100644 --- a/sw/source/uibase/sidebar/StylePresetsPanel.hxx +++ b/sw/source/uibase/sidebar/StylePresetsPanel.hxx @@ -83,7 +83,7 @@ private: std::vector<std::unique_ptr<TemplateEntry>> maTemplateEntries; - DECL_LINK(DoubleClickHdl, void*); + DECL_LINK_TYPED(DoubleClickHdl, ValueSet*, void); }; }} // end of namespace sw::sidebar diff --git a/sw/source/uibase/sidebar/ThemePanel.cxx b/sw/source/uibase/sidebar/ThemePanel.cxx index 838cc1b147d7..c183a14eb404 100644 --- a/sw/source/uibase/sidebar/ThemePanel.cxx +++ b/sw/source/uibase/sidebar/ThemePanel.cxx @@ -457,7 +457,7 @@ ThemePanel::ThemePanel(vcl::Window* pParent, mpApplyButton->SetClickHdl(LINK(this, ThemePanel, ClickHdl)); mpListBoxFonts->SetDoubleClickHdl(LINK(this, ThemePanel, DoubleClickHdl)); - mpValueSetColors->SetDoubleClickHdl(LINK(this, ThemePanel, DoubleClickHdl)); + mpValueSetColors->SetDoubleClickHdl(LINK(this, ThemePanel, DoubleClickValueSetHdl)); std::vector<FontSet> aFontSets = initFontSets(); for (size_t i = 0; i < aFontSets.size(); ++i) @@ -496,7 +496,10 @@ IMPL_LINK_NOARG_TYPED(ThemePanel, ClickHdl, Button*, void) { DoubleClickHdl(NULL); } - +IMPL_LINK_NOARG_TYPED(ThemePanel, DoubleClickValueSetHdl, ValueSet*, void) +{ + DoubleClickHdl(NULL); +} IMPL_LINK_NOARG(ThemePanel, DoubleClickHdl) { SwDocShell* pDocSh = static_cast<SwDocShell*>(SfxObjectShell::Current()); diff --git a/sw/source/uibase/sidebar/ThemePanel.hxx b/sw/source/uibase/sidebar/ThemePanel.hxx index 870690d6492e..173fb76c4375 100644 --- a/sw/source/uibase/sidebar/ThemePanel.hxx +++ b/sw/source/uibase/sidebar/ThemePanel.hxx @@ -74,6 +74,7 @@ private: DECL_LINK_TYPED(ClickHdl, Button*, void); DECL_LINK(DoubleClickHdl, void*); + DECL_LINK_TYPED(DoubleClickValueSetHdl, ValueSet*, void); }; |