summaryrefslogtreecommitdiff
path: root/connectivity/source/drivers/writer/Wservices.cxx
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2018-07-06 09:46:01 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2018-07-06 13:32:09 +0200
commit9eb929aa8cb3f5b0fee1264119a55cdd8cbe8f0e (patch)
treecdcaba62dbfa2ed6006e09afd71a11577477027b /connectivity/source/drivers/writer/Wservices.cxx
parent59fe3d7d231e4acb0635ac899a0ab2dee6c59289 (diff)
connectivity: turn on clang-format for the Writer driver
I (tried to) keep this consistent locally with astyle in the past, switching to clang-format means consistency is enforced by CI. Change-Id: I1016e253c6536b207a05328e5f6f13de37889588 Reviewed-on: https://gerrit.libreoffice.org/57046 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins
Diffstat (limited to 'connectivity/source/drivers/writer/Wservices.cxx')
-rw-r--r--connectivity/source/drivers/writer/Wservices.cxx56
1 files changed, 19 insertions, 37 deletions
diff --git a/connectivity/source/drivers/writer/Wservices.cxx b/connectivity/source/drivers/writer/Wservices.cxx
index 6d77471f65b5..029f71491894 100644
--- a/connectivity/source/drivers/writer/Wservices.cxx
+++ b/connectivity/source/drivers/writer/Wservices.cxx
@@ -22,43 +22,31 @@
using namespace com::sun::star;
-using createFactoryFunc = uno::Reference<lang::XSingleServiceFactory> (*)
- (
- const uno::Reference< lang::XMultiServiceFactory >& rServiceManager,
- const OUString& rComponentName,
- ::cppu::ComponentInstantiation pCreateFunction,
- const uno::Sequence< OUString >& rServiceNames,
- rtl_ModuleCount*
- );
-
+using createFactoryFunc = uno::Reference<lang::XSingleServiceFactory> (*)(
+ const uno::Reference<lang::XMultiServiceFactory>& rServiceManager,
+ const OUString& rComponentName, ::cppu::ComponentInstantiation pCreateFunction,
+ const uno::Sequence<OUString>& rServiceNames, rtl_ModuleCount*);
struct ProviderRequest
{
- uno::Reference< lang::XSingleServiceFactory > xRet;
- uno::Reference< lang::XMultiServiceFactory > const xServiceManager;
+ uno::Reference<lang::XSingleServiceFactory> xRet;
+ uno::Reference<lang::XMultiServiceFactory> const xServiceManager;
OUString const sImplementationName;
- ProviderRequest(
- void* pServiceManager,
- sal_Char const* pImplementationName
- )
+ ProviderRequest(void* pServiceManager, sal_Char const* pImplementationName)
: xServiceManager(static_cast<lang::XMultiServiceFactory*>(pServiceManager))
, sImplementationName(OUString::createFromAscii(pImplementationName))
{
}
- bool CREATE_PROVIDER(
- const OUString& Implname,
- const uno::Sequence< OUString >& Services,
- ::cppu::ComponentInstantiation Factory,
- createFactoryFunc creator
- )
+ bool CREATE_PROVIDER(const OUString& Implname, const uno::Sequence<OUString>& Services,
+ ::cppu::ComponentInstantiation Factory, createFactoryFunc creator)
{
if (!xRet.is() && (Implname == sImplementationName))
{
try
{
- xRet = creator(xServiceManager, sImplementationName,Factory, Services,nullptr);
+ xRet = creator(xServiceManager, sImplementationName, Factory, Services, nullptr);
}
catch (...)
{
@@ -67,28 +55,22 @@ struct ProviderRequest
return xRet.is();
}
- void* getProvider() const
- {
- return xRet.get();
- }
+ void* getProvider() const { return xRet.get(); }
};
-
-extern "C" SAL_DLLPUBLIC_EXPORT void* connectivity_writer_component_getFactory(
- const sal_Char* pImplementationName,
- void* pServiceManager,
- void* /*pRegistryKey*/)
+extern "C" SAL_DLLPUBLIC_EXPORT void*
+connectivity_writer_component_getFactory(const sal_Char* pImplementationName, void* pServiceManager,
+ void* /*pRegistryKey*/)
{
void* pRet = nullptr;
if (pServiceManager)
{
- ProviderRequest aReq(pServiceManager,pImplementationName);
+ ProviderRequest aReq(pServiceManager, pImplementationName);
- aReq.CREATE_PROVIDER(
- connectivity::writer::ODriver::getImplementationName_Static(),
- connectivity::writer::ODriver::getSupportedServiceNames_Static(),
- connectivity::writer::ODriver_CreateInstance, ::cppu::createSingleFactory)
- ;
+ aReq.CREATE_PROVIDER(connectivity::writer::ODriver::getImplementationName_Static(),
+ connectivity::writer::ODriver::getSupportedServiceNames_Static(),
+ connectivity::writer::ODriver_CreateInstance,
+ ::cppu::createSingleFactory);
if (aReq.xRet.is())
aReq.xRet->acquire();