Kaydet (Commit) 8b6c9009 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Various loplugin in --enable-gtk3-kde5 code

Change-Id: I5d5bb6b57a9e9ed2c66d304c18fe7ef233aae072
üst b07e38b2
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include "sal/config.h" #include <sal/config.h>
#include "kde5access.hxx" #include "kde5access.hxx"
...@@ -290,7 +290,7 @@ css::beans::Optional<css::uno::Any> getValue(OUString const& id) ...@@ -290,7 +290,7 @@ css::beans::Optional<css::uno::Any> getValue(OUString const& id)
} }
else if (id == "ooInetProxyType") else if (id == "ooInetProxyType")
{ {
int nProxyType; sal_Int32 nProxyType;
switch (KProtocolManager::proxyType()) switch (KProtocolManager::proxyType())
{ {
case KProtocolManager::ManualProxy: // Proxies are manually configured case KProtocolManager::ManualProxy: // Proxies are manually configured
...@@ -303,7 +303,7 @@ css::beans::Optional<css::uno::Any> getValue(OUString const& id) ...@@ -303,7 +303,7 @@ css::beans::Optional<css::uno::Any> getValue(OUString const& id)
default: // No proxy is used default: // No proxy is used
nProxyType = 0; nProxyType = 0;
} }
return css::beans::Optional<css::uno::Any>(true, uno::makeAny((sal_Int32)nProxyType)); return css::beans::Optional<css::uno::Any>(true, uno::makeAny(nProxyType));
} }
else else
{ {
......
...@@ -56,12 +56,12 @@ ...@@ -56,12 +56,12 @@
namespace namespace
{ {
OUString SAL_CALL getServiceImplementationName() OUString getServiceImplementationName()
{ {
return OUString("com.sun.star.comp.configuration.backend.KDE5Backend"); return OUString("com.sun.star.comp.configuration.backend.KDE5Backend");
} }
css::uno::Sequence<OUString> SAL_CALL getServiceSupportedServiceNames() css::uno::Sequence<OUString> getServiceSupportedServiceNames()
{ {
OUString name("com.sun.star.configuration.backend.KDE5Backend"); OUString name("com.sun.star.configuration.backend.KDE5Backend");
return css::uno::Sequence<OUString>(&name, 1); return css::uno::Sequence<OUString>(&name, 1);
...@@ -74,7 +74,7 @@ public: ...@@ -74,7 +74,7 @@ public:
Service(); Service();
private: private:
virtual ~Service() {} virtual ~Service() override {}
virtual OUString SAL_CALL getImplementationName() override virtual OUString SAL_CALL getImplementationName() override
{ {
...@@ -204,7 +204,7 @@ Service::Service() ...@@ -204,7 +204,7 @@ Service::Service()
void Service::setPropertyValue(OUString const&, css::uno::Any const&) void Service::setPropertyValue(OUString const&, css::uno::Any const&)
{ {
throw css::lang::IllegalArgumentException(OUString("setPropertyValue not supported"), throw css::lang::IllegalArgumentException("setPropertyValue not supported",
static_cast<cppu::OWeakObject*>(this), -1); static_cast<cppu::OWeakObject*>(this), -1);
} }
...@@ -231,7 +231,7 @@ css::uno::Any Service::getPropertyValue(OUString const& PropertyName) ...@@ -231,7 +231,7 @@ css::uno::Any Service::getPropertyValue(OUString const& PropertyName)
} }
css::uno::Reference<css::uno::XInterface> css::uno::Reference<css::uno::XInterface>
SAL_CALL createInstance(css::uno::Reference<css::uno::XComponentContext> const&) createInstance(css::uno::Reference<css::uno::XComponentContext> const&)
{ {
return static_cast<cppu::OWeakObject*>(new Service); return static_cast<cppu::OWeakObject*>(new Service);
} }
...@@ -242,9 +242,8 @@ static cppu::ImplementationEntry const services[] ...@@ -242,9 +242,8 @@ static cppu::ImplementationEntry const services[]
{ nullptr, nullptr, nullptr, nullptr, nullptr, 0 } }; { nullptr, nullptr, nullptr, nullptr, nullptr, 0 } };
} }
extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL kde5be1_component_getFactory(char const* pImplName, extern "C" SAL_DLLPUBLIC_EXPORT void*
void* pServiceManager, kde5be1_component_getFactory(char const* pImplName, void* pServiceManager, void* pRegistryKey)
void* pRegistryKey)
{ {
return cppu::component_getFactoryHelper(pImplName, pServiceManager, pRegistryKey, services); return cppu::component_getFactoryHelper(pImplName, pServiceManager, pRegistryKey, services);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment