diff options
Diffstat (limited to 'sw')
30 files changed, 76 insertions, 76 deletions
diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx index abe6d48d209f..eb764518061a 100644 --- a/sw/inc/shellio.hxx +++ b/sw/inc/shellio.hxx @@ -177,9 +177,9 @@ protected: #define SW_STREAM_READER 1 #define SW_STORAGE_READER 2 -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportDOC(SvStream &rStream, const OUString &rFltName); -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportRTF(SvStream &rStream); -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportHTML(SvStream &rStream); +extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportDOC(SvStream &rStream, const OUString &rFltName); +extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportRTF(SvStream &rStream); +extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportHTML(SvStream &rStream); SAL_DLLPUBLIC_EXPORT void FlushFontCache(); class SW_DLLPUBLIC Reader diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx index 2e43e93b7947..cb903b36ba7f 100644 --- a/sw/source/core/bastyp/calc.cxx +++ b/sw/source/core/bastyp/calc.cxx @@ -145,7 +145,7 @@ const sal_Int32 coContFlags = & ~i18n::KParseTokens::IGNORE_LEADING_WS; extern "C" { -static int SAL_CALL OperatorCompare( const void *pFirst, const void *pSecond) +static int OperatorCompare( const void *pFirst, const void *pSecond) { int nRet = 0; if( CALC_NAME == static_cast<const CalcOp*>(pFirst)->eOp ) diff --git a/sw/source/core/docnode/finalthreadmanager.cxx b/sw/source/core/docnode/finalthreadmanager.cxx index 94f52fa8024d..4d90b7fa158b 100644 --- a/sw/source/core/docnode/finalthreadmanager.cxx +++ b/sw/source/core/docnode/finalthreadmanager.cxx @@ -437,7 +437,7 @@ void SAL_CALL FinalThreadManager::disposing( const css::lang::EventObject& ) // nothing to do, because instance doesn't hold any references of observed objects } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_util_comp_FinalThreadManager_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { diff --git a/sw/source/core/inc/unofreg.hxx b/sw/source/core/inc/unofreg.hxx index 698a6bc0fa0d..cbfd140d25e7 100644 --- a/sw/source/core/inc/unofreg.hxx +++ b/sw/source/core/inc/unofreg.hxx @@ -31,16 +31,16 @@ namespace com { namespace sun { namespace star { namespace lang { } } } } // module -css::uno::Sequence< OUString > SAL_CALL SwUnoModule_getSupportedServiceNames() throw(); -OUString SAL_CALL SwUnoModule_getImplementationName() throw(); +css::uno::Sequence< OUString > SwUnoModule_getSupportedServiceNames() throw(); +OUString SwUnoModule_getImplementationName() throw(); /// @throws css::uno::Exception -css::uno::Reference< css::uno::XInterface > SAL_CALL SwUnoModule_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > &rSMgr ); +css::uno::Reference< css::uno::XInterface > SwUnoModule_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > &rSMgr ); // writer documents -css::uno::Sequence< OUString > SAL_CALL SwTextDocument_getSupportedServiceNames() throw(); -OUString SAL_CALL SwTextDocument_getImplementationName() throw(); +css::uno::Sequence< OUString > SwTextDocument_getSupportedServiceNames() throw(); +OUString SwTextDocument_getImplementationName() throw(); /// @throws css::uno::Exception -css::uno::Reference< css::uno::XInterface > SAL_CALL SwTextDocument_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > &rSMgr, SfxModelFlags _nCreationFlags ); +css::uno::Reference< css::uno::XInterface > SwTextDocument_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > &rSMgr, SfxModelFlags _nCreationFlags ); #endif diff --git a/sw/source/core/layout/dumpfilter.cxx b/sw/source/core/layout/dumpfilter.cxx index 56c0b06f6ff4..37fcded5e262 100644 --- a/sw/source/core/layout/dumpfilter.cxx +++ b/sw/source/core/layout/dumpfilter.cxx @@ -156,7 +156,7 @@ namespace sw } // Namespace sw -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_Writer_LayoutDump_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx index 002317811a3d..e99b643480d4 100644 --- a/sw/source/filter/basflt/fltini.cxx +++ b/sw/source/filter/basflt/fltini.cxx @@ -725,8 +725,8 @@ Reader* GetDOCXReader() #endif } -typedef sal_uInt32 ( SAL_CALL *SaveOrDel )( SfxObjectShell&, SotStorage&, sal_Bool, const OUString& ); -typedef sal_uInt32 ( SAL_CALL *GetSaveWarning )( SfxObjectShell& ); +typedef sal_uInt32 ( *SaveOrDel )( SfxObjectShell&, SotStorage&, sal_Bool, const OUString& ); +typedef sal_uInt32 ( *GetSaveWarning )( SfxObjectShell& ); ErrCode SaveOrDelMSVBAStorage( SfxObjectShell& rDoc, SotStorage& rStor, bool bSaveInto, const OUString& rStorageName ) { diff --git a/sw/source/filter/docx/swdocxreader.cxx b/sw/source/filter/docx/swdocxreader.cxx index 4386de8fdc3e..6d0596073868 100644 --- a/sw/source/filter/docx/swdocxreader.cxx +++ b/sw/source/filter/docx/swdocxreader.cxx @@ -43,7 +43,7 @@ using namespace css; -extern "C" SAL_DLLPUBLIC_EXPORT Reader* SAL_CALL ImportDOCX() +extern "C" SAL_DLLPUBLIC_EXPORT Reader* ImportDOCX() { return new SwDOCXReader; } diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx index 12e2cd62aea5..559e4e7cb197 100644 --- a/sw/source/filter/html/svxcss1.cxx +++ b/sw/source/filter/html/svxcss1.cxx @@ -3151,7 +3151,7 @@ static CSS1PropEntry aCSS1PropFnTab[] = extern "C" { -static int SAL_CALL CSS1PropEntryCompare( const void *pFirst, const void *pSecond) +static int CSS1PropEntryCompare( const void *pFirst, const void *pSecond) { int nRet; if( static_cast<const CSS1PropEntry*>(pFirst)->pFunc ) diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index d5eb72ed2450..bd4b8edb7878 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -5512,7 +5512,7 @@ namespace }; } -bool SAL_CALL TestImportHTML(SvStream &rStream) +bool TestImportHTML(SvStream &rStream) { FontCacheGuard aFontCacheGuard; std::unique_ptr<Reader> xReader(new HTMLReader); diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx index e56ec072faf0..be23eeaeb0a2 100644 --- a/sw/source/filter/rtf/swparrtf.cxx +++ b/sw/source/filter/rtf/swparrtf.cxx @@ -159,9 +159,9 @@ ErrCode SwRTFReader::Read(SwDoc& rDoc, const OUString& /*rBaseURL*/, SwPaM& rPam return ret; } -extern "C" SAL_DLLPUBLIC_EXPORT Reader* SAL_CALL ImportRTF() { return new SwRTFReader; } +extern "C" SAL_DLLPUBLIC_EXPORT Reader* ImportRTF() { return new SwRTFReader; } -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportRTF(SvStream& rStream) +extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportRTF(SvStream& rStream) { SwGlobals::ensure(); diff --git a/sw/source/filter/ww8/docxexportfilter.cxx b/sw/source/filter/ww8/docxexportfilter.cxx index e0c2522e29e3..4069289670e0 100644 --- a/sw/source/filter/ww8/docxexportfilter.cxx +++ b/sw/source/filter/ww8/docxexportfilter.cxx @@ -108,13 +108,13 @@ OUString DocxExportFilter::getImplementationName() return DocxExport_getImplementationName(); } -uno::Sequence< OUString > SAL_CALL DocxExport_getSupportedServiceNames() throw() +uno::Sequence< OUString > DocxExport_getSupportedServiceNames() throw() { return uno::Sequence< OUString > { "com.sun.star.document.ExportFilter" }; } /// @throws uno::Exception -uno::Reference< uno::XInterface > SAL_CALL DocxExport_createInstance(const uno::Reference< uno::XComponentContext > & xCtx ) +uno::Reference< uno::XInterface > DocxExport_createInstance(const uno::Reference< uno::XComponentContext > & xCtx ) { return static_cast<cppu::OWeakObject*>(new DocxExportFilter( xCtx )); } @@ -137,7 +137,7 @@ extern "C" { nullptr, nullptr, nullptr, nullptr, nullptr, 0 } }; -SAL_DLLPUBLIC_EXPORT void* SAL_CALL msword_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* pRegistryKey ) +SAL_DLLPUBLIC_EXPORT void* msword_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* pRegistryKey ) { return ::cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, entries ); } diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx index 3a7454098294..f31ae9bba61b 100644 --- a/sw/source/filter/ww8/rtfexport.cxx +++ b/sw/source/filter/ww8/rtfexport.cxx @@ -1437,8 +1437,8 @@ ErrCode SwRTFWriter::WriteStream() return ERRCODE_NONE; } -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL ExportRTF(const OUString& rFltName, - const OUString& rBaseURL, WriterRef& xRet) +extern "C" SAL_DLLPUBLIC_EXPORT void ExportRTF(const OUString& rFltName, const OUString& rBaseURL, + WriterRef& xRet) { xRet = new SwRTFWriter(rFltName, rBaseURL); } diff --git a/sw/source/filter/ww8/rtfexportfilter.cxx b/sw/source/filter/ww8/rtfexportfilter.cxx index 61abb4a8a2f5..65d143595252 100644 --- a/sw/source/filter/ww8/rtfexportfilter.cxx +++ b/sw/source/filter/ww8/rtfexportfilter.cxx @@ -99,13 +99,13 @@ void RtfExportFilter::setSourceDocument(const uno::Reference<lang::XComponent>& OUString RtfExport_getImplementationName() { return OUString(IMPL_NAME_RTFEXPORT); } -uno::Sequence<OUString> SAL_CALL RtfExport_getSupportedServiceNames() noexcept +uno::Sequence<OUString> RtfExport_getSupportedServiceNames() noexcept { return uno::Sequence<OUString>{ "com.sun.star.document.ExportFilter" }; } uno::Reference<uno::XInterface> - SAL_CALL RtfExport_createInstance(const uno::Reference<uno::XComponentContext>& xCtx) +RtfExport_createInstance(const uno::Reference<uno::XComponentContext>& xCtx) { return static_cast<cppu::OWeakObject*>(new RtfExportFilter(xCtx)); } diff --git a/sw/source/filter/ww8/rtfexportfilter.hxx b/sw/source/filter/ww8/rtfexportfilter.hxx index 472c3c1d5a86..e8cd635585c6 100644 --- a/sw/source/filter/ww8/rtfexportfilter.hxx +++ b/sw/source/filter/ww8/rtfexportfilter.hxx @@ -57,10 +57,10 @@ public: }; OUString RtfExport_getImplementationName(); -css::uno::Sequence<OUString> SAL_CALL RtfExport_getSupportedServiceNames() noexcept; +css::uno::Sequence<OUString> RtfExport_getSupportedServiceNames() noexcept; /// @throws css::uno::Exception css::uno::Reference<css::uno::XInterface> - SAL_CALL RtfExport_createInstance(const css::uno::Reference<css::uno::XComponentContext>& xCtx); +RtfExport_createInstance(const css::uno::Reference<css::uno::XComponentContext>& xCtx); #define IMPL_NAME_RTFEXPORT "com.sun.star.comp.Writer.RtfExport" diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index c67d69cceb12..3f6c736f2bd1 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -3680,18 +3680,18 @@ SwWW8Writer::~SwWW8Writer() { } -extern "C" SAL_DLLPUBLIC_EXPORT sal_uInt32 SAL_CALL SaveOrDelMSVBAStorage_ww8( SfxObjectShell& rDoc, SotStorage& rStor, sal_Bool bSaveInto, const OUString& rStorageName ) +extern "C" SAL_DLLPUBLIC_EXPORT sal_uInt32 SaveOrDelMSVBAStorage_ww8( SfxObjectShell& rDoc, SotStorage& rStor, sal_Bool bSaveInto, const OUString& rStorageName ) { SvxImportMSVBasic aTmp( rDoc, rStor ); return sal_uInt32(aTmp.SaveOrDelMSVBAStorage( bSaveInto, rStorageName )); } -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL ExportDOC( const OUString& rFltName, const OUString& rBaseURL, WriterRef& xRet ) +extern "C" SAL_DLLPUBLIC_EXPORT void ExportDOC( const OUString& rFltName, const OUString& rBaseURL, WriterRef& xRet ) { xRet = new SwWW8Writer( rFltName, rBaseURL ); } -extern "C" SAL_DLLPUBLIC_EXPORT sal_uInt32 SAL_CALL GetSaveWarningOfMSVBAStorage_ww8( SfxObjectShell &rDocS ) +extern "C" SAL_DLLPUBLIC_EXPORT sal_uInt32 GetSaveWarningOfMSVBAStorage_ww8( SfxObjectShell &rDocS ) { return sal_uInt32(SvxImportMSVBasic::GetSaveWarningOfMSVBAStorage( rDocS )); } diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index a60a0971f687..c6d829c4c915 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -6203,7 +6203,7 @@ ErrCode SwWW8ImplReader::LoadDoc(WW8Glossary *pGloss) return nErrRet; } -extern "C" SAL_DLLPUBLIC_EXPORT Reader* SAL_CALL ImportDOC() +extern "C" SAL_DLLPUBLIC_EXPORT Reader* ImportDOC() { return new WW8Reader; } @@ -6220,7 +6220,7 @@ namespace }; } -bool SAL_CALL TestImportDOC(SvStream &rStream, const OUString &rFltName) +bool TestImportDOC(SvStream &rStream, const OUString &rFltName) { FontCacheGuard aFontCacheGuard; std::unique_ptr<Reader> xReader(ImportDOC()); @@ -6264,17 +6264,17 @@ bool SAL_CALL TestImportDOC(SvStream &rStream, const OUString &rFltName) return bRet; } -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportWW8(SvStream &rStream) +extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportWW8(SvStream &rStream) { return TestImportDOC(rStream, "CWW8"); } -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportWW6(SvStream &rStream) +extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportWW6(SvStream &rStream) { return TestImportDOC(rStream, "CWW6"); } -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportWW2(SvStream &rStream) +extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportWW2(SvStream &rStream) { return TestImportDOC(rStream, "WW6"); } diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx index 037fe68c3959..dd1f4269c9a6 100644 --- a/sw/source/filter/xml/xmlexp.cxx +++ b/sw/source/filter/xml/xmlexp.cxx @@ -531,7 +531,7 @@ const SwDoc* SwXMLExport::getDoc() const return const_cast< SwXMLExport* >( this )->getDoc(); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_Writer_XMLExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { @@ -539,7 +539,7 @@ com_sun_star_comp_Writer_XMLExporter_get_implementation(css::uno::XComponentCont SvXMLExportFlags::ALL)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_Writer_XMLStylesExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { @@ -548,7 +548,7 @@ com_sun_star_comp_Writer_XMLStylesExporter_get_implementation(css::uno::XCompone SvXMLExportFlags::FONTDECLS)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_Writer_XMLContentExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { @@ -557,7 +557,7 @@ com_sun_star_comp_Writer_XMLContentExporter_get_implementation(css::uno::XCompon SvXMLExportFlags::FONTDECLS)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_Writer_XMLMetaExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { @@ -565,7 +565,7 @@ com_sun_star_comp_Writer_XMLMetaExporter_get_implementation(css::uno::XComponent SvXMLExportFlags::META)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_Writer_XMLSettingsExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { @@ -573,7 +573,7 @@ com_sun_star_comp_Writer_XMLSettingsExporter_get_implementation(css::uno::XCompo SvXMLExportFlags::SETTINGS)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_Writer_XMLOasisExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { @@ -581,7 +581,7 @@ com_sun_star_comp_Writer_XMLOasisExporter_get_implementation(css::uno::XComponen SvXMLExportFlags::ALL | SvXMLExportFlags::OASIS)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_Writer_XMLOasisStylesExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { @@ -590,7 +590,7 @@ com_sun_star_comp_Writer_XMLOasisStylesExporter_get_implementation(css::uno::XCo SvXMLExportFlags::FONTDECLS | SvXMLExportFlags::OASIS)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_Writer_XMLOasisContentExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { @@ -599,7 +599,7 @@ com_sun_star_comp_Writer_XMLOasisContentExporter_get_implementation(css::uno::XC SvXMLExportFlags::FONTDECLS | SvXMLExportFlags::OASIS)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_Writer_XMLOasisMetaExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { @@ -607,7 +607,7 @@ com_sun_star_comp_Writer_XMLOasisMetaExporter_get_implementation(css::uno::XComp SvXMLExportFlags::META | SvXMLExportFlags::OASIS)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_Writer_XMLOasisSettingsExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index e2118d87ca34..7b63719bfe8d 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -1507,7 +1507,7 @@ const SwDoc* SwXMLImport::getDoc() const return const_cast< SwXMLImport* >( this )->getDoc(); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_Writer_XMLOasisImporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { @@ -1516,7 +1516,7 @@ com_sun_star_comp_Writer_XMLOasisImporter_get_implementation(css::uno::XComponen } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_Writer_XMLOasisStylesImporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { @@ -1526,7 +1526,7 @@ com_sun_star_comp_Writer_XMLOasisStylesImporter_get_implementation(css::uno::XCo } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_Writer_XMLOasisContentImporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { @@ -1535,7 +1535,7 @@ com_sun_star_comp_Writer_XMLOasisContentImporter_get_implementation(css::uno::XC SvXMLImportFlags::FONTDECLS)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_Writer_XMLOasisMetaImporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { @@ -1544,7 +1544,7 @@ com_sun_star_comp_Writer_XMLOasisMetaImporter_get_implementation(css::uno::XComp } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_Writer_XMLOasisSettingsImporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { @@ -1552,7 +1552,7 @@ com_sun_star_comp_Writer_XMLOasisSettingsImporter_get_implementation(css::uno::X SvXMLImportFlags::SETTINGS)); } -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportFODT(SvStream &rStream) +extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportFODT(SvStream &rStream) { SwGlobals::ensure(); @@ -1601,7 +1601,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportFODT(SvStream &rStream) return ret; } -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportDOCX(SvStream &rStream) +extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportDOCX(SvStream &rStream) { SwGlobals::ensure(); diff --git a/sw/source/ui/uno/swdetect.cxx b/sw/source/ui/uno/swdetect.cxx index 44d5c205eb6a..a87824640c4f 100644 --- a/sw/source/ui/uno/swdetect.cxx +++ b/sw/source/ui/uno/swdetect.cxx @@ -132,7 +132,7 @@ Sequence< OUString > SAL_CALL SwFilterDetect::getSupportedServiceNames() return seqServiceNames ; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_writer_FormatDetector_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { diff --git a/sw/source/ui/vba/service.cxx b/sw/source/ui/vba/service.cxx index 3864993f0ed5..2b2adc652695 100644 --- a/sw/source/ui/vba/service.cxx +++ b/sw/source/ui/vba/service.cxx @@ -25,7 +25,7 @@ namespace sdecl = comphelper::service_decl; -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL vbaswobj_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * vbaswobj_component_getFactory( const sal_Char * pImplName, void *, void *) { void* pRet = sdecl::component_getFactoryHelper(pImplName, diff --git a/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx b/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx index e1ad415c34db..2452cea5b51e 100644 --- a/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx +++ b/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx @@ -290,7 +290,7 @@ void MMExcludeEntryController::statusChanged(const frame::FeatureStateEvent& rEv } -extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface * lo_writer_MMCurrentEntryController_get_implementation( uno::XComponentContext *context, uno::Sequence<uno::Any> const &) @@ -298,7 +298,7 @@ lo_writer_MMCurrentEntryController_get_implementation( return cppu::acquire(new MMCurrentEntryController(context)); } -extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface * lo_writer_MMExcludeEntryController_get_implementation( uno::XComponentContext *context, uno::Sequence<uno::Any> const &) diff --git a/sw/source/uibase/dialog/swabstdlg.cxx b/sw/source/uibase/dialog/swabstdlg.cxx index 6343d27cf54e..b4a9277b1921 100644 --- a/sw/source/uibase/dialog/swabstdlg.cxx +++ b/sw/source/uibase/dialog/swabstdlg.cxx @@ -23,11 +23,11 @@ #include <osl/module.hxx> -typedef SwAbstractDialogFactory* (SAL_CALL *SwFuncPtrCreateDialogFactory)(); +typedef SwAbstractDialogFactory* (*SwFuncPtrCreateDialogFactory)(); #ifndef DISABLE_DYNLOADING -extern "C" { static void SAL_CALL thisModule() {} } +extern "C" { static void thisModule() {} } #else diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx index fe285abb58bc..d88e959813ec 100644 --- a/sw/source/uibase/ribbar/workctrl.cxx +++ b/sw/source/uibase/ribbar/workctrl.cxx @@ -946,7 +946,7 @@ void NavElementToolBoxControl::dispatchCommand( } } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * lo_writer_NavElementToolBoxController_get_implementation( css::uno::XComponentContext *rxContext, css::uno::Sequence<css::uno::Any> const &) @@ -1078,7 +1078,7 @@ void SAL_CALL PrevNextScrollToolboxController::statusChanged( const css::frame:: } } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * lo_writer_PreviousScrollToolboxController_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) @@ -1086,7 +1086,7 @@ lo_writer_PreviousScrollToolboxController_get_implementation( return cppu::acquire( new PrevNextScrollToolboxController( context, PrevNextScrollToolboxController::PREVIOUS ) ); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * lo_writer_NextScrollToolboxController_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/sw/source/uibase/sidebar/SwPanelFactory.cxx b/sw/source/uibase/sidebar/SwPanelFactory.cxx index d7b2962e26f0..9fe8ccc143c9 100644 --- a/sw/source/uibase/sidebar/SwPanelFactory.cxx +++ b/sw/source/uibase/sidebar/SwPanelFactory.cxx @@ -188,7 +188,7 @@ Reference<ui::XUIElement> SAL_CALL SwPanelFactory::createUIElement ( } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * org_apache_openoffice_comp_sw_sidebar_SwPanelFactory_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/sw/source/uibase/uno/SwXFilterOptions.cxx b/sw/source/uibase/uno/SwXFilterOptions.cxx index f5c8af9796df..1426c688d587 100644 --- a/sw/source/uibase/uno/SwXFilterOptions.cxx +++ b/sw/source/uibase/uno/SwXFilterOptions.cxx @@ -138,7 +138,7 @@ uno::Sequence< OUString > SwXFilterOptions::getSupportedServiceNames() return uno::Sequence< OUString> (&sService, 1); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_Writer_FilterOptionsDialog_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { diff --git a/sw/source/uibase/uno/unoatxt.cxx b/sw/source/uibase/uno/unoatxt.cxx index 28c2c7f85454..5b37293c7805 100644 --- a/sw/source/uibase/uno/unoatxt.cxx +++ b/sw/source/uibase/uno/unoatxt.cxx @@ -1047,7 +1047,7 @@ void SwAutoTextEventDescriptor::getByName( } } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SwXAutoTextContainer_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { diff --git a/sw/source/uibase/uno/unodoc.cxx b/sw/source/uibase/uno/unodoc.cxx index 2a63caf061c4..08c032796e90 100644 --- a/sw/source/uibase/uno/unodoc.cxx +++ b/sw/source/uibase/uno/unodoc.cxx @@ -30,7 +30,7 @@ using namespace ::com::sun::star; // com.sun.star.comp.Writer.TextDocument -uno::Sequence< OUString > SAL_CALL SwTextDocument_getSupportedServiceNames() throw() +uno::Sequence< OUString > SwTextDocument_getSupportedServiceNames() throw() { // return only top level services here! All others must be // resolved by rtti! @@ -38,12 +38,12 @@ uno::Sequence< OUString > SAL_CALL SwTextDocument_getSupportedServiceNames() thr return aRet; } -OUString SAL_CALL SwTextDocument_getImplementationName() throw() +OUString SwTextDocument_getImplementationName() throw() { return OUString( "com.sun.star.comp.Writer.TextDocument" ); } -uno::Reference< uno::XInterface > SAL_CALL SwTextDocument_createInstance( +uno::Reference< uno::XInterface > SwTextDocument_createInstance( const uno::Reference< lang::XMultiServiceFactory >&, SfxModelFlags _nCreationFlags ) { SolarMutexGuard aGuard; @@ -52,7 +52,7 @@ uno::Reference< uno::XInterface > SAL_CALL SwTextDocument_createInstance( return uno::Reference< uno::XInterface >( pShell->GetModel() ); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_Writer_WebDocument_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { @@ -65,7 +65,7 @@ com_sun_star_comp_Writer_WebDocument_get_implementation(css::uno::XComponentCont } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_Writer_GlobalDocument_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { diff --git a/sw/source/uibase/uno/unofreg.cxx b/sw/source/uibase/uno/unofreg.cxx index dce6625edf92..3d2b0b91683f 100644 --- a/sw/source/uibase/uno/unofreg.cxx +++ b/sw/source/uibase/uno/unofreg.cxx @@ -40,7 +40,7 @@ using namespace ::com::sun::star::lang; extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL sw_component_getFactory( +SAL_DLLPUBLIC_EXPORT void * sw_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * ) @@ -82,7 +82,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL sw_component_getFactory( } // extern "C" -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SwXMailMerge_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { diff --git a/sw/source/uibase/uno/unomod.cxx b/sw/source/uibase/uno/unomod.cxx index 3cd3772ea3fa..c614793a2173 100644 --- a/sw/source/uibase/uno/unomod.cxx +++ b/sw/source/uibase/uno/unomod.cxx @@ -957,7 +957,7 @@ Sequence< OUString > SwXViewSettings::getSupportedServiceNames() return aRet; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SwXModule_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { diff --git a/sw/source/uibase/uno/unomodule.cxx b/sw/source/uibase/uno/unomodule.cxx index cf074ec15d02..dce4a610fcaf 100644 --- a/sw/source/uibase/uno/unomodule.cxx +++ b/sw/source/uibase/uno/unomodule.cxx @@ -32,18 +32,18 @@ using namespace css; -OUString SAL_CALL SwUnoModule_getImplementationName() throw() +OUString SwUnoModule_getImplementationName() throw() { return OUString( "com.sun.star.comp.Writer.WriterModule" ); } -uno::Sequence< OUString > SAL_CALL SwUnoModule_getSupportedServiceNames() throw() +uno::Sequence< OUString > SwUnoModule_getSupportedServiceNames() throw() { uno::Sequence<OUString> aSeq { "com.sun.star.text.ModuleDispatcher" }; return aSeq; } -uno::Reference< uno::XInterface > SAL_CALL SwUnoModule_createInstance( +uno::Reference< uno::XInterface > SwUnoModule_createInstance( const uno::Reference< lang::XMultiServiceFactory > & ) { SolarMutexGuard aGuard; |