diff options
23 files changed, 44 insertions, 44 deletions
diff --git a/avmedia/source/macavf/macavfuno.mm b/avmedia/source/macavf/macavfuno.mm index 57bd8b0ec81b..73020618ec70 100644 --- a/avmedia/source/macavf/macavfuno.mm +++ b/avmedia/source/macavf/macavfuno.mm @@ -22,12 +22,12 @@ using namespace ::com::sun::star; -static uno::Reference< uno::XInterface > SAL_CALL create_MediaPlayer( const uno::Reference< lang::XMultiServiceFactory >& rxFact ) +static uno::Reference< uno::XInterface > create_MediaPlayer( const uno::Reference< lang::XMultiServiceFactory >& rxFact ) { return uno::Reference< uno::XInterface >( *new ::avmedia::macavf::Manager( rxFact ) ); } -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL avmediaMacAVF_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ ) +extern "C" SAL_DLLPUBLIC_EXPORT void* avmediaMacAVF_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ ) { uno::Reference< lang::XSingleServiceFactory > xFactory; void* pRet = nullptr; diff --git a/avmedia/source/macavf/player.hxx b/avmedia/source/macavf/player.hxx index 9a42de477197..47a62aa56971 100644 --- a/avmedia/source/macavf/player.hxx +++ b/avmedia/source/macavf/player.hxx @@ -48,9 +48,9 @@ public: virtual void SAL_CALL setMediaTime( double fTime ) override; virtual double SAL_CALL getMediaTime() override; /// @throws css::uno::RuntimeException - virtual void SAL_CALL setStopTime( double fTime ); + virtual void setStopTime( double fTime ); /// @throws css::uno::RuntimeException - virtual double SAL_CALL getStopTime(); + virtual double getStopTime(); virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) override; virtual sal_Bool SAL_CALL isPlaybackLoop() override; virtual void SAL_CALL setMute( sal_Bool bSet ) override; diff --git a/avmedia/source/macavf/player.mm b/avmedia/source/macavf/player.mm index a950679c9b36..cf94c495911e 100644 --- a/avmedia/source/macavf/player.mm +++ b/avmedia/source/macavf/player.mm @@ -221,13 +221,13 @@ double SAL_CALL Player::getMediaTime() } -void SAL_CALL Player::setStopTime( double fTime ) +void Player::setStopTime( double fTime ) { mfStopTime = fTime; } -double SAL_CALL Player::getStopTime() +double Player::getStopTime() { return mfStopTime; } diff --git a/connectivity/source/drivers/macab/MacabConnection.cxx b/connectivity/source/drivers/macab/MacabConnection.cxx index 1425e3e55b63..fb3710df034d 100644 --- a/connectivity/source/drivers/macab/MacabConnection.cxx +++ b/connectivity/source/drivers/macab/MacabConnection.cxx @@ -285,7 +285,7 @@ void MacabConnection::disposing() MacabConnection_BASE::disposing(); } -Reference< XTablesSupplier > SAL_CALL MacabConnection::createCatalog() +Reference< XTablesSupplier > MacabConnection::createCatalog() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -304,7 +304,7 @@ MacabAddressBook* MacabConnection::getAddressBook() const return m_pAddressBook; } -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL createMacabConnection( void* _pDriver ) +extern "C" SAL_DLLPUBLIC_EXPORT void* createMacabConnection( void* _pDriver ) { MacabConnection* pConnection = new MacabConnection( static_cast< MacabDriver* >( _pDriver ) ); // by definition, the pointer crossing library boundaries as void ptr is acquired once diff --git a/connectivity/source/drivers/macab/MacabConnection.hxx b/connectivity/source/drivers/macab/MacabConnection.hxx index 8cf5c3d0aff0..38b41a13c0b3 100644 --- a/connectivity/source/drivers/macab/MacabConnection.hxx +++ b/connectivity/source/drivers/macab/MacabConnection.hxx @@ -108,7 +108,7 @@ namespace connectivity virtual void SAL_CALL clearWarnings( ) override; // needed for the SQL interpreter - css::uno::Reference< css::sdbcx::XTablesSupplier > SAL_CALL createCatalog(); + css::uno::Reference< css::sdbcx::XTablesSupplier > createCatalog(); // accessors MacabDriver* getDriver() const { return m_pDriver;} diff --git a/connectivity/source/drivers/macab/MacabDriver.cxx b/connectivity/source/drivers/macab/MacabDriver.cxx index 18a1e017d9cf..52345ec571d1 100644 --- a/connectivity/source/drivers/macab/MacabDriver.cxx +++ b/connectivity/source/drivers/macab/MacabDriver.cxx @@ -105,7 +105,7 @@ namespace } -extern "C" { static void SAL_CALL thisModule() {} } +extern "C" { static void thisModule() {} } bool MacabImplModule::impl_loadModule() { diff --git a/connectivity/source/drivers/macab/MacabServices.cxx b/connectivity/source/drivers/macab/MacabServices.cxx index faf214f703da..ed64a21f9181 100644 --- a/connectivity/source/drivers/macab/MacabServices.cxx +++ b/connectivity/source/drivers/macab/MacabServices.cxx @@ -74,7 +74,7 @@ struct ProviderRequest }; -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL macab_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* macab_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void*) diff --git a/connectivity/source/drivers/macab/MacabTables.hxx b/connectivity/source/drivers/macab/MacabTables.hxx index 849e3e0f2634..eb11ef8e77ab 100644 --- a/connectivity/source/drivers/macab/MacabTables.hxx +++ b/connectivity/source/drivers/macab/MacabTables.hxx @@ -45,7 +45,7 @@ namespace connectivity m_xMetaData(_rMetaData) { } - virtual void SAL_CALL disposing() override; + virtual void disposing() override; }; } } diff --git a/fpicker/source/aqua/FPentry.mm b/fpicker/source/aqua/FPentry.mm index 012d219bdaf8..f56c7819fb86 100644 --- a/fpicker/source/aqua/FPentry.mm +++ b/fpicker/source/aqua/FPentry.mm @@ -33,12 +33,12 @@ using namespace ::com::sun::star::registry; using namespace ::cppu; -static Reference< XInterface > SAL_CALL createFileInstance( const Reference< XMultiServiceFactory >& ) +static Reference< XInterface > createFileInstance( const Reference< XMultiServiceFactory >& ) { return Reference< XInterface >( *new SalAquaFilePicker ); } -static Reference< XInterface > SAL_CALL createFolderInstance( +static Reference< XInterface > createFolderInstance( const Reference< XMultiServiceFactory >& rServiceManager ) { return Reference< XInterface >( @@ -48,7 +48,7 @@ static Reference< XInterface > SAL_CALL createFolderInstance( extern "C" { -SAL_DLLPUBLIC_EXPORT void* SAL_CALL fps_aqua_component_getFactory( +SAL_DLLPUBLIC_EXPORT void* fps_aqua_component_getFactory( const sal_Char* pImplName, void* pSrvManager, void* /*pRegistryKey*/ ) { void* pRet = nullptr; diff --git a/fpicker/source/aqua/FilterHelper.hxx b/fpicker/source/aqua/FilterHelper.hxx index 90c4604b01d2..fdd025ef4e5a 100644 --- a/fpicker/source/aqua/FilterHelper.hxx +++ b/fpicker/source/aqua/FilterHelper.hxx @@ -83,19 +83,19 @@ public: //XFilterManager delegates /// @throws css::lang::IllegalArgumentException /// @throws css::uno::RuntimeException - void SAL_CALL appendFilter( const OUString& aTitle, const OUString& aFilter ); + void appendFilter( const OUString& aTitle, const OUString& aFilter ); /// @throws css::lang::IllegalArgumentException /// @throws css::uno::RuntimeException - void SAL_CALL setCurrentFilter( const OUString& aTitle ); + void setCurrentFilter( const OUString& aTitle ); /// @throws css::uno::RuntimeException - OUString SAL_CALL getCurrentFilter( ); + OUString getCurrentFilter( ); //XFilterGroupManager delegates /// @throws css::lang::IllegalArgumentException /// @throws css::uno::RuntimeException - void SAL_CALL appendFilterGroup( const OUString& sGroupTitle, const css::uno::Sequence< css::beans::StringPair >& aFilters ); + void appendFilterGroup( const OUString& sGroupTitle, const css::uno::Sequence< css::beans::StringPair >& aFilters ); //accessor diff --git a/fpicker/source/aqua/FilterHelper.mm b/fpicker/source/aqua/FilterHelper.mm index 47eeaca0a7c5..63e578873292 100644 --- a/fpicker/source/aqua/FilterHelper.mm +++ b/fpicker/source/aqua/FilterHelper.mm @@ -281,14 +281,14 @@ void FilterHelper::setCurrentFilter( const ::rtl::OUString& aTitle ) SetCurFilter(aTitle); } -::rtl::OUString SAL_CALL FilterHelper::getCurrentFilter( ) +::rtl::OUString FilterHelper::getCurrentFilter( ) { ::rtl::OUString sReturn = m_aCurrentFilter; return sReturn; } -void SAL_CALL FilterHelper::appendFilterGroup( const ::rtl::OUString& /* sGroupTitle */, const css::uno::Sequence< css::beans::StringPair >& aFilters ) +void FilterHelper::appendFilterGroup( const ::rtl::OUString& /* sGroupTitle */, const css::uno::Sequence< css::beans::StringPair >& aFilters ) { SolarMutexGuard aGuard; diff --git a/fpicker/source/aqua/SalAquaFilePicker.hxx b/fpicker/source/aqua/SalAquaFilePicker.hxx index 22d7a7d52428..93edde1a5b6f 100644 --- a/fpicker/source/aqua/SalAquaFilePicker.hxx +++ b/fpicker/source/aqua/SalAquaFilePicker.hxx @@ -111,7 +111,7 @@ public: using cppu::WeakComponentImplHelperBase::disposing; /// @throws css::uno::RuntimeException - virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ); + virtual void disposing( const css::lang::EventObject& aEvent ); // XServiceInfo @@ -123,11 +123,11 @@ public: // FilePicker Event functions - void SAL_CALL fileSelectionChanged( css::ui::dialogs::FilePickerEvent aEvent ); - void SAL_CALL directoryChanged( css::ui::dialogs::FilePickerEvent aEvent ); + void fileSelectionChanged( css::ui::dialogs::FilePickerEvent aEvent ); + void directoryChanged( css::ui::dialogs::FilePickerEvent aEvent ); // OUString SAL_CALL helpRequested( css::ui::dialogs::FilePickerEvent aEvent ) const; - void SAL_CALL controlStateChanged( css::ui::dialogs::FilePickerEvent aEvent ); - void SAL_CALL dialogSizeChanged( ); + void controlStateChanged( css::ui::dialogs::FilePickerEvent aEvent ); + void dialogSizeChanged( ); AquaFilePickerDelegate * getDelegate() { return m_pDelegate; diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm b/fpicker/source/aqua/SalAquaFilePicker.mm index af0b1712fc69..761198bdcbf0 100644 --- a/fpicker/source/aqua/SalAquaFilePicker.mm +++ b/fpicker/source/aqua/SalAquaFilePicker.mm @@ -62,7 +62,7 @@ using namespace ::com::sun::star::uno; namespace { - uno::Sequence<rtl::OUString> SAL_CALL FilePicker_getSupportedServiceNames() + uno::Sequence<rtl::OUString> FilePicker_getSupportedServiceNames() { uno::Sequence<rtl::OUString> aRet(3); aRet[0] = "com.sun.star.ui.dialogs.FilePicker"; @@ -468,7 +468,7 @@ void SAL_CALL SalAquaFilePicker::cancel() #pragma mark XEventListener -void SAL_CALL SalAquaFilePicker::disposing( const lang::EventObject& aEvent ) +void SalAquaFilePicker::disposing( const lang::EventObject& aEvent ) { SolarMutexGuard aGuard; @@ -497,25 +497,25 @@ uno::Sequence<rtl::OUString> SAL_CALL SalAquaFilePicker::getSupportedServiceName #pragma mark Misc/Private -void SAL_CALL SalAquaFilePicker::fileSelectionChanged( FilePickerEvent aEvent ) +void SalAquaFilePicker::fileSelectionChanged( FilePickerEvent aEvent ) { if (m_xListener.is()) m_xListener->fileSelectionChanged( aEvent ); } -void SAL_CALL SalAquaFilePicker::directoryChanged( FilePickerEvent aEvent ) +void SalAquaFilePicker::directoryChanged( FilePickerEvent aEvent ) { if (m_xListener.is()) m_xListener->directoryChanged( aEvent ); } -void SAL_CALL SalAquaFilePicker::controlStateChanged( FilePickerEvent aEvent ) +void SalAquaFilePicker::controlStateChanged( FilePickerEvent aEvent ) { if (m_xListener.is()) m_xListener->controlStateChanged( aEvent ); } -void SAL_CALL SalAquaFilePicker::dialogSizeChanged() +void SalAquaFilePicker::dialogSizeChanged() { if (m_xListener.is()) m_xListener->dialogSizeChanged(); diff --git a/fpicker/source/aqua/SalAquaFolderPicker.mm b/fpicker/source/aqua/SalAquaFolderPicker.mm index 8ab74dba6d00..51da7ede79b9 100644 --- a/fpicker/source/aqua/SalAquaFolderPicker.mm +++ b/fpicker/source/aqua/SalAquaFolderPicker.mm @@ -50,7 +50,7 @@ using namespace ::com::sun::star::uno; namespace { // controlling event notifications - uno::Sequence<rtl::OUString> SAL_CALL FolderPicker_getSupportedServiceNames() + uno::Sequence<rtl::OUString> FolderPicker_getSupportedServiceNames() { uno::Sequence<rtl::OUString> aRet(2); aRet[0] = "com.sun.star.ui.dialogs.SystemFolderPicker"; diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm b/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm index 217e030204fe..66ba35f017f7 100644 --- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm +++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm @@ -390,7 +390,7 @@ Reference< XSpellAlternatives > SAL_CALL } /// @throws Exception -Reference< XInterface > SAL_CALL MacSpellChecker_CreateInstance( +Reference< XInterface > MacSpellChecker_CreateInstance( const Reference< XMultiServiceFactory > & /*rSMgr*/ ) { @@ -526,7 +526,7 @@ Sequence< OUString > MacSpellChecker::getSupportedServiceNames_Static() extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL MacOSXSpell_component_getFactory( +SAL_DLLPUBLIC_EXPORT void * MacOSXSpell_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = nullptr; diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx index d4fd8b1d2aca..9982a84306c8 100644 --- a/sal/osl/unx/process_impl.cxx +++ b/sal/osl/unx/process_impl.cxx @@ -46,7 +46,7 @@ namespace { -oslProcessError SAL_CALL bootstrap_getExecutableFile(rtl_uString ** ppFileURL) +oslProcessError bootstrap_getExecutableFile(rtl_uString ** ppFileURL) { oslProcessError result = osl_Process_E_NotFound; diff --git a/sal/osl/unx/security.cxx b/sal/osl/unx/security.cxx index d0d9ed7132b4..cc69dfb5044b 100644 --- a/sal/osl/unx/security.cxx +++ b/sal/osl/unx/security.cxx @@ -427,7 +427,7 @@ static bool osl_psz_getConfigDir(oslSecurity Security, sal_Char* pszDirectory, s */ #define MACOSX_CONFIG_DIR "/Library/Application Support" /* Used on iOS, too */ -static bool SAL_CALL osl_psz_getConfigDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax) +static bool osl_psz_getConfigDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax) { if( osl_psz_getHomeDir(Security, pszDirectory, nMax - sizeof(MACOSX_CONFIG_DIR) + 1) ) { diff --git a/shell/source/backends/macbe/macbecdef.cxx b/shell/source/backends/macbe/macbecdef.cxx index 3cf519809043..7d10f6a2dfaa 100644 --- a/shell/source/backends/macbe/macbecdef.cxx +++ b/shell/source/backends/macbe/macbecdef.cxx @@ -27,7 +27,7 @@ namespace uno = com::sun::star::uno; -static uno::Reference<uno::XInterface> SAL_CALL createMacOSXBackend( +static uno::Reference<uno::XInterface> createMacOSXBackend( const uno::Reference<uno::XComponentContext>&) { return * MacOSXBackend::createInstance(); @@ -48,7 +48,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] = }; -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL macbe1_component_getFactory( const sal_Char *aImplementationName, void *aServiceManager, void *aRegistryKey) +extern "C" SAL_DLLPUBLIC_EXPORT void * macbe1_component_getFactory( const sal_Char *aImplementationName, void *aServiceManager, void *aRegistryKey) { return cppu::component_getFactoryHelper( diff --git a/vcl/inc/osx/keyboardfocuslistener.hxx b/vcl/inc/osx/keyboardfocuslistener.hxx index 8f1e3130bb90..1da1c845293a 100644 --- a/vcl/inc/osx/keyboardfocuslistener.hxx +++ b/vcl/inc/osx/keyboardfocuslistener.hxx @@ -29,7 +29,7 @@ class KeyboardFocusListener : public salhelper::SimpleReferenceObject { public: - virtual void SAL_CALL focusedObjectChanged(const css::uno::Reference< css::accessibility::XAccessible >& xAccessible) = 0; + virtual void focusedObjectChanged(const css::uno::Reference< css::accessibility::XAccessible >& xAccessible) = 0; }; #endif // INCLUDED_VCL_INC_OSX_KEYBOARDFOCUSLISTENER_HXX diff --git a/vcl/osx/HtmlFmtFlt.cxx b/vcl/osx/HtmlFmtFlt.cxx index 7208c67616e7..1cd679c2e8d3 100644 --- a/vcl/osx/HtmlFmtFlt.cxx +++ b/vcl/osx/HtmlFmtFlt.cxx @@ -78,7 +78,7 @@ const std::string TAG_END_HTML = std::string("</html>"); const std::string TAG_BODY = std::string("<body"); const std::string TAG_END_BODY = std::string("</body"); -Sequence<sal_Int8> SAL_CALL TextHtmlToHTMLFormat(Sequence<sal_Int8> const & aTextHtml) +Sequence<sal_Int8> TextHtmlToHTMLFormat(Sequence<sal_Int8> const & aTextHtml) { OSL_ASSERT(aTextHtml.getLength() > 0); diff --git a/vcl/osx/a11yfocuslistener.cxx b/vcl/osx/a11yfocuslistener.cxx index 6c9efc4aafd0..68eb45a31f20 100644 --- a/vcl/osx/a11yfocuslistener.cxx +++ b/vcl/osx/a11yfocuslistener.cxx @@ -57,7 +57,7 @@ id AquaA11yFocusListener::getFocusedUIElement() return m_focusedObject; } -void SAL_CALL +void AquaA11yFocusListener::focusedObjectChanged(const Reference< XAccessible >& xAccessible) { if ( nil != m_focusedObject ) { diff --git a/vcl/osx/a11yfocuslistener.hxx b/vcl/osx/a11yfocuslistener.hxx index 12c76d92741b..44a25cce0b8f 100644 --- a/vcl/osx/a11yfocuslistener.hxx +++ b/vcl/osx/a11yfocuslistener.hxx @@ -38,7 +38,7 @@ public: id getFocusedUIElement(); // KeyboardFocusListener - virtual void SAL_CALL focusedObjectChanged(const css::uno::Reference< css::accessibility::XAccessible >& xAccessible) override; + virtual void focusedObjectChanged(const css::uno::Reference< css::accessibility::XAccessible >& xAccessible) override; }; #endif // INCLUDED_VCL_OSX_A11YFOCUSLISTENER_HXX diff --git a/vcl/osx/saldata.cxx b/vcl/osx/saldata.cxx index 48ee575fbea8..3357adbcd60a 100644 --- a/vcl/osx/saldata.cxx +++ b/vcl/osx/saldata.cxx @@ -28,7 +28,7 @@ oslThreadKey SalData::s_aAutoReleaseKey = nullptr; -static void SAL_CALL releasePool( void* pPool ) +static void releasePool( void* pPool ) { if( pPool ) [static_cast<NSAutoreleasePool*>(pPool) release]; |