diff options
author | Noel Grandin <noel@peralex.com> | 2015-09-11 13:27:40 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-09-14 10:00:44 +0200 |
commit | 2a4ccc0c1e836fb7cde991c1233ca5a63599ec8b (patch) | |
tree | 74fee8c81b010cfef46fab0b96e5eb984726d25a /filter | |
parent | 6532cb0e5ec3a59c248b332e868c4c03c31659f1 (diff) |
convert Link<> to typed
Change-Id: I1c501671d72edd5b998e80c7fa1e91dbeb507af8
Diffstat (limited to 'filter')
-rw-r--r-- | filter/source/flash/impswfdialog.cxx | 6 | ||||
-rw-r--r-- | filter/source/flash/impswfdialog.hxx | 2 | ||||
-rw-r--r-- | filter/source/pdf/impdialog.cxx | 21 | ||||
-rw-r--r-- | filter/source/pdf/impdialog.hxx | 10 | ||||
-rw-r--r-- | filter/source/svg/impsvgdialog.cxx | 10 | ||||
-rw-r--r-- | filter/source/svg/impsvgdialog.hxx | 2 |
6 files changed, 20 insertions, 31 deletions
diff --git a/filter/source/flash/impswfdialog.cxx b/filter/source/flash/impswfdialog.cxx index 9a0da76df8dd..120bdcd030b4 100644 --- a/filter/source/flash/impswfdialog.cxx +++ b/filter/source/flash/impswfdialog.cxx @@ -96,16 +96,14 @@ Sequence< PropertyValue > ImpSWFDialog::GetFilterData() } // AS: This is called whenever the user toggles one of the checkboxes -IMPL_LINK( ImpSWFDialog, OnToggleCheckbox, CheckBox*, pBox ) +IMPL_LINK_TYPED( ImpSWFDialog, OnToggleCheckbox, CheckBox&, rBox, void ) { - if (pBox == mpCheckExportAll) + if (&rBox == mpCheckExportAll) { mpCheckExportBackgrounds->Enable(!mpCheckExportBackgrounds->IsEnabled()); mpCheckExportBackgroundObjects->Enable(!mpCheckExportBackgroundObjects->IsEnabled()); mpCheckExportSlideContents->Enable(!mpCheckExportSlideContents->IsEnabled()); } - - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/flash/impswfdialog.hxx b/filter/source/flash/impswfdialog.hxx index aae9ecf7f1c2..5ff6f085d635 100644 --- a/filter/source/flash/impswfdialog.hxx +++ b/filter/source/flash/impswfdialog.hxx @@ -52,7 +52,7 @@ private: FilterConfigItem maConfigItem; - DECL_LINK( OnToggleCheckbox, CheckBox* ); + DECL_LINK_TYPED( OnToggleCheckbox, CheckBox&, void ); public: ImpSWFDialog( vcl::Window* pParent, diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index 5d89feb87f05..5cb213ef80c0 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -632,7 +632,7 @@ void ImpPDFTabGeneralPage::SetFilterConfigItem( ImpPDFTabDialog* paParent ) case 1: mpCbPDFA1b->Check(); // PDF/A-1a break; } - ToggleExportPDFAHdl( NULL ); + ToggleExportPDFAHdl( *mpCbPDFA1b ); mpCbExportFormFields->SetToggleHdl( LINK( this, ImpPDFTabGeneralPage, ToggleExportFormFieldsHdl ) ); @@ -678,7 +678,7 @@ void ImpPDFTabGeneralPage::SetFilterConfigItem( ImpPDFTabDialog* paParent ) mpCbAddStream->SetToggleHdl( LINK( this, ImpPDFTabGeneralPage, ToggleAddStreamHdl ) ); // init addstream dependencies - ToggleAddStreamHdl(NULL); + ToggleAddStreamHdl(*mpCbAddStream); } @@ -755,10 +755,9 @@ void ImpPDFTabGeneralPage::TogglePagesHdl() } -IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleExportFormFieldsHdl) +IMPL_LINK_NOARG_TYPED(ImpPDFTabGeneralPage, ToggleExportFormFieldsHdl, CheckBox&, void) { mpFormsFrame->Enable(mpCbExportFormFields->IsChecked()); - return 0; } @@ -768,25 +767,22 @@ IMPL_LINK_NOARG_TYPED(ImpPDFTabGeneralPage, ToggleCompressionHdl, RadioButton&, } -IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleReduceImageResolutionHdl) +IMPL_LINK_NOARG_TYPED(ImpPDFTabGeneralPage, ToggleReduceImageResolutionHdl, CheckBox&, void) { mpCoReduceImageResolution->Enable( mpCbReduceImageResolution->IsChecked() ); - return 0; } -IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleWatermarkHdl) +IMPL_LINK_NOARG_TYPED(ImpPDFTabGeneralPage, ToggleWatermarkHdl, CheckBox&, void) { mpEdWatermark->Enable( mpCbWatermark->IsChecked() ); mpFtWatermark->Enable (mpCbWatermark->IsChecked() ); if ( mpCbWatermark->IsChecked() ) mpEdWatermark->GrabFocus(); - - return 0; } -IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleAddStreamHdl) +IMPL_LINK_NOARG_TYPED(ImpPDFTabGeneralPage, ToggleAddStreamHdl, CheckBox&, void) { if( mpCbAddStream->IsVisible() ) { @@ -805,11 +801,10 @@ IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleAddStreamHdl) mpRbSelection->Enable( true ); } } - return 0; } -IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleExportPDFAHdl) +IMPL_LINK_NOARG_TYPED(ImpPDFTabGeneralPage, ToggleExportPDFAHdl, CheckBox&, void) { //set the security page status (and its controls as well) ImpPDFTabSecurityPage* pSecPage = mpaParent ? mpaParent->getSecurityPage() : NULL; @@ -851,8 +846,6 @@ IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleExportPDFAHdl) ScopedVclPtrInstance< MessageDialog > aBox(this, PDFFilterResId(STR_WARN_PASSWORD_PDFA), VCL_MESSAGE_WARNING); aBox->Execute(); } - - return 0; } // the option features tab page diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx index 4dfbe3096181..f656ab8c8aac 100644 --- a/filter/source/pdf/impdialog.hxx +++ b/filter/source/pdf/impdialog.hxx @@ -233,14 +233,14 @@ class ImpPDFTabGeneralPage : public SfxTabPage 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* ); + DECL_LINK_TYPED( ToggleReduceImageResolutionHdl, CheckBox&, void ); + DECL_LINK_TYPED( ToggleWatermarkHdl, CheckBox&, void ); + DECL_LINK_TYPED( ToggleAddStreamHdl, CheckBox&, void ); + DECL_LINK_TYPED( ToggleExportFormFieldsHdl, CheckBox&, void ); void TogglePagesHdl(); public: - DECL_LINK( ToggleExportPDFAHdl, void* ); + DECL_LINK_TYPED( ToggleExportPDFAHdl, CheckBox&, void ); ImpPDFTabGeneralPage( vcl::Window* pParent, const SfxItemSet& rSet ); diff --git a/filter/source/svg/impsvgdialog.cxx b/filter/source/svg/impsvgdialog.cxx index 2fe2bb43553f..c513a1c1a181 100644 --- a/filter/source/svg/impsvgdialog.cxx +++ b/filter/source/svg/impsvgdialog.cxx @@ -77,7 +77,7 @@ ImpSVGDialog::ImpSVGDialog( vcl::Window* pParent, Sequence< PropertyValue >& rFi Size( implMap( *this, 50 ), implMap( *this, 14 ) ) ); maCBTinyProfile->SetToggleHdl( LINK( this, ImpSVGDialog, OnToggleCheckbox ) ); - OnToggleCheckbox( maCBTinyProfile.get() ); + OnToggleCheckbox( *maCBTinyProfile.get() ); maFI->Show(); @@ -123,11 +123,11 @@ Sequence< PropertyValue > ImpSVGDialog::GetFilterData() -IMPL_LINK( ImpSVGDialog, OnToggleCheckbox, CheckBox*, pBox ) +IMPL_LINK_TYPED( ImpSVGDialog, OnToggleCheckbox, CheckBox&, rBox, void ) { - if( pBox == maCBTinyProfile.get() ) + if( &rBox == maCBTinyProfile.get() ) { - if( pBox->IsChecked() ) + if( rBox.IsChecked() ) { mbOldNativeDecoration = maCBUseNativeDecoration->IsChecked(); @@ -140,8 +140,6 @@ IMPL_LINK( ImpSVGDialog, OnToggleCheckbox, CheckBox*, pBox ) maCBUseNativeDecoration->Check( mbOldNativeDecoration ); } } - - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/svg/impsvgdialog.hxx b/filter/source/svg/impsvgdialog.hxx index ada5b71df1e3..c10400ef55ba 100644 --- a/filter/source/svg/impsvgdialog.hxx +++ b/filter/source/svg/impsvgdialog.hxx @@ -60,7 +60,7 @@ private: FilterConfigItem maConfigItem; bool mbOldNativeDecoration; - DECL_LINK( OnToggleCheckbox, CheckBox* ); + DECL_LINK_TYPED( OnToggleCheckbox, CheckBox&, void ); public: |