[Libreoffice-commits] core.git: accessibility/source animations/source avmedia/source basctl/source basic/source chart2/source comphelper/source connectivity/source cui/source dbaccess/source desktop/source dtrans/source editeng/source embedserv/source eventattacher/source extensions/source extensions/test
Julien Nabet
serval2412 at yahoo.fr
Thu May 22 14:34:20 PDT 2014
accessibility/source/standard/vclxaccessibletoolboxitem.cxx | 2
animations/source/animcore/animcore.cxx | 40 ++---
avmedia/source/framework/soundhandler.cxx | 10 -
avmedia/source/win/window.cxx | 8 -
basctl/source/basicide/unomodel.cxx | 2
basic/source/classes/sbunoobj.cxx | 12 -
basic/source/uno/dlgcont.cxx | 4
basic/source/uno/namecont.cxx | 8 -
chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx | 20 +-
comphelper/source/misc/accessiblewrapper.cxx | 2
comphelper/source/misc/proxyaggregation.cxx | 2
comphelper/source/property/genericpropertyset.cxx | 18 +-
comphelper/source/property/propertycontainer.cxx | 6
comphelper/source/property/propstate.cxx | 8 -
connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx | 6
connectivity/source/commontools/dbexception.cxx | 2
connectivity/source/commontools/paramwrapper.cxx | 12 -
connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx | 6
connectivity/source/drivers/ado/APreparedStatement.cxx | 8 -
connectivity/source/drivers/ado/AResultSet.cxx | 6
connectivity/source/drivers/ado/AStatement.cxx | 6
connectivity/source/drivers/ado/Aolevariant.cxx | 10 -
connectivity/source/drivers/calc/CTable.cxx | 22 +--
connectivity/source/drivers/dbase/DTable.cxx | 10 -
connectivity/source/drivers/evoab2/NStatement.cxx | 6
connectivity/source/drivers/file/FCatalog.cxx | 12 -
connectivity/source/drivers/file/FPreparedStatement.cxx | 6
connectivity/source/drivers/file/FResultSet.cxx | 8 -
connectivity/source/drivers/file/FStatement.cxx | 6
connectivity/source/drivers/file/FTable.cxx | 10 -
connectivity/source/drivers/file/FTables.cxx | 8 -
connectivity/source/drivers/flat/EResultSet.cxx | 10 -
connectivity/source/drivers/flat/ETable.cxx | 20 +-
connectivity/source/drivers/hsqldb/HCatalog.cxx | 4
connectivity/source/drivers/hsqldb/HTable.cxx | 4
connectivity/source/drivers/jdbc/CallableStatement.cxx | 4
connectivity/source/drivers/jdbc/JStatement.cxx | 10 -
connectivity/source/drivers/jdbc/PreparedStatement.cxx | 8 -
connectivity/source/drivers/jdbc/ResultSet.cxx | 6
connectivity/source/drivers/kab/KResultSet.cxx | 6
connectivity/source/drivers/kab/KStatement.cxx | 6
connectivity/source/drivers/macab/MacabResultSet.cxx | 6
connectivity/source/drivers/macab/MacabStatement.cxx | 6
connectivity/source/drivers/mork/MResultSet.cxx | 6
connectivity/source/drivers/mork/MStatement.cxx | 6
connectivity/source/drivers/mozab/MResultSet.cxx | 6
connectivity/source/drivers/mozab/MStatement.cxx | 6
connectivity/source/drivers/mysql/YCatalog.cxx | 4
connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx | 6
connectivity/source/drivers/odbc/OResultSet.cxx | 6
connectivity/source/drivers/odbc/OStatement.cxx | 10 -
connectivity/source/drivers/postgresql/pq_baseresultset.cxx | 16 +-
connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx | 4
connectivity/source/drivers/postgresql/pq_preparedstatement.cxx | 18 +-
connectivity/source/drivers/postgresql/pq_statement.cxx | 16 +-
connectivity/source/drivers/postgresql/pq_tools.cxx | 6
connectivity/source/drivers/postgresql/pq_updateableresultset.cxx | 34 ++---
connectivity/source/drivers/postgresql/pq_xbase.cxx | 12 -
connectivity/source/drivers/postgresql/pq_xcontainer.cxx | 6
connectivity/source/drivers/postgresql/pq_xindex.cxx | 4
connectivity/source/drivers/postgresql/pq_xkey.cxx | 4
connectivity/source/drivers/postgresql/pq_xtable.cxx | 16 +-
connectivity/source/drivers/postgresql/pq_xuser.cxx | 2
connectivity/source/drivers/postgresql/pq_xview.cxx | 2
connectivity/source/manager/mdrivermanager.cxx | 2
connectivity/source/parse/sqlnode.cxx | 4
connectivity/source/sdbcx/VCollection.cxx | 6
connectivity/source/sdbcx/VDescriptor.cxx | 8 -
connectivity/source/sdbcx/VTable.cxx | 2
cui/source/dialogs/scriptdlg.cxx | 8 -
dbaccess/source/core/api/RowSet.cxx | 14 +-
dbaccess/source/core/api/View.cxx | 4
dbaccess/source/core/api/callablestatement.cxx | 4
dbaccess/source/core/api/column.cxx | 8 -
dbaccess/source/core/api/datacolumn.cxx | 4
dbaccess/source/core/api/preparedstatement.cxx | 10 -
dbaccess/source/core/api/resultset.cxx | 2
dbaccess/source/core/api/statement.cxx | 18 +-
dbaccess/source/core/api/table.cxx | 8 -
dbaccess/source/core/dataaccess/databasecontext.cxx | 2
dbaccess/source/core/dataaccess/datasource.cxx | 6
dbaccess/source/core/dataaccess/definitioncontainer.cxx | 2
dbaccess/source/core/misc/apitools.cxx | 8 -
dbaccess/source/ui/browser/formadapter.cxx | 3
dbaccess/source/ui/browser/sbagrid.cxx | 4
desktop/source/deployment/misc/dp_interact.cxx | 4
desktop/source/deployment/registry/dp_backend.cxx | 5
desktop/source/deployment/registry/package/dp_package.cxx | 4
dtrans/source/generic/generic_clipboard.cxx | 4
dtrans/source/win32/clipb/WinClipboard.cxx | 2
dtrans/source/win32/dnd/sourcecontext.cxx | 4
dtrans/source/win32/dnd/target.cxx | 10 -
editeng/source/accessibility/AccessibleComponentBase.cxx | 4
editeng/source/accessibility/AccessibleEditableTextPara.cxx | 10 -
editeng/source/items/xmlcnitm.cxx | 4
editeng/source/uno/unofield.cxx | 8 -
editeng/source/uno/unotext.cxx | 68 +++++-----
editeng/source/uno/unotext2.cxx | 46 +++---
editeng/source/xml/xmltxtexp.cxx | 2
embedserv/source/embed/docholder.cxx | 2
embedserv/source/embed/ed_idataobj.cxx | 2
embedserv/source/embed/servprov.cxx | 7 -
eventattacher/source/eventattacher.cxx | 8 -
extensions/source/bibliography/datman.cxx | 2
extensions/source/bibliography/framectr.cxx | 4
extensions/source/ole/oleobjw.cxx | 6
extensions/source/ole/servprov.cxx | 16 --
extensions/source/ole/unoconversionutilities.hxx | 12 -
extensions/source/plugin/base/multiplx.cxx | 30 ++--
extensions/source/plugin/base/plctrl.cxx | 24 +--
extensions/source/propctrlr/eformspropertyhandler.cxx | 2
extensions/source/propctrlr/formcontroller.cxx | 6
extensions/source/propctrlr/submissionhandler.cxx | 2
extensions/test/ole/cpnt/cpnt.cxx | 4
114 files changed, 490 insertions(+), 505 deletions(-)
New commits:
commit b09b5f8f7cfd2d7f3125dab93ebe996c160e1e0c
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Thu May 22 23:19:05 2014 +0200
Prefer cppu::UnoType<T>::get() to ::getCppuType((T*)0) part19
Change-Id: Iab50c52a132c90389992ef68c2d31df95a193ab9
diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
index ff903d1..5f08a4f 100644
--- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
@@ -265,7 +265,7 @@ IMPLEMENT_FORWARD_REFCOUNT( VCLXAccessibleToolBoxItem, AccessibleTextHelper_BASE
Any SAL_CALL VCLXAccessibleToolBoxItem::queryInterface( const Type& _rType ) throw (RuntimeException, std::exception)
{
// #i33611# - toolbox buttons without text don't support XAccessibleText
- if ( _rType == ::getCppuType( ( const Reference< XAccessibleText >* ) 0 )
+ if ( _rType == cppu::UnoType<XAccessibleText>::get()
&& ( !m_pToolBox || m_pToolBox->GetButtonType() == BUTTON_SYMBOL ) )
return Any();
diff --git a/animations/source/animcore/animcore.cxx b/animations/source/animcore/animcore.cxx
index 6210f77..b77675d 100644
--- a/animations/source/animcore/animcore.cxx
+++ b/animations/source/animcore/animcore.cxx
@@ -663,48 +663,48 @@ void AnimationNode::initTypeProvider( sal_Int16 nNodeType ) throw()
Type * pTypeAr = types->getArray();
sal_Int32 nPos = 0;
- pTypeAr[nPos++] = ::getCppuType( (const Reference< XWeak > *)0 );
- pTypeAr[nPos++] = ::getCppuType( (const Reference< XChild > *)0 );
- pTypeAr[nPos++] = ::getCppuType( (const Reference< XCloneable > *)0 );
- pTypeAr[nPos++] = ::getCppuType( (const Reference< XTypeProvider > *)0 );
- pTypeAr[nPos++] = ::getCppuType( (const Reference< XServiceInfo > *)0 );
- pTypeAr[nPos++] = ::getCppuType( (const Reference< XUnoTunnel > *)0 );
- pTypeAr[nPos++] = ::getCppuType( (const Reference< XChangesNotifier> *)0 );
+ pTypeAr[nPos++] = cppu::UnoType<XWeak>::get();
+ pTypeAr[nPos++] = cppu::UnoType<XChild>::get();
+ pTypeAr[nPos++] = cppu::UnoType<XCloneable>::get();
+ pTypeAr[nPos++] = cppu::UnoType<XTypeProvider>::get();
+ pTypeAr[nPos++] = cppu::UnoType<XServiceInfo>::get();
+ pTypeAr[nPos++] = cppu::UnoType<XUnoTunnel>::get();
+ pTypeAr[nPos++] = cppu::UnoType<XChangesNotifier>::get();
switch( nNodeType )
{
case AnimationNodeType::PAR:
case AnimationNodeType::SEQ:
- pTypeAr[nPos++] = ::getCppuType( (const Reference< XTimeContainer > *)0 );
- pTypeAr[nPos++] = ::getCppuType( (const Reference< XEnumerationAccess > *)0 );
+ pTypeAr[nPos++] = cppu::UnoType<XTimeContainer>::get();
+ pTypeAr[nPos++] = cppu::UnoType<XEnumerationAccess>::get();
break;
case AnimationNodeType::ITERATE:
- pTypeAr[nPos++] = ::getCppuType( (const Reference< XIterateContainer > *)0 );
- pTypeAr[nPos++] = ::getCppuType( (const Reference< XEnumerationAccess > *)0 );
+ pTypeAr[nPos++] = cppu::UnoType<XIterateContainer>::get();
+ pTypeAr[nPos++] = cppu::UnoType<XEnumerationAccess>::get();
break;
case AnimationNodeType::ANIMATE:
- pTypeAr[nPos++] = ::getCppuType( (const Reference< XAnimate > *)0 );
+ pTypeAr[nPos++] = cppu::UnoType<XAnimate>::get();
break;
case AnimationNodeType::ANIMATEMOTION:
- pTypeAr[nPos++] = ::getCppuType( (const Reference< XAnimateMotion > *)0 );
+ pTypeAr[nPos++] = cppu::UnoType<XAnimateMotion>::get();
break;
case AnimationNodeType::ANIMATECOLOR:
- pTypeAr[nPos++] = ::getCppuType( (const Reference< XAnimateColor > *)0 );
+ pTypeAr[nPos++] = cppu::UnoType<XAnimateColor>::get();
break;
case AnimationNodeType::ANIMATETRANSFORM:
- pTypeAr[nPos++] = ::getCppuType( (const Reference< XAnimateTransform > *)0 );
+ pTypeAr[nPos++] = cppu::UnoType<XAnimateTransform>::get();
break;
case AnimationNodeType::SET:
- pTypeAr[nPos++] = ::getCppuType( (const Reference< XAnimateSet > *)0 );
+ pTypeAr[nPos++] = cppu::UnoType<XAnimateSet>::get();
break;
case AnimationNodeType::TRANSITIONFILTER:
- pTypeAr[nPos++] = ::getCppuType( (const Reference< XTransitionFilter > *)0 );
+ pTypeAr[nPos++] = cppu::UnoType<XTransitionFilter>::get();
break;
case AnimationNodeType::AUDIO:
- pTypeAr[nPos++] = ::getCppuType( (const Reference< XAudio > *)0 );
+ pTypeAr[nPos++] = cppu::UnoType<XAudio>::get();
break;
case AnimationNodeType::COMMAND:
- pTypeAr[nPos++] = ::getCppuType( ( const Reference< XCommand > *)0 );
+ pTypeAr[nPos++] = cppu::UnoType<XCommand>::get();
break;
}
mpTypes[nNodeType] = types;
@@ -1788,7 +1788,7 @@ void SAL_CALL AnimationNode::setParameter( const Any& _parameter ) throw (Runtim
// XElementAccess
Type SAL_CALL AnimationNode::getElementType() throw (RuntimeException, std::exception)
{
- return ::getCppuType((const Reference< XAnimationNode >*)0);
+ return cppu::UnoType<XAnimationNode>::get();
}
diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx
index 2201b7a..d80d29b 100644
--- a/avmedia/source/framework/soundhandler.cxx
+++ b/avmedia/source/framework/soundhandler.cxx
@@ -92,11 +92,11 @@ css::uno::Sequence< css::uno::Type > SAL_CALL SoundHandler::getTypes() throw( cs
/* Create a static typecollection ... */
static ::cppu::OTypeCollection aTypeCollection
(
- ::getCppuType(( const ::com::sun::star::uno::Reference< css::lang::XTypeProvider >*)NULL ),
- ::getCppuType(( const ::com::sun::star::uno::Reference< css::lang::XServiceInfo >*)NULL ),
- ::getCppuType(( const ::com::sun::star::uno::Reference< css::frame::XNotifyingDispatch >*)NULL ),
- ::getCppuType(( const ::com::sun::star::uno::Reference< css::frame::XDispatch >*)NULL ),
- ::getCppuType(( const ::com::sun::star::uno::Reference< css::document::XExtendedFilterDetection >*)NULL )
+ cppu::UnoType<css::lang::XTypeProvider>::get(),
+ cppu::UnoType<css::lang::XServiceInfo>::get(),
+ cppu::UnoType<css::frame::XNotifyingDispatch>::get(),
+ cppu::UnoType<css::frame::XDispatch>::get(),
+ cppu::UnoType<css::document::XExtendedFilterDetection>::get()
);
/* ... and set his address to static pointer! */
pTypeCollection = &aTypeCollection ;
diff --git a/avmedia/source/win/window.cxx b/avmedia/source/win/window.cxx
index 029ad40..7ba550a 100644
--- a/avmedia/source/win/window.cxx
+++ b/avmedia/source/win/window.cxx
@@ -532,7 +532,7 @@ void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventLis
void Window::fireMousePressedEvent( const ::com::sun::star::awt::MouseEvent& rEvt )
{
- ::cppu::OInterfaceContainerHelper* pContainer = maListeners.getContainer( getCppuType( (uno::Reference< awt::XMouseListener >*) 0 ) );
+ ::cppu::OInterfaceContainerHelper* pContainer = maListeners.getContainer( cppu::UnoType<awt::XMouseListener>::get());
if( pContainer )
{
@@ -545,7 +545,7 @@ void Window::fireMousePressedEvent( const ::com::sun::star::awt::MouseEvent& rEv
void Window::fireMouseReleasedEvent( const ::com::sun::star::awt::MouseEvent& rEvt )
{
- ::cppu::OInterfaceContainerHelper* pContainer = maListeners.getContainer( getCppuType( (uno::Reference< awt::XMouseListener >*) 0 ) );
+ ::cppu::OInterfaceContainerHelper* pContainer = maListeners.getContainer( cppu::UnoType<awt::XMouseListener>::get());
if( pContainer )
{
@@ -558,7 +558,7 @@ void Window::fireMouseReleasedEvent( const ::com::sun::star::awt::MouseEvent& rE
void Window::fireMouseMovedEvent( const ::com::sun::star::awt::MouseEvent& rEvt )
{
- ::cppu::OInterfaceContainerHelper* pContainer = maListeners.getContainer( getCppuType( (uno::Reference< awt::XMouseMotionListener >*) 0 ) );
+ ::cppu::OInterfaceContainerHelper* pContainer = maListeners.getContainer( cppu::UnoType<awt::XMouseMotionListener>::get());
if( pContainer )
{
@@ -571,7 +571,7 @@ void Window::fireMouseMovedEvent( const ::com::sun::star::awt::MouseEvent& rEvt
void Window::fireSetFocusEvent( const ::com::sun::star::awt::FocusEvent& rEvt )
{
- ::cppu::OInterfaceContainerHelper* pContainer = maListeners.getContainer( getCppuType( (uno::Reference< awt::XFocusListener >*) 0 ) );
+ ::cppu::OInterfaceContainerHelper* pContainer = maListeners.getContainer( cppu::UnoType<awt::XFocusListener>::get());
if( pContainer )
{
diff --git a/basctl/source/basicide/unomodel.cxx b/basctl/source/basicide/unomodel.cxx
index ddd684f..16d58e2 100644
--- a/basctl/source/basicide/unomodel.cxx
+++ b/basctl/source/basicide/unomodel.cxx
@@ -76,7 +76,7 @@ uno::Sequence< uno::Type > SAL_CALL SIDEModel::getTypes( ) throw(uno::RuntimeEx
sal_Int32 nLen = aTypes.getLength();
aTypes.realloc(nLen + 1);
uno::Type* pTypes = aTypes.getArray();
- pTypes[nLen++] = ::getCppuType((Reference<XServiceInfo>*)0);
+ pTypes[nLen++] = cppu::UnoType<XServiceInfo>::get();
return aTypes;
}
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 85343b2..86881ee 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -847,7 +847,7 @@ Type getUnoTypeForSbxBaseType( SbxDataType eType )
Type aRetType = getCppuVoidType();
switch( eType )
{
- case SbxNULL: aRetType = ::getCppuType( (const Reference< XInterface > *)0 ); break;
+ case SbxNULL: aRetType = cppu::UnoType<XInterface>::get(); break;
case SbxINTEGER: aRetType = cppu::UnoType<sal_Int16>::get(); break;
case SbxLONG: aRetType = cppu::UnoType<sal_Int32>::get(); break;
case SbxSINGLE: aRetType = cppu::UnoType<float>::get(); break;
@@ -891,7 +891,7 @@ Type getUnoTypeForSbxValue( const SbxValue* pVal )
SbxBaseRef xObj = (SbxBase*)pVal->GetObject();
if( !xObj )
{
- aRetType = getCppuType( static_cast<Reference<XInterface> *>(0) );
+ aRetType = cppu::UnoType<XInterface>::get();
return aRetType;
}
@@ -1592,7 +1592,7 @@ Any invokeAutomationMethod( const OUString& Name, Sequence< Any >& args, SbxArra
// Debugging help method to readout the imlemented interfaces of an object
OUString Impl_GetInterfaceInfo( const Reference< XInterface >& x, const Reference< XIdlClass >& xClass, sal_uInt16 nRekLevel )
{
- Type aIfaceType = ::getCppuType( (const Reference< XInterface > *)0 );
+ Type aIfaceType = cppu::UnoType<XInterface>::get();
static Reference< XIdlClass > xIfaceClass = TypeToIdlClass( aIfaceType );
OUStringBuffer aRetStr;
@@ -2117,7 +2117,7 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
}
}
// get the value
- Reference< XPropertySet > xPropSet( mxUnoAccess->queryAdapter( ::getCppuType( (const Reference< XPropertySet > *)0 ) ), UNO_QUERY );
+ Reference< XPropertySet > xPropSet( mxUnoAccess->queryAdapter( cppu::UnoType<XPropertySet>::get()), UNO_QUERY );
Any aRetAny = xPropSet->getPropertyValue( pProp->GetName() );
// The use of getPropertyValue (instead of using the index) is
// suboptimal, but the refactoring to XInvocation is already pending
@@ -2188,7 +2188,7 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
try
{
// set the value
- Reference< XPropertySet > xPropSet( mxUnoAccess->queryAdapter( ::getCppuType( (const Reference< XPropertySet > *)0 ) ), UNO_QUERY );
+ Reference< XPropertySet > xPropSet( mxUnoAccess->queryAdapter( cppu::UnoType<XPropertySet>::get()), UNO_QUERY );
xPropSet->setPropertyValue( pProp->GetName(), aAnyValue );
// The use of getPropertyValue (instead of using the index) is
// suboptimal, but the refactoring to XInvocation is already pending
@@ -2701,7 +2701,7 @@ SbxVariable* SbUnoObject::Find( const OUString& rName, SbxClassType t )
{
try
{
- Reference< XNameAccess > xNameAccess( mxUnoAccess->queryAdapter( ::getCppuType( (const Reference< XPropertySet > *)0 ) ), UNO_QUERY );
+ Reference< XNameAccess > xNameAccess( mxUnoAccess->queryAdapter( cppu::UnoType<XPropertySet>::get()), UNO_QUERY );
OUString aUName2( rName );
if( xNameAccess.is() && xNameAccess->hasByName( aUName2 ) )
diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx
index a759eea..bc4223a 100644
--- a/basic/source/uno/dlgcont.cxx
+++ b/basic/source/uno/dlgcont.cxx
@@ -496,7 +496,7 @@ SfxDialogLibrary::SfxDialogLibrary( ModifiableHelper& _rModifiable,
const Reference< XComponentContext >& xContext,
const Reference< XSimpleFileAccess3 >& xSFI,
SfxDialogLibraryContainer* pParent )
- : SfxLibrary( _rModifiable, getCppuType( (const Reference< XInputStreamProvider > *)0 ), xContext, xSFI )
+ : SfxLibrary( _rModifiable, cppu::UnoType<XInputStreamProvider>::get(), xContext, xSFI )
, m_pParent( pParent )
, m_aName( aName )
{
@@ -510,7 +510,7 @@ SfxDialogLibrary::SfxDialogLibrary( ModifiableHelper& _rModifiable,
const OUString& aStorageURL,
bool ReadOnly,
SfxDialogLibraryContainer* pParent )
- : SfxLibrary( _rModifiable, getCppuType( (const Reference< XInputStreamProvider > *)0 ),
+ : SfxLibrary( _rModifiable, cppu::UnoType<XInputStreamProvider>::get(),
xContext, xSFI, aLibInfoFileURL, aStorageURL, ReadOnly)
, m_pParent( pParent )
, m_aName( aName )
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index 52d3494f..6bbe9885 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -372,7 +372,7 @@ SfxLibraryContainer::SfxLibraryContainer( void )
, mnRunningVBAScripts( 0 )
, mbVBACompat( false )
, maModifiable( *this, maMutex )
- , maNameContainer( getCppuType( (Reference< XNameAccess >*) NULL ) )
+ , maNameContainer( cppu::UnoType<XNameAccess>::get())
, mbOldInfoFormat( false )
, mbOasis2OOoFormat( false )
, mpBasMgr( NULL )
@@ -3222,9 +3222,9 @@ Sequence< Type > SfxLibrary::getTypes()
if( !s_pTypes_NameContainer )
{
static OTypeCollection s_aTypes_NameContainer(
- ::getCppuType( (const Reference< XNameContainer > *)0 ),
- ::getCppuType( (const Reference< XContainer > *)0 ),
- ::getCppuType( (const Reference< XChangesNotifier > *)0 ),
+ cppu::UnoType<XNameContainer>::get(),
+ cppu::UnoType<XContainer>::get(),
+ cppu::UnoType<XChangesNotifier>::get(),
OComponentHelper::getTypes() );
s_pTypes_NameContainer = &s_aTypes_NameContainer;
}
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
index d312b58..8bc46fd 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
@@ -113,8 +113,6 @@ uno::Any SAL_CALL CreationWizardUnoDlg::queryAggregation( uno::Type const & rTyp
return OComponentHelper::queryAggregation( rType );
}
-#define LCL_CPPUTYPE(t) (::getCppuType( reinterpret_cast< const uno::Reference<t> *>(0)))
-
uno::Sequence< uno::Type > CreationWizardUnoDlg::getTypes() throw(uno::RuntimeException, std::exception)
{
static uno::Sequence< uno::Type > aTypeList;
@@ -123,15 +121,15 @@ uno::Sequence< uno::Type > CreationWizardUnoDlg::getTypes() throw(uno::RuntimeEx
if( !aTypeList.getLength() )
{
::std::vector< uno::Type > aTypes;
- aTypes.push_back( LCL_CPPUTYPE( lang::XComponent ));
- aTypes.push_back( LCL_CPPUTYPE( lang::XTypeProvider ));
- aTypes.push_back( LCL_CPPUTYPE( uno::XAggregation ));
- aTypes.push_back( LCL_CPPUTYPE( uno::XWeak ));
- aTypes.push_back( LCL_CPPUTYPE( lang::XServiceInfo ));
- aTypes.push_back( LCL_CPPUTYPE( lang::XInitialization ));
- aTypes.push_back( LCL_CPPUTYPE( frame::XTerminateListener ));
- aTypes.push_back( LCL_CPPUTYPE( ui::dialogs::XExecutableDialog ));
- aTypes.push_back( LCL_CPPUTYPE( beans::XPropertySet ));
+ aTypes.push_back( cppu::UnoType<lang::XComponent>::get() );
+ aTypes.push_back( cppu::UnoType<lang::XTypeProvider>::get() );
+ aTypes.push_back( cppu::UnoType<uno::XAggregation>::get() );
+ aTypes.push_back( cppu::UnoType<uno::XWeak>::get() );
+ aTypes.push_back( cppu::UnoType<lang::XServiceInfo>::get() );
+ aTypes.push_back( cppu::UnoType<lang::XInitialization>::get() );
+ aTypes.push_back( cppu::UnoType<frame::XTerminateListener>::get() );
+ aTypes.push_back( cppu::UnoType<ui::dialogs::XExecutableDialog>::get() );
+ aTypes.push_back( cppu::UnoType<beans::XPropertySet>::get() );
aTypeList = ::chart::ContainerHelper::ContainerToSequence( aTypes );
}
diff --git a/comphelper/source/misc/accessiblewrapper.cxx b/comphelper/source/misc/accessiblewrapper.cxx
index e8beaeb..646145d 100644
--- a/comphelper/source/misc/accessiblewrapper.cxx
+++ b/comphelper/source/misc/accessiblewrapper.cxx
@@ -477,7 +477,7 @@ namespace comphelper
::osl::MutexGuard aGuard( m_rBHelper.rMutex );
// translate the event
- queryInterface( ::getCppuType( static_cast< Reference< XInterface >* >( NULL ) ) ) >>= aTranslatedEvent.Source;
+ queryInterface( cppu::UnoType<XInterface>::get() ) >>= aTranslatedEvent.Source;
m_pChildMapper->translateAccessibleEvent( _rEvent, aTranslatedEvent );
// see if any of these notifications affect our child manager
diff --git a/comphelper/source/misc/proxyaggregation.cxx b/comphelper/source/misc/proxyaggregation.cxx
index 3a29ba0..b6deaed 100644
--- a/comphelper/source/misc/proxyaggregation.cxx
+++ b/comphelper/source/misc/proxyaggregation.cxx
@@ -219,7 +219,7 @@ namespace comphelper
// append XComponent, coming from WeakComponentImplHelperBase
sal_Int32 nLen = aTypes.getLength();
aTypes.realloc( nLen + 1 );
- aTypes[ nLen ] = ::getCppuType( static_cast< Reference< XComponent >* >( NULL ) );
+ aTypes[ nLen ] = cppu::UnoType<XComponent>::get();
return aTypes;
}
diff --git a/comphelper/source/property/genericpropertyset.cxx b/comphelper/source/property/genericpropertyset.cxx
index c44208c..5ce4ab1 100644
--- a/comphelper/source/property/genericpropertyset.cxx
+++ b/comphelper/source/property/genericpropertyset.cxx
@@ -199,13 +199,13 @@ Any SAL_CALL GenericPropertySet::queryAggregation( const Type & rType )
{
Any aAny;
- if( rType == ::getCppuType((const Reference< XServiceInfo >*)0) )
+ if( rType == cppu::UnoType<XServiceInfo>::get())
aAny <<= Reference< XServiceInfo >(this);
- else if( rType == ::getCppuType((const Reference< XTypeProvider >*)0) )
+ else if( rType == cppu::UnoType<XTypeProvider>::get())
aAny <<= Reference< XTypeProvider >(this);
- else if( rType == ::getCppuType((const Reference< XPropertySet >*)0) )
+ else if( rType == cppu::UnoType<XPropertySet>::get())
aAny <<= Reference< XPropertySet >(this);
- else if( rType == ::getCppuType((const Reference< XMultiPropertySet >*)0) )
+ else if( rType == cppu::UnoType<XMultiPropertySet>::get())
aAny <<= Reference< XMultiPropertySet >(this);
else
aAny <<= OWeakAggObject::queryAggregation( rType );
@@ -229,11 +229,11 @@ uno::Sequence< uno::Type > SAL_CALL GenericPropertySet::getTypes()
uno::Sequence< uno::Type > aTypes( 5 );
uno::Type* pTypes = aTypes.getArray();
- *pTypes++ = ::getCppuType((const uno::Reference< XAggregation>*)0);
- *pTypes++ = ::getCppuType((const uno::Reference< XServiceInfo>*)0);
- *pTypes++ = ::getCppuType((const uno::Reference< XTypeProvider>*)0);
- *pTypes++ = ::getCppuType((const uno::Reference< XPropertySet>*)0);
- *pTypes++ = ::getCppuType((const uno::Reference< XMultiPropertySet>*)0);
+ *pTypes++ = cppu::UnoType<XAggregation>::get();
+ *pTypes++ = cppu::UnoType<XServiceInfo>::get();
+ *pTypes++ = cppu::UnoType<XTypeProvider>::get();
+ *pTypes++ = cppu::UnoType<XPropertySet>::get();
+ *pTypes++ = cppu::UnoType<XMultiPropertySet>::get();
return aTypes;
}
diff --git a/comphelper/source/property/propertycontainer.cxx b/comphelper/source/property/propertycontainer.cxx
index 83a6eae..1cd3fcd 100644
--- a/comphelper/source/property/propertycontainer.cxx
+++ b/comphelper/source/property/propertycontainer.cxx
@@ -56,9 +56,9 @@ Sequence< Type > OPropertyContainer::getBaseTypes() throw (RuntimeException, std
{
// just the types from our one and only base class
::cppu::OTypeCollection aTypes(
- ::getCppuType( static_cast< Reference< XPropertySet >* >(NULL)),
- ::getCppuType( static_cast< Reference< XFastPropertySet >* >(NULL)),
- ::getCppuType( static_cast< Reference< XMultiPropertySet >* >(NULL))
+ cppu::UnoType<XPropertySet>::get(),
+ cppu::UnoType<XFastPropertySet>::get(),
+ cppu::UnoType<XMultiPropertySet>::get()
);
return aTypes.getTypes();
}
diff --git a/comphelper/source/property/propstate.cxx b/comphelper/source/property/propstate.cxx
index 90d8e37..d8f53b5 100644
--- a/comphelper/source/property/propstate.cxx
+++ b/comphelper/source/property/propstate.cxx
@@ -58,11 +58,11 @@ namespace comphelper
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> aTypes(4);
::com::sun::star::uno::Type* pTypes = aTypes.getArray();
// base class types
- pTypes[0] = getCppuType(( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>*)NULL);
- pTypes[1] = getCppuType(( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XMultiPropertySet>*)NULL);
- pTypes[2] = getCppuType(( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XFastPropertySet>*)NULL);
+ pTypes[0] = cppu::UnoType<com::sun::star::beans::XPropertySet>::get();
+ pTypes[1] = cppu::UnoType<com::sun::star::beans::XMultiPropertySet>::get();
+ pTypes[2] = cppu::UnoType<com::sun::star::beans::XFastPropertySet>::get();
// my own type
- pTypes[3] = getCppuType(( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState>*)NULL);
+ pTypes[3] = cppu::UnoType<com::sun::star::beans::XPropertyState>::get();
return aTypes;
}
diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
index 87bd7d3..646d578 100644
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
@@ -149,9 +149,9 @@ Any SAL_CALL ODatabaseMetaDataResultSet::queryInterface( const Type & rType ) th
Sequence< Type > SAL_CALL ODatabaseMetaDataResultSet::getTypes( ) throw(RuntimeException, std::exception)
{
- ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ),
- ::getCppuType( (const Reference< ::com::sun::star::beans::XFastPropertySet > *)0 ),
- ::getCppuType( (const Reference< ::com::sun::star::beans::XPropertySet > *)0 ));
+ ::cppu::OTypeCollection aTypes( cppu::UnoType<com::sun::star::beans::XMultiPropertySet>::get(),
+ cppu::UnoType<com::sun::star::beans::XFastPropertySet>::get(),
+ cppu::UnoType<com::sun::star::beans::XPropertySet>::get());
return ::comphelper::concatSequences(aTypes.getTypes(),ODatabaseMetaDataResultSet_BASE::getTypes());
}
diff --git a/connectivity/source/commontools/dbexception.cxx b/connectivity/source/commontools/dbexception.cxx
index 3b68dde..33ea7a8 100644
--- a/connectivity/source/commontools/dbexception.cxx
+++ b/connectivity/source/commontools/dbexception.cxx
@@ -231,7 +231,7 @@ void SQLExceptionInfo::append( TYPE _eType, const OUString& _rErrorMessage, cons
// find the end of the current chain
Any* pChainIterator = &m_aContent;
SQLException* pLastException = NULL;
- const Type& aSQLExceptionType( ::getCppuType< SQLException >() );
+ const Type& aSQLExceptionType( cppu::UnoType<SQLException>::get() );
while ( pChainIterator )
{
if ( !pChainIterator->hasValue() )
diff --git a/connectivity/source/commontools/paramwrapper.cxx b/connectivity/source/commontools/paramwrapper.cxx
index 60c3ef8..70c9564 100644
--- a/connectivity/source/commontools/paramwrapper.cxx
+++ b/connectivity/source/commontools/paramwrapper.cxx
@@ -119,11 +119,11 @@ namespace param
Sequence< Type > SAL_CALL ParameterWrapper::getTypes( ) throw(RuntimeException, std::exception)
{
Sequence< Type > aTypes( 5 );
- aTypes[ 0 ] = ::getCppuType( static_cast< Reference< XWeak >* >( NULL ) );
- aTypes[ 1 ] = ::getCppuType( static_cast< Reference< XTypeProvider >* >( NULL ) );
- aTypes[ 2 ] = ::getCppuType( static_cast< Reference< XPropertySet >* >( NULL ) );
- aTypes[ 3 ] = ::getCppuType( static_cast< Reference< XFastPropertySet >* >( NULL ) );
- aTypes[ 4 ] = ::getCppuType( static_cast< Reference< XMultiPropertySet >* >( NULL ) );
+ aTypes[ 0 ] = cppu::UnoType<XWeak>::get();
+ aTypes[ 1 ] = cppu::UnoType<XTypeProvider>::get();
+ aTypes[ 2 ] = cppu::UnoType<XPropertySet>::get();
+ aTypes[ 3 ] = cppu::UnoType<XFastPropertySet>::get();
+ aTypes[ 4 ] = cppu::UnoType<XMultiPropertySet>::get();
return aTypes;
}
@@ -295,7 +295,7 @@ namespace param
{
::osl::MutexGuard aGuard( m_aMutex );
impl_checkDisposed_throw();
- return ::getCppuType( static_cast< Reference< XPropertySet >* >( NULL ) );
+ return cppu::UnoType<XPropertySet>::get();
}
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
index d711304..266000b 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
@@ -101,9 +101,9 @@ Any SAL_CALL ODatabaseMetaDataResultSet::queryInterface( const Type & rType ) th
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL ODatabaseMetaDataResultSet::getTypes( ) throw(::com::sun::star::uno::RuntimeException)
{
- ::cppu::OTypeCollection aTypes( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ),
- ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XFastPropertySet > *)0 ),
- ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > *)0 ));
+ ::cppu::OTypeCollection aTypes( cppu::UnoType<com::sun::star::beans::XMultiPropertySet>::get(),
+ cppu::UnoType<com::sun::star::beans::XFastPropertySet>::get(),
+ cppu::UnoType<com::sun::star::beans::XPropertySet>::get());
return ::comphelper::concatSequences(aTypes.getTypes(),ODatabaseMetaDataResultSet_BASE::getTypes());
}
diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx b/connectivity/source/drivers/ado/APreparedStatement.cxx
index 31ed7ac..03f4980 100644
--- a/connectivity/source/drivers/ado/APreparedStatement.cxx
+++ b/connectivity/source/drivers/ado/APreparedStatement.cxx
@@ -104,10 +104,10 @@ Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(Runt
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL OPreparedStatement::getTypes( ) throw(::com::sun::star::uno::RuntimeException)
{
- ::cppu::OTypeCollection aTypes( ::getCppuType( (const ::com::sun::star::uno::Reference< XPreparedStatement > *)0 ),
- ::getCppuType( (const ::com::sun::star::uno::Reference< XParameters > *)0 ),
- ::getCppuType( (const ::com::sun::star::uno::Reference< XResultSetMetaDataSupplier > *)0 ),
- ::getCppuType( (const ::com::sun::star::uno::Reference< XPreparedBatchExecution > *)0 ));
+ ::cppu::OTypeCollection aTypes( cppu::UnoType<XPreparedStatement>::get(),
+ cppu::UnoType<XParameters>::get(),
+ cppu::UnoType<XResultSetMetaDataSupplier>::get(),
+ cppu::UnoType<XPreparedBatchExecution>::get());
return ::comphelper::concatSequences(aTypes.getTypes(),OStatement_Base::getTypes());
}
diff --git a/connectivity/source/drivers/ado/AResultSet.cxx b/connectivity/source/drivers/ado/AResultSet.cxx
index f5db7bf..4a5dd49 100644
--- a/connectivity/source/drivers/ado/AResultSet.cxx
+++ b/connectivity/source/drivers/ado/AResultSet.cxx
@@ -139,9 +139,9 @@ Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeExcep
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL OResultSet::getTypes( ) throw(::com::sun::star::uno::RuntimeException)
{
- ::cppu::OTypeCollection aTypes( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ),
- ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XFastPropertySet > *)0 ),
- ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > *)0 ));
+ ::cppu::OTypeCollection aTypes( cppu::UnoType<com::sun::star::beans::XMultiPropertySet>::get(),
+ cppu::UnoType<com::sun::star::beans::XFastPropertySet>::get(),
+ cppu::UnoType<com::sun::star::beans::XPropertySet>::get());
return ::comphelper::concatSequences(aTypes.getTypes(),OResultSet_BASE::getTypes());
}
diff --git a/connectivity/source/drivers/ado/AStatement.cxx b/connectivity/source/drivers/ado/AStatement.cxx
index 03e06a0..9351a2f 100644
--- a/connectivity/source/drivers/ado/AStatement.cxx
+++ b/connectivity/source/drivers/ado/AStatement.cxx
@@ -122,9 +122,9 @@ Any SAL_CALL OStatement_Base::queryInterface( const Type & rType ) throw(Runtime
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL OStatement_Base::getTypes( ) throw(::com::sun::star::uno::RuntimeException)
{
- ::cppu::OTypeCollection aTypes( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ),
- ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XFastPropertySet > *)0 ),
- ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > *)0 ));
+ ::cppu::OTypeCollection aTypes( cppu::UnoType<com::sun::star::beans::XMultiPropertySet>::get(),
+ cppu::UnoType<com::sun::star::beans::XFastPropertySet>::get(),
+ cppu::UnoType<com::sun::star::beans::XPropertySet>::get());
return ::comphelper::concatSequences(aTypes.getTypes(),OStatement_BASE::getTypes());
}
diff --git a/connectivity/source/drivers/ado/Aolevariant.cxx b/connectivity/source/drivers/ado/Aolevariant.cxx
index 02e6fa2..78ad0d0 100644
--- a/connectivity/source/drivers/ado/Aolevariant.cxx
+++ b/connectivity/source/drivers/ado/Aolevariant.cxx
@@ -734,22 +734,22 @@ SAFEARRAY* OLEVariant::getUI1SAFEARRAYPtr() const
break;
}
case VT_I1:
- aValue.setValue( & cVal, getCppuType((sal_Int8*)0));
+ aValue.setValue( & cVal, cppu::UnoType<sal_Int8>::get());
break;
case VT_UI1: // there is no unsigned char in UNO
- aValue.setValue( & bVal, getCppuType( (sal_Int8*)0));
+ aValue.setValue( & bVal, cppu::UnoType<sal_Int8>::get());
break;
case VT_UI2:
- aValue.setValue( & uiVal, getCppuType( (sal_uInt16*)0));
+ aValue.setValue( & uiVal, cppu::UnoType<cppu::UnoUnsignedShortType>::get());
break;
case VT_UI4:
- aValue.setValue( & ulVal, getCppuType( (sal_uInt32*)0));
+ aValue.setValue( & ulVal, cppu::UnoType<sal_uInt32>::get());
break;
case VT_INT:
aValue.setValue( & intVal, cppu::UnoType<sal_Int32>::get());
break;
case VT_UINT:
- aValue.setValue( & uintVal, getCppuType( (sal_uInt32*)0));
+ aValue.setValue( & uintVal, cppu::UnoType<sal_uInt32>::get());
break;
case VT_VOID:
aValue.setValue( NULL, Type());
diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx
index 7910c10..87ee744 100644
--- a/connectivity/source/drivers/calc/CTable.cxx
+++ b/connectivity/source/drivers/calc/CTable.cxx
@@ -659,14 +659,14 @@ Sequence< Type > SAL_CALL OCalcTable::getTypes( ) throw(RuntimeException, std::
const Type* pEnd = pBegin + aTypes.getLength();
for(;pBegin != pEnd;++pBegin)
{
- if(!( *pBegin == ::getCppuType((const Reference<XKeysSupplier>*)0) ||
- *pBegin == ::getCppuType((const Reference<XIndexesSupplier>*)0) ||
- *pBegin == ::getCppuType((const Reference<XRename>*)0) ||
- *pBegin == ::getCppuType((const Reference<XAlterTable>*)0) ||
- *pBegin == ::getCppuType((const Reference<XDataDescriptorFactory>*)0)))
+ if(!( *pBegin == cppu::UnoType<XKeysSupplier>::get()||
+ *pBegin == cppu::UnoType<XIndexesSupplier>::get()||
+ *pBegin == cppu::UnoType<XRename>::get()||
+ *pBegin == cppu::UnoType<XAlterTable>::get()||
+ *pBegin == cppu::UnoType<XDataDescriptorFactory>::get()))
aOwnTypes.push_back(*pBegin);
}
- aOwnTypes.push_back(::getCppuType( (const Reference< ::com::sun::star::lang::XUnoTunnel > *)0 ));
+ aOwnTypes.push_back(cppu::UnoType<com::sun::star::lang::XUnoTunnel>::get());
const Type* pAttrs = aOwnTypes.empty() ? 0 : &aOwnTypes[0];
return Sequence< Type >(pAttrs, aOwnTypes.size());
@@ -675,11 +675,11 @@ Sequence< Type > SAL_CALL OCalcTable::getTypes( ) throw(RuntimeException, std::
Any SAL_CALL OCalcTable::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
{
- if( rType == ::getCppuType((const Reference<XKeysSupplier>*)0) ||
- rType == ::getCppuType((const Reference<XIndexesSupplier>*)0) ||
- rType == ::getCppuType((const Reference<XRename>*)0) ||
- rType == ::getCppuType((const Reference<XAlterTable>*)0) ||
- rType == ::getCppuType((const Reference<XDataDescriptorFactory>*)0))
+ if( rType == cppu::UnoType<XKeysSupplier>::get()||
+ rType == cppu::UnoType<XIndexesSupplier>::get()||
+ rType == cppu::UnoType<XRename>::get()||
+ rType == cppu::UnoType<XAlterTable>::get()||
+ rType == cppu::UnoType<XDataDescriptorFactory>::get())
return Any();
const Any aRet = ::cppu::queryInterface(rType,static_cast< ::com::sun::star::lang::XUnoTunnel*> (this));
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 9dd02ba..ef07b26 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -718,13 +718,13 @@ Sequence< Type > SAL_CALL ODbaseTable::getTypes( ) throw(RuntimeException, std:
const Type* pEnd = pBegin + aTypes.getLength();
for(;pBegin != pEnd;++pBegin)
{
- if(!(*pBegin == ::getCppuType((const Reference<XKeysSupplier>*)0) ||
- *pBegin == ::getCppuType((const Reference<XDataDescriptorFactory>*)0)))
+ if(!(*pBegin == cppu::UnoType<XKeysSupplier>::get()||
+ *pBegin == cppu::UnoType<XDataDescriptorFactory>::get()))
{
aOwnTypes.push_back(*pBegin);
}
}
- aOwnTypes.push_back(::getCppuType( (const Reference< ::com::sun::star::lang::XUnoTunnel > *)0 ));
+ aOwnTypes.push_back(cppu::UnoType<com::sun::star::lang::XUnoTunnel>::get());
Type *pTypes = aOwnTypes.empty() ? 0 : &aOwnTypes[0];
return Sequence< Type >(pTypes, aOwnTypes.size());
}
@@ -732,8 +732,8 @@ Sequence< Type > SAL_CALL ODbaseTable::getTypes( ) throw(RuntimeException, std:
Any SAL_CALL ODbaseTable::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
{
- if( rType == ::getCppuType((const Reference<XKeysSupplier>*)0) ||
- rType == ::getCppuType((const Reference<XDataDescriptorFactory>*)0))
+ if( rType == cppu::UnoType<XKeysSupplier>::get()||
+ rType == cppu::UnoType<XDataDescriptorFactory>::get())
return Any();
Any aRet = OTable_TYPEDEF::queryInterface(rType);
diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx
index 7c3458b3..a0b2ccf 100644
--- a/connectivity/source/drivers/evoab2/NStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NStatement.cxx
@@ -125,9 +125,9 @@ Any SAL_CALL OCommonStatement::queryInterface( const Type & rType ) throw(Runtim
Sequence< Type > SAL_CALL OCommonStatement::getTypes( ) throw(RuntimeException, std::exception)
{
- ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ),
- ::getCppuType( (const Reference< XFastPropertySet > *)0 ),
- ::getCppuType( (const Reference< XPropertySet > *)0 ));
+ ::cppu::OTypeCollection aTypes( cppu::UnoType<XMultiPropertySet>::get(),
+ cppu::UnoType<XFastPropertySet>::get(),
+ cppu::UnoType<XPropertySet>::get());
return ::comphelper::concatSequences(aTypes.getTypes(),OCommonStatement_IBase::getTypes());
}
diff --git a/connectivity/source/drivers/file/FCatalog.cxx b/connectivity/source/drivers/file/FCatalog.cxx
index 2026f42..079f53b 100644
--- a/connectivity/source/drivers/file/FCatalog.cxx
+++ b/connectivity/source/drivers/file/FCatalog.cxx
@@ -68,9 +68,9 @@ void OFileCatalog::refreshTables()
Any SAL_CALL OFileCatalog::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
{
- if( rType == ::getCppuType((const Reference<XGroupsSupplier>*)0) ||
- rType == ::getCppuType((const Reference<XUsersSupplier>*)0) ||
- rType == ::getCppuType((const Reference<XViewsSupplier>*)0))
+ if( rType == cppu::UnoType<XGroupsSupplier>::get()||
+ rType == cppu::UnoType<XUsersSupplier>::get()||
+ rType == cppu::UnoType<XViewsSupplier>::get())
return Any();
@@ -89,9 +89,9 @@ Sequence< Type > SAL_CALL OFileCatalog::getTypes( ) throw(RuntimeException, std
const Type* pEnd = pBegin + aTypes.getLength();
for(;pBegin != pEnd;++pBegin)
{
- if(!(*pBegin == ::getCppuType((const Reference<XGroupsSupplier>*)0) ||
- *pBegin == ::getCppuType((const Reference<XUsersSupplier>*)0) ||
- *pBegin == ::getCppuType((const Reference<XViewsSupplier>*)0)))
+ if(!(*pBegin == cppu::UnoType<XGroupsSupplier>::get()||
+ *pBegin == cppu::UnoType<XUsersSupplier>::get()||
+ *pBegin == cppu::UnoType<XViewsSupplier>::get()))
{
aOwnTypes.push_back(*pBegin);
}
diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx
index 6fb706b..89bab27 100644
--- a/connectivity/source/drivers/file/FPreparedStatement.cxx
+++ b/connectivity/source/drivers/file/FPreparedStatement.cxx
@@ -121,9 +121,9 @@ Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(Runt
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL OPreparedStatement::getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception)
{
- ::cppu::OTypeCollection aTypes( ::getCppuType( (const ::com::sun::star::uno::Reference< XPreparedStatement > *)0 ),
- ::getCppuType( (const ::com::sun::star::uno::Reference< XParameters > *)0 ),
- ::getCppuType( (const ::com::sun::star::uno::Reference< XResultSetMetaDataSupplier > *)0 ));
+ ::cppu::OTypeCollection aTypes( cppu::UnoType<XPreparedStatement>::get(),
+ cppu::UnoType<XParameters>::get(),
+ cppu::UnoType<XResultSetMetaDataSupplier>::get());
return ::comphelper::concatSequences(aTypes.getTypes(),OStatement_BASE2::getTypes());
}
diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx
index aece696..4f454e3 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -179,9 +179,9 @@ Sequence< Type > SAL_CALL OResultSet::getTypes( ) throw(RuntimeException, std::
{
::osl::MutexGuard aGuard( m_aMutex );
- OTypeCollection aTypes( ::getCppuType( (const Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ),
- ::getCppuType( (const Reference< ::com::sun::star::beans::XPropertySet > *)0 ),
- ::getCppuType( (const Reference< ::com::sun::star::beans::XPropertySet > *)0 ));
+ OTypeCollection aTypes( cppu::UnoType<com::sun::star::beans::XMultiPropertySet>::get(),
+ cppu::UnoType<com::sun::star::beans::XPropertySet>::get(),
+ cppu::UnoType<com::sun::star::beans::XPropertySet>::get());
return ::comphelper::concatSequences(aTypes.getTypes(),OResultSet_BASE::getTypes());
}
@@ -1154,7 +1154,7 @@ void OResultSet::sortRows()
// is just one field given for sorting
// and this field is indexed, then the Index will be used
Reference<XIndexesSupplier> xIndexSup;
- m_pTable->queryInterface(::getCppuType((const Reference<XIndexesSupplier>*)0)) >>= xIndexSup;
+ m_pTable->queryInterface(cppu::UnoType<XIndexesSupplier>::get()) >>= xIndexSup;
Reference<XIndexAccess> xIndexes;
if(xIndexSup.is())
diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx
index a95af1c..031b81f 100644
--- a/connectivity/source/drivers/file/FStatement.cxx
+++ b/connectivity/source/drivers/file/FStatement.cxx
@@ -151,9 +151,9 @@ Any SAL_CALL OStatement_Base::queryInterface( const Type & rType ) throw(Runtime
Sequence< Type > SAL_CALL OStatement_Base::getTypes( ) throw(RuntimeException, std::exception)
{
- ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ),
- ::getCppuType( (const Reference< ::com::sun::star::beans::XFastPropertySet > *)0 ),
- ::getCppuType( (const Reference< ::com::sun::star::beans::XPropertySet > *)0 ));
+ ::cppu::OTypeCollection aTypes( cppu::UnoType<com::sun::star::beans::XMultiPropertySet>::get(),
+ cppu::UnoType<com::sun::star::beans::XFastPropertySet>::get(),
+ cppu::UnoType<com::sun::star::beans::XPropertySet>::get());
return ::comphelper::concatSequences(aTypes.getTypes(),OStatement_BASE::getTypes());
}
diff --git a/connectivity/source/drivers/file/FTable.cxx b/connectivity/source/drivers/file/FTable.cxx
index 70e7c2d..4abbcbd 100644
--- a/connectivity/source/drivers/file/FTable.cxx
+++ b/connectivity/source/drivers/file/FTable.cxx
@@ -107,11 +107,11 @@ void OFileTable::refreshIndexes()
Any SAL_CALL OFileTable::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
{
- if( rType == ::getCppuType((const Reference<XKeysSupplier>*)0) ||
- rType == ::getCppuType((const Reference<XRename>*)0) ||
- rType == ::getCppuType((const Reference<XAlterTable>*)0) ||
- rType == ::getCppuType((const Reference<XIndexesSupplier>*)0) ||
- rType == ::getCppuType((const Reference<XDataDescriptorFactory>*)0))
+ if( rType == cppu::UnoType<XKeysSupplier>::get()||
+ rType == cppu::UnoType<XRename>::get()||
+ rType == cppu::UnoType<XAlterTable>::get()||
+ rType == cppu::UnoType<XIndexesSupplier>::get()||
+ rType == cppu::UnoType<XDataDescriptorFactory>::get())
return Any();
return OTable_TYPEDEF::queryInterface(rType);
diff --git a/connectivity/source/drivers/file/FTables.cxx b/connectivity/source/drivers/file/FTables.cxx
index acff3d5..ae5f2cb 100644
--- a/connectivity/source/drivers/file/FTables.cxx
+++ b/connectivity/source/drivers/file/FTables.cxx
@@ -53,10 +53,10 @@ m_xMetaData.clear();
Any SAL_CALL OTables::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
{
- if( rType == ::getCppuType((const Reference<XColumnLocate>*)0) ||
- rType == ::getCppuType((const Reference<XDataDescriptorFactory>*)0) ||
- rType == ::getCppuType((const Reference<XAppend>*)0) ||
- rType == ::getCppuType((const Reference<XDrop>*)0))
+ if( rType == cppu::UnoType<XColumnLocate>::get()||
+ rType == cppu::UnoType<XDataDescriptorFactory>::get()||
+ rType == cppu::UnoType<XAppend>::get()||
+ rType == cppu::UnoType<XDrop>::get())
return Any();
typedef sdbcx::OCollection OTables_BASE;
diff --git a/connectivity/source/drivers/flat/EResultSet.cxx b/connectivity/source/drivers/flat/EResultSet.cxx
index 3d743a9..a9a8bc5 100644
--- a/connectivity/source/drivers/flat/EResultSet.cxx
+++ b/connectivity/source/drivers/flat/EResultSet.cxx
@@ -64,8 +64,8 @@ sal_Bool SAL_CALL OFlatResultSet::supportsService( const OUString& _rServiceName
Any SAL_CALL OFlatResultSet::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
{
- if(rType == ::getCppuType((const Reference<XDeleteRows>*)0) || rType == ::getCppuType((const Reference<XResultSetUpdate>*)0)
- || rType == ::getCppuType((const Reference<XRowUpdate>*)0))
+ if(rType == cppu::UnoType<XDeleteRows>::get()|| rType == cppu::UnoType<XResultSetUpdate>::get()
+ || rType == cppu::UnoType<XRowUpdate>::get())
return Any();
const Any aRet = OResultSet::queryInterface(rType);
@@ -81,9 +81,9 @@ Sequence< Type > SAL_CALL OFlatResultSet::getTypes( ) throw( RuntimeException,
const Type* pEnd = pBegin + aTypes.getLength();
for(;pBegin != pEnd;++pBegin)
{
- if(!(*pBegin == ::getCppuType((const Reference<XDeleteRows>*)0) ||
- *pBegin == ::getCppuType((const Reference<XResultSetUpdate>*)0) ||
- *pBegin == ::getCppuType((const Reference<XRowUpdate>*)0)))
+ if(!(*pBegin == cppu::UnoType<XDeleteRows>::get()||
+ *pBegin == cppu::UnoType<XResultSetUpdate>::get()||
+ *pBegin == cppu::UnoType<XRowUpdate>::get()))
{
aOwnTypes.push_back(*pBegin);
}
diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx
index 2b4a75f..7059cb2 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -543,11 +543,11 @@ Sequence< Type > SAL_CALL OFlatTable::getTypes( ) throw(RuntimeException, std::
const Type* pEnd = pBegin + aTypes.getLength();
for(;pBegin != pEnd;++pBegin)
{
- if(!(*pBegin == ::getCppuType((const Reference<XKeysSupplier>*)0) ||
- *pBegin == ::getCppuType((const Reference<XRename>*)0) ||
- *pBegin == ::getCppuType((const Reference<XIndexesSupplier>*)0) ||
- *pBegin == ::getCppuType((const Reference<XAlterTable>*)0) ||
- *pBegin == ::getCppuType((const Reference<XDataDescriptorFactory>*)0)))
+ if(!(*pBegin == cppu::UnoType<XKeysSupplier>::get()||
+ *pBegin == cppu::UnoType<XRename>::get()||
+ *pBegin == cppu::UnoType<XIndexesSupplier>::get()||
+ *pBegin == cppu::UnoType<XAlterTable>::get()||
+ *pBegin == cppu::UnoType<XDataDescriptorFactory>::get()))
{
aOwnTypes.push_back(*pBegin);
}
@@ -559,11 +559,11 @@ Sequence< Type > SAL_CALL OFlatTable::getTypes( ) throw(RuntimeException, std::
Any SAL_CALL OFlatTable::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
{
- if( rType == ::getCppuType((const Reference<XKeysSupplier>*)0) ||
- rType == ::getCppuType((const Reference<XIndexesSupplier>*)0) ||
- rType == ::getCppuType((const Reference<XRename>*)0) ||
- rType == ::getCppuType((const Reference<XAlterTable>*)0) ||
- rType == ::getCppuType((const Reference<XDataDescriptorFactory>*)0))
+ if( rType == cppu::UnoType<XKeysSupplier>::get()||
+ rType == cppu::UnoType<XIndexesSupplier>::get()||
+ rType == cppu::UnoType<XRename>::get()||
+ rType == cppu::UnoType<XAlterTable>::get()||
+ rType == cppu::UnoType<XDataDescriptorFactory>::get())
return Any();
Any aRet = OTable_TYPEDEF::queryInterface(rType);
diff --git a/connectivity/source/drivers/hsqldb/HCatalog.cxx b/connectivity/source/drivers/hsqldb/HCatalog.cxx
index 25529f8..9a87f6e 100644
--- a/connectivity/source/drivers/hsqldb/HCatalog.cxx
+++ b/connectivity/source/drivers/hsqldb/HCatalog.cxx
@@ -127,7 +127,7 @@ void OHCatalog::refreshUsers()
Any SAL_CALL OHCatalog::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
{
- if ( rType == ::getCppuType((const Reference<XGroupsSupplier>*)0) )
+ if ( rType == cppu::UnoType<XGroupsSupplier>::get())
return Any();
return OCatalog::queryInterface(rType);
@@ -142,7 +142,7 @@ Sequence< Type > SAL_CALL OHCatalog::getTypes( ) throw(RuntimeException, std::e
const Type* pEnd = pBegin + aTypes.getLength();
for(;pBegin != pEnd;++pBegin)
{
- if ( !(*pBegin == ::getCppuType((const Reference<XGroupsSupplier>*)0)))
+ if ( !(*pBegin == cppu::UnoType<XGroupsSupplier>::get()))
{
aOwnTypes.push_back(*pBegin);
}
diff --git a/connectivity/source/drivers/hsqldb/HTable.cxx b/connectivity/source/drivers/hsqldb/HTable.cxx
index 6ee8f5b..4e7b965 100644
--- a/connectivity/source/drivers/hsqldb/HTable.cxx
+++ b/connectivity/source/drivers/hsqldb/HTable.cxx
@@ -351,7 +351,7 @@ Sequence< Type > SAL_CALL OHSQLTable::getTypes( ) throw(RuntimeException, std::
const Type* pEnd = pIter + aTypes.getLength();
for(;pIter != pEnd;++pIter)
{
- if( *pIter != ::getCppuType((const Reference<XRename>*)0) )
+ if( *pIter != cppu::UnoType<XRename>::get())
{
aOwnTypes.push_back(*pIter);
}
@@ -401,7 +401,7 @@ void SAL_CALL OHSQLTable::rename( const OUString& newName ) throw(SQLException,
Any SAL_CALL OHSQLTable::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
{
- if( m_Type.equalsAscii("VIEW") && rType == ::getCppuType((const Reference<XRename>*)0) )
+ if( m_Type.equalsAscii("VIEW") && rType == cppu::UnoType<XRename>::get())
return Any();
return OTableHelper::queryInterface(rType);
diff --git a/connectivity/source/drivers/jdbc/CallableStatement.cxx b/connectivity/source/drivers/jdbc/CallableStatement.cxx
index a39bab0..bb16548 100644
--- a/connectivity/source/drivers/jdbc/CallableStatement.cxx
+++ b/connectivity/source/drivers/jdbc/CallableStatement.cxx
@@ -61,8 +61,8 @@ Any SAL_CALL java_sql_CallableStatement::queryInterface( const Type & rType ) th
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL java_sql_CallableStatement::getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception)
{
- ::cppu::OTypeCollection aTypes( ::getCppuType( (const ::com::sun::star::uno::Reference< starsdbc::XRow > *)0 ),
- ::getCppuType( (const ::com::sun::star::uno::Reference< starsdbc::XOutParameters > *)0 ));
+ ::cppu::OTypeCollection aTypes( cppu::UnoType<starsdbc::XRow>::get(),
+ cppu::UnoType<starsdbc::XOutParameters>::get());
return ::comphelper::concatSequences(aTypes.getTypes(),java_sql_PreparedStatement::getTypes());
}
diff --git a/connectivity/source/drivers/jdbc/JStatement.cxx b/connectivity/source/drivers/jdbc/JStatement.cxx
index 060ae0f..7154cd9 100644
--- a/connectivity/source/drivers/jdbc/JStatement.cxx
+++ b/connectivity/source/drivers/jdbc/JStatement.cxx
@@ -121,7 +121,7 @@ void SAL_CALL OStatement_BASE2::release() throw()
Any SAL_CALL java_sql_Statement_Base::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
{
- if ( m_pConnection && !m_pConnection->isAutoRetrievingEnabled() && rType == ::getCppuType( (const Reference< XGeneratedResultSet > *)0 ) )
+ if ( m_pConnection && !m_pConnection->isAutoRetrievingEnabled() && rType == cppu::UnoType<XGeneratedResultSet>::get())
return Any();
Any aRet( java_sql_Statement_BASE::queryInterface(rType) );
return aRet.hasValue() ? aRet : OPropertySetHelper::queryInterface(rType);
@@ -129,15 +129,15 @@ Any SAL_CALL java_sql_Statement_Base::queryInterface( const Type & rType ) throw
Sequence< Type > SAL_CALL java_sql_Statement_Base::getTypes( ) throw(RuntimeException, std::exception)
{
- ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ),
- ::getCppuType( (const Reference< ::com::sun::star::beans::XFastPropertySet > *)0 ),
- ::getCppuType( (const Reference< ::com::sun::star::beans::XPropertySet > *)0 ));
+ ::cppu::OTypeCollection aTypes( cppu::UnoType<com::sun::star::beans::XMultiPropertySet>::get(),
+ cppu::UnoType<com::sun::star::beans::XFastPropertySet>::get(),
+ cppu::UnoType<com::sun::star::beans::XPropertySet>::get());
Sequence< Type > aOldTypes = java_sql_Statement_BASE::getTypes();
if ( m_pConnection && !m_pConnection->isAutoRetrievingEnabled() )
{
::std::remove(aOldTypes.getArray(),aOldTypes.getArray() + aOldTypes.getLength(),
- ::getCppuType( (const Reference< XGeneratedResultSet > *)0 ));
+ cppu::UnoType<XGeneratedResultSet>::get());
aOldTypes.realloc(aOldTypes.getLength() - 1);
}
diff --git a/connectivity/source/drivers/jdbc/PreparedStatement.cxx b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
index d9e97d5..2ebd437 100644
--- a/connectivity/source/drivers/jdbc/PreparedStatement.cxx
+++ b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
@@ -82,10 +82,10 @@ jclass java_sql_PreparedStatement::getMyClass() const
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL java_sql_PreparedStatement::getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception)
{
- ::cppu::OTypeCollection aTypes( ::getCppuType( (const ::com::sun::star::uno::Reference< XPreparedStatement > *)0 ),
- ::getCppuType( (const ::com::sun::star::uno::Reference< XParameters > *)0 ),
- ::getCppuType( (const ::com::sun::star::uno::Reference< XResultSetMetaDataSupplier > *)0 ),
- ::getCppuType( (const ::com::sun::star::uno::Reference< XPreparedBatchExecution > *)0 ));
+ ::cppu::OTypeCollection aTypes( cppu::UnoType<XPreparedStatement>::get(),
+ cppu::UnoType<XParameters>::get(),
+ cppu::UnoType<XResultSetMetaDataSupplier>::get(),
+ cppu::UnoType<XPreparedBatchExecution>::get());
return ::comphelper::concatSequences(aTypes.getTypes(),OStatement_BASE2::getTypes());
}
diff --git a/connectivity/source/drivers/jdbc/ResultSet.cxx b/connectivity/source/drivers/jdbc/ResultSet.cxx
index b247671..6d327c1 100644
--- a/connectivity/source/drivers/jdbc/ResultSet.cxx
+++ b/connectivity/source/drivers/jdbc/ResultSet.cxx
@@ -122,9 +122,9 @@ m_xMetaData.clear();
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL java_sql_ResultSet::getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception)
{
- ::cppu::OTypeCollection aTypes( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ),
- ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XFastPropertySet > *)0 ),
- ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > *)0 ));
+ ::cppu::OTypeCollection aTypes( cppu::UnoType<com::sun::star::beans::XMultiPropertySet>::get(),
+ cppu::UnoType<com::sun::star::beans::XFastPropertySet>::get(),
+ cppu::UnoType<com::sun::star::beans::XPropertySet>::get());
return ::comphelper::concatSequences(aTypes.getTypes(),java_sql_ResultSet_BASE::getTypes());
}
diff --git a/connectivity/source/drivers/kab/KResultSet.cxx b/connectivity/source/drivers/kab/KResultSet.cxx
index d13e3dc..ad7f98cb 100644
--- a/connectivity/source/drivers/kab/KResultSet.cxx
+++ b/connectivity/source/drivers/kab/KResultSet.cxx
@@ -137,9 +137,9 @@ void SAL_CALL KabResultSet::release() throw()
Sequence< Type > SAL_CALL KabResultSet::getTypes() throw(RuntimeException, std::exception)
{
OTypeCollection aTypes(
- ::getCppuType( (const Reference< ::com::sun::star::beans::XMultiPropertySet >*) 0),
- ::getCppuType( (const Reference< ::com::sun::star::beans::XFastPropertySet >*) 0),
- ::getCppuType( (const Reference< ::com::sun::star::beans::XPropertySet >*) 0));
+ cppu::UnoType<com::sun::star::beans::XMultiPropertySet>::get(),
+ cppu::UnoType<com::sun::star::beans::XFastPropertySet>::get(),
+ cppu::UnoType<com::sun::star::beans::XPropertySet>::get());
return comphelper::concatSequences(aTypes.getTypes(), KabResultSet_BASE::getTypes());
}
diff --git a/connectivity/source/drivers/kab/KStatement.cxx b/connectivity/source/drivers/kab/KStatement.cxx
index 5bf7d8e..65dcb06 100644
--- a/connectivity/source/drivers/kab/KStatement.cxx
+++ b/connectivity/source/drivers/kab/KStatement.cxx
@@ -362,9 +362,9 @@ Any SAL_CALL KabCommonStatement::queryInterface( const Type & rType ) throw(Runt
Sequence< Type > SAL_CALL KabCommonStatement::getTypes( ) throw(RuntimeException, std::exception)
{
- ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ),
- ::getCppuType( (const Reference< XFastPropertySet > *)0 ),
- ::getCppuType( (const Reference< XPropertySet > *)0 ));
+ ::cppu::OTypeCollection aTypes( cppu::UnoType<XMultiPropertySet>::get(),
+ cppu::UnoType<XFastPropertySet>::get(),
+ cppu::UnoType<XPropertySet>::get());
return comphelper::concatSequences(aTypes.getTypes(),KabCommonStatement_BASE::getTypes());
}
diff --git a/connectivity/source/drivers/macab/MacabResultSet.cxx b/connectivity/source/drivers/macab/MacabResultSet.cxx
index d0206df..0e3aee4 100644
--- a/connectivity/source/drivers/macab/MacabResultSet.cxx
+++ b/connectivity/source/drivers/macab/MacabResultSet.cxx
@@ -163,9 +163,9 @@ void SAL_CALL MacabResultSet::release() throw()
Sequence< Type > SAL_CALL MacabResultSet::getTypes() throw(RuntimeException)
{
OTypeCollection aTypes(
- ::getCppuType( (const Reference< ::com::sun::star::beans::XMultiPropertySet >*) 0),
- ::getCppuType( (const Reference< ::com::sun::star::beans::XFastPropertySet >*) 0),
- ::getCppuType( (const Reference< ::com::sun::star::beans::XPropertySet >*) 0));
+ cppu::UnoType<com::sun::star::beans::XMultiPropertySet>::get(),
+ cppu::UnoType<com::sun::star::beans::XFastPropertySet>::get(),
+ cppu::UnoType<com::sun::star::beans::XPropertySet>::get());
return comphelper::concatSequences(aTypes.getTypes(), MacabResultSet_BASE::getTypes());
}
diff --git a/connectivity/source/drivers/macab/MacabStatement.cxx b/connectivity/source/drivers/macab/MacabStatement.cxx
index 87b2799..0fb2105 100644
--- a/connectivity/source/drivers/macab/MacabStatement.cxx
+++ b/connectivity/source/drivers/macab/MacabStatement.cxx
@@ -372,9 +372,9 @@ Any SAL_CALL MacabCommonStatement::queryInterface( const Type & rType ) throw(Ru
Sequence< Type > SAL_CALL MacabCommonStatement::getTypes( ) throw(RuntimeException, std::exception)
{
- ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ),
- ::getCppuType( (const Reference< XFastPropertySet > *)0 ),
- ::getCppuType( (const Reference< XPropertySet > *)0 ));
+ ::cppu::OTypeCollection aTypes( cppu::UnoType<XMultiPropertySet>::get(),
+ cppu::UnoType<XFastPropertySet>::get(),
+ cppu::UnoType<XPropertySet>::get());
return comphelper::concatSequences(aTypes.getTypes(),MacabCommonStatement_BASE::getTypes());
}
diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx
index c85e842..0473655 100644
--- a/connectivity/source/drivers/mork/MResultSet.cxx
+++ b/connectivity/source/drivers/mork/MResultSet.cxx
@@ -146,9 +146,9 @@ Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeExcep
Sequence< Type > SAL_CALL OResultSet::getTypes( ) throw( RuntimeException, std::exception)
{
- OTypeCollection aTypes( ::getCppuType( (const Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ),
- ::getCppuType( (const Reference< ::com::sun::star::beans::XFastPropertySet > *)0 ),
- ::getCppuType( (const Reference< ::com::sun::star::beans::XPropertySet > *)0 ));
+ OTypeCollection aTypes( cppu::UnoType<com::sun::star::beans::XMultiPropertySet>::get(),
+ cppu::UnoType<com::sun::star::beans::XFastPropertySet>::get(),
+ cppu::UnoType<com::sun::star::beans::XPropertySet>::get());
return ::comphelper::concatSequences(aTypes.getTypes(),OResultSet_BASE::getTypes());
}
diff --git a/connectivity/source/drivers/mork/MStatement.cxx b/connectivity/source/drivers/mork/MStatement.cxx
index c9a06ff..20a3011 100644
--- a/connectivity/source/drivers/mork/MStatement.cxx
+++ b/connectivity/source/drivers/mork/MStatement.cxx
@@ -121,9 +121,9 @@ Any SAL_CALL OCommonStatement::queryInterface( const Type & rType ) throw(Runtim
Sequence< Type > SAL_CALL OCommonStatement::getTypes( ) throw(RuntimeException, std::exception)
{
- ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ),
- ::getCppuType( (const Reference< XFastPropertySet > *)0 ),
- ::getCppuType( (const Reference< XPropertySet > *)0 ));
+ ::cppu::OTypeCollection aTypes( cppu::UnoType<XMultiPropertySet>::get(),
+ cppu::UnoType<XFastPropertySet>::get(),
+ cppu::UnoType<XPropertySet>::get());
return ::comphelper::concatSequences(aTypes.getTypes(),OCommonStatement_IBASE::getTypes());
}
diff --git a/connectivity/source/drivers/mozab/MResultSet.cxx b/connectivity/source/drivers/mozab/MResultSet.cxx
index a0d78de..519a1b1 100644
--- a/connectivity/source/drivers/mozab/MResultSet.cxx
+++ b/connectivity/source/drivers/mozab/MResultSet.cxx
@@ -144,9 +144,9 @@ Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeExcep
Sequence< Type > SAL_CALL OResultSet::getTypes( ) throw( RuntimeException)
{
- OTypeCollection aTypes( ::getCppuType( (const Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ),
- ::getCppuType( (const Reference< ::com::sun::star::beans::XFastPropertySet > *)0 ),
- ::getCppuType( (const Reference< ::com::sun::star::beans::XPropertySet > *)0 ));
+ OTypeCollection aTypes( cppu::UnoType<com::sun::star::beans::XMultiPropertySet>::get(),
+ cppu::UnoType<com::sun::star::beans::XFastPropertySet>::get(),
+ cppu::UnoType<com::sun::star::beans::XPropertySet>::get());
return ::comphelper::concatSequences(aTypes.getTypes(),OResultSet_BASE::getTypes());
}
diff --git a/connectivity/source/drivers/mozab/MStatement.cxx b/connectivity/source/drivers/mozab/MStatement.cxx
index 56637f1..8406820 100644
--- a/connectivity/source/drivers/mozab/MStatement.cxx
+++ b/connectivity/source/drivers/mozab/MStatement.cxx
@@ -116,9 +116,9 @@ Any SAL_CALL OCommonStatement::queryInterface( const Type & rType ) throw(Runtim
Sequence< Type > SAL_CALL OCommonStatement::getTypes( ) throw(RuntimeException)
{
- ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ),
- ::getCppuType( (const Reference< XFastPropertySet > *)0 ),
- ::getCppuType( (const Reference< XPropertySet > *)0 ));
+ ::cppu::OTypeCollection aTypes( cppu::UnoType<XMultiPropertySet>::get(),
+ cppu::UnoType<XFastPropertySet>::get(),
+ cppu::UnoType<XPropertySet>::get());
return ::comphelper::concatSequences(aTypes.getTypes(),OCommonStatement_IBASE::getTypes());
}
diff --git a/connectivity/source/drivers/mysql/YCatalog.cxx b/connectivity/source/drivers/mysql/YCatalog.cxx
index 5510fae..85adabe 100644
--- a/connectivity/source/drivers/mysql/YCatalog.cxx
+++ b/connectivity/source/drivers/mysql/YCatalog.cxx
@@ -119,7 +119,7 @@ void OMySQLCatalog::refreshUsers()
Any SAL_CALL OMySQLCatalog::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
{
- if ( rType == ::getCppuType((const Reference<XGroupsSupplier>*)0) )
+ if ( rType == cppu::UnoType<XGroupsSupplier>::get())
return Any();
@@ -135,7 +135,7 @@ Sequence< Type > SAL_CALL OMySQLCatalog::getTypes( ) throw(RuntimeException, st
const Type* pEnd = pBegin + aTypes.getLength();
for(;pBegin != pEnd;++pBegin)
{
- if ( !(*pBegin == ::getCppuType((const Reference<XGroupsSupplier>*)0)))
+ if ( !(*pBegin == cppu::UnoType<XGroupsSupplier>::get()))
{
aOwnTypes.push_back(*pBegin);
}
diff --git a/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx
index 46ef180..7a2d3dc 100644
--- a/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx
@@ -125,9 +125,9 @@ void SAL_CALL ODatabaseMetaDataResultSet::release() throw()
Sequence< Type > SAL_CALL ODatabaseMetaDataResultSet::getTypes( ) throw(RuntimeException, std::exception)
{
- ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ),
- ::getCppuType( (const Reference< XFastPropertySet > *)0 ),
- ::getCppuType( (const Reference< XPropertySet > *)0 ));
+ ::cppu::OTypeCollection aTypes( cppu::UnoType<XMultiPropertySet>::get(),
+ cppu::UnoType<XFastPropertySet>::get(),
+ cppu::UnoType<XPropertySet>::get());
return ::comphelper::concatSequences(aTypes.getTypes(),ODatabaseMetaDataResultSet_BASE::getTypes());
}
diff --git a/connectivity/source/drivers/odbc/OResultSet.cxx b/connectivity/source/drivers/odbc/OResultSet.cxx
index 76e53b9..f5a79b0 100644
--- a/connectivity/source/drivers/odbc/OResultSet.cxx
+++ b/connectivity/source/drivers/odbc/OResultSet.cxx
@@ -362,9 +362,9 @@ Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeExcep
Sequence< Type > SAL_CALL OResultSet::getTypes( ) throw( RuntimeException, std::exception)
{
- OTypeCollection aTypes( ::getCppuType( (const Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ),
- ::getCppuType( (const Reference< ::com::sun::star::beans::XFastPropertySet > *)0 ),
- ::getCppuType( (const Reference< ::com::sun::star::beans::XPropertySet > *)0 ));
+ OTypeCollection aTypes( cppu::UnoType<com::sun::star::beans::XMultiPropertySet>::get(),
+ cppu::UnoType<com::sun::star::beans::XFastPropertySet>::get(),
+ cppu::UnoType<com::sun::star::beans::XPropertySet>::get());
return ::comphelper::concatSequences(aTypes.getTypes(),OResultSet_BASE::getTypes());
}
diff --git a/connectivity/source/drivers/odbc/OStatement.cxx b/connectivity/source/drivers/odbc/OStatement.cxx
index 40466b8..c9391e8 100644
--- a/connectivity/source/drivers/odbc/OStatement.cxx
+++ b/connectivity/source/drivers/odbc/OStatement.cxx
@@ -131,7 +131,7 @@ void SAL_CALL OStatement_BASE2::release() throw()
Any SAL_CALL OStatement_Base::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
{
- if ( m_pConnection && !m_pConnection->isAutoRetrievingEnabled() && rType == ::getCppuType( (const Reference< XGeneratedResultSet > *)0 ) )
+ if ( m_pConnection && !m_pConnection->isAutoRetrievingEnabled() && rType == cppu::UnoType<XGeneratedResultSet>::get())
return Any();
Any aRet = OStatement_BASE::queryInterface(rType);
return aRet.hasValue() ? aRet : OPropertySetHelper::queryInterface(rType);
@@ -139,14 +139,14 @@ Any SAL_CALL OStatement_Base::queryInterface( const Type & rType ) throw(Runtime
Sequence< Type > SAL_CALL OStatement_Base::getTypes( ) throw(RuntimeException, std::exception)
{
- ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ),
- ::getCppuType( (const Reference< XFastPropertySet > *)0 ),
- ::getCppuType( (const Reference< XPropertySet > *)0 ));
+ ::cppu::OTypeCollection aTypes( cppu::UnoType<XMultiPropertySet>::get(),
+ cppu::UnoType<XFastPropertySet>::get(),
+ cppu::UnoType<XPropertySet>::get());
Sequence< Type > aOldTypes = OStatement_BASE::getTypes();
if ( m_pConnection && !m_pConnection->isAutoRetrievingEnabled() )
{
::std::remove(aOldTypes.getArray(),aOldTypes.getArray() + aOldTypes.getLength(),
- ::getCppuType( (const Reference< XGeneratedResultSet > *)0 ));
+ cppu::UnoType<XGeneratedResultSet>::get());
aOldTypes.realloc(aOldTypes.getLength() - 1);
}
diff --git a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
index a8af6d4..55a6702 100644
--- a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
+++ b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
@@ -202,14 +202,14 @@ Sequence<Type > BaseResultSet::getTypes() throw( RuntimeException, std::exceptio
if( !pCollection )
{
static cppu::OTypeCollection collection(
- getCppuType( (Reference< XResultSet> *) 0 ),
- getCppuType( (Reference< XResultSetMetaDataSupplier> *) 0 ),
- getCppuType( (Reference< XRow> *) 0 ),
- getCppuType( (Reference< XColumnLocate> *) 0 ),
- getCppuType( (Reference< XCloseable> *) 0 ),
- getCppuType( (Reference< XPropertySet >*) 0 ),
- getCppuType( (Reference< XFastPropertySet > *) 0 ),
- getCppuType( (Reference< XMultiPropertySet > *) 0 ),
+ cppu::UnoType<XResultSet>::get(),
+ cppu::UnoType<XResultSetMetaDataSupplier>::get(),
+ cppu::UnoType<XRow>::get(),
+ cppu::UnoType<XColumnLocate>::get(),
+ cppu::UnoType<XCloseable>::get(),
+ cppu::UnoType<XPropertySet>::get(),
+ cppu::UnoType<XFastPropertySet>::get(),
+ cppu::UnoType<XMultiPropertySet>::get(),
OComponentHelper::getTypes());
pCollection = &collection;
}
diff --git a/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx b/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx
index b37c3b2..78a6742 100644
--- a/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx
+++ b/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx
@@ -96,8 +96,8 @@ com::sun::star::uno::Sequence< com::sun::star::uno::Type > FakedUpdateableResult
if( !pCollection )
{
static cppu::OTypeCollection collection(
- getCppuType( (Reference< XResultSetUpdate> *) 0 ),
- getCppuType( (Reference< XRowUpdate> *) 0 ),
+ cppu::UnoType<XResultSetUpdate>::get(),
+ cppu::UnoType<XRowUpdate>::get(),
ResultSet::getTypes());
pCollection = &collection;
}
diff --git a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
index 55c0175..dcaa620 100644
--- a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
@@ -269,15 +269,15 @@ Sequence< Type > PreparedStatement::getTypes() throw ( RuntimeException, std::ex
if( !pCollection )
{
static cppu::OTypeCollection collection(
- getCppuType( (Reference< XWarningsSupplier> *) 0 ),
- getCppuType( (Reference< XPreparedStatement> *) 0 ),
- getCppuType( (Reference< com::sun::star::sdbc::XResultSetMetaDataSupplier> *) 0 ),
- getCppuType( (Reference< XParameters> *) 0 ),
- getCppuType( (Reference< XCloseable> *) 0 ),
- getCppuType( (Reference< XGeneratedResultSet> *) 0 ),
- getCppuType( (Reference< XPropertySet >*) 0 ),
- getCppuType( (Reference< XFastPropertySet > *) 0 ),
- getCppuType( (Reference< XMultiPropertySet > *) 0 ),
+ cppu::UnoType<XWarningsSupplier>::get(),
+ cppu::UnoType<XPreparedStatement>::get(),
+ cppu::UnoType<com::sun::star::sdbc::XResultSetMetaDataSupplier>::get(),
+ cppu::UnoType<XParameters>::get(),
+ cppu::UnoType<XCloseable>::get(),
+ cppu::UnoType<XGeneratedResultSet>::get(),
+ cppu::UnoType<XPropertySet>::get(),
+ cppu::UnoType<XFastPropertySet>::get(),
+ cppu::UnoType<XMultiPropertySet>::get(),
OComponentHelper::getTypes());
pCollection = &collection;
}
diff --git a/connectivity/source/drivers/postgresql/pq_statement.cxx b/connectivity/source/drivers/postgresql/pq_statement.cxx
index 23727db..629d362 100644
--- a/connectivity/source/drivers/postgresql/pq_statement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_statement.cxx
@@ -215,14 +215,14 @@ Sequence< Type > Statement::getTypes() throw ( RuntimeException, std::exception
if( !pCollection )
{
static cppu::OTypeCollection collection(
- getCppuType( (Reference< XWarningsSupplier> *) 0 ),
- getCppuType( (Reference< XStatement> *) 0 ),
- getCppuType( (Reference< com::sun::star::sdbc::XResultSetMetaDataSupplier> *) 0 ),
- getCppuType( (Reference< XCloseable> *) 0 ),
- getCppuType( (Reference< XPropertySet >*) 0 ),
- getCppuType( (Reference< XFastPropertySet > *) 0 ),
- getCppuType( (Reference< XMultiPropertySet > *) 0 ),
- getCppuType( (Reference< XGeneratedResultSet > *) 0 ),
+ cppu::UnoType<XWarningsSupplier>::get(),
+ cppu::UnoType<XStatement>::get(),
+ cppu::UnoType<com::sun::star::sdbc::XResultSetMetaDataSupplier>::get(),
+ cppu::UnoType<XCloseable>::get(),
+ cppu::UnoType<XPropertySet>::get(),
+ cppu::UnoType<XFastPropertySet>::get(),
+ cppu::UnoType<XMultiPropertySet>::get(),
+ cppu::UnoType<XGeneratedResultSet>::get(),
OComponentHelper::getTypes());
pCollection = &collection;
}
diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx b/connectivity/source/drivers/postgresql/pq_tools.cxx
index ff89568..17428fd 100644
--- a/connectivity/source/drivers/postgresql/pq_tools.cxx
+++ b/connectivity/source/drivers/postgresql/pq_tools.cxx
@@ -1209,11 +1209,11 @@ bool implSetObject( const Reference< XParameters >& _rxParameters,
bSuccessfullyReRouted = false;
break;
case typelib_TypeClass_STRUCT:
- if (_rValue.getValueType() == ::getCppuType((const com::sun::star::util::DateTime*)0))
+ if (_rValue.getValueType() == cppu::UnoType<com::sun::star::util::DateTime>::get())
_rxParameters->setTimestamp(_nColumnIndex, *(com::sun::star::util::DateTime*)_rValue.getValue());
- else if (_rValue.getValueType() == ::getCppuType((const com::sun::star::util::Date*)0))
+ else if (_rValue.getValueType() == cppu::UnoType<com::sun::star::util::Date>::get())
_rxParameters->setDate(_nColumnIndex, *(com::sun::star::util::Date*)_rValue.getValue());
- else if (_rValue.getValueType() == ::getCppuType((const com::sun::star::util::Time*)0))
+ else if (_rValue.getValueType() == cppu::UnoType<com::sun::star::util::Time>::get())
_rxParameters->setTime(_nColumnIndex, *(com::sun::star::util::Time*)_rValue.getValue());
else
bSuccessfullyReRouted = false;
diff --git a/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx b/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx
index ac7b755..dfe3f42 100644
--- a/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx
+++ b/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx
@@ -157,8 +157,8 @@ com::sun::star::uno::Sequence< com::sun::star::uno::Type > UpdateableResultSet::
if( !pCollection )
{
static cppu::OTypeCollection collection(
- getCppuType( (Reference< XResultSetUpdate> *) 0 ),
- getCppuType( (Reference< XRowUpdate> *) 0 ),
+ cppu::UnoType<XResultSetUpdate>::get(),
+ cppu::UnoType<XRowUpdate>::get(),
SequenceResultSet::getTypes());
pCollection = &collection;
}
@@ -549,27 +549,27 @@ Sequence< Type > UpdateableResultSet::getStaticTypes( bool updateable )
if( updateable )
{
cppu::OTypeCollection collection(
- getCppuType( (Reference< XResultSetUpdate> *) 0 ),
- getCppuType( (Reference< XRowUpdate> *) 0 ),
-// getCppuType( (Reference< com::sun::star::sdbcx::XRowLocate > *) 0 ),
+ cppu::UnoType<XResultSetUpdate>::get(),
+ cppu::UnoType<XRowUpdate>::get(),
+// cppu::UnoType<com::sun::star::sdbcx::XRowLocate>::get(),
getStaticTypes( false /* updateable */ ) );
return collection.getTypes();
}
else
{
cppu::OTypeCollection collection(
- getCppuType( (Reference< XResultSet> *) 0 ),
- getCppuType( (Reference< XResultSetMetaDataSupplier> *) 0 ),
- getCppuType( (Reference< XRow> *) 0 ),
- getCppuType( (Reference< XColumnLocate> *) 0 ),
- getCppuType( (Reference< XCloseable> *) 0 ),
- getCppuType( (Reference< XPropertySet >*) 0 ),
- getCppuType( (Reference< XFastPropertySet > *) 0 ),
- getCppuType( (Reference< XMultiPropertySet > *) 0 ),
- getCppuType( (const Reference< com::sun::star::lang::XComponent > *)0 ), // OComponentHelper
- getCppuType( (const Reference< com::sun::star::lang::XTypeProvider > *)0 ),
- getCppuType( (const Reference< com::sun::star::uno::XAggregation > *)0 ),
- getCppuType( (const Reference< com::sun::star::uno::XWeak > *)0 ) );
+ cppu::UnoType<XResultSet>::get(),
+ cppu::UnoType<XResultSetMetaDataSupplier>::get(),
+ cppu::UnoType<XRow>::get(),
+ cppu::UnoType<XColumnLocate>::get(),
+ cppu::UnoType<XCloseable>::get(),
+ cppu::UnoType<XPropertySet>::get(),
+ cppu::UnoType<XFastPropertySet>::get(),
+ cppu::UnoType<XMultiPropertySet>::get(),
+ cppu::UnoType<com::sun::star::lang::XComponent>::get(), // OComponentHelper
+ cppu::UnoType<com::sun::star::lang::XTypeProvider>::get(),
+ cppu::UnoType<com::sun::star::uno::XAggregation>::get(),
+ cppu::UnoType<com::sun::star::uno::XWeak>::get());
return collection.getTypes();
}
}
diff --git a/connectivity/source/drivers/postgresql/pq_xbase.cxx b/connectivity/source/drivers/postgresql/pq_xbase.cxx
index 02cd0fc..3539abe 100644
--- a/connectivity/source/drivers/postgresql/pq_xbase.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xbase.cxx
@@ -164,12 +164,12 @@ Sequence< com::sun::star::uno::Type > ReflectionBase::getTypes()
{
osl::MutexGuard guard( m_refMutex->mutex );
static cppu::OTypeCollection collection(
- getCppuType( (Reference< XPropertySet >*) 0 ),
- getCppuType( (Reference< XFastPropertySet > *) 0 ),
- getCppuType( (Reference< XMultiPropertySet > *) 0 ),
- getCppuType( (Reference< com::sun::star::lang::XServiceInfo > *) 0 ),
- getCppuType( (Reference< com::sun::star::sdbcx::XDataDescriptorFactory > *) 0 ),
- getCppuType( (Reference< com::sun::star::container::XNamed > *) 0 ),
+ cppu::UnoType<XPropertySet>::get(),
+ cppu::UnoType<XFastPropertySet>::get(),
+ cppu::UnoType<XMultiPropertySet>::get(),
+ cppu::UnoType<com::sun::star::lang::XServiceInfo>::get(),
+ cppu::UnoType<com::sun::star::sdbcx::XDataDescriptorFactory>::get(),
+ cppu::UnoType<com::sun::star::container::XNamed>::get(),
OComponentHelper::getTypes());
return collection.getTypes();
}
diff --git a/connectivity/source/drivers/postgresql/pq_xcontainer.cxx b/connectivity/source/drivers/postgresql/pq_xcontainer.cxx
index b4ae905..2af77d5 100644
--- a/connectivity/source/drivers/postgresql/pq_xcontainer.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xcontainer.cxx
@@ -98,7 +98,7 @@ public:
}
virtual Type getType() const SAL_OVERRIDE
{
- return getCppuType( (Reference< XContainerListener > *)0 );
+ return cppu::UnoType<XContainerListener>::get();
}
};
@@ -120,7 +120,7 @@ public:
virtual Type getType() const SAL_OVERRIDE
{
- return getCppuType( (Reference< XContainerListener > *)0 );
+ return cppu::UnoType<XContainerListener>::get();
}
};
@@ -141,7 +141,7 @@ public:
virtual Type getType() const SAL_OVERRIDE
{
- return getCppuType( (Reference< XContainerListener > *)0 );
+ return cppu::UnoType<XContainerListener>::get();
}
};
diff --git a/connectivity/source/drivers/postgresql/pq_xindex.cxx b/connectivity/source/drivers/postgresql/pq_xindex.cxx
index 9c81b6c..6ce1c9c 100644
--- a/connectivity/source/drivers/postgresql/pq_xindex.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xindex.cxx
@@ -134,7 +134,7 @@ Sequence<Type > Index::getTypes() throw( RuntimeException, std::exception )
if( !pCollection )
{
static cppu::OTypeCollection collection(
- getCppuType( (Reference< com::sun::star::sdbcx::XColumnsSupplier> *) 0 ),
+ cppu::UnoType<com::sun::star::sdbcx::XColumnsSupplier>::get(),
ReflectionBase::getTypes());
pCollection = &collection;
}
@@ -207,7 +207,7 @@ Sequence<Type > IndexDescriptor::getTypes() throw( RuntimeException, std::except
if( !pCollection )
{
static cppu::OTypeCollection collection(
- getCppuType( (Reference< com::sun::star::sdbcx::XColumnsSupplier> *) 0 ),
+ cppu::UnoType<com::sun::star::sdbcx::XColumnsSupplier>::get(),
ReflectionBase::getTypes());
pCollection = &collection;
}
diff --git a/connectivity/source/drivers/postgresql/pq_xkey.cxx b/connectivity/source/drivers/postgresql/pq_xkey.cxx
index 7aacf2a..e47a043 100644
--- a/connectivity/source/drivers/postgresql/pq_xkey.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xkey.cxx
@@ -136,7 +136,7 @@ Sequence<Type > Key::getTypes() throw( RuntimeException, std::exception )
if( !pCollection )
{
static cppu::OTypeCollection collection(
- getCppuType( (Reference< com::sun::star::sdbcx::XColumnsSupplier> *) 0 ),
+ cppu::UnoType<com::sun::star::sdbcx::XColumnsSupplier>::get(),
ReflectionBase::getTypes());
pCollection = &collection;
}
@@ -204,7 +204,7 @@ Sequence<Type > KeyDescriptor::getTypes() throw( RuntimeException, std::exceptio
if( !pCollection )
{
static cppu::OTypeCollection collection(
- getCppuType( (Reference< com::sun::star::sdbcx::XColumnsSupplier> *) 0 ),
+ cppu::UnoType<com::sun::star::sdbcx::XColumnsSupplier>::get(),
ReflectionBase::getTypes());
pCollection = &collection;
}
diff --git a/connectivity/source/drivers/postgresql/pq_xtable.cxx b/connectivity/source/drivers/postgresql/pq_xtable.cxx
index e6e1363..f907597 100644
--- a/connectivity/source/drivers/postgresql/pq_xtable.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xtable.cxx
@@ -291,11 +291,11 @@ Sequence<Type > Table::getTypes() throw( RuntimeException, std::exception )
if( !pCollection )
{
static cppu::OTypeCollection collection(
- getCppuType( (Reference< com::sun::star::sdbcx::XIndexesSupplier> *) 0 ),
- getCppuType( (Reference< com::sun::star::sdbcx::XKeysSupplier> *) 0 ),
- getCppuType( (Reference< com::sun::star::sdbcx::XColumnsSupplier> *) 0 ),
- getCppuType( (Reference< com::sun::star::sdbcx::XRename> *) 0 ),
- getCppuType( (Reference< com::sun::star::sdbcx::XAlterTable> *) 0 ),
+ cppu::UnoType<com::sun::star::sdbcx::XIndexesSupplier>::get(),
+ cppu::UnoType<com::sun::star::sdbcx::XKeysSupplier>::get(),
+ cppu::UnoType<com::sun::star::sdbcx::XColumnsSupplier>::get(),
+ cppu::UnoType<com::sun::star::sdbcx::XRename>::get(),
+ cppu::UnoType<com::sun::star::sdbcx::XAlterTable>::get(),
ReflectionBase::getTypes());
pCollection = &collection;
}
@@ -405,9 +405,9 @@ Sequence<Type > TableDescriptor::getTypes() throw( RuntimeException, std::except
if( !pCollection )
{
static cppu::OTypeCollection collection(
- getCppuType( (Reference< com::sun::star::sdbcx::XIndexesSupplier> *) 0 ),
- getCppuType( (Reference< com::sun::star::sdbcx::XKeysSupplier> *) 0 ),
- getCppuType( (Reference< com::sun::star::sdbcx::XColumnsSupplier> *) 0 ),
+ cppu::UnoType<com::sun::star::sdbcx::XIndexesSupplier>::get(),
+ cppu::UnoType<com::sun::star::sdbcx::XKeysSupplier>::get(),
+ cppu::UnoType<com::sun::star::sdbcx::XColumnsSupplier>::get(),
ReflectionBase::getTypes());
pCollection = &collection;
}
diff --git a/connectivity/source/drivers/postgresql/pq_xuser.cxx b/connectivity/source/drivers/postgresql/pq_xuser.cxx
index 1ebf29d..63875eb 100644
--- a/connectivity/source/drivers/postgresql/pq_xuser.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xuser.cxx
@@ -115,7 +115,7 @@ Sequence<Type > User::getTypes() throw( RuntimeException, std::exception )
if( !pCollection )
{
static cppu::OTypeCollection collection(
- getCppuType( (Reference< com::sun::star::sdbcx::XUser> *) 0 ),
+ cppu::UnoType<com::sun::star::sdbcx::XUser>::get(),
ReflectionBase::getTypes());
pCollection = &collection;
}
diff --git a/connectivity/source/drivers/postgresql/pq_xview.cxx b/connectivity/source/drivers/postgresql/pq_xview.cxx
index ca2202f..e2e0aaf 100644
--- a/connectivity/source/drivers/postgresql/pq_xview.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xview.cxx
@@ -187,7 +187,7 @@ Sequence<Type > View::getTypes() throw( RuntimeException, std::exception )
if( !pCollection )
{
static cppu::OTypeCollection collection(
- getCppuType( (Reference< com::sun::star::sdbcx::XRename> *) 0 ),
+ cppu::UnoType<com::sun::star::sdbcx::XRename>::get(),
ReflectionBase::getTypes());
pCollection = &collection;
}
diff --git a/connectivity/source/manager/mdrivermanager.cxx b/connectivity/source/manager/mdrivermanager.cxx
index 4e55147..202a835 100644
--- a/connectivity/source/manager/mdrivermanager.cxx
+++ b/connectivity/source/manager/mdrivermanager.cxx
@@ -505,7 +505,7 @@ Reference< XEnumeration > SAL_CALL OSDBCDriverManager::createEnumeration( ) thr
::com::sun::star::uno::Type SAL_CALL OSDBCDriverManager::getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception)
{
- return ::getCppuType(static_cast< Reference< XDriver >* >(NULL));
+ return cppu::UnoType<XDriver>::get();
}
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index 1e003cb..be2c75d 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -1205,9 +1205,9 @@ OSQLParseNode* OSQLParser::predicateTree(OUString& rErrorMessage, const OUString
if (m_nFormatKey && m_xFormatter.is())
{
Any aValue = getNumberFormatProperty( m_xFormatter, m_nFormatKey, OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_LOCALE) );
- OSL_ENSURE(aValue.getValueType() == ::getCppuType((const ::com::sun::star::lang::Locale*)0), "OSQLParser::PredicateTree : invalid language property !");
+ OSL_ENSURE(aValue.getValueType() == cppu::UnoType<com::sun::star::lang::Locale>::get(), "OSQLParser::PredicateTree : invalid language property !");
- if (aValue.getValueType() == ::getCppuType((const ::com::sun::star::lang::Locale*)0))
+ if (aValue.getValueType() == cppu::UnoType<com::sun::star::lang::Locale>::get())
aValue >>= m_pData->aLocale;
}
else
diff --git a/connectivity/source/sdbcx/VCollection.cxx b/connectivity/source/sdbcx/VCollection.cxx
index 76d0692..8081d15 100644
--- a/connectivity/source/sdbcx/VCollection.cxx
+++ b/connectivity/source/sdbcx/VCollection.cxx
@@ -256,7 +256,7 @@ OCollection::~OCollection()
Any SAL_CALL OCollection::queryInterface( const Type & rType ) throw (RuntimeException, std::exception)
{
- if ( m_bUseIndexOnly && rType == ::getCppuType(static_cast< Reference< XNameAccess > *> (NULL)) )
+ if ( m_bUseIndexOnly && rType == cppu::UnoType<XNameAccess>::get() )
{
return Any();
}
@@ -273,7 +273,7 @@ Sequence< Type > SAL_CALL OCollection::getTypes() throw (RuntimeException, std::
::std::vector<Type> aOwnTypes;
aOwnTypes.reserve(aTypes.getLength());
- Type aType = ::getCppuType(static_cast< Reference<XNameAccess> *>(NULL));
+ Type aType = cppu::UnoType<XNameAccess>::get();
for(;pBegin != pEnd; ++pBegin)
{
if ( *pBegin != aType )
@@ -480,7 +480,7 @@ void SAL_CALL OCollection::release() throw()
Type SAL_CALL OCollection::getElementType( ) throw(RuntimeException, std::exception)
{
- return::getCppuType(static_cast< Reference< XPropertySet>*>(NULL));
+ returncppu::UnoType<XPropertySet>::get();
}
sal_Bool SAL_CALL OCollection::hasElements( ) throw(RuntimeException, std::exception)
diff --git a/connectivity/source/sdbcx/VDescriptor.cxx b/connectivity/source/sdbcx/VDescriptor.cxx
index a911b0b..8a1ff43 100644
--- a/connectivity/source/sdbcx/VDescriptor.cxx
+++ b/connectivity/source/sdbcx/VDescriptor.cxx
@@ -133,10 +133,10 @@ namespace connectivity
Sequence< Type > SAL_CALL ODescriptor::getTypes( ) throw(RuntimeException, std::exception)
{
- ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ),
- ::getCppuType( (const Reference< XFastPropertySet > *)0 ),
- ::getCppuType( (const Reference< XPropertySet > *)0 ),
- ::getCppuType( (const Reference< XUnoTunnel > *)0 ));
+ ::cppu::OTypeCollection aTypes( cppu::UnoType<XMultiPropertySet>::get(),
+ cppu::UnoType<XFastPropertySet>::get(),
+ cppu::UnoType<XPropertySet>::get(),
+ cppu::UnoType<XUnoTunnel>::get());
return aTypes.getTypes();
}
diff --git a/connectivity/source/sdbcx/VTable.cxx b/connectivity/source/sdbcx/VTable.cxx
index e9cb3ae..42421f4 100644
--- a/connectivity/source/sdbcx/VTable.cxx
+++ b/connectivity/source/sdbcx/VTable.cxx
@@ -130,7 +130,7 @@ Any SAL_CALL OTable::queryInterface( const Type & rType ) throw(RuntimeException
{
if(!isNew())
aRet = OTable_BASE::queryInterface( rType);
- if(isNew() && (rType == getCppuType( (Reference<XIndexesSupplier>*)0)))
+ if(isNew() && (rType == cppu::UnoType<XIndexesSupplier>::get()))
return Any();
if(!aRet.hasValue())
aRet = OTableDescriptor_BASE::queryInterface( rType);
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 7e73497..f40016d 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -1404,18 +1404,18 @@ OUString GetErrorMessage( const Exception& e )
OUString GetErrorMessage( const com::sun::star::uno::Any& aException )
{
if ( aException.getValueType() ==
- ::getCppuType( (const reflection::InvocationTargetException* ) NULL ) )
+ cppu::UnoType<reflection::InvocationTargetException>::get())
{
reflection::InvocationTargetException ite;
aException >>= ite;
- if ( ite.TargetException.getValueType() == ::getCppuType( ( const provider::ScriptErrorRaisedException* ) NULL ) )
+ if ( ite.TargetException.getValueType() == cppu::UnoType<provider::ScriptErrorRaisedException>::get())
{
// Error raised by script
provider::ScriptErrorRaisedException scriptError;
ite.TargetException >>= scriptError;
return GetErrorMessage( scriptError );
}
- else if ( ite.TargetException.getValueType() == ::getCppuType( ( const provider::ScriptExceptionRaisedException* ) NULL ) )
+ else if ( ite.TargetException.getValueType() == cppu::UnoType<provider::ScriptExceptionRaisedException>::get())
{
// Exception raised by script
provider::ScriptExceptionRaisedException scriptException;
@@ -1429,7 +1429,7 @@ OUString GetErrorMessage( const com::sun::star::uno::Any& aException )
}
}
- else if ( aException.getValueType() == ::getCppuType( ( const provider::ScriptFrameworkErrorException* ) NULL ) )
+ else if ( aException.getValueType() == cppu::UnoType<provider::ScriptFrameworkErrorException>::get())
{
// A Script Framework error has occurred
provider::ScriptFrameworkErrorException sfe;
diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index 644b937..f8ba99e 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -170,7 +170,7 @@ ORowSet::ORowSet( const Reference< ::com::sun::star::uno::XComponentContext >& _
m_aPrematureParamValues.get().resize( 0 );
// sdb.RowSet Properties
- registerMayBeVoidProperty(PROPERTY_ACTIVE_CONNECTION,PROPERTY_ID_ACTIVE_CONNECTION, PropertyAttribute::MAYBEVOID|PropertyAttribute::TRANSIENT|PropertyAttribute::BOUND, &m_aActiveConnection, ::getCppuType(static_cast< Reference< XConnection >* >(0)));
+ registerMayBeVoidProperty(PROPERTY_ACTIVE_CONNECTION,PROPERTY_ID_ACTIVE_CONNECTION, PropertyAttribute::MAYBEVOID|PropertyAttribute::TRANSIENT|PropertyAttribute::BOUND, &m_aActiveConnection, cppu::UnoType<XConnection>::get());
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list