diff options
author | Noel Grandin <noel@peralex.com> | 2015-09-09 11:41:20 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-09-10 11:38:30 +0200 |
commit | f4e951a61a20edd6efbd244966e851aa378e66ad (patch) | |
tree | f4879e437b88432069001e7e3dadd2649cd33a14 /filter | |
parent | include algorithm for std::min (diff) | |
download | core-f4e951a61a20edd6efbd244966e851aa378e66ad.tar.gz core-f4e951a61a20edd6efbd244966e851aa378e66ad.zip |
convert Link<> to typed
Change-Id: I603463d0486d4d0f21ebbdc6eca900db58bb090f
Diffstat (limited to 'filter')
-rw-r--r-- | filter/source/pdf/impdialog.cxx | 29 | ||||
-rw-r--r-- | filter/source/pdf/impdialog.hxx | 12 |
2 files changed, 24 insertions, 17 deletions
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index 8ff8bcf00321..5d89feb87f05 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -596,7 +596,7 @@ void ImpPDFTabGeneralPage::SetFilterConfigItem( ImpPDFTabDialog* paParent ) mpRbRange->SetToggleHdl( LINK( this, ImpPDFTabGeneralPage, TogglePagesHdl ) ); mpRbAll->Check(); - TogglePagesHdl( NULL ); + TogglePagesHdl(); mpRbSelection->Enable( paParent->mbSelectionPresent ); mbIsPresentation = paParent->mbIsPresentation; @@ -742,12 +742,16 @@ VclPtr<SfxTabPage> ImpPDFTabGeneralPage::Create( vcl::Window* pParent, } -IMPL_LINK_NOARG(ImpPDFTabGeneralPage, TogglePagesHdl) +IMPL_LINK_NOARG_TYPED(ImpPDFTabGeneralPage, TogglePagesHdl, RadioButton&, void) +{ + TogglePagesHdl(); +} + +void ImpPDFTabGeneralPage::TogglePagesHdl() { mpEdPages->Enable( mpRbRange->IsChecked() ); if ( mpRbRange->IsChecked() ) mpEdPages->GrabFocus(); - return 0; } @@ -758,10 +762,9 @@ IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleExportFormFieldsHdl) } -IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleCompressionHdl) +IMPL_LINK_NOARG_TYPED(ImpPDFTabGeneralPage, ToggleCompressionHdl, RadioButton&, void) { mpQualityFrame->Enable(mpRbJPEGCompression->IsChecked()); - return 0; } @@ -1016,20 +1019,23 @@ void ImpPDFTabOpnFtrPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent { mpRbPgLyContinueFacing->SetToggleHdl( LINK( this, ImpPDFTabOpnFtrPage, ToggleRbPgLyContinueFacingHdl ) ); mpCbPgLyFirstOnLeft->Check( paParent->mbFirstPageLeft ); - ToggleRbPgLyContinueFacingHdl( NULL ); + ToggleRbPgLyContinueFacingHdl(); } } -IMPL_LINK_NOARG(ImpPDFTabOpnFtrPage, ToggleRbPgLyContinueFacingHdl) +IMPL_LINK_NOARG_TYPED(ImpPDFTabOpnFtrPage, ToggleRbPgLyContinueFacingHdl, RadioButton&, void) +{ + ToggleRbPgLyContinueFacingHdl(); +} + +void ImpPDFTabOpnFtrPage::ToggleRbPgLyContinueFacingHdl() { mpCbPgLyFirstOnLeft->Enable( mpRbPgLyContinueFacing->IsChecked() ); - return 0; } -IMPL_LINK_NOARG( ImpPDFTabOpnFtrPage, ToggleRbMagnHdl ) +IMPL_LINK_NOARG_TYPED( ImpPDFTabOpnFtrPage, ToggleRbMagnHdl, RadioButton&, void ) { mpNumZoom->Enable( mpRbMagnZoom->IsChecked() ); - return 0; } @@ -1077,10 +1083,9 @@ void ImpPDFTabViewerPage::dispose() SfxTabPage::dispose(); } -IMPL_LINK_NOARG( ImpPDFTabViewerPage, ToggleRbBookmarksHdl ) +IMPL_LINK_NOARG_TYPED( ImpPDFTabViewerPage, ToggleRbBookmarksHdl, RadioButton&, void ) { m_pNumBookmarkLevels->Enable( m_pRbVisibleBookmarkLevels->IsChecked() ); - return 0; } VclPtr<SfxTabPage> ImpPDFTabViewerPage::Create( vcl::Window* pParent, diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx index 39f9e78011e0..4dfbe3096181 100644 --- a/filter/source/pdf/impdialog.hxx +++ b/filter/source/pdf/impdialog.hxx @@ -231,12 +231,13 @@ class ImpPDFTabGeneralPage : public SfxTabPage VclPtr<ImpPDFTabDialog> mpaParent; - DECL_LINK( TogglePagesHdl, void* ); - DECL_LINK( ToggleCompressionHdl, void* ); + DECL_LINK_TYPED( TogglePagesHdl, RadioButton&, void ); + DECL_LINK_TYPED( ToggleCompressionHdl, RadioButton&, void ); DECL_LINK( ToggleReduceImageResolutionHdl, void* ); DECL_LINK( ToggleWatermarkHdl, void* ); DECL_LINK( ToggleAddStreamHdl, void* ); DECL_LINK( ToggleExportFormFieldsHdl, void* ); + void TogglePagesHdl(); public: DECL_LINK( ToggleExportPDFAHdl, void* ); @@ -277,8 +278,9 @@ class ImpPDFTabOpnFtrPage : public SfxTabPage bool mbUseCTLFont; - DECL_LINK( ToggleRbPgLyContinueFacingHdl, void* ); - DECL_LINK( ToggleRbMagnHdl, void* ); + DECL_LINK_TYPED( ToggleRbPgLyContinueFacingHdl, RadioButton&, void ); + DECL_LINK_TYPED( ToggleRbMagnHdl, RadioButton&, void ); + void ToggleRbPgLyContinueFacingHdl(); public: ImpPDFTabOpnFtrPage( vcl::Window* pParent, @@ -313,7 +315,7 @@ class ImpPDFTabViewerPage : public SfxTabPage VclPtr<RadioButton> m_pRbVisibleBookmarkLevels; VclPtr<NumericField> m_pNumBookmarkLevels; - DECL_LINK( ToggleRbBookmarksHdl, void* ); + DECL_LINK_TYPED( ToggleRbBookmarksHdl, RadioButton&, void ); public: ImpPDFTabViewerPage( vcl::Window* pParent, const SfxItemSet& rSet ); |