diff options
Diffstat (limited to 'sd/source/ui/unoidl')
-rw-r--r-- | sd/source/ui/unoidl/UnoDocumentSettings.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/unoidl/UnoDocumentSettings.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/unoidl/facreg.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/unoidl/randomnode.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/unoidl/sddetect.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/unoidl/unodoc.cxx | 12 | ||||
-rw-r--r-- | sd/source/ui/unoidl/unomodule.cxx | 2 |
7 files changed, 12 insertions, 12 deletions
diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx index 590c23125543..84a7ad50412f 100644 --- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx +++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx @@ -122,7 +122,7 @@ namespace sd rtl::Reference<SdXImpressDocument> mxModel; }; - Reference< XInterface > SAL_CALL DocumentSettings_createInstance( SdXImpressDocument* pModel ) + Reference< XInterface > DocumentSettings_createInstance( SdXImpressDocument* pModel ) throw () { DBG_ASSERT( pModel, "I need a model for the DocumentSettings!" ); diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.hxx b/sd/source/ui/unoidl/UnoDocumentSettings.hxx index 2519c5fd7cbc..fa405a33f0d4 100644 --- a/sd/source/ui/unoidl/UnoDocumentSettings.hxx +++ b/sd/source/ui/unoidl/UnoDocumentSettings.hxx @@ -26,7 +26,7 @@ class SdXImpressDocument; namespace sd { - css::uno::Reference< css::uno::XInterface > SAL_CALL DocumentSettings_createInstance( SdXImpressDocument* pDoc ) throw(); + css::uno::Reference< css::uno::XInterface > DocumentSettings_createInstance( SdXImpressDocument* pDoc ) throw(); } #endif diff --git a/sd/source/ui/unoidl/facreg.cxx b/sd/source/ui/unoidl/facreg.cxx index b4700f1d39b7..5ec60462575b 100644 --- a/sd/source/ui/unoidl/facreg.cxx +++ b/sd/source/ui/unoidl/facreg.cxx @@ -59,7 +59,7 @@ std::shared_ptr<FactoryMap> const & GetFactoryMap() extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL sd_component_getFactory( +SAL_DLLPUBLIC_EXPORT void * sd_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * ) diff --git a/sd/source/ui/unoidl/randomnode.cxx b/sd/source/ui/unoidl/randomnode.cxx index 966d1929cdcb..9ae03e5ac1ae 100644 --- a/sd/source/ui/unoidl/randomnode.cxx +++ b/sd/source/ui/unoidl/randomnode.cxx @@ -562,7 +562,7 @@ Sequence< OUString > RandomAnimationNode::getSupportedServiceNames() } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* RandomAnimationNode_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx index 342bea38cdb0..2c4a2dbc62a2 100644 --- a/sd/source/ui/unoidl/sddetect.cxx +++ b/sd/source/ui/unoidl/sddetect.cxx @@ -152,7 +152,7 @@ Sequence< OUString > SAL_CALL SdFilterDetect::getSupportedServiceNames() } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_draw_FormatDetector_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { diff --git a/sd/source/ui/unoidl/unodoc.cxx b/sd/source/ui/unoidl/unodoc.cxx index 4394229aa24c..554be509cc18 100644 --- a/sd/source/ui/unoidl/unodoc.cxx +++ b/sd/source/ui/unoidl/unodoc.cxx @@ -32,12 +32,12 @@ using namespace ::com::sun::star; // com.sun.star.comp.Draw.DrawingDocument -OUString SAL_CALL SdDrawingDocument_getImplementationName() +OUString SdDrawingDocument_getImplementationName() { return OUString( "com.sun.star.comp.Draw.DrawingDocument" ); } -uno::Sequence< OUString > SAL_CALL SdDrawingDocument_getSupportedServiceNames() +uno::Sequence< OUString > SdDrawingDocument_getSupportedServiceNames() { uno::Sequence< OUString > aSeq( 2 ); aSeq[0] = "com.sun.star.drawing.DrawingDocument"; @@ -46,7 +46,7 @@ uno::Sequence< OUString > SAL_CALL SdDrawingDocument_getSupportedServiceNames() return aSeq; } -uno::Reference< uno::XInterface > SAL_CALL SdDrawingDocument_createInstance( +uno::Reference< uno::XInterface > SdDrawingDocument_createInstance( const uno::Reference< lang::XMultiServiceFactory > &, SfxModelFlags _nCreationFlags ) { SolarMutexGuard aGuard; @@ -61,12 +61,12 @@ uno::Reference< uno::XInterface > SAL_CALL SdDrawingDocument_createInstance( // com.sun.star.comp.Draw.PresentationDocument -OUString SAL_CALL SdPresentationDocument_getImplementationName() +OUString SdPresentationDocument_getImplementationName() { return OUString( "com.sun.star.comp.Draw.PresentationDocument" ); } -uno::Sequence< OUString > SAL_CALL SdPresentationDocument_getSupportedServiceNames() +uno::Sequence< OUString > SdPresentationDocument_getSupportedServiceNames() { uno::Sequence< OUString > aSeq( 2 ); aSeq[0] = "com.sun.star.drawing.DrawingDocumentFactory"; @@ -75,7 +75,7 @@ uno::Sequence< OUString > SAL_CALL SdPresentationDocument_getSupportedServiceNam return aSeq; } -uno::Reference< uno::XInterface > SAL_CALL SdPresentationDocument_createInstance( +uno::Reference< uno::XInterface > SdPresentationDocument_createInstance( const uno::Reference< lang::XMultiServiceFactory > &, SfxModelFlags _nCreationFlags ) { SolarMutexGuard aGuard; diff --git a/sd/source/ui/unoidl/unomodule.cxx b/sd/source/ui/unoidl/unomodule.cxx index a885545f17b8..425f3d074d40 100644 --- a/sd/source/ui/unoidl/unomodule.cxx +++ b/sd/source/ui/unoidl/unomodule.cxx @@ -125,7 +125,7 @@ uno::Sequence< OUString > SAL_CALL SdUnoModule::getSupportedServiceNames( ) } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_Draw_DrawingModule_get_implementation(css::uno::XComponentContext* , css::uno::Sequence<css::uno::Any> const &) { |