summaryrefslogtreecommitdiff
path: root/scripting
diff options
context:
space:
mode:
Diffstat (limited to 'scripting')
-rw-r--r--scripting/source/basprov/basprov.cxx4
-rw-r--r--scripting/source/dlgprov/dlgprov.cxx10
-rw-r--r--scripting/source/dlgprov/dlgprov.hxx4
-rw-r--r--scripting/source/protocolhandler/scripthandler.cxx2
-rw-r--r--scripting/source/provider/BrowseNodeFactoryImpl.cxx6
-rw-r--r--scripting/source/provider/MasterScriptProvider.cxx6
-rw-r--r--scripting/source/provider/MasterScriptProvider.hxx12
-rw-r--r--scripting/source/provider/MasterScriptProviderFactory.cxx6
-rw-r--r--scripting/source/stringresource/stringresource.cxx8
-rw-r--r--scripting/source/vbaevents/eventhelper.cxx4
10 files changed, 31 insertions, 31 deletions
diff --git a/scripting/source/basprov/basprov.cxx b/scripting/source/basprov/basprov.cxx
index 28cc4a48714a..17f67cece24e 100644
--- a/scripting/source/basprov/basprov.cxx
+++ b/scripting/source/basprov/basprov.cxx
@@ -483,7 +483,7 @@ namespace basprov
// component operations
- static Reference< XInterface > SAL_CALL create_BasicProviderImpl(
+ static Reference< XInterface > create_BasicProviderImpl(
Reference< XComponentContext > const & xContext )
{
return static_cast< lang::XTypeProvider * >( new BasicProviderImpl( xContext ) );
@@ -509,7 +509,7 @@ namespace basprov
extern "C"
{
- SAL_DLLPUBLIC_EXPORT void * SAL_CALL basprov_component_getFactory(
+ SAL_DLLPUBLIC_EXPORT void * basprov_component_getFactory(
const sal_Char * pImplName, void * pServiceManager,
void * pRegistryKey )
{
diff --git a/scripting/source/dlgprov/dlgprov.cxx b/scripting/source/dlgprov/dlgprov.cxx
index df16f43ffe24..4de9c48308b4 100644
--- a/scripting/source/dlgprov/dlgprov.cxx
+++ b/scripting/source/dlgprov/dlgprov.cxx
@@ -65,18 +65,18 @@ using namespace ::sf_misc;
namespace comp_DialogModelProvider
{
- OUString SAL_CALL _getImplementationName()
+ OUString _getImplementationName()
{
return OUString("com.sun.star.comp.scripting.DialogModelProvider");
}
- uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames()
+ uno::Sequence< OUString > _getSupportedServiceNames()
{
uno::Sequence< OUString > s { "com.sun.star.awt.UnoControlDialogModelProvider" };
return s;
}
- uno::Reference< uno::XInterface > SAL_CALL _create(const uno::Reference< uno::XComponentContext > & context)
+ uno::Reference< uno::XInterface > _create(const uno::Reference< uno::XComponentContext > & context)
{
return static_cast< ::cppu::OWeakObject * >(new dlgprov::DialogModelProvider(context));
}
@@ -736,7 +736,7 @@ namespace dlgprov
// component operations
- static Reference< XInterface > SAL_CALL create_DialogProviderImpl(
+ static Reference< XInterface > create_DialogProviderImpl(
Reference< XComponentContext > const & xContext )
{
return static_cast< lang::XTypeProvider * >( new DialogProviderImpl( xContext ) );
@@ -759,7 +759,7 @@ namespace dlgprov
extern "C"
{
- SAL_DLLPUBLIC_EXPORT void * SAL_CALL dlgprov_component_getFactory(
+ SAL_DLLPUBLIC_EXPORT void * dlgprov_component_getFactory(
const sal_Char * pImplName, void * pServiceManager,
void * pRegistryKey )
{
diff --git a/scripting/source/dlgprov/dlgprov.hxx b/scripting/source/dlgprov/dlgprov.hxx
index a5081da60a7d..521bf3f2e316 100644
--- a/scripting/source/dlgprov/dlgprov.hxx
+++ b/scripting/source/dlgprov/dlgprov.hxx
@@ -152,8 +152,8 @@ namespace dlgprov
namespace comp_DialogModelProvider {
// component and service helper functions:
-OUString SAL_CALL _getImplementationName();
-css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames();
+OUString _getImplementationName();
+css::uno::Sequence< OUString > _getSupportedServiceNames();
} // namespace comp_DialogModelProvider
diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx
index 150ffa052509..b4313df5b8fb 100644
--- a/scripting/source/protocolhandler/scripthandler.cxx
+++ b/scripting/source/protocolhandler/scripthandler.cxx
@@ -472,7 +472,7 @@ const Reference< XMultiServiceFactory >& xServiceManager )
extern "C"
{
- SAL_DLLPUBLIC_EXPORT void* SAL_CALL protocolhandler_component_getFactory( const sal_Char * pImplementationName ,
+ SAL_DLLPUBLIC_EXPORT void* protocolhandler_component_getFactory( const sal_Char * pImplementationName ,
void * pServiceManager ,
void * )
{
diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.cxx b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
index 49c51dba6c07..90be10172ba7 100644
--- a/scripting/source/provider/BrowseNodeFactoryImpl.cxx
+++ b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
@@ -629,7 +629,7 @@ BrowseNodeFactoryImpl::getOrganizerHierarchy()
// Namespace global methods for setting up BrowseNodeFactory service
-Sequence< OUString > SAL_CALL
+Sequence< OUString >
bnf_getSupportedServiceNames( )
{
OUString str_name(
@@ -638,14 +638,14 @@ bnf_getSupportedServiceNames( )
return Sequence< OUString >( &str_name, 1 );
}
-OUString SAL_CALL
+OUString
bnf_getImplementationName( )
{
return OUString(
"com.sun.star.script.browse.BrowseNodeFactory" );
}
-Reference< XInterface > SAL_CALL
+Reference< XInterface >
bnf_create( Reference< XComponentContext > const & xComponentContext )
{
return static_cast< ::cppu::OWeakObject * >(
diff --git a/scripting/source/provider/MasterScriptProvider.cxx b/scripting/source/provider/MasterScriptProvider.cxx
index 12c336caf84f..d82d70f3f1dd 100644
--- a/scripting/source/provider/MasterScriptProvider.cxx
+++ b/scripting/source/provider/MasterScriptProvider.cxx
@@ -708,7 +708,7 @@ Sequence< OUString > SAL_CALL MasterScriptProvider::getSupportedServiceNames( )
namespace scripting_runtimemgr
{
-Reference< XInterface > SAL_CALL sp_create(
+Reference< XInterface > sp_create(
const Reference< XComponentContext > & xCompC )
{
return static_cast<cppu::OWeakObject *>(new ::func_provider::MasterScriptProvider( xCompC ));
@@ -733,7 +733,7 @@ OUString sp_getImplementationName( )
}
// ***** registration or ScriptingFrameworkURIHelper
-Reference< XInterface > SAL_CALL urihelper_create(
+Reference< XInterface > urihelper_create(
const Reference< XComponentContext > & xCompC )
{
return static_cast<cppu::OWeakObject *>(
@@ -801,7 +801,7 @@ extern "C"
* data
* @return a component factory
*/
- SAL_DLLPUBLIC_EXPORT void * SAL_CALL scriptframe_component_getFactory(
+ SAL_DLLPUBLIC_EXPORT void * scriptframe_component_getFactory(
const sal_Char * pImplName,
void * pServiceManager,
void * pRegistryKey )
diff --git a/scripting/source/provider/MasterScriptProvider.hxx b/scripting/source/provider/MasterScriptProvider.hxx
index 303418f94b3a..bb1ffe9306d8 100644
--- a/scripting/source/provider/MasterScriptProvider.hxx
+++ b/scripting/source/provider/MasterScriptProvider.hxx
@@ -127,17 +127,17 @@ private:
OUString m_sCtxString;
};
-OUString SAL_CALL mspf_getImplementationName() ;
-css::uno::Reference< css::uno::XInterface > SAL_CALL mspf_create( css::uno::Reference< css::uno::XComponentContext > const & xComponentContext );
-css::uno::Sequence< OUString > SAL_CALL mspf_getSupportedServiceNames();
+OUString mspf_getImplementationName() ;
+css::uno::Reference< css::uno::XInterface > mspf_create( css::uno::Reference< css::uno::XComponentContext > const & xComponentContext );
+css::uno::Sequence< OUString > mspf_getSupportedServiceNames();
}
namespace browsenodefactory
{
-OUString SAL_CALL bnf_getImplementationName() ;
-css::uno::Reference< css::uno::XInterface > SAL_CALL bnf_create( css::uno::Reference< css::uno::XComponentContext > const & xComponentContext );
-css::uno::Sequence< OUString > SAL_CALL bnf_getSupportedServiceNames();
+OUString bnf_getImplementationName() ;
+css::uno::Reference< css::uno::XInterface > bnf_create( css::uno::Reference< css::uno::XComponentContext > const & xComponentContext );
+css::uno::Sequence< OUString > bnf_getSupportedServiceNames();
}
#endif // INCLUDED_SCRIPTING_SOURCE_PROVIDER_MASTERSCRIPTPROVIDER_HXX
diff --git a/scripting/source/provider/MasterScriptProviderFactory.cxx b/scripting/source/provider/MasterScriptProviderFactory.cxx
index a805015d0c3e..f7798f8d195e 100644
--- a/scripting/source/provider/MasterScriptProviderFactory.cxx
+++ b/scripting/source/provider/MasterScriptProviderFactory.cxx
@@ -62,7 +62,7 @@ MasterScriptProviderFactory::getActiveMSPList() const
return m_MSPList;
}
-Sequence< OUString > SAL_CALL mspf_getSupportedServiceNames( )
+Sequence< OUString > mspf_getSupportedServiceNames( )
{
OUString str_name(
"com.sun.star.script.provider.MasterScriptProviderFactory");
@@ -70,13 +70,13 @@ Sequence< OUString > SAL_CALL mspf_getSupportedServiceNames( )
return Sequence< OUString >( &str_name, 1 );
}
-OUString SAL_CALL mspf_getImplementationName( )
+OUString mspf_getImplementationName( )
{
return OUString(
"com.sun.star.script.provider.MasterScriptProviderFactory");
}
-Reference< XInterface > SAL_CALL
+Reference< XInterface >
mspf_create( Reference< XComponentContext > const & xComponentContext )
{
return static_cast< ::cppu::OWeakObject * >(
diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx
index 88becc349103..308b3ff57176 100644
--- a/scripting/source/stringresource/stringresource.cxx
+++ b/scripting/source/stringresource/stringresource.cxx
@@ -90,7 +90,7 @@ static OUString getImplementationName_StringResourceImpl()
return OUString( "com.sun.star.comp.scripting.StringResource" );
}
-static Reference< XInterface > SAL_CALL create_StringResourceImpl(
+static Reference< XInterface > create_StringResourceImpl(
Reference< XComponentContext > const & xContext )
{
return static_cast< ::cppu::OWeakObject * >( new StringResourcePersistenceImpl( xContext ) );
@@ -2128,7 +2128,7 @@ static OUString getImplementationName_StringResourceWithStorageImpl()
return OUString( "com.sun.star.comp.scripting.StringResourceWithStorage" );
}
-static Reference< XInterface > SAL_CALL create_StringResourceWithStorageImpl(
+static Reference< XInterface > create_StringResourceWithStorageImpl(
Reference< XComponentContext > const & xContext )
{
return static_cast< ::cppu::OWeakObject * >( new StringResourceWithStorageImpl( xContext ) );
@@ -2415,7 +2415,7 @@ static OUString getImplementationName_StringResourceWithLocationImpl()
return OUString( "com.sun.star.comp.scripting.StringResourceWithLocation" );
}
-static Reference< XInterface > SAL_CALL create_StringResourceWithLocationImpl(
+static Reference< XInterface > create_StringResourceWithLocationImpl(
Reference< XComponentContext > const & xContext )
{
return static_cast< ::cppu::OWeakObject * >( new StringResourceWithLocationImpl( xContext ) );
@@ -2758,7 +2758,7 @@ static const struct ::cppu::ImplementationEntry s_component_entries [] =
extern "C"
{
- SAL_DLLPUBLIC_EXPORT void * SAL_CALL stringresource_component_getFactory(
+ SAL_DLLPUBLIC_EXPORT void * stringresource_component_getFactory(
const sal_Char * pImplName, void * pServiceManager,
void * pRegistryKey )
{
diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx
index 79e7bb88ab7a..ced2d021bc63 100644
--- a/scripting/source/vbaevents/eventhelper.cxx
+++ b/scripting/source/vbaevents/eventhelper.cxx
@@ -980,7 +980,7 @@ VBAToOOEventDescGen::getEventSupplier( const Reference< XInterface >& xControl,
return xSupplier;
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
ooo_vba_EventListener_get_implementation(css::uno::XComponentContext*,
css::uno::Sequence<css::uno::Any> const &)
{
@@ -988,7 +988,7 @@ ooo_vba_EventListener_get_implementation(css::uno::XComponentContext*,
}
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
ooo_vba_VBAToOOEventDesc_get_implementation(css::uno::XComponentContext*,
css::uno::Sequence<css::uno::Any> const &)
{
generated by cgit (git 2.34.1) at 2024-12-25 07:34:53 +0000