diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2015-09-23 15:10:45 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-09-24 16:20:51 +0000 |
| commit | 74ce05b940be952be63687f31be45a58afa1d1ee (patch) | |
| tree | ad894ce2bd300c1676211d7b8259ab1cd238b507 /vcl | |
| parent | e85b2333bce7b1dcae73861df6d90b48b9f4efe5 (diff) | |
convert Link<> to typed
Change-Id: I280473a7a9069a86388f608bddc8e48879771bc9
Reviewed-on: https://gerrit.libreoffice.org/18815
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/filter/graphicfilter.cxx | 71 |
1 files changed, 34 insertions, 37 deletions
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index 45480f4be204..84cdfcac5ac8 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -2177,53 +2177,50 @@ void GraphicFilter::ResetLastError() pErrorEx->nFilterError = pErrorEx->nStreamError = 0UL; } -const Link<> GraphicFilter::GetFilterCallback() const +const Link<ConvertData&,bool> GraphicFilter::GetFilterCallback() const { - const Link<> aLink( LINK( const_cast<GraphicFilter*>(this), GraphicFilter, FilterCallback ) ); + const Link<ConvertData&,bool> aLink( LINK( const_cast<GraphicFilter*>(this), GraphicFilter, FilterCallback ) ); return aLink; } -IMPL_LINK( GraphicFilter, FilterCallback, ConvertData*, pData ) +IMPL_LINK_TYPED( GraphicFilter, FilterCallback, ConvertData&, rData, bool ) { bool nRet = false; - if( pData ) + sal_uInt16 nFormat = GRFILTER_FORMAT_DONTKNOW; + OString aShortName; + switch( rData.mnFormat ) + { + case( ConvertDataFormat::BMP ): aShortName = BMP_SHORTNAME; break; + case( ConvertDataFormat::GIF ): aShortName = GIF_SHORTNAME; break; + case( ConvertDataFormat::JPG ): aShortName = JPG_SHORTNAME; break; + case( ConvertDataFormat::MET ): aShortName = MET_SHORTNAME; break; + case( ConvertDataFormat::PCT ): aShortName = PCT_SHORTNAME; break; + case( ConvertDataFormat::PNG ): aShortName = PNG_SHORTNAME; break; + case( ConvertDataFormat::SVM ): aShortName = SVM_SHORTNAME; break; + case( ConvertDataFormat::TIF ): aShortName = TIF_SHORTNAME; break; + case( ConvertDataFormat::WMF ): aShortName = WMF_SHORTNAME; break; + case( ConvertDataFormat::EMF ): aShortName = EMF_SHORTNAME; break; + case( ConvertDataFormat::SVG ): aShortName = SVG_SHORTNAME; break; + + default: + break; + } + if( GRAPHIC_NONE == rData.maGraphic.GetType() || rData.maGraphic.GetContext() ) // Import { - sal_uInt16 nFormat = GRFILTER_FORMAT_DONTKNOW; - OString aShortName; - switch( pData->mnFormat ) - { - case( ConvertDataFormat::BMP ): aShortName = BMP_SHORTNAME; break; - case( ConvertDataFormat::GIF ): aShortName = GIF_SHORTNAME; break; - case( ConvertDataFormat::JPG ): aShortName = JPG_SHORTNAME; break; - case( ConvertDataFormat::MET ): aShortName = MET_SHORTNAME; break; - case( ConvertDataFormat::PCT ): aShortName = PCT_SHORTNAME; break; - case( ConvertDataFormat::PNG ): aShortName = PNG_SHORTNAME; break; - case( ConvertDataFormat::SVM ): aShortName = SVM_SHORTNAME; break; - case( ConvertDataFormat::TIF ): aShortName = TIF_SHORTNAME; break; - case( ConvertDataFormat::WMF ): aShortName = WMF_SHORTNAME; break; - case( ConvertDataFormat::EMF ): aShortName = EMF_SHORTNAME; break; - case( ConvertDataFormat::SVG ): aShortName = SVG_SHORTNAME; break; - - default: - break; - } - if( GRAPHIC_NONE == pData->maGraphic.GetType() || pData->maGraphic.GetContext() ) // Import - { - // Import - nFormat = GetImportFormatNumberForShortName( OStringToOUString( aShortName, RTL_TEXTENCODING_UTF8) ); - nRet = ImportGraphic( pData->maGraphic, OUString(), pData->mrStm, nFormat ) == 0; - } + // Import + nFormat = GetImportFormatNumberForShortName( OStringToOUString( aShortName, RTL_TEXTENCODING_UTF8) ); + nRet = ImportGraphic( rData.maGraphic, OUString(), rData.mrStm, nFormat ) == 0; + } #ifndef DISABLE_EXPORT - else if( !aShortName.isEmpty() ) - { - // Export - nFormat = GetExportFormatNumberForShortName( OStringToOUString(aShortName, RTL_TEXTENCODING_UTF8) ); - nRet = ExportGraphic( pData->maGraphic, OUString(), pData->mrStm, nFormat ) == 0; - } -#endif + else if( !aShortName.isEmpty() ) + { + // Export + nFormat = GetExportFormatNumberForShortName( OStringToOUString(aShortName, RTL_TEXTENCODING_UTF8) ); + nRet = ExportGraphic( rData.maGraphic, OUString(), rData.mrStm, nFormat ) == 0; } - return long(nRet); +#endif + return nRet; } namespace |