diff options
Diffstat (limited to 'vcl/source/components')
-rw-r--r-- | vcl/source/components/dtranscomp.cxx | 16 | ||||
-rw-r--r-- | vcl/source/components/factory.cxx | 2 | ||||
-rw-r--r-- | vcl/source/components/fontident.cxx | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/vcl/source/components/dtranscomp.cxx b/vcl/source/components/dtranscomp.cxx index 46ca921d3def..dd1bf719ffa6 100644 --- a/vcl/source/components/dtranscomp.cxx +++ b/vcl/source/components/dtranscomp.cxx @@ -215,7 +215,7 @@ Reference< XInterface > ClipboardFactory::createInstanceWithArguments( const Seq return xResult; } -OUString SAL_CALL Clipboard_getImplementationName() +OUString Clipboard_getImplementationName() { return OUString( #if defined MACOSX @@ -230,7 +230,7 @@ OUString SAL_CALL Clipboard_getImplementationName() ); } -Reference< XSingleServiceFactory > SAL_CALL Clipboard_createFactory() +Reference< XSingleServiceFactory > Clipboard_createFactory() { return Reference< XSingleServiceFactory >( new ClipboardFactory() ); } @@ -303,7 +303,7 @@ void GenericDragSource::initialize( const Sequence< Any >& ) { } -Sequence< OUString > SAL_CALL DragSource_getSupportedServiceNames() +Sequence< OUString > DragSource_getSupportedServiceNames() { #if defined MACOSX return { "com.sun.star.datatransfer.dnd.OleDragSource" }; @@ -314,7 +314,7 @@ Sequence< OUString > SAL_CALL DragSource_getSupportedServiceNames() #endif } -OUString SAL_CALL DragSource_getImplementationName() +OUString DragSource_getImplementationName() { #if defined MACOSX return OUString("com.sun.star.comp.datatransfer.dnd.OleDragSource_V1"); @@ -325,7 +325,7 @@ OUString SAL_CALL DragSource_getImplementationName() #endif } -Reference< XInterface > SAL_CALL DragSource_createInstance( const Reference< XMultiServiceFactory >& ) +Reference< XInterface > DragSource_createInstance( const Reference< XMultiServiceFactory >& ) { SolarMutexGuard aGuard; Reference< XInterface > xResult = ImplGetSVData()->mpDefInst->CreateDragSource(); @@ -404,7 +404,7 @@ void GenericDropTarget::setDefaultActions( sal_Int8) { } -Sequence< OUString > SAL_CALL DropTarget_getSupportedServiceNames() +Sequence< OUString > DropTarget_getSupportedServiceNames() { #if defined MACOSX return Sequence< OUString > { "com.sun.star.datatransfer.dnd.OleDropTarget" }; @@ -415,7 +415,7 @@ Sequence< OUString > SAL_CALL DropTarget_getSupportedServiceNames() #endif } -OUString SAL_CALL DropTarget_getImplementationName() +OUString DropTarget_getImplementationName() { return OUString( #if defined MACOSX @@ -428,7 +428,7 @@ OUString SAL_CALL DropTarget_getImplementationName() ); } -Reference< XInterface > SAL_CALL DropTarget_createInstance( const Reference< XMultiServiceFactory >& ) +Reference< XInterface > DropTarget_createInstance( const Reference< XMultiServiceFactory >& ) { SolarMutexGuard aGuard; Reference< XInterface > xResult = ImplGetSVData()->mpDefInst->CreateDropTarget(); diff --git a/vcl/source/components/factory.cxx b/vcl/source/components/factory.cxx index 27f701f721f9..51b256d0cc1a 100644 --- a/vcl/source/components/factory.cxx +++ b/vcl/source/components/factory.cxx @@ -31,7 +31,7 @@ using namespace com::sun::star::lang; extern "C" { - VCL_DLLPUBLIC void* SAL_CALL vcl_component_getFactory( + VCL_DLLPUBLIC void* vcl_component_getFactory( const sal_Char* pImplementationName, void* pXUnoSMgr, void* /*pXUnoKey*/ diff --git a/vcl/source/components/fontident.cxx b/vcl/source/components/fontident.cxx index ac3168160657..58226634a477 100644 --- a/vcl/source/components/fontident.cxx +++ b/vcl/source/components/fontident.cxx @@ -157,7 +157,7 @@ OUString FontIdentificator_getImplementationName() return OUString( "vcl::FontIdentificator" ); } -Reference< XInterface > SAL_CALL FontIdentificator_createInstance( const Reference< XMultiServiceFactory >& ) +Reference< XInterface > FontIdentificator_createInstance( const Reference< XMultiServiceFactory >& ) { return static_cast< ::cppu::OWeakObject * >( new FontIdentificator ); } |