summaryrefslogtreecommitdiff
path: root/starmath/source
diff options
context:
space:
mode:
Diffstat (limited to 'starmath/source')
-rw-r--r--starmath/source/detreg.cxx2
-rw-r--r--starmath/source/mathmlexport.cxx12
-rw-r--r--starmath/source/mathmlimport.cxx20
-rw-r--r--starmath/source/mathtype.cxx2
-rw-r--r--starmath/source/register.cxx2
-rw-r--r--starmath/source/register.hxx24
-rw-r--r--starmath/source/unodoc.cxx6
-rw-r--r--starmath/source/unofilter.cxx2
8 files changed, 35 insertions, 35 deletions
diff --git a/starmath/source/detreg.cxx b/starmath/source/detreg.cxx
index b5d3b8f2acb7..12a2428ba28c 100644
--- a/starmath/source/detreg.cxx
+++ b/starmath/source/detreg.cxx
@@ -27,7 +27,7 @@ using namespace ::com::sun::star::lang;
extern "C" {
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL smd_component_getFactory( const sal_Char* pImplementationName,
+SAL_DLLPUBLIC_EXPORT void* smd_component_getFactory( const sal_Char* pImplementationName,
void* pServiceManager,
void* /*pRegistryKey*/ )
{
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index 5a4adc576f47..c25e7396d4ca 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -365,37 +365,37 @@ const uno::Sequence< sal_Int8 > & SmXMLExport::getUnoTunnelId() throw()
return theSmXMLExportUnoTunnelId::get().getSeq();
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
Math_XMLExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new SmXMLExport(context, "com.sun.star.comp.Math.XMLExporter", SvXMLExportFlags::OASIS|SvXMLExportFlags::ALL));
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
Math_XMLMetaExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new SmXMLExport(context, "com.sun.star.comp.Math.XMLMetaExporter", SvXMLExportFlags::META));
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
Math_XMLOasisMetaExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new SmXMLExport(context, "com.sun.star.comp.Math.XMLOasisMetaExporter", SvXMLExportFlags::OASIS|SvXMLExportFlags::META));
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
Math_XMLSettingsExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new SmXMLExport(context, "com.sun.star.comp.Math.XMLSettingsExporter", SvXMLExportFlags::SETTINGS));
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
Math_XMLOasisSettingsExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new SmXMLExport(context, "com.sun.star.comp.Math.XMLOasisSettingsExporter", SvXMLExportFlags::OASIS|SvXMLExportFlags::SETTINGS));
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
Math_XMLContentExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new SmXMLExport(context, "com.sun.star.comp.Math.XMLContentExporter", SvXMLExportFlags::OASIS|SvXMLExportFlags::CONTENT));
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index 3697f23b3c4d..59fa00467b42 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -423,54 +423,54 @@ const uno::Sequence< sal_Int8 > & SmXMLImport::getUnoTunnelId() throw()
return theSmXMLImportUnoTunnelId::get().getSeq();
}
-OUString SAL_CALL SmXMLImport_getImplementationName() throw()
+OUString SmXMLImport_getImplementationName() throw()
{
return OUString( "com.sun.star.comp.Math.XMLImporter" );
}
-uno::Sequence< OUString > SAL_CALL SmXMLImport_getSupportedServiceNames()
+uno::Sequence< OUString > SmXMLImport_getSupportedServiceNames()
throw()
{
return uno::Sequence<OUString>{ IMPORT_SVC_NAME };
}
-uno::Reference< uno::XInterface > SAL_CALL SmXMLImport_createInstance(
+uno::Reference< uno::XInterface > SmXMLImport_createInstance(
const uno::Reference< lang::XMultiServiceFactory > & rSMgr)
{
return static_cast<cppu::OWeakObject*>(new SmXMLImport(comphelper::getComponentContext(rSMgr), SmXMLImport_getImplementationName(), SvXMLImportFlags::ALL));
}
-OUString SAL_CALL SmXMLImportMeta_getImplementationName() throw()
+OUString SmXMLImportMeta_getImplementationName() throw()
{
return OUString( "com.sun.star.comp.Math.XMLOasisMetaImporter" );
}
-uno::Sequence< OUString > SAL_CALL SmXMLImportMeta_getSupportedServiceNames()
+uno::Sequence< OUString > SmXMLImportMeta_getSupportedServiceNames()
throw()
{
return uno::Sequence<OUString>{ IMPORT_SVC_NAME };
}
-uno::Reference< uno::XInterface > SAL_CALL SmXMLImportMeta_createInstance(
+uno::Reference< uno::XInterface > SmXMLImportMeta_createInstance(
const uno::Reference< lang::XMultiServiceFactory > & rSMgr)
{
return static_cast<cppu::OWeakObject*>(new SmXMLImport( comphelper::getComponentContext(rSMgr), SmXMLImportMeta_getImplementationName(), SvXMLImportFlags::META ));
}
-OUString SAL_CALL SmXMLImportSettings_getImplementationName() throw()
+OUString SmXMLImportSettings_getImplementationName() throw()
{
return OUString( "com.sun.star.comp.Math.XMLOasisSettingsImporter" );
}
-uno::Sequence< OUString > SAL_CALL SmXMLImportSettings_getSupportedServiceNames()
+uno::Sequence< OUString > SmXMLImportSettings_getSupportedServiceNames()
throw()
{
return uno::Sequence<OUString>{ IMPORT_SVC_NAME };
}
-uno::Reference< uno::XInterface > SAL_CALL SmXMLImportSettings_createInstance(
+uno::Reference< uno::XInterface > SmXMLImportSettings_createInstance(
const uno::Reference< lang::XMultiServiceFactory > & rSMgr)
{
return static_cast<cppu::OWeakObject*>(new SmXMLImport( comphelper::getComponentContext(rSMgr), SmXMLImportSettings_getImplementationName(), SvXMLImportFlags::SETTINGS ));
@@ -3115,7 +3115,7 @@ void SmXMLImport::SetConfigurationSettings(const Sequence<PropertyValue>& aConfP
}
}
-extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportMML(SvStream &rStream)
+extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportMML(SvStream &rStream)
{
SmGlobals::ensure();
diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx
index c7016656a3e1..9c726cc67c08 100644
--- a/starmath/source/mathtype.cxx
+++ b/starmath/source/mathtype.cxx
@@ -3340,7 +3340,7 @@ void MathType::HandleText(SmNode *pNode)
}
}
-extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportMathType(SvStream &rStream)
+extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportMathType(SvStream &rStream)
{
OUString sText;
MathType aEquation(sText);
diff --git a/starmath/source/register.cxx b/starmath/source/register.cxx
index 946e8543afbe..e99038c3acb6 100644
--- a/starmath/source/register.cxx
+++ b/starmath/source/register.cxx
@@ -30,7 +30,7 @@ using namespace ::com::sun::star::lang;
extern "C" {
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL sm_component_getFactory( const sal_Char* pImplementationName,
+SAL_DLLPUBLIC_EXPORT void* sm_component_getFactory( const sal_Char* pImplementationName,
void* pServiceManager,
void* /*pRegistryKey*/ )
{
diff --git a/starmath/source/register.hxx b/starmath/source/register.hxx
index 9cdd82a06bb6..cf6bac038eb7 100644
--- a/starmath/source/register.hxx
+++ b/starmath/source/register.hxx
@@ -24,34 +24,34 @@
#include <sfx2/sfxmodelfactory.hxx>
//Math document
-css::uno::Sequence< OUString > SAL_CALL
+css::uno::Sequence< OUString >
SmDocument_getSupportedServiceNames() throw();
-OUString SAL_CALL
+OUString
SmDocument_getImplementationName() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface >SAL_CALL
+css::uno::Reference< css::uno::XInterface >
SmDocument_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr, SfxModelFlags _nCreationFlags);
//MathML import
-css::uno::Sequence< OUString > SAL_CALL
+css::uno::Sequence< OUString >
SmXMLImport_getSupportedServiceNames() throw();
-OUString SAL_CALL
+OUString
SmXMLImport_getImplementationName() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL
+css::uno::Reference< css::uno::XInterface >
SmXMLImport_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr);
-css::uno::Sequence< OUString > SAL_CALL
+css::uno::Sequence< OUString >
SmXMLImportMeta_getSupportedServiceNames() throw();
-OUString SAL_CALL
+OUString
SmXMLImportMeta_getImplementationName() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL
+css::uno::Reference< css::uno::XInterface >
SmXMLImportMeta_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr);
-css::uno::Sequence< OUString > SAL_CALL
+css::uno::Sequence< OUString >
SmXMLImportSettings_getSupportedServiceNames() throw();
-OUString SAL_CALL SmXMLImportSettings_getImplementationName() throw();
+OUString SmXMLImportSettings_getImplementationName() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL
+css::uno::Reference< css::uno::XInterface >
SmXMLImportSettings_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr);
#endif
diff --git a/starmath/source/unodoc.cxx b/starmath/source/unodoc.cxx
index 23de3a86e3ca..6355b5860f2f 100644
--- a/starmath/source/unodoc.cxx
+++ b/starmath/source/unodoc.cxx
@@ -27,17 +27,17 @@
using namespace ::com::sun::star;
-OUString SAL_CALL SmDocument_getImplementationName() throw()
+OUString SmDocument_getImplementationName() throw()
{
return OUString( "com.sun.star.comp.Math.FormulaDocument" );
}
-uno::Sequence< OUString > SAL_CALL SmDocument_getSupportedServiceNames() throw()
+uno::Sequence< OUString > SmDocument_getSupportedServiceNames() throw()
{
return uno::Sequence<OUString>{ "com.sun.star.formula.FormulaProperties" };
}
-uno::Reference< uno::XInterface > SAL_CALL SmDocument_createInstance(
+uno::Reference< uno::XInterface > SmDocument_createInstance(
const uno::Reference< lang::XMultiServiceFactory > & /*rSMgr*/, SfxModelFlags _nCreationFlags )
{
SolarMutexGuard aGuard;
diff --git a/starmath/source/unofilter.cxx b/starmath/source/unofilter.cxx
index 597d8f41718e..4a1d329731d3 100644
--- a/starmath/source/unofilter.cxx
+++ b/starmath/source/unofilter.cxx
@@ -115,7 +115,7 @@ uno::Sequence<OUString> MathTypeFilter::getSupportedServiceNames()
return aRet;
}
-extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* SAL_CALL com_sun_star_comp_Math_MathTypeFilter_get_implementation(uno::XComponentContext* /*pCtx*/, uno::Sequence<uno::Any> const& /*rSeq*/)
+extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* com_sun_star_comp_Math_MathTypeFilter_get_implementation(uno::XComponentContext* /*pCtx*/, uno::Sequence<uno::Any> const& /*rSeq*/)
{
return cppu::acquire(new MathTypeFilter);
}
generated by cgit (git 2.34.1) at 2024-07-08 03:44:21 +0000