mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
d29e614ff9cd91c4e4a1bada6a21884e33323f8d
libreoffice/include/ucbhelper/macros.hxx

300 lines
16 KiB
C++
Raw Normal View History

Add vim/emacs modelines to all source files Fixes #fdo30794 Based on bin/add-modelines script (originally posted in mail 1286706307.1871.1399280959@webmail.messagingengine.com) Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
2010-10-14 08:27:31 +02:00
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
re-base on ALv2 code.
2012-06-22 17:51:25 +01:00
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
initial import
2000-09-18 16:07:07 +00:00
fixincludeguards.sh: include/u* Change-Id: I8a07ccb309490206a2edd36f2fe4d0e2c0982ea2
2013-10-23 19:16:30 +02:00
#ifndef INCLUDED_UCBHELPER_MACROS_HXX
#define INCLUDED_UCBHELPER_MACROS_HXX
initial import
2000-09-18 16:07:07 +00:00
#include <sal/types.h>
#include <cppuhelper/queryinterface.hxx>
#include <cppuhelper/factory.hxx>
#include <cppuhelper/weakref.hxx>
fdo#54938: Convert some places to use cppu::supportsService The last cases are non obvious, so it's pratically done Change-Id: Icae1da8e238f516eaed0f7fbdf96fff778eac547 Reviewed-on: https://gerrit.libreoffice.org/8445 Reviewed-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com> Tested-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
2014-03-04 08:41:53 -03:00
#include <cppuhelper/supportsservice.hxx>
initial import
2000-09-18 16:07:07 +00:00
#include <cppuhelper/typeprovider.hxx>
INTEGRATION: CWS bgdlremove (1.3.64); FILE MERGED 2007/05/11 12:54:06 kso 1.3.64.1: #i76911# - ucbhelper no longer uses VOS
2007-06-05 13:49:45 +00:00
fdo#65108 inter-module includes <> include/ucbhelper Change-Id: I355c0873ef51b92f39dd7cc0d696075f54f890d9
2013-11-09 15:37:02 -06:00
#include <osl/mutex.hxx>
#include <ucbhelper/getcomponentcontext.hxx>
initial import
2000-09-18 16:07:07 +00:00
Remove visual noise from include Conflicts: include/framework/preventduplicateinteraction.hxx include/sfx2/sfxbasecontroller.hxx include/sfx2/sfxbasemodel.hxx include/toolkit/awt/vclxtabpagemodel.hxx include/vcl/field.hxx include/vcl/settings.hxx Change-Id: Ibccf9f88c68267a3d7e656012b51eaf644c418c2 Reviewed-on: https://gerrit.libreoffice.org/8272 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-02-25 19:06:16 +01:00
initial import
2000-09-18 16:07:07 +00:00
Replace remaining getCppuType et al with cppu::UnoType Change-Id: I0ecb96d6f26c827640f3329c81884001f860090d
2015-04-01 08:42:56 +02:00
#define CPPU_TYPE( T ) cppu::UnoType<T>::get()
#define CPPU_TYPE_REF( T ) CPPU_TYPE( T )
initial import
2000-09-18 16:07:07 +00:00
// XTypeProvider impl. internals
Remove visual noise from include Conflicts: include/framework/preventduplicateinteraction.hxx include/sfx2/sfxbasecontroller.hxx include/sfx2/sfxbasemodel.hxx include/toolkit/awt/vclxtabpagemodel.hxx include/vcl/field.hxx include/vcl/settings.hxx Change-Id: Ibccf9f88c68267a3d7e656012b51eaf644c418c2 Reviewed-on: https://gerrit.libreoffice.org/8272 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-02-25 19:06:16 +01:00
initial import
2000-09-18 16:07:07 +00:00
#define XTYPEPROVIDER_COMMON_IMPL( Class ) \
com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL \
Class::getImplementationId() \
cppuhelper: retrofit std::exception into overriding exception specs Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
2014-02-25 21:31:58 +01:00
throw( com::sun::star::uno::RuntimeException, std::exception ) \
initial import
2000-09-18 16:07:07 +00:00
{ \
ucbhelper: simplify deprecated XTypeProvider.getImplementationId Change-Id: I7797ba7fdc47a5f8d2453e839d8644bf125652bd
2014-03-10 16:37:26 +01:00
return css::uno::Sequence<sal_Int8>(); \
initial import
2000-09-18 16:07:07 +00:00
}
#define GETTYPES_IMPL_START( Class ) \
com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL \
Class::getTypes() \
cppuhelper: retrofit std::exception into overriding exception specs Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
2014-02-25 21:31:58 +01:00
throw( com::sun::star::uno::RuntimeException, std::exception ) \
initial import
2000-09-18 16:07:07 +00:00
{ \
static cppu::OTypeCollection* pCollection = NULL; \
if ( !pCollection ) \
{ \
osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() ); \
if ( !pCollection ) \
{ \
static cppu::OTypeCollection collection(
#define GETTYPES_IMPL_END \
); \
pCollection = &collection; \
} \
} \
return (*pCollection).getTypes(); \
}
Remove visual noise from include Conflicts: include/framework/preventduplicateinteraction.hxx include/sfx2/sfxbasecontroller.hxx include/sfx2/sfxbasemodel.hxx include/toolkit/awt/vclxtabpagemodel.hxx include/vcl/field.hxx include/vcl/settings.hxx Change-Id: Ibccf9f88c68267a3d7e656012b51eaf644c418c2 Reviewed-on: https://gerrit.libreoffice.org/8272 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-02-25 19:06:16 +01:00
initial import
2000-09-18 16:07:07 +00:00
// XTypeProvider impl.
Remove visual noise from include Conflicts: include/framework/preventduplicateinteraction.hxx include/sfx2/sfxbasecontroller.hxx include/sfx2/sfxbasemodel.hxx include/toolkit/awt/vclxtabpagemodel.hxx include/vcl/field.hxx include/vcl/settings.hxx Change-Id: Ibccf9f88c68267a3d7e656012b51eaf644c418c2 Reviewed-on: https://gerrit.libreoffice.org/8272 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-02-25 19:06:16 +01:00
initial import
2000-09-18 16:07:07 +00:00
// 2 interfaces supported
#define XTYPEPROVIDER_IMPL_2( Class, I1,I2 ) \
XTYPEPROVIDER_COMMON_IMPL( Class ) \
GETTYPES_IMPL_START( Class ) \
CPPU_TYPE_REF( I1 ), \
CPPU_TYPE_REF( I2 ) \
GETTYPES_IMPL_END
// 3 interfaces supported
#define XTYPEPROVIDER_IMPL_3( Class, I1,I2,I3 ) \
XTYPEPROVIDER_COMMON_IMPL( Class ) \
GETTYPES_IMPL_START( Class ) \
CPPU_TYPE_REF( I1 ), \
CPPU_TYPE_REF( I2 ), \
CPPU_TYPE_REF( I3 ) \
GETTYPES_IMPL_END
// 4 interfaces supported
#define XTYPEPROVIDER_IMPL_4( Class, I1,I2,I3,I4 ) \
XTYPEPROVIDER_COMMON_IMPL( Class ) \
GETTYPES_IMPL_START( Class ) \
CPPU_TYPE_REF( I1 ), \
CPPU_TYPE_REF( I2 ), \
CPPU_TYPE_REF( I3 ), \
CPPU_TYPE_REF( I4 ) \
GETTYPES_IMPL_END
// 5 interfaces supported
#define XTYPEPROVIDER_IMPL_5( Class, I1,I2,I3,I4,I5 ) \
XTYPEPROVIDER_COMMON_IMPL( Class ) \
GETTYPES_IMPL_START( Class ) \
CPPU_TYPE_REF( I1 ), \
CPPU_TYPE_REF( I2 ), \
CPPU_TYPE_REF( I3 ), \
CPPU_TYPE_REF( I4 ), \
CPPU_TYPE_REF( I5 ) \
GETTYPES_IMPL_END
// 9 interfaces supported
#define XTYPEPROVIDER_IMPL_9( Class, I1,I2,I3,I4,I5,I6,I7,I8,I9 ) \
XTYPEPROVIDER_COMMON_IMPL( Class ) \
GETTYPES_IMPL_START( Class ) \
CPPU_TYPE_REF( I1 ), \
CPPU_TYPE_REF( I2 ), \
CPPU_TYPE_REF( I3 ), \
CPPU_TYPE_REF( I4 ), \
CPPU_TYPE_REF( I5 ), \
CPPU_TYPE_REF( I6 ), \
CPPU_TYPE_REF( I7 ), \
CPPU_TYPE_REF( I8 ), \
CPPU_TYPE_REF( I9 ) \
GETTYPES_IMPL_END
// 10 interfaces supported
#define XTYPEPROVIDER_IMPL_10( Class, I1,I2,I3,I4,I5,I6,I7,I8,I9,I10 ) \
XTYPEPROVIDER_COMMON_IMPL( Class ) \
GETTYPES_IMPL_START( Class ) \
CPPU_TYPE_REF( I1 ), \
CPPU_TYPE_REF( I2 ), \
CPPU_TYPE_REF( I3 ), \
CPPU_TYPE_REF( I4 ), \
CPPU_TYPE_REF( I5 ), \
CPPU_TYPE_REF( I6 ), \
CPPU_TYPE_REF( I7 ), \
CPPU_TYPE_REF( I8 ), \
CPPU_TYPE_REF( I9 ), \
CPPU_TYPE_REF( I10 ) \
GETTYPES_IMPL_END
// 11 interfaces supported
#define XTYPEPROVIDER_IMPL_11( Class, I1,I2,I3,I4,I5,I6,I7,I8,I9,I10,I11 ) \
XTYPEPROVIDER_COMMON_IMPL( Class ) \
GETTYPES_IMPL_START( Class ) \
CPPU_TYPE_REF( I1 ), \
CPPU_TYPE_REF( I2 ), \
CPPU_TYPE_REF( I3 ), \
CPPU_TYPE_REF( I4 ), \
CPPU_TYPE_REF( I5 ), \
CPPU_TYPE_REF( I6 ), \
CPPU_TYPE_REF( I7 ), \
CPPU_TYPE_REF( I8 ), \
CPPU_TYPE_REF( I9 ), \
CPPU_TYPE_REF( I10 ), \
CPPU_TYPE_REF( I11 ) \
GETTYPES_IMPL_END
// XServiceInfo impl. internals
Remove visual noise from include Conflicts: include/framework/preventduplicateinteraction.hxx include/sfx2/sfxbasecontroller.hxx include/sfx2/sfxbasemodel.hxx include/toolkit/awt/vclxtabpagemodel.hxx include/vcl/field.hxx include/vcl/settings.hxx Change-Id: Ibccf9f88c68267a3d7e656012b51eaf644c418c2 Reviewed-on: https://gerrit.libreoffice.org/8272 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-02-25 19:06:16 +01:00
initial import
2000-09-18 16:07:07 +00:00
#define XSERVICEINFO_COMMOM_IMPL( Class, ImplName ) \
mass removal of rtl:: prefixes for O(U)String* Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
2013-04-07 12:06:47 +02:00
OUString SAL_CALL Class::getImplementationName() \
cppuhelper: retrofit std::exception into overriding exception specs Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
2014-02-25 21:31:58 +01:00
throw( com::sun::star::uno::RuntimeException, std::exception ) \
initial import
2000-09-18 16:07:07 +00:00
{ \
return getImplementationName_Static(); \
} \
\
mass removal of rtl:: prefixes for O(U)String* Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
2013-04-07 12:06:47 +02:00
OUString Class::getImplementationName_Static() \
initial import
2000-09-18 16:07:07 +00:00
{ \
return ImplName; \
} \
\
sal_Bool SAL_CALL \
mass removal of rtl:: prefixes for O(U)String* Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
2013-04-07 12:06:47 +02:00
Class::supportsService( const OUString& ServiceName ) \
cppuhelper: retrofit std::exception into overriding exception specs Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
2014-02-25 21:31:58 +01:00
throw( com::sun::star::uno::RuntimeException, std::exception ) \
initial import
2000-09-18 16:07:07 +00:00
{ \
fdo#54938: Convert some places to use cppu::supportsService The last cases are non obvious, so it's pratically done Change-Id: Icae1da8e238f516eaed0f7fbdf96fff778eac547 Reviewed-on: https://gerrit.libreoffice.org/8445 Reviewed-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com> Tested-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
2014-03-04 08:41:53 -03:00
return cppu::supportsService( this, ServiceName ); \
initial import
2000-09-18 16:07:07 +00:00
} \
\
mass removal of rtl:: prefixes for O(U)String* Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
2013-04-07 12:06:47 +02:00
com::sun::star::uno::Sequence< OUString > SAL_CALL \
initial import
2000-09-18 16:07:07 +00:00
Class::getSupportedServiceNames() \
cppuhelper: retrofit std::exception into overriding exception specs Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
2014-02-25 21:31:58 +01:00
throw( com::sun::star::uno::RuntimeException, std::exception ) \
initial import
2000-09-18 16:07:07 +00:00
{ \
return getSupportedServiceNames_Static(); \
}
#define XSERVICEINFO_CREATE_INSTANCE_IMPL( Class ) \
static com::sun::star::uno::Reference< \
com::sun::star::uno::XInterface > SAL_CALL \
Class##_CreateInstance( const com::sun::star::uno::Reference< \
com::sun::star::lang::XMultiServiceFactory> & rSMgr ) \
throw( com::sun::star::uno::Exception ) \
{ \
com::sun::star::lang::XServiceInfo* pX = \
loplugin:cstylecast: deal with remaining pointer casts Change-Id: I9778efd0b1d1838c9f51693749575916d77e3198
2015-06-08 16:29:28 +02:00
static_cast<com::sun::star::lang::XServiceInfo*>(new Class( rSMgr )); \
initial import
2000-09-18 16:07:07 +00:00
return com::sun::star::uno::Reference< \
com::sun::star::uno::XInterface >::query( pX ); \
}
fdo#46808, Deprecate configuration::ConfigurationProvider old-style service ...in favor of existing new-style configuration::theDefaultProvider singleton. Theoretically, ConfigurationProvider instances can be created with specific Locale and EnableAsync arguments, but this is hardly used in practice, and thus effectively all uses of the ConfigurationProvider service use the theDefaultProvider instance, anyway. theDefaultProvider is restricted to the XMultiServiceFactory interface, while ConfigurationProvider also makes available XComponent. However, dispose must not be called manually on theDefaultProvider singleton anyway, and calls to add-/removeEventListener are so few (and in dubious code that should better be cleaned up) that requiring an explicit queryInterface does not really hurt there. This commit originated as a patch by Noel Grandin to "Adapt configuration::ConfigurationProvider UNO service to new style [by creating] a merged XConfigurationProvider interface for this service to implement." It was then modified by Stephan Bergmann by deprecating ConfigurationProvider instead of adding XConfigurationProvider and by replacing calls to ConfigurationProvider::create with calls to theDefaultProvider::get. Change-Id: I9c16700afe0faff1ef6f20338a66bd7a9af990bd
2012-10-30 14:02:56 +02:00
#define XSERVICEINFO_CREATE_INSTANCE_IMPL_CTX( Class ) \
static com::sun::star::uno::Reference< \
com::sun::star::uno::XInterface > SAL_CALL \
Class##_CreateInstance( const com::sun::star::uno::Reference< \
com::sun::star::lang::XMultiServiceFactory> & rSMgr ) \
throw( com::sun::star::uno::Exception ) \
{ \
com::sun::star::lang::XServiceInfo* pX = \
loplugin:cstylecast: deal with remaining pointer casts Change-Id: I9778efd0b1d1838c9f51693749575916d77e3198
2015-06-08 16:29:28 +02:00
static_cast<com::sun::star::lang::XServiceInfo*>(new Class( ucbhelper::getComponentContext(rSMgr) )); \
fdo#46808, Deprecate configuration::ConfigurationProvider old-style service ...in favor of existing new-style configuration::theDefaultProvider singleton. Theoretically, ConfigurationProvider instances can be created with specific Locale and EnableAsync arguments, but this is hardly used in practice, and thus effectively all uses of the ConfigurationProvider service use the theDefaultProvider instance, anyway. theDefaultProvider is restricted to the XMultiServiceFactory interface, while ConfigurationProvider also makes available XComponent. However, dispose must not be called manually on theDefaultProvider singleton anyway, and calls to add-/removeEventListener are so few (and in dubious code that should better be cleaned up) that requiring an explicit queryInterface does not really hurt there. This commit originated as a patch by Noel Grandin to "Adapt configuration::ConfigurationProvider UNO service to new style [by creating] a merged XConfigurationProvider interface for this service to implement." It was then modified by Stephan Bergmann by deprecating ConfigurationProvider instead of adding XConfigurationProvider and by replacing calls to ConfigurationProvider::create with calls to theDefaultProvider::get. Change-Id: I9c16700afe0faff1ef6f20338a66bd7a9af990bd
2012-10-30 14:02:56 +02:00
return com::sun::star::uno::Reference< \
com::sun::star::uno::XInterface >::query( pX ); \
}
Remove visual noise from include Conflicts: include/framework/preventduplicateinteraction.hxx include/sfx2/sfxbasecontroller.hxx include/sfx2/sfxbasemodel.hxx include/toolkit/awt/vclxtabpagemodel.hxx include/vcl/field.hxx include/vcl/settings.hxx Change-Id: Ibccf9f88c68267a3d7e656012b51eaf644c418c2 Reviewed-on: https://gerrit.libreoffice.org/8272 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-02-25 19:06:16 +01:00
initial import
2000-09-18 16:07:07 +00:00
// XServiceInfo impl.
Remove visual noise from include Conflicts: include/framework/preventduplicateinteraction.hxx include/sfx2/sfxbasecontroller.hxx include/sfx2/sfxbasemodel.hxx include/toolkit/awt/vclxtabpagemodel.hxx include/vcl/field.hxx include/vcl/settings.hxx Change-Id: Ibccf9f88c68267a3d7e656012b51eaf644c418c2 Reviewed-on: https://gerrit.libreoffice.org/8272 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-02-25 19:06:16 +01:00
initial import
2000-09-18 16:07:07 +00:00
#define ONE_INSTANCE_SERVICE_FACTORY_IMPL( Class ) \
com::sun::star::uno::Reference< \
com::sun::star::lang::XSingleServiceFactory > \
Class::createServiceFactory( const com::sun::star::uno::Reference< \
com::sun::star::lang::XMultiServiceFactory >& rxServiceMgr ) \
{ \
return com::sun::star::uno::Reference< \
com::sun::star::lang::XSingleServiceFactory >( \
cppu::createOneInstanceFactory( \
rxServiceMgr, \
Class::getImplementationName_Static(), \
Class##_CreateInstance, \
Class::getSupportedServiceNames_Static() ) ); \
}
// Service without service factory.
// Own implementation of getSupportedServiceNames_Static().
#define XSERVICEINFO_NOFACTORY_IMPL_0( Class, ImplName ) \
XSERVICEINFO_COMMOM_IMPL( Class, ImplName ) \
\
mass removal of rtl:: prefixes for O(U)String* Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
2013-04-07 12:06:47 +02:00
com::sun::star::uno::Sequence< OUString > \
initial import
2000-09-18 16:07:07 +00:00
Class::getSupportedServiceNames_Static()
// 1 service name
#define XSERVICEINFO_NOFACTORY_IMPL_1( Class, ImplName, Service1 ) \
XSERVICEINFO_COMMOM_IMPL( Class, ImplName ) \
\
mass removal of rtl:: prefixes for O(U)String* Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
2013-04-07 12:06:47 +02:00
com::sun::star::uno::Sequence< OUString > \
initial import
2000-09-18 16:07:07 +00:00
Class::getSupportedServiceNames_Static() \
{ \
mass removal of rtl:: prefixes for O(U)String* Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
2013-04-07 12:06:47 +02:00
com::sun::star::uno::Sequence< OUString > aSNS( 1 ); \
initial import
2000-09-18 16:07:07 +00:00
aSNS.getArray()[ 0 ] = Service1; \
return aSNS; \
}
// Service with service factory.
fdo#46808, Deprecate configuration::ConfigurationProvider old-style service ...in favor of existing new-style configuration::theDefaultProvider singleton. Theoretically, ConfigurationProvider instances can be created with specific Locale and EnableAsync arguments, but this is hardly used in practice, and thus effectively all uses of the ConfigurationProvider service use the theDefaultProvider instance, anyway. theDefaultProvider is restricted to the XMultiServiceFactory interface, while ConfigurationProvider also makes available XComponent. However, dispose must not be called manually on theDefaultProvider singleton anyway, and calls to add-/removeEventListener are so few (and in dubious code that should better be cleaned up) that requiring an explicit queryInterface does not really hurt there. This commit originated as a patch by Noel Grandin to "Adapt configuration::ConfigurationProvider UNO service to new style [by creating] a merged XConfigurationProvider interface for this service to implement." It was then modified by Stephan Bergmann by deprecating ConfigurationProvider instead of adding XConfigurationProvider and by replacing calls to ConfigurationProvider::create with calls to theDefaultProvider::get. Change-Id: I9c16700afe0faff1ef6f20338a66bd7a9af990bd
2012-10-30 14:02:56 +02:00
// Own implementation of getSupportedServiceNames_Static().
#define XSERVICEINFO_IMPL_0_CTX( Class, ImplName ) \
XSERVICEINFO_COMMOM_IMPL( Class, ImplName ) \
XSERVICEINFO_CREATE_INSTANCE_IMPL_CTX( Class ) \
\
mass removal of rtl:: prefixes for O(U)String* Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
2013-04-07 12:06:47 +02:00
com::sun::star::uno::Sequence< OUString > \
initial import
2000-09-18 16:07:07 +00:00
Class::getSupportedServiceNames_Static()
Revert "Initial experiments with static linking of (some) ..." Thist idea caused too intrusive changes to the code of call sites, I think. Will do it another way that leaves call sites as is. This reverts commit 25d114eec4d451acdda1ddff4c8ed9d47ba6275f.
2012-03-28 11:22:52 +03:00
// 1 service name
#define XSERVICEINFO_IMPL_1( Class, ImplName, Service1 ) \
XSERVICEINFO_COMMOM_IMPL( Class, ImplName ) \
XSERVICEINFO_CREATE_INSTANCE_IMPL( Class ) \
initial import
2000-09-18 16:07:07 +00:00
\
mass removal of rtl:: prefixes for O(U)String* Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
2013-04-07 12:06:47 +02:00
com::sun::star::uno::Sequence< OUString > \
Revert "Initial experiments with static linking of (some) ..." Thist idea caused too intrusive changes to the code of call sites, I think. Will do it another way that leaves call sites as is. This reverts commit 25d114eec4d451acdda1ddff4c8ed9d47ba6275f.
2012-03-28 11:22:52 +03:00
Class::getSupportedServiceNames_Static() \
initial import
2000-09-18 16:07:07 +00:00
{ \
mass removal of rtl:: prefixes for O(U)String* Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
2013-04-07 12:06:47 +02:00
com::sun::star::uno::Sequence< OUString > aSNS( 1 ); \
Revert "Initial experiments with static linking of (some) ..." Thist idea caused too intrusive changes to the code of call sites, I think. Will do it another way that leaves call sites as is. This reverts commit 25d114eec4d451acdda1ddff4c8ed9d47ba6275f.
2012-03-28 11:22:52 +03:00
aSNS.getArray()[ 0 ] = Service1; \
return aSNS; \
initial import
2000-09-18 16:07:07 +00:00
}
fdo#46808, use service constructor for ucb::Store Change-Id: I62719ef9d58215e287af3e1be52404993722ec67
2012-10-31 16:08:53 +02:00
// 1 service name
#define XSERVICEINFO_IMPL_1_CTX( Class, ImplName, Service1 ) \
XSERVICEINFO_COMMOM_IMPL( Class, ImplName ) \
XSERVICEINFO_CREATE_INSTANCE_IMPL_CTX( Class ) \
\
mass removal of rtl:: prefixes for O(U)String* Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
2013-04-07 12:06:47 +02:00
com::sun::star::uno::Sequence< OUString > \
fdo#46808, use service constructor for ucb::Store Change-Id: I62719ef9d58215e287af3e1be52404993722ec67
2012-10-31 16:08:53 +02:00
Class::getSupportedServiceNames_Static() \
{ \
mass removal of rtl:: prefixes for O(U)String* Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
2013-04-07 12:06:47 +02:00
com::sun::star::uno::Sequence< OUString > aSNS( 1 ); \
fdo#46808, use service constructor for ucb::Store Change-Id: I62719ef9d58215e287af3e1be52404993722ec67
2012-10-31 16:08:53 +02:00
aSNS.getArray()[ 0 ] = Service1; \
return aSNS; \
}
fixincludeguards.sh: include/u* Change-Id: I8a07ccb309490206a2edd36f2fe4d0e2c0982ea2
2013-10-23 19:16:30 +02:00
#endif /* ! INCLUDED_UCBHELPER_MACROS_HXX */
Add vim/emacs modelines to all source files Fixes #fdo30794 Based on bin/add-modelines script (originally posted in mail 1286706307.1871.1399280959@webmail.messagingengine.com) Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
2010-10-14 08:27:31 +02:00
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
Reference in New Issue Copy Permalink