From 3af500580b1c82eabd60335c9ebc458a3f68850c Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 8 Dec 2017 15:58:41 +0200 Subject: loplugin:salcall fix functions since cdecl is the default calling convention on Windows for such functions, the annotation is redundant. Change-Id: I1a85fa27e5ac65ce0e04a19bde74c90800ffaa2d Reviewed-on: https://gerrit.libreoffice.org/46164 Tested-by: Jenkins Reviewed-by: Noel Grandin --- filter/source/config/cache/registration.cxx | 2 +- filter/source/flash/swfdialog.cxx | 4 ++-- filter/source/flash/swffilter.cxx | 4 ++-- filter/source/flash/swfuno.cxx | 2 +- filter/source/flash/swfuno.hxx | 8 ++++---- filter/source/graphic/Services.cxx | 2 +- filter/source/graphicfilter/egif/egif.cxx | 2 +- filter/source/graphicfilter/eps/eps.cxx | 2 +- filter/source/graphicfilter/etiff/etiff.cxx | 2 +- filter/source/graphicfilter/icgm/cgm.cxx | 2 +- filter/source/graphicfilter/idxf/idxf.cxx | 2 +- filter/source/graphicfilter/ieps/ieps.cxx | 2 +- filter/source/graphicfilter/ios2met/ios2met.cxx | 2 +- filter/source/graphicfilter/ipbm/ipbm.cxx | 2 +- filter/source/graphicfilter/ipcd/ipcd.cxx | 2 +- filter/source/graphicfilter/ipcx/ipcx.cxx | 2 +- filter/source/graphicfilter/ipict/ipict.cxx | 2 +- filter/source/graphicfilter/ipsd/ipsd.cxx | 2 +- filter/source/graphicfilter/iras/iras.cxx | 2 +- filter/source/graphicfilter/itga/itga.cxx | 2 +- filter/source/graphicfilter/itiff/itiff.cxx | 2 +- filter/source/msfilter/escherex.cxx | 2 +- filter/source/msfilter/msvbahelper.cxx | 2 +- filter/source/msfilter/services.cxx | 2 +- filter/source/odfflatxml/OdfFlatXml.cxx | 2 +- filter/source/pdf/pdfdialog.cxx | 4 ++-- filter/source/pdf/pdfdialog.hxx | 4 ++-- filter/source/pdf/pdffilter.cxx | 4 ++-- filter/source/pdf/pdffilter.hxx | 4 ++-- filter/source/pdf/pdfinteract.cxx | 4 ++-- filter/source/pdf/pdfinteract.hxx | 4 ++-- filter/source/pdf/pdfuno.cxx | 2 +- filter/source/storagefilterdetect/fdcomp.cxx | 2 +- filter/source/svg/svgdialog.cxx | 4 ++-- filter/source/svg/svgdialog.hxx | 4 ++-- filter/source/svg/svgfilter.cxx | 2 +- filter/source/t602/filterenv.cxx | 2 +- filter/source/t602/t602filter.cxx | 10 +++++----- filter/source/t602/t602filter.hxx | 8 ++++---- filter/source/textfilterdetect/filterdetect.cxx | 2 +- filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx | 4 ++-- filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx | 4 ++-- filter/source/xmlfilteradaptor/genericfilter.cxx | 2 +- filter/source/xmlfilterdetect/fdcomp.cxx | 2 +- filter/source/xmlfilterdetect/filterdetect.hxx | 6 +++--- filter/source/xsltdialog/xmlfilterdialogcomponent.cxx | 6 +++--- filter/source/xsltfilter/XSLTFilter.cxx | 6 +++--- 47 files changed, 75 insertions(+), 75 deletions(-) (limited to 'filter') diff --git a/filter/source/config/cache/registration.cxx b/filter/source/config/cache/registration.cxx index e847faa1a228..38cd72c3efd1 100644 --- a/filter/source/config/cache/registration.cxx +++ b/filter/source/config/cache/registration.cxx @@ -32,7 +32,7 @@ namespace filter{ namespace config{ -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT void* filterconfig1_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /* pRegistryKey */ ) diff --git a/filter/source/flash/swfdialog.cxx b/filter/source/flash/swfdialog.cxx index 104fc60022c2..aabf1bf9c91b 100644 --- a/filter/source/flash/swfdialog.cxx +++ b/filter/source/flash/swfdialog.cxx @@ -47,14 +47,14 @@ OUString SWFDialog_getImplementationName () } -Sequence< OUString > SAL_CALL SWFDialog_getSupportedServiceNames() +Sequence< OUString > SWFDialog_getSupportedServiceNames() { Sequence aRet { SERVICE_NAME }; return aRet; } -Reference< XInterface > SAL_CALL SWFDialog_createInstance( const Reference< XMultiServiceFactory > & rSMgr) +Reference< XInterface > SWFDialog_createInstance( const Reference< XMultiServiceFactory > & rSMgr) { return static_cast(new SWFDialog( comphelper::getComponentContext(rSMgr) )); } diff --git a/filter/source/flash/swffilter.cxx b/filter/source/flash/swffilter.cxx index 4c8f8a5654d1..029c84930937 100644 --- a/filter/source/flash/swffilter.cxx +++ b/filter/source/flash/swffilter.cxx @@ -486,13 +486,13 @@ OUString FlashExportFilter_getImplementationName () return OUString ( "com.sun.star.comp.Impress.FlashExportFilter" ); } -Sequence< OUString > SAL_CALL FlashExportFilter_getSupportedServiceNames( ) +Sequence< OUString > FlashExportFilter_getSupportedServiceNames( ) { Sequence aRet { "com.sun.star.document.ExportFilter" }; return aRet; } -Reference< XInterface > SAL_CALL FlashExportFilter_createInstance( const Reference< XMultiServiceFactory > & rSMgr) +Reference< XInterface > FlashExportFilter_createInstance( const Reference< XMultiServiceFactory > & rSMgr) { return static_cast(new FlashExportFilter( comphelper::getComponentContext(rSMgr) )); } diff --git a/filter/source/flash/swfuno.cxx b/filter/source/flash/swfuno.cxx index 87c45602c8a0..d9b18294e575 100644 --- a/filter/source/flash/swfuno.cxx +++ b/filter/source/flash/swfuno.cxx @@ -32,7 +32,7 @@ using namespace ::swf; extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL flash_component_getFactory( +SAL_DLLPUBLIC_EXPORT void * flash_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ ) { void * pRet = nullptr; diff --git a/filter/source/flash/swfuno.hxx b/filter/source/flash/swfuno.hxx index e1a0fd7243e7..caa304868509 100644 --- a/filter/source/flash/swfuno.hxx +++ b/filter/source/flash/swfuno.hxx @@ -41,11 +41,11 @@ namespace swf { OUString FlashExportFilter_getImplementationName(); /// @throws css::uno::RuntimeException -css::uno::Sequence SAL_CALL +css::uno::Sequence FlashExportFilter_getSupportedServiceNames(); /// @throws css::uno::Exception -css::uno::Reference SAL_CALL +css::uno::Reference FlashExportFilter_createInstance( css::uno::Reference const & rSMgr); @@ -55,10 +55,10 @@ FlashExportFilter_createInstance( OUString SWFDialog_getImplementationName (); /// @throws css::uno::RuntimeException -css::uno::Sequence SAL_CALL SWFDialog_getSupportedServiceNames(); +css::uno::Sequence SWFDialog_getSupportedServiceNames(); /// @throws css::uno::Exception -css::uno::Reference SAL_CALL SWFDialog_createInstance( +css::uno::Reference SWFDialog_createInstance( css::uno::Reference const & rSMgr); #endif diff --git a/filter/source/graphic/Services.cxx b/filter/source/graphic/Services.cxx index e32ef6e98948..a7abd8828844 100644 --- a/filter/source/graphic/Services.cxx +++ b/filter/source/graphic/Services.cxx @@ -29,7 +29,7 @@ const comphelper::service_decl::ServiceDecl graphicExportFilter( "com.sun.star.document.ExportFilter" ); -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL graphicfilter_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* graphicfilter_component_getFactory( sal_Char const* pImplementationName, void*, void*) { if ( rtl_str_compare (pImplementationName, GRAPHIC_EXPORT_FILTER_SERVICE) == 0 ) diff --git a/filter/source/graphicfilter/egif/egif.cxx b/filter/source/graphicfilter/egif/egif.cxx index db6838f6a288..aed662ba4cbd 100644 --- a/filter/source/graphicfilter/egif/egif.cxx +++ b/filter/source/graphicfilter/egif/egif.cxx @@ -541,7 +541,7 @@ void GIFWriter::WriteTerminator() } -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT bool egiGraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem ) { GIFWriter aWriter(rStream); diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx index 694998345361..55965ae6f3ba 100644 --- a/filter/source/graphicfilter/eps/eps.cxx +++ b/filter/source/graphicfilter/eps/eps.cxx @@ -2657,7 +2657,7 @@ bool PSWriter::ImplGetBoundingBox( double* nNumb, sal_uInt8* pSource, sal_uLong //================== GraphicExport - the exported function =================== -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT bool epsGraphicExport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pFilterConfigItem ) { PSWriter aPSWriter; diff --git a/filter/source/graphicfilter/etiff/etiff.cxx b/filter/source/graphicfilter/etiff/etiff.cxx index f02985fc1658..1a10eb540b38 100644 --- a/filter/source/graphicfilter/etiff/etiff.cxx +++ b/filter/source/graphicfilter/etiff/etiff.cxx @@ -572,7 +572,7 @@ void TIFFWriter::EndCompression() } -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT bool etiGraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem ) { TIFFWriter aWriter(rStream); diff --git a/filter/source/graphicfilter/icgm/cgm.cxx b/filter/source/graphicfilter/icgm/cgm.cxx index 31c583900e1f..a421b93500cf 100644 --- a/filter/source/graphicfilter/icgm/cgm.cxx +++ b/filter/source/graphicfilter/icgm/cgm.cxx @@ -710,7 +710,7 @@ bool CGM::Write( SvStream& rIStm ) }; // GraphicImport - the exported function -extern "C" SAL_DLLPUBLIC_EXPORT sal_uInt32 SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT sal_uInt32 ImportCGM(SvStream& rIn, uno::Reference< frame::XModel > const & rXModel, css::uno::Reference const & aXStatInd) { diff --git a/filter/source/graphicfilter/idxf/idxf.cxx b/filter/source/graphicfilter/idxf/idxf.cxx index be458003df8d..80abdd8a8470 100644 --- a/filter/source/graphicfilter/idxf/idxf.cxx +++ b/filter/source/graphicfilter/idxf/idxf.cxx @@ -29,7 +29,7 @@ class FilterConfigItem; //================== GraphicImport - the exported function ================ -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT bool idxGraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* ) { DXFRepresentation aDXF; diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx index 9c8e73b5d520..f9ad7d49cd76 100644 --- a/filter/source/graphicfilter/ieps/ieps.cxx +++ b/filter/source/graphicfilter/ieps/ieps.cxx @@ -562,7 +562,7 @@ void MakePreview(sal_uInt8* pBuf, sal_uInt32 nBytesRead, //================== GraphicImport - the exported function ================ -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT bool ipsGraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* ) { if ( rStream.GetError() ) diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx index 0fde944a6fd7..b737ac664d14 100644 --- a/filter/source/graphicfilter/ios2met/ios2met.cxx +++ b/filter/source/graphicfilter/ios2met/ios2met.cxx @@ -2764,7 +2764,7 @@ void OS2METReader::ReadOS2MET( SvStream & rStreamOS2MET, GDIMetaFile & rGDIMetaF //================== GraphicImport - the exported function ================ -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT bool imeGraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* ) { OS2METReader aOS2METReader; diff --git a/filter/source/graphicfilter/ipbm/ipbm.cxx b/filter/source/graphicfilter/ipbm/ipbm.cxx index 4b230af5c0d5..c0476adbbd5e 100644 --- a/filter/source/graphicfilter/ipbm/ipbm.cxx +++ b/filter/source/graphicfilter/ipbm/ipbm.cxx @@ -535,7 +535,7 @@ bool PBMReader::ImplReadBody() //================== GraphicImport - the exported function ================ -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT bool ipbGraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* ) { PBMReader aPBMReader(rStream); diff --git a/filter/source/graphicfilter/ipcd/ipcd.cxx b/filter/source/graphicfilter/ipcd/ipcd.cxx index d4a49be998e4..5adaf3e7d911 100644 --- a/filter/source/graphicfilter/ipcd/ipcd.cxx +++ b/filter/source/graphicfilter/ipcd/ipcd.cxx @@ -359,7 +359,7 @@ void PCDReader::ReadImage() //================== GraphicImport - the exported Function ================ -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT bool icdGraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pConfigItem ) { PCDReader aPCDReader(rStream); diff --git a/filter/source/graphicfilter/ipcx/ipcx.cxx b/filter/source/graphicfilter/ipcx/ipcx.cxx index fed075ed131b..38c6d54664c2 100644 --- a/filter/source/graphicfilter/ipcx/ipcx.cxx +++ b/filter/source/graphicfilter/ipcx/ipcx.cxx @@ -390,7 +390,7 @@ void PCXReader::ImplReadPalette( sal_uLong nCol ) //================== GraphicImport - the exported function ================ -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT bool ipxGraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* ) { PCXReader aPCXReader(rStream); diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx index 67292c76a46b..a661c9a2e9a5 100644 --- a/filter/source/graphicfilter/ipict/ipict.cxx +++ b/filter/source/graphicfilter/ipict/ipict.cxx @@ -2012,7 +2012,7 @@ void ReadPictFile(SvStream &rStreamPict, GDIMetaFile& rGDIMetaFile) //================== GraphicImport - the exported function ================ -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT bool iptGraphicImport( SvStream& rIStm, Graphic & rGraphic, FilterConfigItem* ) { GDIMetaFile aMTF; diff --git a/filter/source/graphicfilter/ipsd/ipsd.cxx b/filter/source/graphicfilter/ipsd/ipsd.cxx index 21214a799657..29718b67119c 100644 --- a/filter/source/graphicfilter/ipsd/ipsd.cxx +++ b/filter/source/graphicfilter/ipsd/ipsd.cxx @@ -752,7 +752,7 @@ bool PSDReader::ImplReadBody() //================== GraphicImport - the exported function ================ -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT bool ipdGraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* ) { PSDReader aPSDReader(rStream); diff --git a/filter/source/graphicfilter/iras/iras.cxx b/filter/source/graphicfilter/iras/iras.cxx index 4c878be321f7..ac75b2a77bd3 100644 --- a/filter/source/graphicfilter/iras/iras.cxx +++ b/filter/source/graphicfilter/iras/iras.cxx @@ -380,7 +380,7 @@ sal_uInt8 RASReader::ImplGetByte() //================== GraphicImport - the exported function ================ -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT bool iraGraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* ) { RASReader aRASReader(rStream); diff --git a/filter/source/graphicfilter/itga/itga.cxx b/filter/source/graphicfilter/itga/itga.cxx index 6eaafe722932..10681f221085 100644 --- a/filter/source/graphicfilter/itga/itga.cxx +++ b/filter/source/graphicfilter/itga/itga.cxx @@ -786,7 +786,7 @@ bool TGAReader::ImplReadPalette() //================== GraphicImport - the exported function ================ -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT bool itgGraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* ) { TGAReader aTGAReader(rStream); diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx index 8752e9dd98b4..a9c875e2287d 100644 --- a/filter/source/graphicfilter/itiff/itiff.cxx +++ b/filter/source/graphicfilter/itiff/itiff.cxx @@ -1557,7 +1557,7 @@ bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic ) //================== GraphicImport - the exported function ================ -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT bool itiGraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* ) { TIFFReader aTIFFReader; diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index 2cdb6f9ab674..578c368dcfe7 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -271,7 +271,7 @@ EscherProperties EscherPropertyContainer::GetOpts() const return aVector; } -extern "C" int SAL_CALL EscherPropSortFunc( const void* p1, const void* p2 ) +extern "C" int EscherPropSortFunc( const void* p1, const void* p2 ) { sal_Int16 nID1 = static_cast(p1)->nPropId &~0xc000; sal_Int16 nID2 = static_cast(p2)->nPropId &~0xc000; diff --git a/filter/source/msfilter/msvbahelper.cxx b/filter/source/msfilter/msvbahelper.cxx index 0951cc87c8a1..286a352705bc 100644 --- a/filter/source/msfilter/msvbahelper.cxx +++ b/filter/source/msfilter/msvbahelper.cxx @@ -509,7 +509,7 @@ OUString VBAMacroResolver_getImplementationName() return OUString( "com.sun.star.comp.vba.VBAMacroResolver" ); } -uno::Reference< uno::XInterface > SAL_CALL VBAMacroResolver_createInstance( const uno::Reference< uno::XComponentContext >& ) +uno::Reference< uno::XInterface > VBAMacroResolver_createInstance( const uno::Reference< uno::XComponentContext >& ) { return static_cast< ::cppu::OWeakObject* >( new VBAMacroResolver ); } diff --git a/filter/source/msfilter/services.cxx b/filter/source/msfilter/services.cxx index 9ef19e882e23..ba3a7b066b65 100644 --- a/filter/source/msfilter/services.cxx +++ b/filter/source/msfilter/services.cxx @@ -37,7 +37,7 @@ static ::cppu::ImplementationEntry const spServices[] = } // namespace -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL msfilter_component_getFactory( const char* pImplName, void* pServiceManager, void* pRegistryKey ) +extern "C" SAL_DLLPUBLIC_EXPORT void* msfilter_component_getFactory( const char* pImplName, void* pServiceManager, void* pRegistryKey ) { return ::cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, spServices ); } diff --git a/filter/source/odfflatxml/OdfFlatXml.cxx b/filter/source/odfflatxml/OdfFlatXml.cxx index aab5ec7adec4..9a7881e24c88 100644 --- a/filter/source/odfflatxml/OdfFlatXml.cxx +++ b/filter/source/odfflatxml/OdfFlatXml.cxx @@ -215,7 +215,7 @@ Reference< XInterface > SAL_CALL OdfFlatXml::impl_createInstance(const Reference } -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT void* odfflatxml_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /* pRegistryKey */ ) diff --git a/filter/source/pdf/pdfdialog.cxx b/filter/source/pdf/pdfdialog.cxx index 47573daaaf60..fcd66f01a56b 100644 --- a/filter/source/pdf/pdfdialog.cxx +++ b/filter/source/pdf/pdfdialog.cxx @@ -39,14 +39,14 @@ OUString PDFDialog_getImplementationName () } -Sequence< OUString > SAL_CALL PDFDialog_getSupportedServiceNames() +Sequence< OUString > PDFDialog_getSupportedServiceNames() { Sequence aRet { SERVICE_NAME }; return aRet; } -Reference< XInterface > SAL_CALL PDFDialog_createInstance( const Reference< XMultiServiceFactory > & rSMgr) +Reference< XInterface > PDFDialog_createInstance( const Reference< XMultiServiceFactory > & rSMgr) { return static_cast(new PDFDialog( comphelper::getComponentContext(rSMgr) )); } diff --git a/filter/source/pdf/pdfdialog.hxx b/filter/source/pdf/pdfdialog.hxx index 31316434882c..671db03ed6fa 100644 --- a/filter/source/pdf/pdfdialog.hxx +++ b/filter/source/pdf/pdfdialog.hxx @@ -67,9 +67,9 @@ public: /// @throws RuntimeException OUString PDFDialog_getImplementationName (); /// @throws RuntimeException -Sequence< OUString > SAL_CALL PDFDialog_getSupportedServiceNames(); +Sequence< OUString > PDFDialog_getSupportedServiceNames(); /// @throws Exception -Reference< XInterface > SAL_CALL PDFDialog_createInstance( const Reference< XMultiServiceFactory > & rSMgr); +Reference< XInterface > PDFDialog_createInstance( const Reference< XMultiServiceFactory > & rSMgr); #endif // INCLUDED_FILTER_SOURCE_PDF_PDFDIALOG_HXX diff --git a/filter/source/pdf/pdffilter.cxx b/filter/source/pdf/pdffilter.cxx index 2a32408bb0c3..d20a2d3acd98 100644 --- a/filter/source/pdf/pdffilter.cxx +++ b/filter/source/pdf/pdffilter.cxx @@ -202,14 +202,14 @@ OUString PDFFilter_getImplementationName () } -Sequence< OUString > SAL_CALL PDFFilter_getSupportedServiceNames( ) +Sequence< OUString > PDFFilter_getSupportedServiceNames( ) { Sequence aRet { "com.sun.star.document.PDFFilter" }; return aRet; } -Reference< XInterface > SAL_CALL PDFFilter_createInstance( const Reference< XMultiServiceFactory > & rSMgr) +Reference< XInterface > PDFFilter_createInstance( const Reference< XMultiServiceFactory > & rSMgr) { return static_cast(new PDFFilter( comphelper::getComponentContext(rSMgr) )); } diff --git a/filter/source/pdf/pdffilter.hxx b/filter/source/pdf/pdffilter.hxx index 7fedeaffa4fe..5e1db495249e 100644 --- a/filter/source/pdf/pdffilter.hxx +++ b/filter/source/pdf/pdffilter.hxx @@ -85,11 +85,11 @@ public: OUString PDFFilter_getImplementationName (); /// @throws RuntimeException -Sequence< OUString > SAL_CALL PDFFilter_getSupportedServiceNames( ); +Sequence< OUString > PDFFilter_getSupportedServiceNames( ); /// @throws Exception Reference< XInterface > -SAL_CALL PDFFilter_createInstance( const Reference< XMultiServiceFactory > & rSMgr); +PDFFilter_createInstance( const Reference< XMultiServiceFactory > & rSMgr); #endif // INCLUDED_FILTER_SOURCE_PDF_PDFFILTER_HXX diff --git a/filter/source/pdf/pdfinteract.cxx b/filter/source/pdf/pdfinteract.cxx index c416e2c1f5c9..a704fbf3f7ba 100644 --- a/filter/source/pdf/pdfinteract.cxx +++ b/filter/source/pdf/pdfinteract.cxx @@ -68,14 +68,14 @@ OUString PDFInteractionHandler_getImplementationName () } -Sequence< OUString > SAL_CALL PDFInteractionHandler_getSupportedServiceNames( ) +Sequence< OUString > PDFInteractionHandler_getSupportedServiceNames( ) { Sequence aRet { "com.sun.star.filter.pdfexport.PDFExportInteractionHandler" }; return aRet; } -Reference< XInterface > SAL_CALL PDFInteractionHandler_createInstance( const Reference< XMultiServiceFactory > & ) +Reference< XInterface > PDFInteractionHandler_createInstance( const Reference< XMultiServiceFactory > & ) { return static_cast(new PDFInteractionHandler); } diff --git a/filter/source/pdf/pdfinteract.hxx b/filter/source/pdf/pdfinteract.hxx index 06bd82fb7262..0795558c084e 100644 --- a/filter/source/pdf/pdfinteract.hxx +++ b/filter/source/pdf/pdfinteract.hxx @@ -56,11 +56,11 @@ public: OUString PDFInteractionHandler_getImplementationName (); /// @throws RuntimeException -Sequence< OUString > SAL_CALL PDFInteractionHandler_getSupportedServiceNames( ); +Sequence< OUString > PDFInteractionHandler_getSupportedServiceNames( ); /// @throws Exception Reference< XInterface > -SAL_CALL PDFInteractionHandler_createInstance( const Reference< XMultiServiceFactory > & rSMgr); +PDFInteractionHandler_createInstance( const Reference< XMultiServiceFactory > & rSMgr); #endif // INCLUDED_FILTER_SOURCE_PDF_PDFINTERACT_HXX diff --git a/filter/source/pdf/pdfuno.cxx b/filter/source/pdf/pdfuno.cxx index 4a72f57bb0cc..8dad87097afa 100644 --- a/filter/source/pdf/pdfuno.cxx +++ b/filter/source/pdf/pdfuno.cxx @@ -33,7 +33,7 @@ using namespace ::com::sun::star::registry; extern "C" { - SAL_DLLPUBLIC_EXPORT void* SAL_CALL pdffilter_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) + SAL_DLLPUBLIC_EXPORT void* pdffilter_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { OUString aImplName( OUString::createFromAscii( pImplName ) ); void* pRet = nullptr; diff --git a/filter/source/storagefilterdetect/fdcomp.cxx b/filter/source/storagefilterdetect/fdcomp.cxx index 36c64b12e292..9a281e540efb 100644 --- a/filter/source/storagefilterdetect/fdcomp.cxx +++ b/filter/source/storagefilterdetect/fdcomp.cxx @@ -26,7 +26,7 @@ static cppu::ImplementationEntry const services[] = { } -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL storagefd_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * storagefd_component_getFactory( char const * pImplName, void * pServiceManager, void * pRegistryKey) { return cppu::component_getFactoryHelper( diff --git a/filter/source/svg/svgdialog.cxx b/filter/source/svg/svgdialog.cxx index 9c282498ebb2..fcaaa05f24eb 100644 --- a/filter/source/svg/svgdialog.cxx +++ b/filter/source/svg/svgdialog.cxx @@ -46,14 +46,14 @@ OUString SVGDialog_getImplementationName () } -Sequence< OUString > SAL_CALL SVGDialog_getSupportedServiceNames() +Sequence< OUString > SVGDialog_getSupportedServiceNames() { Sequence< OUString > aRet { SVG_DIALOG_SERVICE_NAME }; return aRet; } -Reference< XInterface > SAL_CALL SVGDialog_createInstance( const Reference< XMultiServiceFactory > & rSMgr ) +Reference< XInterface > SVGDialog_createInstance( const Reference< XMultiServiceFactory > & rSMgr ) { return static_cast< cppu::OWeakObject* >( new SVGDialog( comphelper::getComponentContext(rSMgr) ) ); } diff --git a/filter/source/svg/svgdialog.hxx b/filter/source/svg/svgdialog.hxx index 92d3d0432938..ed4bcbee343f 100644 --- a/filter/source/svg/svgdialog.hxx +++ b/filter/source/svg/svgdialog.hxx @@ -74,11 +74,11 @@ public: OUString SVGDialog_getImplementationName (); /// @throws css::uno::RuntimeException -css::uno::Sequence< OUString > SAL_CALL SVGDialog_getSupportedServiceNames( ); +css::uno::Sequence< OUString > SVGDialog_getSupportedServiceNames( ); /// @throws css::uno::Exception css::uno::Reference< css::uno::XInterface > - SAL_CALL SVGDialog_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr); + SVGDialog_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr); #endif // INCLUDED_FILTER_SOURCE_SVG_SVGDIALOG_HXX diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx index cba3d3210ad9..c689eebee5e0 100644 --- a/filter/source/svg/svgfilter.cxx +++ b/filter/source/svg/svgfilter.cxx @@ -398,7 +398,7 @@ namespace sdecl = comphelper::service_decl; "com.sun.star.svg.SVGWriter" ); // The C shared lib entry points -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL svgfilter_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* svgfilter_component_getFactory( sal_Char const* pImplName, void*, void*) { if ( rtl_str_compare (pImplName, SVG_FILTER_IMPL_NAME) == 0 ) diff --git a/filter/source/t602/filterenv.cxx b/filter/source/t602/filterenv.cxx index 73dda29993d8..11af8a6690a5 100644 --- a/filter/source/t602/filterenv.cxx +++ b/filter/source/t602/filterenv.cxx @@ -33,7 +33,7 @@ using namespace T602ImportFilter; extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL t602filter_component_getFactory( +SAL_DLLPUBLIC_EXPORT void * t602filter_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ ) { void * pRet = nullptr; diff --git a/filter/source/t602/t602filter.cxx b/filter/source/t602/t602filter.cxx index 36f6bc6da996..38ca6230bb70 100644 --- a/filter/source/t602/t602filter.cxx +++ b/filter/source/t602/t602filter.cxx @@ -871,7 +871,7 @@ OUString T602ImportFilter_getImplementationName () return OUString ( "com.sun.star.comp.Writer.T602ImportFilter" ); } -Sequence< OUString > SAL_CALL T602ImportFilter_getSupportedServiceNames( ) +Sequence< OUString > T602ImportFilter_getSupportedServiceNames( ) { Sequence < OUString > aRet(2); OUString* pArray = aRet.getArray(); @@ -880,7 +880,7 @@ Sequence< OUString > SAL_CALL T602ImportFilter_getSupportedServiceNames( ) return aRet; } -Reference< XInterface > SAL_CALL T602ImportFilter_createInstance( const Reference< XMultiServiceFactory > & rSMgr) +Reference< XInterface > T602ImportFilter_createInstance( const Reference< XMultiServiceFactory > & rSMgr) { return static_cast(new T602ImportFilter( rSMgr )); } @@ -1141,20 +1141,20 @@ OUString T602ImportFilterDialog_getImplementationName () return OUString ( "com.sun.star.comp.Writer.T602ImportFilterDialog" ); } -Sequence< OUString > SAL_CALL T602ImportFilterDialog_getSupportedServiceNames( ) +Sequence< OUString > T602ImportFilterDialog_getSupportedServiceNames( ) { Sequence aRet { "com.sun.star.ui.dialogs.FilterOptionsDialog" }; return aRet; } -Reference< XInterface > SAL_CALL T602ImportFilterDialog_createInstance( const Reference< XMultiServiceFactory > & ) +Reference< XInterface > T602ImportFilterDialog_createInstance( const Reference< XMultiServiceFactory > & ) { return static_cast(new T602ImportFilterDialog); } } -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImport602(SvStream &rStream) +extern "C" SAL_DLLPUBLIC_EXPORT bool TestImport602(SvStream &rStream) { css::uno::Reference xStream(new utl::OSeekableInputStreamWrapper(rStream)); rtl::Reference aImport( diff --git a/filter/source/t602/t602filter.hxx b/filter/source/t602/t602filter.hxx index 63bd0335614f..22abefa78838 100644 --- a/filter/source/t602/t602filter.hxx +++ b/filter/source/t602/t602filter.hxx @@ -254,21 +254,21 @@ private: OUString T602ImportFilter_getImplementationName(); /// @throws css::uno::RuntimeException -css::uno::Sequence< OUString > SAL_CALL T602ImportFilter_getSupportedServiceNames( ); +css::uno::Sequence< OUString > T602ImportFilter_getSupportedServiceNames( ); /// @throws css::uno::Exception css::uno::Reference< css::uno::XInterface > -SAL_CALL T602ImportFilter_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr); +T602ImportFilter_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr); /// @throws css::uno::RuntimeException OUString T602ImportFilterDialog_getImplementationName(); /// @throws css::uno::RuntimeException -css::uno::Sequence< OUString > SAL_CALL T602ImportFilterDialog_getSupportedServiceNames( ); +css::uno::Sequence< OUString > T602ImportFilterDialog_getSupportedServiceNames( ); /// @throws css::uno::Exception css::uno::Reference< css::uno::XInterface > -SAL_CALL T602ImportFilterDialog_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr); +T602ImportFilterDialog_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr); } diff --git a/filter/source/textfilterdetect/filterdetect.cxx b/filter/source/textfilterdetect/filterdetect.cxx index ee93d28ddbed..d2f8fb0bd54c 100644 --- a/filter/source/textfilterdetect/filterdetect.cxx +++ b/filter/source/textfilterdetect/filterdetect.cxx @@ -225,7 +225,7 @@ uno::Sequence SAL_CALL PlainTextFilterDetect::getSupportedServiceNames return PlainTextFilterDetect_getSupportedServiceNames(); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_filters_PlainTextFilterDetect_get_implementation(css::uno::XComponentContext* , css::uno::Sequence const &) { diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx index ffe7684c7431..5db591bcf53e 100644 --- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx +++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx @@ -325,7 +325,7 @@ OUString XmlFilterAdaptor_getImplementationName () return OUString( "com.sun.star.comp.Writer.XmlFilterAdaptor" ); } -Sequence< OUString > SAL_CALL XmlFilterAdaptor_getSupportedServiceNames( ) +Sequence< OUString > XmlFilterAdaptor_getSupportedServiceNames( ) { Sequence < OUString > aRet(2); OUString* pArray = aRet.getArray(); @@ -334,7 +334,7 @@ Sequence< OUString > SAL_CALL XmlFilterAdaptor_getSupportedServiceNames( ) return aRet; } -Reference< XInterface > SAL_CALL XmlFilterAdaptor_createInstance( const Reference< XMultiServiceFactory > & rSMgr) +Reference< XInterface > XmlFilterAdaptor_createInstance( const Reference< XMultiServiceFactory > & rSMgr) { return static_cast(new XmlFilterAdaptor( comphelper::getComponentContext(rSMgr) )); } diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx index a0512a34d864..78a4fbad6369 100644 --- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx +++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx @@ -108,12 +108,12 @@ public: OUString XmlFilterAdaptor_getImplementationName(); /// @throws css::uno::RuntimeException -css::uno::Sequence< OUString > SAL_CALL XmlFilterAdaptor_getSupportedServiceNames( ); +css::uno::Sequence< OUString > XmlFilterAdaptor_getSupportedServiceNames( ); /// @throws css::uno::Exception css::uno::Reference< css::uno::XInterface > -SAL_CALL XmlFilterAdaptor_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr); +XmlFilterAdaptor_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr); #endif diff --git a/filter/source/xmlfilteradaptor/genericfilter.cxx b/filter/source/xmlfilteradaptor/genericfilter.cxx index c2bebaaec1b8..91bda6f47728 100644 --- a/filter/source/xmlfilteradaptor/genericfilter.cxx +++ b/filter/source/xmlfilteradaptor/genericfilter.cxx @@ -29,7 +29,7 @@ using namespace ::com::sun::star::registry; extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL xmlfa_component_getFactory( +SAL_DLLPUBLIC_EXPORT void * xmlfa_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ ) { void * pRet = nullptr; diff --git a/filter/source/xmlfilterdetect/fdcomp.cxx b/filter/source/xmlfilterdetect/fdcomp.cxx index 3b975cc05d31..1cbec9680402 100644 --- a/filter/source/xmlfilterdetect/fdcomp.cxx +++ b/filter/source/xmlfilterdetect/fdcomp.cxx @@ -36,7 +36,7 @@ static cppu::ImplementationEntry const services[] = { } -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL xmlfd_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * xmlfd_component_getFactory( char const * pImplName, void * pServiceManager, void * pRegistryKey) { return cppu::component_getFactoryHelper( diff --git a/filter/source/xmlfilterdetect/filterdetect.hxx b/filter/source/xmlfilterdetect/filterdetect.hxx index 5db916d76e5e..77d716387f90 100644 --- a/filter/source/xmlfilterdetect/filterdetect.hxx +++ b/filter/source/xmlfilterdetect/filterdetect.hxx @@ -56,11 +56,11 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; -OUString SAL_CALL FilterDetect_getImplementationName(); +OUString FilterDetect_getImplementationName(); -css::uno::Sequence< OUString > SAL_CALL FilterDetect_getSupportedServiceNames(); +css::uno::Sequence< OUString > FilterDetect_getSupportedServiceNames(); -css::uno::Reference< css::uno::XInterface > SAL_CALL +css::uno::Reference< css::uno::XInterface > FilterDetect_createInstance( css::uno::Reference< css::uno::XComponentContext > const & context); diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx index 60b08704e95d..807d01138b04 100644 --- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx +++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx @@ -170,14 +170,14 @@ OUString XMLFilterDialogComponent_getImplementationName() } /// @throws RuntimeException -Sequence< OUString > SAL_CALL XMLFilterDialogComponent_getSupportedServiceNames() +Sequence< OUString > XMLFilterDialogComponent_getSupportedServiceNames() { Sequence< OUString > aSupported { "com.sun.star.ui.dialogs.XSLTFilterDialog" }; return aSupported; } /// @throws Exception -Reference< XInterface > SAL_CALL XMLFilterDialogComponent_createInstance( const Reference< XMultiServiceFactory > & rSMgr) +Reference< XInterface > XMLFilterDialogComponent_createInstance( const Reference< XMultiServiceFactory > & rSMgr) { return static_cast(new XMLFilterDialogComponent( comphelper::getComponentContext(rSMgr) )); } @@ -324,7 +324,7 @@ void SAL_CALL XMLFilterDialogComponent::initialize( const Sequence< Any >& aArgu extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL xsltdlg_component_getFactory( +SAL_DLLPUBLIC_EXPORT void * xsltdlg_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ ) { void * pRet = nullptr; diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx index 75d5febb8799..811ad6458d8b 100644 --- a/filter/source/xsltfilter/XSLTFilter.cxx +++ b/filter/source/xsltfilter/XSLTFilter.cxx @@ -539,13 +539,13 @@ namespace XSLT #define TRANSFORMER_SERVICE_NAME "com.sun.star.xml.xslt.XSLTTransformer" #define TRANSFORMER_IMPL_NAME "com.sun.star.comp.documentconversion.LibXSLTTransformer" - static css::uno::Reference SAL_CALL + static css::uno::Reference CreateTransformerInstance(const css::uno::Reference &r) { return css::uno::Reference (static_cast(new LibXSLTTransformer( comphelper::getComponentContext(r) ))); } - static css::uno::Reference SAL_CALL + static css::uno::Reference CreateFilterInstance(const css::uno::Reference &r) { return css::uno::Reference (static_cast(new XSLTFilter( comphelper::getComponentContext(r) ))); @@ -557,7 +557,7 @@ using namespace XSLT; extern "C" { - SAL_DLLPUBLIC_EXPORT void * SAL_CALL xsltfilter_component_getFactory(const sal_Char * pImplName, + SAL_DLLPUBLIC_EXPORT void * xsltfilter_component_getFactory(const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */) { void * pRet = nullptr; -- cgit