diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-02-11 22:33:02 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-02-11 22:33:02 -0600 |
| commit | f9b4521edc6a2370ca773aa80d3719d4bb45190d (patch) | |
| tree | 47d70f7153b76720096786f33d4642d979286299 /ucb/source/cacher/cachedcontentresultsetstub.cxx | |
| parent | af12942f68dba5d0d2b6fd39f63566d5fc3af4b8 (diff) | |
merge non-conflicting changes in sysui and ucb
Diffstat (limited to 'ucb/source/cacher/cachedcontentresultsetstub.cxx')
| -rw-r--r-- | ucb/source/cacher/cachedcontentresultsetstub.cxx | 89 |
1 files changed, 12 insertions, 77 deletions
diff --git a/ucb/source/cacher/cachedcontentresultsetstub.cxx b/ucb/source/cacher/cachedcontentresultsetstub.cxx index 98ac358c67..9a87b67f52 100644 --- a/ucb/source/cacher/cachedcontentresultsetstub.cxx +++ b/ucb/source/cacher/cachedcontentresultsetstub.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -50,8 +51,8 @@ CachedContentResultSetStub::CachedContentResultSetStub( Reference< XResultSet > , m_bFirstFetchSizePropagationDone( sal_False ) , m_nLastFetchSize( 1 )//this value is not important at all , m_bLastFetchDirection( sal_True )//this value is not important at all - , m_aPropertyNameForFetchSize( OUString::createFromAscii( "FetchSize" ) ) - , m_aPropertyNameForFetchDirection( OUString::createFromAscii( "FetchDirection" ) ) + , m_aPropertyNameForFetchSize( OUString(RTL_CONSTASCII_USTRINGPARAM("FetchSize")) ) + , m_aPropertyNameForFetchDirection( OUString(RTL_CONSTASCII_USTRINGPARAM("FetchDirection")) ) { impl_init(); } @@ -165,73 +166,6 @@ Sequence< Type > SAL_CALL CachedContentResultSetStub } } return *pTypes; - /* - static cppu::OTypeCollection * pCollection = 0; - if (!pCollection) - { - osl::MutexGuard aGuard(osl::Mutex::getGlobalMutex()); - if (!pCollection) - { - static cppu::OTypeCollection - aTheCollection( - getCppuType( - static_cast< Reference< XTypeProvider > - const * >( - 0)), - getCppuType( - static_cast< Reference< XServiceInfo > - const * >( - 0)), - getCppuType( - static_cast< Reference< XComponent > - const * >( - 0)), - getCppuType( - static_cast< Reference< XCloseable > - const * >( - 0)), - getCppuType( - static_cast< Reference< XResultSetMetaDataSupplier > - const * >( - 0)), - getCppuType( - static_cast< Reference< XPropertySet > - const * >( - 0)), - getCppuType( - static_cast< Reference< XPropertyChangeListener > - const * >( - 0)), - getCppuType( - static_cast< Reference< XVetoableChangeListener > - const * >( - 0)), - getCppuType( - static_cast< Reference< XResultSet > - const * >( - 0)), - getCppuType( - static_cast< Reference< XContentAccess > - const * >( - 0)), - getCppuType( - static_cast< Reference< XRow > - const * >( - 0)), - getCppuType( - static_cast< Reference< XFetchProvider > - const * >( - 0)), - getCppuType( - static_cast< Reference< XFetchProviderForContentAccess > - const * >( - 0)) - ); - pCollection = &aTheCollection; - } - } - return pCollection->getTypes(); - */ } //-------------------------------------------------------------------------- @@ -239,10 +173,10 @@ Sequence< Type > SAL_CALL CachedContentResultSetStub //-------------------------------------------------------------------------- XSERVICEINFO_NOFACTORY_IMPL_1( CachedContentResultSetStub, - OUString::createFromAscii( - "com.sun.star.comp.ucb.CachedContentResultSetStub" ), - OUString::createFromAscii( - CACHED_CRS_STUB_SERVICE_NAME ) ); + OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.comp.ucb.CachedContentResultSetStub" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( + CACHED_CRS_STUB_SERVICE_NAME )) ); //----------------------------------------------------------------- // XFetchProvider methods. @@ -598,10 +532,10 @@ XTYPEPROVIDER_IMPL_3( CachedContentResultSetStubFactory, //-------------------------------------------------------------------------- XSERVICEINFO_IMPL_1( CachedContentResultSetStubFactory, - OUString::createFromAscii( - "com.sun.star.comp.ucb.CachedContentResultSetStubFactory" ), - OUString::createFromAscii( - CACHED_CRS_STUB_FACTORY_NAME ) ); + OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.comp.ucb.CachedContentResultSetStubFactory" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( + CACHED_CRS_STUB_FACTORY_NAME )) ); //-------------------------------------------------------------------------- // Service factory implementation. @@ -629,3 +563,4 @@ Reference< XResultSet > SAL_CALL CachedContentResultSetStubFactory } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |