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 --- xmlscript/source/inc/unoservices.hxx | 6 +++--- xmlscript/source/inc/xml_import.hxx | 2 +- xmlscript/source/misc/unoservices.cxx | 2 +- xmlscript/source/xml_helper/xml_byteseq.cxx | 6 +++--- xmlscript/source/xml_helper/xml_impctx.cxx | 4 ++-- xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx | 4 ++-- xmlscript/source/xmldlg_imexp/xmldlg_export.cxx | 2 +- xmlscript/source/xmldlg_imexp/xmldlg_import.cxx | 2 +- xmlscript/source/xmlflat_imexp/xmlbas_export.cxx | 4 ++-- xmlscript/source/xmlflat_imexp/xmlbas_import.cxx | 4 ++-- xmlscript/source/xmllib_imexp/xmllib_export.cxx | 4 ++-- xmlscript/source/xmllib_imexp/xmllib_import.cxx | 4 ++-- xmlscript/source/xmlmod_imexp/xmlmod_export.cxx | 2 +- xmlscript/source/xmlmod_imexp/xmlmod_import.cxx | 2 +- 14 files changed, 24 insertions(+), 24 deletions(-) (limited to 'xmlscript/source') diff --git a/xmlscript/source/inc/unoservices.hxx b/xmlscript/source/inc/unoservices.hxx index de330a74ad3e..32582d248c22 100644 --- a/xmlscript/source/inc/unoservices.hxx +++ b/xmlscript/source/inc/unoservices.hxx @@ -34,12 +34,12 @@ namespace com { namespace sun { namespace star { namespace uno { namespace xmlscript { -css::uno::Sequence SAL_CALL +css::uno::Sequence getSupportedServiceNames_DocumentHandlerImpl(); -OUString SAL_CALL getImplementationName_DocumentHandlerImpl(); +OUString getImplementationName_DocumentHandlerImpl(); -css::uno::Reference SAL_CALL create_DocumentHandlerImpl( +css::uno::Reference create_DocumentHandlerImpl( css::uno::Reference const & xContext); } diff --git a/xmlscript/source/inc/xml_import.hxx b/xmlscript/source/inc/xml_import.hxx index 23f40fefba88..2ac4fb7d543d 100644 --- a/xmlscript/source/inc/xml_import.hxx +++ b/xmlscript/source/inc/xml_import.hxx @@ -46,7 +46,7 @@ namespace xmlscript document handler for parser */ css::uno::Reference< css::xml::sax::XDocumentHandler > -SAL_CALL createDocumentHandler( +createDocumentHandler( css::uno::Reference< css::xml::input::XRoot > const & xRoot ); diff --git a/xmlscript/source/misc/unoservices.cxx b/xmlscript/source/misc/unoservices.cxx index 00ca4d074b93..e6fce092b762 100644 --- a/xmlscript/source/misc/unoservices.cxx +++ b/xmlscript/source/misc/unoservices.cxx @@ -38,7 +38,7 @@ namespace xmlscript extern "C" { - SAL_DLLPUBLIC_EXPORT void * SAL_CALL xmlscript_component_getFactory( + SAL_DLLPUBLIC_EXPORT void * xmlscript_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return ::cppu::component_getFactoryHelper( diff --git a/xmlscript/source/xml_helper/xml_byteseq.cxx b/xmlscript/source/xml_helper/xml_byteseq.cxx index 7948e1cf0d87..5291dfbd5187 100644 --- a/xmlscript/source/xml_helper/xml_byteseq.cxx +++ b/xmlscript/source/xml_helper/xml_byteseq.cxx @@ -122,12 +122,12 @@ void BSeqOutputStream::closeOutput() { } -Reference< io::XInputStream > SAL_CALL createInputStream( std::vector const & rInData ) +Reference< io::XInputStream > createInputStream( std::vector const & rInData ) { return new BSeqInputStream( rInData ); } -Reference< io::XInputStream > SAL_CALL createInputStream( const sal_Int8* pData, int len ) +Reference< io::XInputStream > createInputStream( const sal_Int8* pData, int len ) { std::vector rInData(len); if (len != 0) { @@ -136,7 +136,7 @@ Reference< io::XInputStream > SAL_CALL createInputStream( const sal_Int8* pData, return new BSeqInputStream( rInData ); } -Reference< io::XOutputStream > SAL_CALL createOutputStream( std::vector * pOutData ) +Reference< io::XOutputStream > createOutputStream( std::vector * pOutData ) { return new BSeqOutputStream( pOutData ); } diff --git a/xmlscript/source/xml_helper/xml_impctx.cxx b/xmlscript/source/xml_helper/xml_impctx.cxx index dbb32918d48c..48b3153228c6 100644 --- a/xmlscript/source/xml_helper/xml_impctx.cxx +++ b/xmlscript/source/xml_helper/xml_impctx.cxx @@ -702,7 +702,7 @@ OUString ExtendedAttributes::getValueByUidName( return OUString(); } -Reference< xml::sax::XDocumentHandler > SAL_CALL createDocumentHandler( +Reference< xml::sax::XDocumentHandler > createDocumentHandler( Reference< xml::input::XRoot > const & xRoot ) { SAL_WARN_IF( !xRoot.is(), "xmlscript.xmlhelper", "xRoot is NULL" ); @@ -714,7 +714,7 @@ Reference< xml::sax::XDocumentHandler > SAL_CALL createDocumentHandler( return Reference< xml::sax::XDocumentHandler >(); } -Reference< XInterface > SAL_CALL create_DocumentHandlerImpl( +Reference< XInterface > create_DocumentHandlerImpl( SAL_UNUSED_PARAMETER Reference< XComponentContext > const & ) { return static_cast< ::cppu::OWeakObject * >( diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx index 68f63a8d3a25..24e5a4c3eb2f 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx @@ -53,7 +53,7 @@ uno::Reference< io::XInputStream > InputStreamProvider::createInputStream() return ::xmlscript::createInputStream( _bytes ); } -uno::Reference< io::XInputStreamProvider > SAL_CALL exportDialogModel( +uno::Reference< io::XInputStreamProvider > exportDialogModel( uno::Reference< container::XNameContainer > const & xDialogModel, uno::Reference< uno::XComponentContext > const & xContext, uno::Reference< XModel > const & xDocument ) @@ -69,7 +69,7 @@ uno::Reference< io::XInputStreamProvider > SAL_CALL exportDialogModel( return new InputStreamProvider( aBytes ); } -void SAL_CALL importDialogModel( +void importDialogModel( uno::Reference< io::XInputStream > const & xInput, uno::Reference< container::XNameContainer > const & xDialogModel, uno::Reference< uno::XComponentContext > const & xContext, diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx index 9dab7b525b9b..5d802a380d93 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx @@ -1352,7 +1352,7 @@ void StyleBag::dump( Reference< xml::sax::XExtendedDocumentHandler > const & xOu } } -void SAL_CALL exportDialogModel( +void exportDialogModel( Reference< xml::sax::XExtendedDocumentHandler > const & xOut, Reference< container::XNameContainer > const & xDialogModel, Reference< frame::XModel > const & xDocument ) diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx index bd937e7d3b3b..f0d6777d9534 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx @@ -1759,7 +1759,7 @@ Reference< xml::input::XElement > DialogImport::getStyle( return nullptr; } -Reference< xml::sax::XDocumentHandler > SAL_CALL importDialogModel( +Reference< xml::sax::XDocumentHandler > importDialogModel( Reference< container::XNameContainer > const & xDialogModel, Reference< XComponentContext > const & xContext, Reference< XModel > const & xDocument ) diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx b/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx index b280f28ce8da..872f47a7e2df 100644 --- a/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx +++ b/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx @@ -382,7 +382,7 @@ sal_Bool XMLBasicExporterBase::filter( const Sequence< beans::PropertyValue >& / } // namespace xmlscript -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_xmlscript_XMLBasicExporter( css::uno::XComponentContext *, css::uno::Sequence const &) @@ -390,7 +390,7 @@ com_sun_star_comp_xmlscript_XMLBasicExporter( return cppu::acquire(new xmlscript::XMLBasicExporter()); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_xmlscript_XMLOasisBasicExporter( css::uno::XComponentContext *, css::uno::Sequence const &) diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx b/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx index 61d0dabec521..9a143c6567e1 100644 --- a/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx +++ b/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx @@ -628,7 +628,7 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x } // namespace xmlscript -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_xmlscript_XMLBasicImporter( css::uno::XComponentContext *context, css::uno::Sequence const &) @@ -636,7 +636,7 @@ com_sun_star_comp_xmlscript_XMLBasicImporter( return cppu::acquire(new xmlscript::XMLBasicImporter(context)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_xmlscript_XMLOasisBasicImporter( css::uno::XComponentContext *context, css::uno::Sequence const &) diff --git a/xmlscript/source/xmllib_imexp/xmllib_export.cxx b/xmlscript/source/xmllib_imexp/xmllib_export.cxx index bb92579f4f5f..e2c73119a7d7 100644 --- a/xmlscript/source/xmllib_imexp/xmllib_export.cxx +++ b/xmlscript/source/xmllib_imexp/xmllib_export.cxx @@ -31,7 +31,7 @@ const char aTrueStr[] = "true"; const char aFalseStr[] = "false"; void -SAL_CALL exportLibraryContainer( +exportLibraryContainer( Reference< xml::sax::XWriter > const & xOut, const LibDescriptorArray* pLibArray ) { @@ -89,7 +89,7 @@ SAL_CALL exportLibraryContainer( } void -SAL_CALL exportLibrary( +exportLibrary( css::uno::Reference< css::xml::sax::XWriter > const & xOut, const LibDescriptor& rLib ) { diff --git a/xmlscript/source/xmllib_imexp/xmllib_import.cxx b/xmlscript/source/xmllib_imexp/xmllib_import.cxx index 5b216324273a..ea2de8523f48 100644 --- a/xmlscript/source/xmllib_imexp/xmllib_import.cxx +++ b/xmlscript/source/xmllib_imexp/xmllib_import.cxx @@ -230,14 +230,14 @@ void LibraryElement::endElement() } Reference< css::xml::sax::XDocumentHandler > -SAL_CALL importLibraryContainer( LibDescriptorArray* pLibArray ) +importLibraryContainer( LibDescriptorArray* pLibArray ) { return ::xmlscript::createDocumentHandler( static_cast< xml::input::XRoot * >( new LibraryImport( pLibArray ) ) ); } css::uno::Reference< css::xml::sax::XDocumentHandler > -SAL_CALL importLibrary( LibDescriptor& rLib ) +importLibrary( LibDescriptor& rLib ) { return ::xmlscript::createDocumentHandler( static_cast< xml::input::XRoot * >( new LibraryImport( &rLib ) ) ); diff --git a/xmlscript/source/xmlmod_imexp/xmlmod_export.cxx b/xmlscript/source/xmlmod_imexp/xmlmod_export.cxx index 38d6239055b5..a15ea963897a 100644 --- a/xmlscript/source/xmlmod_imexp/xmlmod_export.cxx +++ b/xmlscript/source/xmlmod_imexp/xmlmod_export.cxx @@ -27,7 +27,7 @@ namespace xmlscript { void -SAL_CALL exportScriptModule( +exportScriptModule( Reference< xml::sax::XWriter > const & xOut, const ModuleDescriptor& rMod ) { diff --git a/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx b/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx index b2a0ac4aa7e7..e34e6fc058a7 100644 --- a/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx +++ b/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx @@ -143,7 +143,7 @@ ModuleImport::~ModuleImport() } Reference< xml::sax::XDocumentHandler > -SAL_CALL importScriptModule( ModuleDescriptor& rMod ) +importScriptModule( ModuleDescriptor& rMod ) { return ::xmlscript::createDocumentHandler( static_cast< xml::input::XRoot * >( new ModuleImport( rMod ) ) ); -- cgit