diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2015-07-12 21:13:57 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-07-13 06:58:14 +0000 |
| commit | 2970ec843820a72d73a91cc11fc353e5b9fde5fd (patch) | |
| tree | f2cee9aa4ff219d1456f2d2f79404cf58f5bb845 /filter | |
| parent | 26ac3ee8b2f8cb3bd298d98f9a94c9e305f6c304 (diff) | |
editeng: make Link<> usage typed
Change-Id: Iec36c7e4f4fbc2ee2ee25d4d0c8488340ba7d8c4
Reviewed-on: https://gerrit.libreoffice.org/16968
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/svg/svgexport.cxx | 7 | ||||
| -rw-r--r-- | filter/source/svg/svgfilter.hxx | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index 6e91d555bc53..b0ddc8c4eb97 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -2128,7 +2128,7 @@ OUString SVGFilter::implGetInterfaceName( const Reference< XInterface >& rxIf ) -IMPL_LINK( SVGFilter, CalcFieldHdl, EditFieldInfo*, pInfo ) +IMPL_LINK_TYPED( SVGFilter, CalcFieldHdl, EditFieldInfo*, pInfo, void ) { bool bFieldProcessed = false; if( pInfo && mbPresentation ) @@ -2146,7 +2146,7 @@ IMPL_LINK( SVGFilter, CalcFieldHdl, EditFieldInfo*, pInfo ) if( !mCreateOjectsCurrentMasterPage.is() ) { OSL_FAIL( "error: !mCreateOjectsCurrentMasterPage.is()" ); - return 0; + return; } bool bHasCharSetMap = !( mTextFieldCharSets.find( mCreateOjectsCurrentMasterPage ) == mTextFieldCharSets.end() ); @@ -2365,7 +2365,8 @@ IMPL_LINK( SVGFilter, CalcFieldHdl, EditFieldInfo*, pInfo ) } } - return ( bFieldProcessed ? 0 : maOldFieldHdl.Call( pInfo ) ); + if (!bFieldProcessed) + maOldFieldHdl.Call( pInfo ); } diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx index 55b625344cfb..b0fc550295af 100644 --- a/filter/source/svg/svgfilter.hxx +++ b/filter/source/svg/svgfilter.hxx @@ -244,8 +244,8 @@ private: XDrawPageSequence mSelectedPages; XDrawPageSequence mMasterPageTargets; - Link<> maOldFieldHdl; - Link<> maNewFieldHdl; + Link<EditFieldInfo*,void> maOldFieldHdl; + Link<EditFieldInfo*,void> maNewFieldHdl; bool implImport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException, std::exception); @@ -290,7 +290,7 @@ private: static Any implSafeGetPagePropSet( const OUString & sPropertyName, const Reference< XPropertySet > & rxPropSet, const Reference< XPropertySetInfo > & rxPropSetInfo ); - DECL_LINK( CalcFieldHdl, EditFieldInfo* ); + DECL_LINK_TYPED( CalcFieldHdl, EditFieldInfo*, void ); static bool isStreamGZip(css::uno::Reference<css::io::XInputStream> xInput); static bool isStreamSvg(css::uno::Reference<css::io::XInputStream> xInput); |