diff options
Diffstat (limited to 'dbaccess/source/inc')
-rw-r--r-- | dbaccess/source/inc/OAuthenticationContinuation.hxx | 4 | ||||
-rw-r--r-- | dbaccess/source/inc/apitools.hxx | 488 | ||||
-rw-r--r-- | dbaccess/source/inc/cfg_reghelper.hxx | 2 | ||||
-rw-r--r-- | dbaccess/source/inc/cfgstrings.hrc | 2 | ||||
-rw-r--r-- | dbaccess/source/inc/constasciistring.hxx | 10 | ||||
-rw-r--r-- | dbaccess/source/inc/dbadllapi.hxx | 2 | ||||
-rw-r--r-- | dbaccess/source/inc/dbastrings.hrc | 4 | ||||
-rw-r--r-- | dbaccess/source/inc/dbu_reghelper.hxx | 2 | ||||
-rw-r--r-- | dbaccess/source/inc/dbustrings.hrc | 4 | ||||
-rw-r--r-- | dbaccess/source/inc/dsntypes.hxx | 42 | ||||
-rw-r--r-- | dbaccess/source/inc/flt_reghelper.hxx | 2 | ||||
-rw-r--r-- | dbaccess/source/inc/registrationhelper.hxx | 34 | ||||
-rw-r--r-- | dbaccess/source/inc/sdbtstrings.hrc | 2 | ||||
-rw-r--r-- | dbaccess/source/inc/stringconstants.hrc | 254 | ||||
-rw-r--r-- | dbaccess/source/inc/xmlstrings.hrc | 2 |
15 files changed, 427 insertions, 427 deletions
diff --git a/dbaccess/source/inc/OAuthenticationContinuation.hxx b/dbaccess/source/inc/OAuthenticationContinuation.hxx index 743772cdc506..fc8a2a61221a 100644 --- a/dbaccess/source/inc/OAuthenticationContinuation.hxx +++ b/dbaccess/source/inc/OAuthenticationContinuation.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,7 @@ namespace dbaccess { //........................................................................ -class OOO_DLLPUBLIC_DBA OAuthenticationContinuation : +class OOO_DLLPUBLIC_DBA OAuthenticationContinuation : public comphelper::OInteraction< com::sun::star::ucb::XInteractionSupplyAuthentication > { sal_Bool m_bRemberPassword : 1; // remember the password for this session ? diff --git a/dbaccess/source/inc/apitools.hxx b/dbaccess/source/inc/apitools.hxx index f5e85f426877..85b73c382e12 100644 --- a/dbaccess/source/inc/apitools.hxx +++ b/dbaccess/source/inc/apitools.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,7 @@ DECLARE_STL_VECTOR(::com::sun::star::uno::WeakReferenceHelper, OWeakRefArray); //================================================================================== //= OSubComponent - a component which holds a hard ref to it's parent -//= and is been hold itself (by the parent) with a weak ref +//= and is been hold itself (by the parent) with a weak ref //================================================================================== class OSubComponent : public ::cppu::OComponentHelper { @@ -76,263 +76,263 @@ public: //---------------------------------------------------------------------------------- // (internal - not to be used outside - usually) -#define IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname) \ - ::rtl::OUString SAL_CALL classname::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) \ - { \ - return ::rtl::OUString::createFromAscii(implasciiname); \ - } \ - -#define IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(classname, implasciiname) \ - ::rtl::OUString SAL_CALL classname::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) \ - { \ - return getImplementationName_Static(); \ - } \ - ::rtl::OUString SAL_CALL classname::getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException) \ - { \ - return ::rtl::OUString::createFromAscii(implasciiname); \ - } \ - -#define IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \ - sal_Bool SAL_CALL classname::supportsService( const ::rtl::OUString& _rServiceName ) throw(::com::sun::star::uno::RuntimeException) \ - { \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); \ - const ::rtl::OUString* pSupported = aSupported.getConstArray(); \ - for (sal_Int32 i=0; i<aSupported.getLength(); ++i, ++pSupported) \ - if (pSupported->equals(_rServiceName)) \ - return sal_True; \ +#define IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname) \ + ::rtl::OUString SAL_CALL classname::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) \ + { \ + return ::rtl::OUString::createFromAscii(implasciiname); \ + } \ + +#define IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(classname, implasciiname) \ + ::rtl::OUString SAL_CALL classname::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) \ + { \ + return getImplementationName_Static(); \ + } \ + ::rtl::OUString SAL_CALL classname::getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException) \ + { \ + return ::rtl::OUString::createFromAscii(implasciiname); \ + } \ + +#define IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \ + sal_Bool SAL_CALL classname::supportsService( const ::rtl::OUString& _rServiceName ) throw(::com::sun::star::uno::RuntimeException) \ + { \ + ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); \ + const ::rtl::OUString* pSupported = aSupported.getConstArray(); \ + for (sal_Int32 i=0; i<aSupported.getLength(); ++i, ++pSupported) \ + if (pSupported->equals(_rServiceName)) \ + return sal_True; \ \ - return sal_False; \ - } \ - -#define IMPLEMENT_SERVICE_INFO_GETSUPPORTED1(classname, serviceasciiname) \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ - { \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1); \ - aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname); \ - return aSupported; \ - } \ - -#define IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(classname, serviceasciiname) \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ - { \ - return getSupportedServiceNames_Static(); \ - } \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException) \ - { \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1); \ - aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname); \ - return aSupported; \ - } \ - -#define IMPLEMENT_SERVICE_INFO_GETSUPPORTED2_STATIC(classname, serviceasciiname1, serviceasciiname2) \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ - { \ - return getSupportedServiceNames_Static(); \ - } \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException) \ - { \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(2); \ - aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname1); \ - aSupported[1] = ::rtl::OUString::createFromAscii(serviceasciiname2); \ - return aSupported; \ - } \ - -#define IMPLEMENT_SERVICE_INFO_GETSUPPORTED2(classname, serviceasciiname1, serviceasciiname2) \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ - { \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(2); \ - aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname1); \ - aSupported[1] = ::rtl::OUString::createFromAscii(serviceasciiname2); \ - return aSupported; \ - } \ - -#define IMPLEMENT_SERVICE_INFO_GETSUPPORTED3(classname, serviceasciiname1, serviceasciiname2, serviceasciiname3) \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ - { \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(3); \ - aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname1); \ - aSupported[1] = ::rtl::OUString::createFromAscii(serviceasciiname2); \ - aSupported[2] = ::rtl::OUString::createFromAscii(serviceasciiname3); \ - return aSupported; \ - } \ - -#define IMPLEMENT_SERVICE_INFO_CREATE_STATIC(classname) \ - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > \ - SAL_CALL classname::Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB) \ - { \ - return static_cast< XServiceInfo* >(new classname(_rxORB)); \ - } \ + return sal_False; \ + } \ + +#define IMPLEMENT_SERVICE_INFO_GETSUPPORTED1(classname, serviceasciiname) \ + ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ + { \ + ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1); \ + aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname); \ + return aSupported; \ + } \ + +#define IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(classname, serviceasciiname) \ + ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ + { \ + return getSupportedServiceNames_Static(); \ + } \ + ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException) \ + { \ + ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1); \ + aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname); \ + return aSupported; \ + } \ + +#define IMPLEMENT_SERVICE_INFO_GETSUPPORTED2_STATIC(classname, serviceasciiname1, serviceasciiname2) \ + ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ + { \ + return getSupportedServiceNames_Static(); \ + } \ + ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException) \ + { \ + ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(2); \ + aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname1); \ + aSupported[1] = ::rtl::OUString::createFromAscii(serviceasciiname2); \ + return aSupported; \ + } \ + +#define IMPLEMENT_SERVICE_INFO_GETSUPPORTED2(classname, serviceasciiname1, serviceasciiname2) \ + ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ + { \ + ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(2); \ + aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname1); \ + aSupported[1] = ::rtl::OUString::createFromAscii(serviceasciiname2); \ + return aSupported; \ + } \ + +#define IMPLEMENT_SERVICE_INFO_GETSUPPORTED3(classname, serviceasciiname1, serviceasciiname2, serviceasciiname3) \ + ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ + { \ + ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(3); \ + aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname1); \ + aSupported[1] = ::rtl::OUString::createFromAscii(serviceasciiname2); \ + aSupported[2] = ::rtl::OUString::createFromAscii(serviceasciiname3); \ + return aSupported; \ + } \ + +#define IMPLEMENT_SERVICE_INFO_CREATE_STATIC(classname) \ + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > \ + SAL_CALL classname::Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB) \ + { \ + return static_cast< XServiceInfo* >(new classname(_rxORB)); \ + } \ //---------------------------------------------------------------------------------- // declare service info methods - no getImplementationName, so the class is abstract -#define DECLARE_SERVICE_INFO_ABSTRACT() \ - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); \ - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ +#define DECLARE_SERVICE_INFO_ABSTRACT() \ + virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); \ + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ //---------------------------------------------------------------------------------- // declare service info methods -#define DECLARE_SERVICE_INFO() \ - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); \ - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); \ - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ - -#define DECLARE_SERVICE_INFO_STATIC() \ - DECLARE_SERVICE_INFO(); \ - static ::rtl::OUString SAL_CALL getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException); \ - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException); \ - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > \ - SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&) \ +#define DECLARE_SERVICE_INFO() \ + virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); \ + virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); \ + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ + +#define DECLARE_SERVICE_INFO_STATIC() \ + DECLARE_SERVICE_INFO(); \ + static ::rtl::OUString SAL_CALL getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException); \ + static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException); \ + static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > \ + SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&) \ //---------------------------------------------------------------------------------- -#define IMPLEMENT_SERVICE_INFO1(classname, implasciiname, serviceasciiname) \ - IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname) \ - IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \ - IMPLEMENT_SERVICE_INFO_GETSUPPORTED1(classname, serviceasciiname) \ +#define IMPLEMENT_SERVICE_INFO1(classname, implasciiname, serviceasciiname) \ + IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname) \ + IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \ + IMPLEMENT_SERVICE_INFO_GETSUPPORTED1(classname, serviceasciiname) \ //---------------------------------------------------------------------------------- -#define IMPLEMENT_SERVICE_INFO1_STATIC(classname, implasciiname, serviceasciiname) \ - IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(classname, implasciiname) \ - IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \ - IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(classname, serviceasciiname) \ - IMPLEMENT_SERVICE_INFO_CREATE_STATIC(classname) \ +#define IMPLEMENT_SERVICE_INFO1_STATIC(classname, implasciiname, serviceasciiname) \ + IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(classname, implasciiname) \ + IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \ + IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(classname, serviceasciiname) \ + IMPLEMENT_SERVICE_INFO_CREATE_STATIC(classname) \ //---------------------------------------------------------------------------------- -#define IMPLEMENT_SERVICE_INFO2(classname, implasciiname, serviceasciiname1, serviceasciiname2) \ - IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname) \ - IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \ +#define IMPLEMENT_SERVICE_INFO2(classname, implasciiname, serviceasciiname1, serviceasciiname2) \ + IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname) \ + IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \ IMPLEMENT_SERVICE_INFO_GETSUPPORTED2(classname, serviceasciiname1, serviceasciiname2) - + //---------------------------------------------------------------------------------- -#define IMPLEMENT_SERVICE_INFO2_STATIC(classname, implasciiname, serviceasciiname1, serviceasciiname2) \ - IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(classname, implasciiname) \ - IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \ - IMPLEMENT_SERVICE_INFO_GETSUPPORTED2_STATIC(classname, serviceasciiname1,serviceasciiname2) \ - IMPLEMENT_SERVICE_INFO_CREATE_STATIC(classname) \ +#define IMPLEMENT_SERVICE_INFO2_STATIC(classname, implasciiname, serviceasciiname1, serviceasciiname2) \ + IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(classname, implasciiname) \ + IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \ + IMPLEMENT_SERVICE_INFO_GETSUPPORTED2_STATIC(classname, serviceasciiname1,serviceasciiname2) \ + IMPLEMENT_SERVICE_INFO_CREATE_STATIC(classname) \ //---------------------------------------------------------------------------------- -#define IMPLEMENT_SERVICE_INFO3(classname, implasciiname, serviceasciiname1, serviceasciiname2, serviceasciiname3) \ - IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname) \ - IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \ - IMPLEMENT_SERVICE_INFO_GETSUPPORTED3(classname, serviceasciiname1, serviceasciiname2, serviceasciiname3) \ +#define IMPLEMENT_SERVICE_INFO3(classname, implasciiname, serviceasciiname1, serviceasciiname2, serviceasciiname3) \ + IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname) \ + IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \ + IMPLEMENT_SERVICE_INFO_GETSUPPORTED3(classname, serviceasciiname1, serviceasciiname2, serviceasciiname3) \ //---------------------------------------------------------------------------------- -#define IMPLEMENT_SERVICE_INFO1_ABSTRACT(classname, serviceasciiname) \ - IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \ - IMPLEMENT_SERVICE_INFO_GETSUPPORTED1(classname, serviceasciiname) \ +#define IMPLEMENT_SERVICE_INFO1_ABSTRACT(classname, serviceasciiname) \ + IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \ + IMPLEMENT_SERVICE_INFO_GETSUPPORTED1(classname, serviceasciiname) \ //---------------------------------------------------------------------------------- -#define IMPLEMENT_SERVICE_INFO2_ABSTRACT(classname, serviceasciiname1, serviceasciiname2) \ - IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \ - IMPLEMENT_SERVICE_INFO_GETSUPPORTED2(classname, serviceasciiname1, serviceasciiname2) \ +#define IMPLEMENT_SERVICE_INFO2_ABSTRACT(classname, serviceasciiname1, serviceasciiname2) \ + IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \ + IMPLEMENT_SERVICE_INFO_GETSUPPORTED2(classname, serviceasciiname1, serviceasciiname2) \ //================================================================================== //= XTypeProvider helpers //-------------------------------------------------------------------------- -#define DECLARE_IMPLEMENTATION_ID( ) \ +#define DECLARE_IMPLEMENTATION_ID( ) \ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException); \ - static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId() \ + static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId() \ //-------------------------------------------------------------------------- -#define DECLARE_GETTYPES( ) \ +#define DECLARE_GETTYPES( ) \ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException); //-------------------------------------------------------------------------- -#define DECLARE_TYPEPROVIDER( ) \ - DECLARE_GETTYPES( ) \ +#define DECLARE_TYPEPROVIDER( ) \ + DECLARE_GETTYPES( ) \ DECLARE_IMPLEMENTATION_ID( ) //-------------------------------------------------------------------------- -#define IMPLEMENT_IMPLEMENTATION_ID( classname ) \ -::com::sun::star::uno::Sequence< sal_Int8 > classname::getUnoTunnelImplementationId() \ -{ \ - static ::cppu::OImplementationId* pId = 0; \ - if ( !pId ) \ - { \ - ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); \ - if ( !pId ) \ - { \ - static ::cppu::OImplementationId aId; \ - pId = &aId; \ - } \ - } \ - return pId->getImplementationId(); \ +#define IMPLEMENT_IMPLEMENTATION_ID( classname ) \ +::com::sun::star::uno::Sequence< sal_Int8 > classname::getUnoTunnelImplementationId() \ +{ \ + static ::cppu::OImplementationId* pId = 0; \ + if ( !pId ) \ + { \ + ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); \ + if ( !pId ) \ + { \ + static ::cppu::OImplementationId aId; \ + pId = &aId; \ + } \ + } \ + return pId->getImplementationId(); \ } \ -::com::sun::star::uno::Sequence< sal_Int8 > classname::getImplementationId() throw (::com::sun::star::uno::RuntimeException) \ -{ \ +::com::sun::star::uno::Sequence< sal_Int8 > classname::getImplementationId() throw (::com::sun::star::uno::RuntimeException) \ +{ \ return classname::getUnoTunnelImplementationId(); \ } //-------------------------------------------------------------------------- -#define IMPLEMENT_GETTYPES2( classname, baseclass1, baseclass2 ) \ - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > classname::getTypes() throw (::com::sun::star::uno::RuntimeException) \ - { \ - return ::comphelper::concatSequences( \ - baseclass1::getTypes( ), \ - baseclass2::getTypes( ) \ - ); \ +#define IMPLEMENT_GETTYPES2( classname, baseclass1, baseclass2 ) \ + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > classname::getTypes() throw (::com::sun::star::uno::RuntimeException) \ + { \ + return ::comphelper::concatSequences( \ + baseclass1::getTypes( ), \ + baseclass2::getTypes( ) \ + ); \ } //-------------------------------------------------------------------------- -#define IMPLEMENT_GETTYPES3( classname, baseclass1, baseclass2, baseclass3 ) \ - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > classname::getTypes() throw (::com::sun::star::uno::RuntimeException) \ - { \ - return ::comphelper::concatSequences( \ - baseclass1::getTypes( ), \ - baseclass2::getTypes( ), \ - baseclass3::getTypes( ) \ - ); \ +#define IMPLEMENT_GETTYPES3( classname, baseclass1, baseclass2, baseclass3 ) \ + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > classname::getTypes() throw (::com::sun::star::uno::RuntimeException) \ + { \ + return ::comphelper::concatSequences( \ + baseclass1::getTypes( ), \ + baseclass2::getTypes( ), \ + baseclass3::getTypes( ) \ + ); \ } //-------------------------------------------------------------------------- -#define IMPLEMENT_TYPEPROVIDER2( classname, baseclass1, baseclass2 ) \ - IMPLEMENT_IMPLEMENTATION_ID( classname) \ +#define IMPLEMENT_TYPEPROVIDER2( classname, baseclass1, baseclass2 ) \ + IMPLEMENT_IMPLEMENTATION_ID( classname) \ IMPLEMENT_GETTYPES2( classname, baseclass1, baseclass2 ) //-------------------------------------------------------------------------- -#define IMPLEMENT_TYPEPROVIDER3( classname, baseclass1, baseclass2, baseclass3 ) \ - IMPLEMENT_IMPLEMENTATION_ID( classname) \ +#define IMPLEMENT_TYPEPROVIDER3( classname, baseclass1, baseclass2, baseclass3 ) \ + IMPLEMENT_IMPLEMENTATION_ID( classname) \ IMPLEMENT_GETTYPES3(classname, baseclass1, baseclass2, baseclass3 ) //================================================================================== //= helper for declaring/implementing classes based on the OPropertyContainer and an OPropertyArrayUsageHelper //---------------------------------------------------------------------------------- -#define DECLARE_PROPERTYCONTAINER_DEFAULTS( ) \ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); \ - virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); \ +#define DECLARE_PROPERTYCONTAINER_DEFAULTS( ) \ + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); \ + virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); \ virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const - + //---------------------------------------------------------------------------------- -#define IMPLEMENT_PROPERTYCONTAINER_DEFAULTS2( classname , baseclass1) \ - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL classname::getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException) \ - { \ - Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); \ - return xInfo; \ - } \ - ::cppu::IPropertyArrayHelper& classname::getInfoHelper() \ - { \ - return *baseclass1::getArrayHelper(); \ - } \ - ::cppu::IPropertyArrayHelper* classname::createArrayHelper( ) const \ - { \ - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > aProps; \ - describeProperties(aProps); \ - return new ::cppu::OPropertyArrayHelper(aProps); \ +#define IMPLEMENT_PROPERTYCONTAINER_DEFAULTS2( classname , baseclass1) \ + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL classname::getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException) \ + { \ + Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); \ + return xInfo; \ + } \ + ::cppu::IPropertyArrayHelper& classname::getInfoHelper() \ + { \ + return *baseclass1::getArrayHelper(); \ + } \ + ::cppu::IPropertyArrayHelper* classname::createArrayHelper( ) const \ + { \ + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > aProps; \ + describeProperties(aProps); \ + return new ::cppu::OPropertyArrayHelper(aProps); \ } //---------------------------------------------------------------------------------- -#define IMPLEMENT_PROPERTYCONTAINER_DEFAULTS( classname ) \ +#define IMPLEMENT_PROPERTYCONTAINER_DEFAULTS( classname ) \ IMPLEMENT_PROPERTYCONTAINER_DEFAULTS2( classname, classname ) //================================================================================== //= helper for implementing the createArrayHelper //---------------------------------------------------------------------------------- -#define BEGIN_PROPERTY_SEQUENCE(count) \ - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property> aDescriptor(count); \ - ::com::sun::star::beans::Property* pDesc = aDescriptor.getArray(); \ - sal_Int32 nPos = 0; \ +#define BEGIN_PROPERTY_SEQUENCE(count) \ + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property> aDescriptor(count); \ + ::com::sun::star::beans::Property* pDesc = aDescriptor.getArray(); \ + sal_Int32 nPos = 0; \ //---------------------------------------------------------------------------------- -#define BEGIN_PROPERTY_HELPER(count) \ +#define BEGIN_PROPERTY_HELPER(count) \ BEGIN_PROPERTY_SEQUENCE(count) //---------------------------------------------------------------------------------- @@ -340,103 +340,103 @@ public: pDesc[nPos++] = ::com::sun::star::beans::Property(PROPERTY_##varname, PROPERTY_ID_##varname, cpputype, //---------------------------------------------------------------------------------- -#define DECL_PROP0(varname, type) \ +#define DECL_PROP0(varname, type) \ DECL_PROP_IMPL(varname, ::getCppuType((const type *)0)) 0) //---------------------------------------------------------------------------------- -#define DECL_PROP0_BOOL(varname) \ +#define DECL_PROP0_BOOL(varname) \ DECL_PROP_IMPL(varname, ::getBooleanCppuType()) 0) //---------------------------------------------------------------------------------- -#define DECL_PROP0_IFACE(varname, iface) \ +#define DECL_PROP0_IFACE(varname, iface) \ DECL_PROP_IMPL(varname, ::getCppuType(static_cast< ::com::sun::star::uno::Reference< iface >* >(NULL))) 0) //---------------------------------------------------------------------------------- -#define DECL_PROP1(varname, type, attrib1) \ +#define DECL_PROP1(varname, type, attrib1) \ DECL_PROP_IMPL(varname, ::getCppuType((const type *)0)) ::com::sun::star::beans::PropertyAttribute::attrib1) //---------------------------------------------------------------------------------- -#define DECL_PROP1_BOOL(varname, attrib1) \ +#define DECL_PROP1_BOOL(varname, attrib1) \ DECL_PROP_IMPL(varname, ::getBooleanCppuType()) ::com::sun::star::beans::PropertyAttribute::attrib1) //---------------------------------------------------------------------------------- -#define DECL_PROP1_IFACE(varname, iface, attrib1) \ +#define DECL_PROP1_IFACE(varname, iface, attrib1) \ DECL_PROP_IMPL(varname, ::getCppuType(static_cast< ::com::sun::star::uno::Reference< iface >* >(NULL))) ::com::sun::star::beans::PropertyAttribute::attrib1) //---------------------------------------------------------------------------------- -#define DECL_PROP2_IFACE(varname, iface, attrib1, attrib2) \ +#define DECL_PROP2_IFACE(varname, iface, attrib1, attrib2) \ DECL_PROP_IMPL(varname, ::getCppuType(static_cast< ::com::sun::star::uno::Reference< iface >* >(NULL))) ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2) //---------------------------------------------------------------------------------- -#define DECL_PROP2(varname, type, attrib1, attrib2) \ +#define DECL_PROP2(varname, type, attrib1, attrib2) \ DECL_PROP_IMPL(varname, ::getCppuType((const type *)0)) ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2) //---------------------------------------------------------------------------------- -#define DECL_PROP2_BOOL(varname, attrib1, attrib2) \ +#define DECL_PROP2_BOOL(varname, attrib1, attrib2) \ DECL_PROP_IMPL(varname, ::getBooleanCppuType()) ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2) //---------------------------------------------------------------------------------- -#define DECL_PROP3(varname, type, attrib1, attrib2, attrib3) \ +#define DECL_PROP3(varname, type, attrib1, attrib2, attrib3) \ DECL_PROP_IMPL(varname, ::getCppuType((const type *)0)) ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2 | ::com::sun::star::beans::PropertyAttribute::attrib3) //---------------------------------------------------------------------------------- -#define DECL_PROP3_BOOL(varname, attrib1, attrib2, attrib3) \ +#define DECL_PROP3_BOOL(varname, attrib1, attrib2, attrib3) \ DECL_PROP_IMPL(varname, ::getBooleanCppuType()) ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2 | ::com::sun::star::beans::PropertyAttribute::attrib3) //---------------------------------------------------------------------------------- -#define END_PROPERTY_SEQUENCE() \ - OSL_ENSURE(nPos == aDescriptor.getLength(), "forgot to adjust the count ?"); \ +#define END_PROPERTY_SEQUENCE() \ + OSL_ENSURE(nPos == aDescriptor.getLength(), "forgot to adjust the count ?"); \ //---------------------------------------------------------------------------------- -#define END_PROPERTY_HELPER() \ - END_PROPERTY_SEQUENCE() \ +#define END_PROPERTY_HELPER() \ + END_PROPERTY_SEQUENCE() \ return new ::cppu::OPropertyArrayHelper(aDescriptor); -#define NOTIFY_LISTERNERS(_rListeners,T,method) \ +#define NOTIFY_LISTERNERS(_rListeners,T,method) \ Sequence< Reference< XInterface > > aListenerSeq = _rListeners.getElements(); \ \ - const Reference< XInterface >* pxIntBegin = aListenerSeq.getConstArray(); \ + const Reference< XInterface >* pxIntBegin = aListenerSeq.getConstArray(); \ const Reference< XInterface >* pxInt = pxIntBegin + aListenerSeq.getLength(); \ \ - _rGuard.clear(); \ - while( pxInt > pxIntBegin ) \ - { \ - try \ - { \ - while( pxInt > pxIntBegin ) \ - { \ - --pxInt; \ - static_cast< T* >( pxInt->get() )->method(aEvt); \ - } \ - } \ - catch( RuntimeException& ) \ - { \ - } \ - } \ + _rGuard.clear(); \ + while( pxInt > pxIntBegin ) \ + { \ + try \ + { \ + while( pxInt > pxIntBegin ) \ + { \ + --pxInt; \ + static_cast< T* >( pxInt->get() )->method(aEvt); \ + } \ + } \ + catch( RuntimeException& ) \ + { \ + } \ + } \ _rGuard.reset(); -#define NOTIFY_LISTERNERS1(_rListeners,T,method,arg1) \ +#define NOTIFY_LISTERNERS1(_rListeners,T,method,arg1) \ Sequence< Reference< XInterface > > aListenerSeq = _rListeners.getElements(); \ \ - const Reference< XInterface >* pxIntBegin = aListenerSeq.getConstArray(); \ + const Reference< XInterface >* pxIntBegin = aListenerSeq.getConstArray(); \ const Reference< XInterface >* pxInt = pxIntBegin + aListenerSeq.getLength(); \ \ - _rGuard.clear(); \ - while( pxInt > pxIntBegin ) \ - { \ - try \ - { \ - while( pxInt > pxIntBegin ) \ - { \ - --pxInt; \ - static_cast< T* >( pxInt->get() )->method(aEvt,arg1); \ - } \ - } \ - catch( RuntimeException& ) \ - { \ - } \ - } \ + _rGuard.clear(); \ + while( pxInt > pxIntBegin ) \ + { \ + try \ + { \ + while( pxInt > pxIntBegin ) \ + { \ + --pxInt; \ + static_cast< T* >( pxInt->get() )->method(aEvt,arg1); \ + } \ + } \ + catch( RuntimeException& ) \ + { \ + } \ + } \ _rGuard.reset(); //================================================================================== // miscellaneous -#define UNUSED(x) x; +#define UNUSED(x) x; #endif // _DBASHARED_APITOOLS_HXX_ diff --git a/dbaccess/source/inc/cfg_reghelper.hxx b/dbaccess/source/inc/cfg_reghelper.hxx index e7edf6004423..51fef4ea28e7 100644 --- a/dbaccess/source/inc/cfg_reghelper.hxx +++ b/dbaccess/source/inc/cfg_reghelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/inc/cfgstrings.hrc b/dbaccess/source/inc/cfgstrings.hrc index 82f46a60a96e..5364dca5acf0 100644 --- a/dbaccess/source/inc/cfgstrings.hrc +++ b/dbaccess/source/inc/cfgstrings.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/inc/constasciistring.hxx b/dbaccess/source/inc/constasciistring.hxx index 2179e2d7ffdd..3b86e19e209b 100644 --- a/dbaccess/source/inc/constasciistring.hxx +++ b/dbaccess/source/inc/constasciistring.hxx @@ -14,17 +14,17 @@ // string constants struct ConstAsciiString { - const sal_Char* ascii; - sal_Int32 length; + const sal_Char* ascii; + sal_Int32 length; - inline operator const ::rtl::OUString& () const; - inline operator const sal_Char* () const { return ascii; } + inline operator const ::rtl::OUString& () const; + inline operator const sal_Char* () const { return ascii; } inline ConstAsciiString(const sal_Char* _pAsciiZeroTerminated, const sal_Int32 _nLength); inline ~ConstAsciiString(); private: - mutable ::rtl::OUString* ustring; + mutable ::rtl::OUString* ustring; }; //------------------------------------------------------------ diff --git a/dbaccess/source/inc/dbadllapi.hxx b/dbaccess/source/inc/dbadllapi.hxx index 9dfd5c3269fc..b505ae135949 100644 --- a/dbaccess/source/inc/dbadllapi.hxx +++ b/dbaccess/source/inc/dbadllapi.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/inc/dbastrings.hrc b/dbaccess/source/inc/dbastrings.hrc index eb6b98d5bd8b..db629f1ce220 100644 --- a/dbaccess/source/inc/dbastrings.hrc +++ b/dbaccess/source/inc/dbastrings.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ namespace dbaccess //= SQLSTATE //============================================================ DECLARE_CONSTASCII_USTRING(SQLSTATE_GENERAL); - + //============================================================ //= Properties //============================================================ diff --git a/dbaccess/source/inc/dbu_reghelper.hxx b/dbaccess/source/inc/dbu_reghelper.hxx index fa2b70c1bde0..f9ba053b3139 100644 --- a/dbaccess/source/inc/dbu_reghelper.hxx +++ b/dbaccess/source/inc/dbu_reghelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/inc/dbustrings.hrc b/dbaccess/source/inc/dbustrings.hrc index aeef19d752dd..9bd4325eedb8 100644 --- a/dbaccess/source/inc/dbustrings.hrc +++ b/dbaccess/source/inc/dbustrings.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,7 +53,7 @@ namespace dbaui //= service names //============================================================ DECLARE_CONSTASCII_USTRING(SERVICE_SDB_DIRECTSQLDIALOG); - + //============================================================ //= other DBU relevant strings //============================================================ diff --git a/dbaccess/source/inc/dsntypes.hxx b/dbaccess/source/inc/dsntypes.hxx index b781c1b77316..e25809b12156 100644 --- a/dbaccess/source/inc/dsntypes.hxx +++ b/dbaccess/source/inc/dsntypes.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,11 +69,11 @@ enum DATASOURCE_TYPE DST_KAB = 20, DST_MACAB = 21, DST_MSACCESS_2007 = 22, - DST_EMBEDDED_HSQLDB = 23, + DST_EMBEDDED_HSQLDB = 23, DST_MYSQL_NATIVE = 24, DST_MYSQL_NATIVE_DIRECT = 25, - DST_USERDEFINE1, /// first user defined driver + DST_USERDEFINE1, /// first user defined driver DST_USERDEFINE2, DST_USERDEFINE3, DST_USERDEFINE4, @@ -85,18 +85,18 @@ enum DATASOURCE_TYPE DST_USERDEFINE10, - DST_UNKNOWN /// unrecognized type + DST_UNKNOWN /// unrecognized type }; #define PAGE_DBSETUPWIZARD_INTRO 0 -#define PAGE_DBSETUPWIZARD_DBASE 1 +#define PAGE_DBSETUPWIZARD_DBASE 1 #define PAGE_DBSETUPWIZARD_TEXT 2 #define PAGE_DBSETUPWIZARD_MSACCESS 3 #define PAGE_DBSETUPWIZARD_LDAP 4 #define PAGE_DBSETUPWIZARD_ADABAS 5 #define PAGE_DBSETUPWIZARD_MYSQL_INTRO 6 #define PAGE_DBSETUPWIZARD_MYSQL_JDBC 7 -#define PAGE_DBSETUPWIZARD_MYSQL_ODBC 8 +#define PAGE_DBSETUPWIZARD_MYSQL_ODBC 8 #define PAGE_DBSETUPWIZARD_ORACLE 9 #define PAGE_DBSETUPWIZARD_JDBC 10 #define PAGE_DBSETUPWIZARD_ADO 11 @@ -117,13 +117,13 @@ class OOO_DLLPUBLIC_DBA ODsnTypeCollection protected: DECLARE_STL_VECTOR(String, StringVector); - StringVector m_aDsnTypesDisplayNames; /// user readable names for the datasource types - StringVector m_aDsnPrefixes; /// DSN prefixes which determine the type of a datasource + StringVector m_aDsnTypesDisplayNames; /// user readable names for the datasource types + StringVector m_aDsnPrefixes; /// DSN prefixes which determine the type of a datasource ::connectivity::DriversConfig m_aDriverConfig; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory; #ifdef DBG_UTIL - sal_Int32 m_nLivingIterators; /// just for debugging reasons, counts the living iterators + sal_Int32 m_nLivingIterators; /// just for debugging reasons, counts the living iterators #endif public: @@ -138,7 +138,7 @@ public: /// on a given string, cut the type prefix and return the result String cutPrefix(const ::rtl::OUString& _sURL) const; - + /// on a given string, return the type prefix String getPrefix(const ::rtl::OUString& _sURL) const; @@ -161,7 +161,7 @@ public: /// check if the given data source allows to show column description. sal_Bool supportsColumnDescription(const ::rtl::OUString& _sURL) const; - + // check if a Browse button may be shown to insert connection url sal_Bool supportsBrowsing(const ::rtl::OUString& _sURL) const; @@ -184,9 +184,9 @@ public: getDefaultDBSettings( const ::rtl::OUString& _sURL ) const; /// get access to the first element of the types collection - TypeIterator begin() const; + TypeIterator begin() const; /// get access to the (last + 1st) element of the types collection - TypeIterator end() const; + TypeIterator end() const; void fillPageIds(const ::rtl::OUString& _sURL,::std::vector<sal_Int16>& _rOutPathIds) const; @@ -210,32 +210,32 @@ class OOO_DLLPUBLIC_DBA ODsnTypeCollection::TypeIterator friend bool OOO_DLLPUBLIC_DBA operator!=(const TypeIterator& lhs, const TypeIterator& rhs) { return !(lhs == rhs); } protected: - const ODsnTypeCollection* m_pContainer; - sal_Int32 m_nPosition; + const ODsnTypeCollection* m_pContainer; + sal_Int32 m_nPosition; public: TypeIterator(const TypeIterator& _rSource); ~TypeIterator(); ::rtl::OUString getURLPrefix() const; - String getDisplayName() const; + String getDisplayName() const; /// prefix increment - const TypeIterator& operator++(); + const TypeIterator& operator++(); /// postfix increment - const TypeIterator operator++(int) { TypeIterator hold(*this); ++*this; return hold; } + const TypeIterator operator++(int) { TypeIterator hold(*this); ++*this; return hold; } /// prefix decrement - const TypeIterator& operator--(); + const TypeIterator& operator--(); /// postfix decrement - const TypeIterator operator--(int) { TypeIterator hold(*this); --*this; return hold; } + const TypeIterator operator--(int) { TypeIterator hold(*this); --*this; return hold; } protected: TypeIterator(const ODsnTypeCollection* _pContainer, sal_Int32 _nInitialPos = 0); }; //......................................................................... -} // namespace dbaccess +} // namespace dbaccess //......................................................................... #endif // _DBACCESS_DSNTYPES_HXX_ diff --git a/dbaccess/source/inc/flt_reghelper.hxx b/dbaccess/source/inc/flt_reghelper.hxx index a68555add95a..e572d494eff7 100644 --- a/dbaccess/source/inc/flt_reghelper.hxx +++ b/dbaccess/source/inc/flt_reghelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/inc/registrationhelper.hxx b/dbaccess/source/inc/registrationhelper.hxx index dd02ed5226a3..f53e7da9518e 100644 --- a/dbaccess/source/inc/registrationhelper.hxx +++ b/dbaccess/source/inc/registrationhelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,20 +35,20 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rServiceManager, const ::rtl::OUString & _rComponentName, ::cppu::ComponentInstantiation _pCreateFunction, - const ::com::sun::star::uno::Sequence< ::rtl::OUString > & _rServiceNames, + const ::com::sun::star::uno::Sequence< ::rtl::OUString > & _rServiceNames, rtl_ModuleCount* _p ); //========================================================================== class OModuleRegistration { - static ::com::sun::star::uno::Sequence< ::rtl::OUString >* + static ::com::sun::star::uno::Sequence< ::rtl::OUString >* s_pImplementationNames; - static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > >* + static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > >* s_pSupportedServices; - static ::com::sun::star::uno::Sequence< sal_Int64 >* + static ::com::sun::star::uno::Sequence< sal_Int64 >* s_pCreationFunctionPointers; - static ::com::sun::star::uno::Sequence< sal_Int64 >* + static ::com::sun::star::uno::Sequence< sal_Int64 >* s_pFactoryFunctionPointers; // no direct instantiation, only static members/methods @@ -56,10 +56,10 @@ class OModuleRegistration public: /** register a component implementing a service with the given data. - @param _rImplementationName the implementation name of the component - @param _rServiceNames the services the component supports - @param _pCreateFunction a function for creating an instance of the component - @param _pFactoryFunction a function for creating a factory for that component + @param _rImplementationName the implementation name of the component + @param _rServiceNames the services the component supports + @param _pCreateFunction a function for creating an instance of the component + @param _pFactoryFunction a function for creating a factory for that component @see revokeComponent */ static void registerComponent( @@ -69,25 +69,25 @@ public: FactoryInstantiation _pFactoryFunction); /** revoke the registration for the specified component - @param _rImplementationName the implementation name of the component + @param _rImplementationName the implementation name of the component */ static void revokeComponent( const ::rtl::OUString& _rImplementationName); /** writes the registration information of all components which are currently registered into the specified registry. Usually used from within component_writeInfo. - @param _rxServiceManager the service manager - @param _rRootKey the registry key under which the information will be stored - @return sal_True if the registration of all implementations was successfull, sal_False otherwise + @param _rxServiceManager the service manager + @param _rRootKey the registry key under which the information will be stored + @return sal_True if the registration of all implementations was successfull, sal_False otherwise */ static sal_Bool writeComponentInfos( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxServiceManager, const ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey >& _rRootKey); /** creates a Factory for the component with the given implementation name. Usually used from within component_getFactory. - @param _rxServiceManager a pointer to an XMultiServiceFactory interface as got in component_getFactory - @param _pImplementationName the implementation name of the component - @return the XInterface access to a factory for the component + @param _rxServiceManager a pointer to an XMultiServiceFactory interface as got in component_getFactory + @param _pImplementationName the implementation name of the component + @return the XInterface access to a factory for the component */ static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getComponentFactory( const ::rtl::OUString& _rImplementationName, diff --git a/dbaccess/source/inc/sdbtstrings.hrc b/dbaccess/source/inc/sdbtstrings.hrc index c4837f52bce1..b7490d4af078 100644 --- a/dbaccess/source/inc/sdbtstrings.hrc +++ b/dbaccess/source/inc/sdbtstrings.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/inc/stringconstants.hrc b/dbaccess/source/inc/stringconstants.hrc index 48fb8312839c..651600613647 100644 --- a/dbaccess/source/inc/stringconstants.hrc +++ b/dbaccess/source/inc/stringconstants.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,133 +39,133 @@ //============================================================ //= property ids //============================================================ -#define PROPERTY_ID_TITLE 1 -#define PROPERTY_ID_URL 2 -#define PROPERTY_ID_INFO 4 -#define PROPERTY_ID_ISPASSWORDREQUIRED 5 -#define PROPERTY_ID_TABLEFILTER 6 -#define PROPERTY_ID_NAME 7 -#define PROPERTY_ID_SCHEMANAME 8 -#define PROPERTY_ID_CATALOGNAME 9 -#define PROPERTY_ID_PRIVILEGES 10 -#define PROPERTY_ID_ESCAPE_PROCESSING 11 -#define PROPERTY_ID_COMMAND 12 -#define PROPERTY_ID_TYPE 13 -#define PROPERTY_ID_TYPENAME 14 -#define PROPERTY_ID_PRECISION 15 -#define PROPERTY_ID_SCALE 16 -#define PROPERTY_ID_ISNULLABLE 17 -#define PROPERTY_ID_ISAUTOINCREMENT 18 -#define PROPERTY_ID_ISROWVERSION 19 -#define PROPERTY_ID_DESCRIPTION 20 -#define PROPERTY_ID_DEFAULTVALUE 21 -#define PROPERTY_ID_NUMBERFORMAT 22 -#define PROPERTY_ID_QUERYTIMEOUT 23 -#define PROPERTY_ID_MAXFIELDSIZE 24 -#define PROPERTY_ID_MAXROWS 25 -#define PROPERTY_ID_CURSORNAME 26 -#define PROPERTY_ID_RESULTSETCONCURRENCY 27 -#define PROPERTY_ID_RESULTSETTYPE 28 -#define PROPERTY_ID_FETCHDIRECTION 29 -#define PROPERTY_ID_FETCHSIZE 30 -#define PROPERTY_ID_USEBOOKMARKS 31 -#define PROPERTY_ID_ISSEARCHABLE 32 -#define PROPERTY_ID_ISCURRENCY 33 -#define PROPERTY_ID_ISSIGNED 34 -#define PROPERTY_ID_DISPLAYSIZE 35 -#define PROPERTY_ID_LABEL 36 -#define PROPERTY_ID_ISREADONLY 37 -#define PROPERTY_ID_ISWRITABLE 38 -#define PROPERTY_ID_ISDEFINITELYWRITABLE 39 -#define PROPERTY_ID_VALUE 40 -#define PROPERTY_ID_TABLENAME 41 -#define PROPERTY_ID_ISCASESENSITIVE 42 -#define PROPERTY_ID_SERVICENAME 43 -#define PROPERTY_ID_ISBOOKMARKABLE 44 -#define PROPERTY_ID_CANUPDATEINSERTEDROWS 45 -#define PROPERTY_ID_ISSET 46 -#define PROPERTY_ID_ISOUTPARAMETER 47 -#define PROPERTY_ID_NUMBERFORMATSSUPPLIER 48 -#define PROPERTY_ID_ISCALCULATED 49 -#define PROPERTY_ID_DATASOURCENAME 50 -#define PROPERTY_ID_TRANSACTIONISOLATION 51 -#define PROPERTY_ID_TYPEMAP 52 -#define PROPERTY_ID_USER 53 -#define PROPERTY_ID_PASSWORD 54 +#define PROPERTY_ID_TITLE 1 +#define PROPERTY_ID_URL 2 +#define PROPERTY_ID_INFO 4 +#define PROPERTY_ID_ISPASSWORDREQUIRED 5 +#define PROPERTY_ID_TABLEFILTER 6 +#define PROPERTY_ID_NAME 7 +#define PROPERTY_ID_SCHEMANAME 8 +#define PROPERTY_ID_CATALOGNAME 9 +#define PROPERTY_ID_PRIVILEGES 10 +#define PROPERTY_ID_ESCAPE_PROCESSING 11 +#define PROPERTY_ID_COMMAND 12 +#define PROPERTY_ID_TYPE 13 +#define PROPERTY_ID_TYPENAME 14 +#define PROPERTY_ID_PRECISION 15 +#define PROPERTY_ID_SCALE 16 +#define PROPERTY_ID_ISNULLABLE 17 +#define PROPERTY_ID_ISAUTOINCREMENT 18 +#define PROPERTY_ID_ISROWVERSION 19 +#define PROPERTY_ID_DESCRIPTION 20 +#define PROPERTY_ID_DEFAULTVALUE 21 +#define PROPERTY_ID_NUMBERFORMAT 22 +#define PROPERTY_ID_QUERYTIMEOUT 23 +#define PROPERTY_ID_MAXFIELDSIZE 24 +#define PROPERTY_ID_MAXROWS 25 +#define PROPERTY_ID_CURSORNAME 26 +#define PROPERTY_ID_RESULTSETCONCURRENCY 27 +#define PROPERTY_ID_RESULTSETTYPE 28 +#define PROPERTY_ID_FETCHDIRECTION 29 +#define PROPERTY_ID_FETCHSIZE 30 +#define PROPERTY_ID_USEBOOKMARKS 31 +#define PROPERTY_ID_ISSEARCHABLE 32 +#define PROPERTY_ID_ISCURRENCY 33 +#define PROPERTY_ID_ISSIGNED 34 +#define PROPERTY_ID_DISPLAYSIZE 35 +#define PROPERTY_ID_LABEL 36 +#define PROPERTY_ID_ISREADONLY 37 +#define PROPERTY_ID_ISWRITABLE 38 +#define PROPERTY_ID_ISDEFINITELYWRITABLE 39 +#define PROPERTY_ID_VALUE 40 +#define PROPERTY_ID_TABLENAME 41 +#define PROPERTY_ID_ISCASESENSITIVE 42 +#define PROPERTY_ID_SERVICENAME 43 +#define PROPERTY_ID_ISBOOKMARKABLE 44 +#define PROPERTY_ID_CANUPDATEINSERTEDROWS 45 +#define PROPERTY_ID_ISSET 46 +#define PROPERTY_ID_ISOUTPARAMETER 47 +#define PROPERTY_ID_NUMBERFORMATSSUPPLIER 48 +#define PROPERTY_ID_ISCALCULATED 49 +#define PROPERTY_ID_DATASOURCENAME 50 +#define PROPERTY_ID_TRANSACTIONISOLATION 51 +#define PROPERTY_ID_TYPEMAP 52 +#define PROPERTY_ID_USER 53 +#define PROPERTY_ID_PASSWORD 54 #define PROPERTY_ID_COMMAND_TYPE 55 -#define PROPERTY_ID_ACTIVECOMMAND 56 -#define PROPERTY_ID_ACTIVE_CONNECTION 57 -#define PROPERTY_ID_FILTER 58 -#define PROPERTY_ID_APPLYFILTER 59 -#define PROPERTY_ID_ORDER 60 -#define PROPERTY_ID_ISMODIFIED 61 -#define PROPERTY_ID_ISNEW 62 -#define PROPERTY_ID_ROWCOUNT 63 -#define PROPERTY_ID_ISROWCOUNTFINAL 64 -#define PROPERTY_ID_HELPFILENAME 65 -#define PROPERTY_ID_REALNAME 66 -#define PROPERTY_ID_HIDDEN 67 -#define PROPERTY_ID_ALIGN 68 -#define PROPERTY_ID_WIDTH 69 -#define PROPERTY_ID_TABLETYPEFILTER 70 +#define PROPERTY_ID_ACTIVECOMMAND 56 +#define PROPERTY_ID_ACTIVE_CONNECTION 57 +#define PROPERTY_ID_FILTER 58 +#define PROPERTY_ID_APPLYFILTER 59 +#define PROPERTY_ID_ORDER 60 +#define PROPERTY_ID_ISMODIFIED 61 +#define PROPERTY_ID_ISNEW 62 +#define PROPERTY_ID_ROWCOUNT 63 +#define PROPERTY_ID_ISROWCOUNTFINAL 64 +#define PROPERTY_ID_HELPFILENAME 65 +#define PROPERTY_ID_REALNAME 66 +#define PROPERTY_ID_HIDDEN 67 +#define PROPERTY_ID_ALIGN 68 +#define PROPERTY_ID_WIDTH 69 +#define PROPERTY_ID_TABLETYPEFILTER 70 #define PROPERTY_ID_DATABASE_LOCATION 71 -#define PROPERTY_ID_FONT 72 -#define PROPERTY_ID_ROW_HEIGHT 73 -#define PROPERTY_ID_TEXTCOLOR 74 -#define PROPERTY_ID_UPDATE_TABLENAME 75 -#define PROPERTY_ID_UPDATE_SCHEMANAME 76 -#define PROPERTY_ID_UPDATE_CATALOGNAME 77 -#define PROPERTY_ID_CONTROLMODEL 78 -#define PROPERTY_ID_RELATIVEPOSITION 79 -#define PROPERTY_ID_ISASCENDING 80 -#define PROPERTY_ID_RELATEDCOLUMN 81 -#define PROPERTY_ID_ISUNIQUE 82 -#define PROPERTY_ID_ISPRIMARYKEYINDEX 83 -#define PROPERTY_ID_IGNORERESULT 84 -#define PROPERTY_ID_DELETERULE 85 -#define PROPERTY_ID_UPDATERULE 86 -#define PROPERTY_ID_REFERENCEDTABLE 87 -#define PROPERTY_ID_REFERENCEDCOLUMN 88 -#define PROPERTY_ID_PARENTWINDOW 89 -#define PROPERTY_ID_SQLEXCEPTION 90 -#define PROPERTY_ID_ISHIDDEN 91 -#define PROPERTY_ID_SUPPRESSVERSIONCL 92 -#define PROPERTY_ID_LAYOUTINFORMATION 93 -#define PROPERTY_ID_TEXTLINECOLOR 94 -#define PROPERTY_ID_TEXTEMPHASIS 95 -#define PROPERTY_ID_TEXTRELIEF 96 -#define PROPERTY_ID_HELPTEXT 97 -#define PROPERTY_ID_CONTROLDEFAULT 98 -#define PROPERTY_ID_AUTOINCREMENTCREATION 99 -#define PROPERTY_ID_SPECIAL_OPTIONS 100 -#define PROPERTY_ID_FONTCHARWIDTH 101 -#define PROPERTY_ID_FONTCHARSET 102 -#define PROPERTY_ID_FONTFAMILY 103 -#define PROPERTY_ID_FONTHEIGHT 104 -#define PROPERTY_ID_FONTKERNING 105 -#define PROPERTY_ID_FONTNAME 106 -#define PROPERTY_ID_FONTORIENTATION 107 -#define PROPERTY_ID_FONTPITCH 108 -#define PROPERTY_ID_FONTSLANT 109 -#define PROPERTY_ID_FONTSTRIKEOUT 110 -#define PROPERTY_ID_FONTSTYLENAME 111 -#define PROPERTY_ID_FONTUNDERLINE 112 -#define PROPERTY_ID_FONTWEIGHT 113 -#define PROPERTY_ID_FONTWIDTH 114 -#define PROPERTY_ID_FONTWORDLINEMODE 115 -#define PROPERTY_ID_FONTTYPE 116 -#define PROPERTY_ID_PERSISTENT_NAME 117 -#define PROPERTY_ID_ORIGINAL 118 -#define PROPERTY_ID_TABSTOP 119 -#define PROPERTY_ID_DEFAULTCONTROL 120 -#define PROPERTY_ID_ENABLED 121 -#define PROPERTY_ID_BORDER 122 -#define PROPERTY_ID_COLUMN 123 -#define PROPERTY_ID_AS_TEMPLATE 124 -#define PROPERTY_ID_IS_FORM 125 -#define PROPERTY_ID_HAVING_CLAUSE 126 -#define PROPERTY_ID_GROUP_BY 127 -#define PROPERTY_ID_EDIT_WIDTH 128 +#define PROPERTY_ID_FONT 72 +#define PROPERTY_ID_ROW_HEIGHT 73 +#define PROPERTY_ID_TEXTCOLOR 74 +#define PROPERTY_ID_UPDATE_TABLENAME 75 +#define PROPERTY_ID_UPDATE_SCHEMANAME 76 +#define PROPERTY_ID_UPDATE_CATALOGNAME 77 +#define PROPERTY_ID_CONTROLMODEL 78 +#define PROPERTY_ID_RELATIVEPOSITION 79 +#define PROPERTY_ID_ISASCENDING 80 +#define PROPERTY_ID_RELATEDCOLUMN 81 +#define PROPERTY_ID_ISUNIQUE 82 +#define PROPERTY_ID_ISPRIMARYKEYINDEX 83 +#define PROPERTY_ID_IGNORERESULT 84 +#define PROPERTY_ID_DELETERULE 85 +#define PROPERTY_ID_UPDATERULE 86 +#define PROPERTY_ID_REFERENCEDTABLE 87 +#define PROPERTY_ID_REFERENCEDCOLUMN 88 +#define PROPERTY_ID_PARENTWINDOW 89 +#define PROPERTY_ID_SQLEXCEPTION 90 +#define PROPERTY_ID_ISHIDDEN 91 +#define PROPERTY_ID_SUPPRESSVERSIONCL 92 +#define PROPERTY_ID_LAYOUTINFORMATION 93 +#define PROPERTY_ID_TEXTLINECOLOR 94 +#define PROPERTY_ID_TEXTEMPHASIS 95 +#define PROPERTY_ID_TEXTRELIEF 96 +#define PROPERTY_ID_HELPTEXT 97 +#define PROPERTY_ID_CONTROLDEFAULT 98 +#define PROPERTY_ID_AUTOINCREMENTCREATION 99 +#define PROPERTY_ID_SPECIAL_OPTIONS 100 +#define PROPERTY_ID_FONTCHARWIDTH 101 +#define PROPERTY_ID_FONTCHARSET 102 +#define PROPERTY_ID_FONTFAMILY 103 +#define PROPERTY_ID_FONTHEIGHT 104 +#define PROPERTY_ID_FONTKERNING 105 +#define PROPERTY_ID_FONTNAME 106 +#define PROPERTY_ID_FONTORIENTATION 107 +#define PROPERTY_ID_FONTPITCH 108 +#define PROPERTY_ID_FONTSLANT 109 +#define PROPERTY_ID_FONTSTRIKEOUT 110 +#define PROPERTY_ID_FONTSTYLENAME 111 +#define PROPERTY_ID_FONTUNDERLINE 112 +#define PROPERTY_ID_FONTWEIGHT 113 +#define PROPERTY_ID_FONTWIDTH 114 +#define PROPERTY_ID_FONTWORDLINEMODE 115 +#define PROPERTY_ID_FONTTYPE 116 +#define PROPERTY_ID_PERSISTENT_NAME 117 +#define PROPERTY_ID_ORIGINAL 118 +#define PROPERTY_ID_TABSTOP 119 +#define PROPERTY_ID_DEFAULTCONTROL 120 +#define PROPERTY_ID_ENABLED 121 +#define PROPERTY_ID_BORDER 122 +#define PROPERTY_ID_COLUMN 123 +#define PROPERTY_ID_AS_TEMPLATE 124 +#define PROPERTY_ID_IS_FORM 125 +#define PROPERTY_ID_HAVING_CLAUSE 126 +#define PROPERTY_ID_GROUP_BY 127 +#define PROPERTY_ID_EDIT_WIDTH 128 #define PROPERTY_ID_SETTINGS 129 #define PROPERTY_ID_CONNECTION_RESOURCE 130 #define PROPERTY_ID_RESULT_SET 131 @@ -184,7 +184,7 @@ #define PROPERTY_ID_CURRENT_QUERY_DESIGN 144 #define PROPERTY_ID_SINGLESELECTQUERYCOMPOSER 145 #define PROPERTY_ID_PROPCHANGE_NOTIFY 146 - + //============================================================ //= property names //============================================================ diff --git a/dbaccess/source/inc/xmlstrings.hrc b/dbaccess/source/inc/xmlstrings.hrc index db5a729e2ea6..82fcbab8b94d 100644 --- a/dbaccess/source/inc/xmlstrings.hrc +++ b/dbaccess/source/inc/xmlstrings.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite |