diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2015-09-25 10:27:15 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-09-25 18:21:31 +0000 |
| commit | f8a7c031f1ff872f9566b7bfce0321c0b89d45f9 (patch) | |
| tree | 30e862f02865686fc0434efc82330c8dd968d860 /chart2 | |
| parent | 1296732028df43160d070d27be6fd961e284fdd6 (diff) | |
convert Link<> to typed
Change-Id: Ic39135b39f1389fdf94fb16746100209ee63f492
Reviewed-on: https://gerrit.libreoffice.org/18856
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/source/controller/main/ShapeController.cxx | 12 | ||||
| -rw-r--r-- | chart2/source/controller/main/ShapeController.hxx | 4 |
2 files changed, 7 insertions, 9 deletions
diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx index 6897a29650f4..7fc856e3d9b2 100644 --- a/chart2/source/controller/main/ShapeController.cxx +++ b/chart2/source/controller/main/ShapeController.cxx @@ -229,22 +229,20 @@ void ShapeController::describeSupportedFeatures() implDescribeSupportedFeature( ".uno:ParagraphDialog", COMMAND_ID_PARAGRAPH_DIALOG, CommandGroup::EDIT ); } -IMPL_LINK( ShapeController, CheckNameHdl, AbstractSvxNameDialog*, pDialog ) +IMPL_LINK_TYPED( ShapeController, CheckNameHdl, AbstractSvxObjectNameDialog&, rDialog, bool ) { OUString aName; - if ( pDialog ) - { - pDialog->GetName( aName ); - } + rDialog.GetName( aName ); + if ( !aName.isEmpty() ) { DrawViewWrapper* pDrawViewWrapper = ( m_pChartController ? m_pChartController->GetDrawViewWrapper() : NULL ); if ( pDrawViewWrapper && pDrawViewWrapper->getNamedSdrObject( aName ) ) { - return 0; + return false; } } - return 1; + return true; } void ShapeController::executeDispatch_FormatLine() diff --git a/chart2/source/controller/main/ShapeController.hxx b/chart2/source/controller/main/ShapeController.hxx index b1601890458e..93c701e909a5 100644 --- a/chart2/source/controller/main/ShapeController.hxx +++ b/chart2/source/controller/main/ShapeController.hxx @@ -22,7 +22,7 @@ #include "FeatureCommandDispatchBase.hxx" #include <tools/link.hxx> -class AbstractSvxNameDialog; +class AbstractSvxObjectNameDialog; class SdrObject; namespace chart @@ -62,7 +62,7 @@ protected: virtual void describeSupportedFeatures() SAL_OVERRIDE; private: - DECL_LINK( CheckNameHdl, AbstractSvxNameDialog* ); + DECL_LINK_TYPED( CheckNameHdl, AbstractSvxObjectNameDialog&, bool); void executeDispatch_FormatLine(); void executeDispatch_FormatArea(); |