diff options
Diffstat (limited to 'svx')
-rw-r--r-- | svx/inc/galbrws2.hxx | 1 | ||||
-rw-r--r-- | svx/source/gallery2/galbrws2.cxx | 20 | ||||
-rw-r--r-- | svx/source/sidebar/line/LineWidthControl.cxx | 9 | ||||
-rw-r--r-- | svx/source/sidebar/line/LineWidthControl.hxx | 2 | ||||
-rw-r--r-- | svx/source/sidebar/text/TextCharacterSpacingControl.cxx | 9 | ||||
-rw-r--r-- | svx/source/sidebar/text/TextCharacterSpacingControl.hxx | 2 | ||||
-rw-r--r-- | svx/source/sidebar/text/TextUnderlineControl.cxx | 6 | ||||
-rw-r--r-- | svx/source/sidebar/text/TextUnderlineControl.hxx | 2 | ||||
-rw-r--r-- | svx/source/tbxctrls/bulletsnumbering.cxx | 10 | ||||
-rw-r--r-- | svx/source/tbxctrls/colorwindow.hxx | 2 | ||||
-rw-r--r-- | svx/source/tbxctrls/colrctrl.cxx | 4 | ||||
-rw-r--r-- | svx/source/tbxctrls/extrusioncontrols.cxx | 12 | ||||
-rw-r--r-- | svx/source/tbxctrls/extrusioncontrols.hxx | 2 | ||||
-rw-r--r-- | svx/source/tbxctrls/fontworkgallery.cxx | 3 | ||||
-rw-r--r-- | svx/source/tbxctrls/linectrl.cxx | 4 | ||||
-rw-r--r-- | svx/source/tbxctrls/tbcontrl.cxx | 14 |
16 files changed, 52 insertions, 50 deletions
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() |