Skip to content

C
core
Kaydet (Commit) 8b40ddd9 authored tarafından Norbert Thiebaud's avatar Norbert Thiebaud
Dosyalara gözat
Seçenekler

kill XINTERFACE_IMPL_4 

Change-Id: I88e2e62b82f40cfa3e892023d381f7611e093fd6
üst a5aad2ac
Hide whitespace changes
Inline Side-by-side
Showing with 126 additions and 72 deletions
include/ucbhelper/macros.hxx
Dosyayı görüntüle @ 8b40ddd9
......@@ -62,33 +62,6 @@ com::sun::star::uno::Any SAL_CALL Class::queryInterface( \
return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); \
}\
// 4 interfaces implemented
#define XINTERFACE_IMPL_4( Class, Ifc1, Ifc2, Ifc3, Ifc4 ) \
void SAL_CALL Class::acquire() \
throw() \
{ \
OWeakObject::acquire(); \
} \
\
void SAL_CALL Class::release() \
throw() \
{ \
OWeakObject::release(); \
} \
com::sun::star::uno::Any SAL_CALL Class::queryInterface( \
const com::sun::star::uno::Type & rType ) \
throw( com::sun::star::uno::RuntimeException, std::exception ) \
{ \
com::sun::star::uno::Any aRet = cppu::queryInterface( rType, \
(static_cast< Ifc1* >(this)), \
(static_cast< Ifc2* >(this)), \
(static_cast< Ifc3* >(this)), \
(static_cast< Ifc4* >(this)) \
); \
return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); \
}\
// 9 interfaces implemented
// XTypeProvider decl.
......
ucb/source/core/ucbstore.cxx
Dosyayı görüntüle @ 8b40ddd9
......@@ -194,16 +194,29 @@ UcbStore::~UcbStore()
// XInterface methods.
void SAL_CALL UcbStore::acquire()
throw()
{
OWeakObject::acquire();
}
void SAL_CALL UcbStore::release()
throw()
{
OWeakObject::release();
}
XINTERFACE_IMPL_4( UcbStore,
XTypeProvider,
XServiceInfo,
XPropertySetRegistryFactory,
XInitialization );
css::uno::Any SAL_CALL UcbStore::queryInterface( const css::uno::Type & rType )
throw( css::uno::RuntimeException, std::exception )
{
css::uno::Any aRet = cppu::queryInterface( rType,
(static_cast< XTypeProvider* >(this)),
(static_cast< XServiceInfo* >(this)),
(static_cast< XPropertySetRegistryFactory* >(this)),
(static_cast< XInitialization* >(this))
);
return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
}
// XTypeProvider methods.
......
ucb/source/sorter/sortdynres.cxx
Dosyayı görüntüle @ 8b40ddd9
......@@ -103,14 +103,29 @@ SortedDynamicResultSet::~SortedDynamicResultSet()
// XInterface methods.
void SAL_CALL SortedDynamicResultSet::acquire()
throw()
{
OWeakObject::acquire();
}
void SAL_CALL SortedDynamicResultSet::release()
throw()
{
OWeakObject::release();
}
XINTERFACE_IMPL_4( SortedDynamicResultSet,
XTypeProvider,
XServiceInfo,
XComponent, /* base class of XDynamicResultSet */
XDynamicResultSet );
css::uno::Any SAL_CALL SortedDynamicResultSet::queryInterface( const css::uno::Type & rType )
throw( css::uno::RuntimeException, std::exception )
{
css::uno::Any aRet = cppu::queryInterface( rType,
(static_cast< XTypeProvider* >(this)),
(static_cast< XServiceInfo* >(this)),
(static_cast< XComponent* >(this)),
(static_cast< XDynamicResultSet* >(this))
);
return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
}
// XTypeProvider methods.
......
ucb/source/ucp/hierarchy/hierarchydatasource.cxx
Dosyayı görüntüle @ 8b40ddd9
......@@ -234,16 +234,29 @@ HierarchyDataSource::~HierarchyDataSource()
// XInterface methods.
void SAL_CALL HierarchyDataSource::acquire()
throw()
{
OWeakObject::acquire();
}
void SAL_CALL HierarchyDataSource::release()
throw()
{
OWeakObject::release();
}
XINTERFACE_IMPL_4( HierarchyDataSource,
lang::XTypeProvider,
lang::XServiceInfo,
lang::XComponent,
lang::XMultiServiceFactory );
css::uno::Any SAL_CALL HierarchyDataSource::queryInterface( const css::uno::Type & rType )
throw( css::uno::RuntimeException, std::exception )
{
css::uno::Any aRet = cppu::queryInterface( rType,
(static_cast< lang::XTypeProvider* >(this)),
(static_cast< lang::XServiceInfo* >(this)),
(static_cast< lang::XComponent* >(this)),
(static_cast< lang::XMultiServiceFactory* >(this))
);
return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
}
// XTypeProvider methods.
......
ucb/source/ucp/hierarchy/hierarchyprovider.cxx
Dosyayı görüntüle @ 8b40ddd9
......@@ -64,15 +64,29 @@ HierarchyContentProvider::~HierarchyContentProvider()
// XInterface methods.
void SAL_CALL HierarchyContentProvider::acquire()
throw()
{
OWeakObject::acquire();
}
void SAL_CALL HierarchyContentProvider::release()
throw()
{
OWeakObject::release();
}
XINTERFACE_IMPL_4( HierarchyContentProvider,
lang::XTypeProvider,
lang::XServiceInfo,
ucb::XContentProvider,
lang::XInitialization );
css::uno::Any SAL_CALL HierarchyContentProvider::queryInterface( const css::uno::Type & rType )
throw( css::uno::RuntimeException, std::exception )
{
css::uno::Any aRet = cppu::queryInterface( rType,
(static_cast< lang::XTypeProvider* >(this)),
(static_cast< lang::XServiceInfo* >(this)),
(static_cast< ucb::XContentProvider* >(this)),
(static_cast< lang::XInitialization* >(this))
);
return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
}
// XTypeProvider methods.
......
ucb/source/ucp/tdoc/tdoc_provider.cxx
Dosyayı görüntüle @ 8b40ddd9
......@@ -68,16 +68,29 @@ ContentProvider::~ContentProvider()
// XInterface methods.
void SAL_CALL ContentProvider::acquire()
throw()
{
OWeakObject::acquire();
}
void SAL_CALL ContentProvider::release()
throw()
{
OWeakObject::release();
}
XINTERFACE_IMPL_4( ContentProvider,
lang::XTypeProvider,
lang::XServiceInfo,
ucb::XContentProvider,
frame::XTransientDocumentsDocumentContentFactory );
css::uno::Any SAL_CALL ContentProvider::queryInterface( const css::uno::Type & rType )
throw( css::uno::RuntimeException, std::exception )
{
css::uno::Any aRet = cppu::queryInterface( rType,
(static_cast< lang::XTypeProvider* >(this)),
(static_cast< lang::XServiceInfo* >(this)),
(static_cast< ucb::XContentProvider* >(this)),
(static_cast< frame::XTransientDocumentsDocumentContentFactory* >(this))
);
return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
}
// XTypeProvider methods.
......
ucbhelper/source/provider/resultsethelper.cxx
Dosyayı görüntüle @ 8b40ddd9
......@@ -70,16 +70,29 @@ ResultSetImplHelper::~ResultSetImplHelper()
// XInterface methods.
void SAL_CALL ResultSetImplHelper::acquire()
throw()
{
OWeakObject::acquire();
}
void SAL_CALL ResultSetImplHelper::release()
throw()
{
OWeakObject::release();
}
XINTERFACE_IMPL_4( ResultSetImplHelper,
lang::XTypeProvider,
lang::XServiceInfo,
lang::XComponent, /* base of XDynamicResultSet */
com::sun::star::ucb::XDynamicResultSet );
css::uno::Any SAL_CALL ResultSetImplHelper::queryInterface( const css::uno::Type & rType )
throw( css::uno::RuntimeException, std::exception )
{
css::uno::Any aRet = cppu::queryInterface( rType,
(static_cast< lang::XTypeProvider* >(this)),
(static_cast< lang::XServiceInfo* >(this)),
(static_cast< lang::XComponent* >(this)),
(static_cast< css::ucb::XDynamicResultSet* >(this))
);
return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
}
// XTypeProvider methods.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment