compilerplugins/clang/salcall.cxx | 1 - embeddedobj/source/msole/xdialogcreator.cxx | 6 +++--- embeddedobj/source/msole/xdialogcreator.hxx | 6 +++--- shell/source/backends/wininetbe/wininetbackend.cxx | 4 ++-- shell/source/backends/wininetbe/wininetbackend.hxx | 4 ++-- 5 files changed, 10 insertions(+), 11 deletions(-)
New commits: commit 1bbefac109ee1989e09fe5c59c1752be8715da5a Author: Stephan Bergmann <sberg...@redhat.com> Date: Wed Dec 20 11:59:16 2017 +0100 Remove redundant, duplicated getSpellingLoc call Change-Id: Ic1e4fd2833dd0bcc64363733e7794448b2d4de37 Reviewed-on: https://gerrit.libreoffice.org/46839 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Stephan Bergmann <sberg...@redhat.com> diff --git a/compilerplugins/clang/salcall.cxx b/compilerplugins/clang/salcall.cxx index 663c9c8f45b6..3ff786d2ee87 100644 --- a/compilerplugins/clang/salcall.cxx +++ b/compilerplugins/clang/salcall.cxx @@ -516,7 +516,6 @@ bool SalCall::isSalCallFunction(FunctionDecl const* functionDecl, SourceLocation startLoc = SM.getSpellingLoc(startLoc); #if !defined _WIN32 - startLoc = SM.getSpellingLoc(startLoc); // When the SAL_CALL macro expands to nothing, it may even precede the function // declaration's source range, so go back one token (unless the declaration is known to // start with a token that must precede a possible "SAL_CALL", like "virtual" or commit fd2c1c5915fdcb23c2af5a3f4c0efe130174838d Author: Stephan Bergmann <sberg...@redhat.com> Date: Wed Dec 20 09:20:13 2017 +0100 loplugin:salcall (clang-cl) Change-Id: Iebbbd8e20ef8d5eb28d8594e142ea323aaa63a82 Reviewed-on: https://gerrit.libreoffice.org/46835 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Stephan Bergmann <sberg...@redhat.com> diff --git a/embeddedobj/source/msole/xdialogcreator.cxx b/embeddedobj/source/msole/xdialogcreator.cxx index bcf02a0972f3..d8338cbacfd4 100644 --- a/embeddedobj/source/msole/xdialogcreator.cxx +++ b/embeddedobj/source/msole/xdialogcreator.cxx @@ -105,7 +105,7 @@ uno::Sequence< sal_Int8 > GetRelatedInternalID_Impl( const uno::Sequence< sal_In } -uno::Sequence< OUString > SAL_CALL MSOLEDialogObjectCreator::impl_staticGetSupportedServiceNames() +uno::Sequence< OUString > MSOLEDialogObjectCreator::impl_staticGetSupportedServiceNames() { uno::Sequence< OUString > aRet(2); aRet[0] = "com.sun.star.embed.MSOLEObjectSystemCreator"; @@ -114,13 +114,13 @@ uno::Sequence< OUString > SAL_CALL MSOLEDialogObjectCreator::impl_staticGetSuppo } -OUString SAL_CALL MSOLEDialogObjectCreator::impl_staticGetImplementationName() +OUString MSOLEDialogObjectCreator::impl_staticGetImplementationName() { return OUString("com.sun.star.comp.embed.MSOLEObjectSystemCreator"); } -uno::Reference< uno::XInterface > SAL_CALL MSOLEDialogObjectCreator::impl_staticCreateSelfInstance( +uno::Reference< uno::XInterface > MSOLEDialogObjectCreator::impl_staticCreateSelfInstance( const uno::Reference< lang::XMultiServiceFactory >& xServiceManager ) { return uno::Reference< uno::XInterface >( *new MSOLEDialogObjectCreator( xServiceManager ) ); diff --git a/embeddedobj/source/msole/xdialogcreator.hxx b/embeddedobj/source/msole/xdialogcreator.hxx index 02a8059c094c..b858930b3646 100644 --- a/embeddedobj/source/msole/xdialogcreator.hxx +++ b/embeddedobj/source/msole/xdialogcreator.hxx @@ -42,11 +42,11 @@ public: OSL_ENSURE( xFactory.is(), "No service manager is provided!" ); } - static css::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames(); + static css::uno::Sequence< OUString > impl_staticGetSupportedServiceNames(); - static OUString SAL_CALL impl_staticGetImplementationName(); + static OUString impl_staticGetImplementationName(); - static css::uno::Reference< css::uno::XInterface > SAL_CALL + static css::uno::Reference< css::uno::XInterface > impl_staticCreateSelfInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ); diff --git a/shell/source/backends/wininetbe/wininetbackend.cxx b/shell/source/backends/wininetbe/wininetbackend.cxx index b1006803d065..bed1e270cf6d 100644 --- a/shell/source/backends/wininetbe/wininetbackend.cxx +++ b/shell/source/backends/wininetbe/wininetbackend.cxx @@ -341,7 +341,7 @@ css::uno::Any WinInetBackend::getPropertyValue( } } -OUString SAL_CALL WinInetBackend::getBackendName() { +OUString WinInetBackend::getBackendName() { return OUString("com.sun.star.comp.configuration.backend.WinInetBackend") ; } @@ -350,7 +350,7 @@ OUString SAL_CALL WinInetBackend::getImplementationName() return getBackendName() ; } -uno::Sequence<OUString> SAL_CALL WinInetBackend::getBackendServiceNames() +uno::Sequence<OUString> WinInetBackend::getBackendServiceNames() { uno::Sequence<OUString> aServiceNameList { "com.sun.star.configuration.backend.WinInetBackend" }; diff --git a/shell/source/backends/wininetbe/wininetbackend.hxx b/shell/source/backends/wininetbe/wininetbackend.hxx index b1df7d7a76a3..8478f3512f46 100644 --- a/shell/source/backends/wininetbe/wininetbackend.hxx +++ b/shell/source/backends/wininetbe/wininetbackend.hxx @@ -52,13 +52,13 @@ class WinInetBackend : public ::cppu::WeakImplHelper < @return implementation name */ - static OUString SAL_CALL getBackendName() ; + static OUString getBackendName() ; /** Provides the supported services names @return service names */ - static uno::Sequence<OUString> SAL_CALL getBackendServiceNames() ; + static uno::Sequence<OUString> getBackendServiceNames() ; // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits