summaryrefslogtreecommitdiff
path: root/mysqlc/source/mysqlc_subcomponent.hxx
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:07:32 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:07:32 +0200
commit99effbc418feee675b6fd54a07c2f68d927de469 (patch)
treeb9a415494780c6cb86d0dfcf2d69a9da9cc436bd /mysqlc/source/mysqlc_subcomponent.hxx
parentf76f752dc908cfbab1cade605fe4f742233dfa6d (diff)
recreated tag libreoffice-3.3.0.4 which had these commits:
commit 01c917c0bdbb833cda4a0a77bc10264c4d40fcd5 (tag: refs/tags/libreoffice-3.3.0.4, refs/remotes/origin/libreoffice-3-3-0) Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 18 19:01:16 2011 +0100 Version 3.3.0.4, tag libreoffice-3.3.0.4 (3.3-rc4) commit 983cd7d8b4d9c87f872472343f8399cb640cfb9a Author: Rene Engelhard <rene@debian.org> Date: Wed Jan 12 10:03:30 2011 +0100 fix presenter screens description.xml build sdext/source/presenter/makefile.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit cb68579984b772fcbccd673f9cf930b4828d6fde Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 11 22:59:36 2011 +0100 Branch libreoffice-3-3-0 This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.3.x release, please use the 'libreoffice-3-3' branch. If you want to build something cool, unstable, and risky, use master.
Notes
split repo tag: extensions_libreoffice-3.3.0.4
Diffstat (limited to 'mysqlc/source/mysqlc_subcomponent.hxx')
-rw-r--r--mysqlc/source/mysqlc_subcomponent.hxx78
1 files changed, 39 insertions, 39 deletions
diff --git a/mysqlc/source/mysqlc_subcomponent.hxx b/mysqlc/source/mysqlc_subcomponent.hxx
index 8cf2f2b8b7e1..853091aa53d8 100644
--- a/mysqlc/source/mysqlc_subcomponent.hxx
+++ b/mysqlc/source/mysqlc_subcomponent.hxx
@@ -1,7 +1,7 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
+*
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -74,7 +74,7 @@ namespace connectivity
protected:
// the parent must support the tunnel implementation
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xParent;
- SELF* m_pDerivedImplementation;
+ SELF* m_pDerivedImplementation;
public:
OSubComponent(
@@ -107,14 +107,14 @@ namespace connectivity
class OPropertyArrayUsageHelper
{
protected:
- static sal_Int32 s_nRefCount;
- static ::cppu::IPropertyArrayHelper* s_pProps;
- static ::osl::Mutex s_aMutex;
+ static sal_Int32 s_nRefCount;
+ static ::cppu::IPropertyArrayHelper* s_pProps;
+ static ::osl::Mutex s_aMutex;
public:
OPropertyArrayUsageHelper();
virtual ~OPropertyArrayUsageHelper()
- { // ARGHHHHHHH ..... would like to implement this in proparrhlp_impl.hxx (as we do with all other methods)
+ { // ARGHHHHHHH ..... would like to implement this in proparrhlp_impl.hxx (as we do with all other methods)
// but SUNPRO 5 compiler (linker) doesn't like this
::osl::MutexGuard aGuard(s_aMutex);
OSL_ENSURE(s_nRefCount > 0, "OPropertyArrayUsageHelper::~OPropertyArrayUsageHelper : suspicious call : have a refcount of 0 !");
@@ -128,7 +128,7 @@ namespace connectivity
/** call this in the getInfoHelper method of your derived class. The method returns the array helper of the
class, which is created if neccessary.
*/
- ::cppu::IPropertyArrayHelper* getArrayHelper();
+ ::cppu::IPropertyArrayHelper* getArrayHelper();
protected:
/** used to implement the creation of the array helper which is shared amongst all instances of the class.
@@ -138,19 +138,19 @@ namespace connectivity
<BR>
as long as IPropertyArrayHelper has no virtual destructor, the implementation of ~OPropertyArrayUsageHelper
assumes that you created an ::cppu::OPropertyArrayHelper when deleting s_pProps.
- @return an pointer to the newly created array helper. Must not be NULL.
+ @return an pointer to the newly created array helper. Must not be NULL.
*/
virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const = 0;
};
- template<class TYPE>
- sal_Int32 OPropertyArrayUsageHelper< TYPE >::s_nRefCount = 0;
+ template<class TYPE>
+ sal_Int32 OPropertyArrayUsageHelper< TYPE >::s_nRefCount = 0;
- template<class TYPE>
- ::cppu::IPropertyArrayHelper* OPropertyArrayUsageHelper< TYPE >::s_pProps = NULL;
+ template<class TYPE>
+ ::cppu::IPropertyArrayHelper* OPropertyArrayUsageHelper< TYPE >::s_pProps = NULL;
- template<class TYPE>
- ::osl::Mutex OPropertyArrayUsageHelper< TYPE >::s_aMutex;
+ template<class TYPE>
+ ::osl::Mutex OPropertyArrayUsageHelper< TYPE >::s_aMutex;
//------------------------------------------------------------------
template <class TYPE>
@@ -211,31 +211,31 @@ namespace connectivity
}
-#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 IMPLEMENT_SERVICE_INFO(classname, implasciiname, serviceasciiname) \
- ::rtl::OUString SAL_CALL classname::getImplementationName() throw (::com::sun::star::uno::RuntimeException) \
- { \
- return ::rtl::OUString::createFromAscii(implasciiname); \
- } \
- ::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; \
- } \
- sal_Bool SAL_CALL classname::supportsService(const ::rtl::OUString& _rServiceName) throw(::com::sun::star::uno::RuntimeException) \
- { \
- Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); \
- const ::rtl::OUString* pSupported = aSupported.getConstArray(); \
- const ::rtl::OUString* pEnd = pSupported + aSupported.getLength(); \
- for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported) \
- ; \
- return pSupported != pEnd; \
- } \
+#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 IMPLEMENT_SERVICE_INFO(classname, implasciiname, serviceasciiname) \
+ ::rtl::OUString SAL_CALL classname::getImplementationName() throw (::com::sun::star::uno::RuntimeException) \
+ { \
+ return ::rtl::OUString::createFromAscii(implasciiname); \
+ } \
+ ::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; \
+ } \
+ sal_Bool SAL_CALL classname::supportsService(const ::rtl::OUString& _rServiceName) throw(::com::sun::star::uno::RuntimeException) \
+ { \
+ Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); \
+ const ::rtl::OUString* pSupported = aSupported.getConstArray(); \
+ const ::rtl::OUString* pEnd = pSupported + aSupported.getLength(); \
+ for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported) \
+ ; \
+ return pSupported != pEnd; \
+ } \
}