diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2014-05-17 00:23:39 +0200 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2014-05-17 00:24:22 +0200 |
| commit | dd33f91581aaca03a83a70d94195338516742fa2 (patch) | |
| tree | f5ca034e1a928d43cbc00d637bdf3c256dffea7d | |
| parent | 8ae06100856964d849e8c6ecbc85cbb44bcf0414 (diff) | |
Prefer cppu::UnoType<T>::get() to ::getCppuType((T*)0) part14
Change-Id: Ibccaa2138426c22cd63d273a1b6cdc927ebe80dc
34 files changed, 328 insertions, 328 deletions
diff --git a/dtrans/source/generic/generic_clipboard.cxx b/dtrans/source/generic/generic_clipboard.cxx index fee760708b90..d71161980829 100644 --- a/dtrans/source/generic/generic_clipboard.cxx +++ b/dtrans/source/generic/generic_clipboard.cxx @@ -135,7 +135,7 @@ void SAL_CALL GenericClipboard::addClipboardListener( const Reference< XClipboar OSL_ENSURE( !rBHelper.bInDispose, "do not add listeners in the dispose call" ); OSL_ENSURE( !rBHelper.bDisposed, "object is disposed" ); if (!rBHelper.bInDispose && !rBHelper.bDisposed) - rBHelper.aLC.addInterface( getCppuType( (const ::com::sun::star::uno::Reference< XClipboardListener > *) 0), listener ); + rBHelper.aLC.addInterface( cppu::UnoType<XClipboardListener>::get(), listener ); } void SAL_CALL GenericClipboard::removeClipboardListener( const Reference< XClipboardListener >& listener ) diff --git a/embeddedobj/source/commonembedding/embedobj.cxx b/embeddedobj/source/commonembedding/embedobj.cxx index 2bb477c4fc82..048655c40f4b 100644 --- a/embeddedobj/source/commonembedding/embedobj.cxx +++ b/embeddedobj/source/commonembedding/embedobj.cxx @@ -118,7 +118,7 @@ void OCommonEmbeddedObject::StateChangeNotification_Impl( bool bBeforeChange, sa if ( m_pInterfaceContainer ) { ::cppu::OInterfaceContainerHelper* pContainer = m_pInterfaceContainer->getContainer( - ::getCppuType( ( const uno::Reference< embed::XStateChangeListener >*) NULL ) ); + cppu::UnoType<embed::XStateChangeListener>::get()); if ( pContainer != NULL ) { lang::EventObject aSource( static_cast< ::cppu::OWeakObject* >( this ) ); diff --git a/embeddedobj/source/commonembedding/miscobj.cxx b/embeddedobj/source/commonembedding/miscobj.cxx index eda750f7c991..8df625dc06b9 100644 --- a/embeddedobj/source/commonembedding/miscobj.cxx +++ b/embeddedobj/source/commonembedding/miscobj.cxx @@ -323,7 +323,7 @@ void OCommonEmbeddedObject::PostEvent_Impl( const OUString& aEventName ) if ( m_pInterfaceContainer ) { ::cppu::OInterfaceContainerHelper* pIC = m_pInterfaceContainer->getContainer( - ::getCppuType((const uno::Reference< document::XEventListener >*)0) ); + cppu::UnoType<document::XEventListener>::get()); if( pIC ) { document::EventObject aEvent; @@ -358,7 +358,7 @@ uno::Any SAL_CALL OCommonEmbeddedObject::queryInterface( const uno::Type& rType { uno::Any aReturn; - if ( rType == ::getCppuType( (uno::Reference< embed::XEmbeddedObject > const *)0 )) + if ( rType == cppu::UnoType<embed::XEmbeddedObject>::get() ) { void * p = static_cast< embed::XEmbeddedObject * >( this ); return uno::Any( &p, rType ); @@ -414,24 +414,24 @@ uno::Sequence< uno::Type > SAL_CALL OCommonEmbeddedObject::getTypes() if ( m_bIsLink ) { static ::cppu::OTypeCollection aTypeCollection( - ::getCppuType( (const uno::Reference< lang::XTypeProvider >*)NULL ), - ::getCppuType( (const uno::Reference< embed::XEmbeddedObject >*)NULL ), - ::getCppuType( (const uno::Reference< embed::XInplaceObject >*)NULL ), - ::getCppuType( (const uno::Reference< embed::XCommonEmbedPersist >*)NULL ), - ::getCppuType( (const uno::Reference< container::XChild >*)NULL ), - ::getCppuType( (const uno::Reference< embed::XLinkageSupport >*)NULL ) ); + cppu::UnoType<lang::XTypeProvider>::get(), + cppu::UnoType<embed::XEmbeddedObject>::get(), + cppu::UnoType<embed::XInplaceObject>::get(), + cppu::UnoType<embed::XCommonEmbedPersist>::get(), + cppu::UnoType<container::XChild>::get(), + cppu::UnoType<embed::XLinkageSupport>::get()); pTypeCollection = &aTypeCollection ; } else { static ::cppu::OTypeCollection aTypeCollection( - ::getCppuType( (const uno::Reference< lang::XTypeProvider >*)NULL ), - ::getCppuType( (const uno::Reference< embed::XEmbeddedObject >*)NULL ), - ::getCppuType( (const uno::Reference< embed::XInplaceObject >*)NULL ), - ::getCppuType( (const uno::Reference< embed::XCommonEmbedPersist >*)NULL ), - ::getCppuType( (const uno::Reference< container::XChild >*)NULL ), - ::getCppuType( (const uno::Reference< embed::XEmbedPersist >*)NULL ) ); + cppu::UnoType<lang::XTypeProvider>::get(), + cppu::UnoType<embed::XEmbeddedObject>::get(), + cppu::UnoType<embed::XInplaceObject>::get(), + cppu::UnoType<embed::XCommonEmbedPersist>::get(), + cppu::UnoType<container::XChild>::get(), + cppu::UnoType<embed::XEmbedPersist>::get()); pTypeCollection = &aTypeCollection ; } @@ -509,7 +509,7 @@ void SAL_CALL OCommonEmbeddedObject::addStateChangeListener( const uno::Referenc if ( !m_pInterfaceContainer ) m_pInterfaceContainer = new ::cppu::OMultiTypeInterfaceContainerHelper( m_aMutex ); - m_pInterfaceContainer->addInterface( ::getCppuType( (const uno::Reference< embed::XStateChangeListener >*)0 ), + m_pInterfaceContainer->addInterface( cppu::UnoType<embed::XStateChangeListener>::get(), xListener ); } @@ -520,7 +520,7 @@ void SAL_CALL OCommonEmbeddedObject::removeStateChangeListener( { ::osl::MutexGuard aGuard( m_aMutex ); if ( m_pInterfaceContainer ) - m_pInterfaceContainer->removeInterface( ::getCppuType( (const uno::Reference< embed::XStateChangeListener >*)0 ), + m_pInterfaceContainer->removeInterface( cppu::UnoType<embed::XStateChangeListener>::get(), xListener ); } @@ -539,7 +539,7 @@ void SAL_CALL OCommonEmbeddedObject::close( sal_Bool bDeliverOwnership ) if ( m_pInterfaceContainer ) { ::cppu::OInterfaceContainerHelper* pContainer = - m_pInterfaceContainer->getContainer( ::getCppuType( ( const uno::Reference< util::XCloseListener >*) NULL ) ); + m_pInterfaceContainer->getContainer( cppu::UnoType<util::XCloseListener>::get()); if ( pContainer != NULL ) { ::cppu::OInterfaceIteratorHelper pIterator(*pContainer); @@ -557,7 +557,7 @@ void SAL_CALL OCommonEmbeddedObject::close( sal_Bool bDeliverOwnership ) } pContainer = m_pInterfaceContainer->getContainer( - ::getCppuType( ( const uno::Reference< util::XCloseListener >*) NULL ) ); + cppu::UnoType<util::XCloseListener>::get()); if ( pContainer != NULL ) { ::cppu::OInterfaceIteratorHelper pCloseIterator(*pContainer); @@ -640,7 +640,7 @@ void SAL_CALL OCommonEmbeddedObject::addCloseListener( const uno::Reference< uti if ( !m_pInterfaceContainer ) m_pInterfaceContainer = new ::cppu::OMultiTypeInterfaceContainerHelper( m_aMutex ); - m_pInterfaceContainer->addInterface( ::getCppuType( (const uno::Reference< util::XCloseListener >*)0 ), xListener ); + m_pInterfaceContainer->addInterface( cppu::UnoType<util::XCloseListener>::get(), xListener ); } @@ -649,7 +649,7 @@ void SAL_CALL OCommonEmbeddedObject::removeCloseListener( const uno::Reference< { ::osl::MutexGuard aGuard( m_aMutex ); if ( m_pInterfaceContainer ) - m_pInterfaceContainer->removeInterface( ::getCppuType( (const uno::Reference< util::XCloseListener >*)0 ), + m_pInterfaceContainer->removeInterface( cppu::UnoType<util::XCloseListener>::get(), xListener ); } @@ -664,7 +664,7 @@ void SAL_CALL OCommonEmbeddedObject::addEventListener( const uno::Reference< doc if ( !m_pInterfaceContainer ) m_pInterfaceContainer = new ::cppu::OMultiTypeInterfaceContainerHelper( m_aMutex ); - m_pInterfaceContainer->addInterface( ::getCppuType( (const uno::Reference< document::XEventListener >*)0 ), xListener ); + m_pInterfaceContainer->addInterface( cppu::UnoType<document::XEventListener>::get(), xListener ); } @@ -673,7 +673,7 @@ void SAL_CALL OCommonEmbeddedObject::removeEventListener( const uno::Reference< { ::osl::MutexGuard aGuard( m_aMutex ); if ( m_pInterfaceContainer ) - m_pInterfaceContainer->removeInterface( ::getCppuType( (const uno::Reference< document::XEventListener >*)0 ), + m_pInterfaceContainer->removeInterface( cppu::UnoType<document::XEventListener>::get(), xListener ); } diff --git a/embeddedobj/source/commonembedding/specialobject.cxx b/embeddedobj/source/commonembedding/specialobject.cxx index 1342103c13bb..c98b79788377 100644 --- a/embeddedobj/source/commonembedding/specialobject.cxx +++ b/embeddedobj/source/commonembedding/specialobject.cxx @@ -83,9 +83,9 @@ uno::Sequence< uno::Type > SAL_CALL OSpecialEmbeddedObject::getTypes() if ( !pTypeCollection ) { static ::cppu::OTypeCollection aTypeCollection( - ::getCppuType( (const uno::Reference< lang::XTypeProvider >*)NULL ), - ::getCppuType( (const uno::Reference< embed::XEmbeddedObject >*)NULL ), - ::getCppuType( (const uno::Reference< embed::XInplaceObject >*)NULL ) ); + cppu::UnoType<lang::XTypeProvider>::get(), + cppu::UnoType<embed::XEmbeddedObject>::get(), + cppu::UnoType<embed::XInplaceObject>::get()); pTypeCollection = &aTypeCollection ; } diff --git a/embeddedobj/source/general/dummyobject.cxx b/embeddedobj/source/general/dummyobject.cxx index 531cb8fd0064..d4a14811a486 100644 --- a/embeddedobj/source/general/dummyobject.cxx +++ b/embeddedobj/source/general/dummyobject.cxx @@ -62,7 +62,7 @@ void ODummyEmbeddedObject::PostEvent_Impl( const OUString& aEventName ) if ( m_pInterfaceContainer ) { ::cppu::OInterfaceContainerHelper* pIC = m_pInterfaceContainer->getContainer( - ::getCppuType((const uno::Reference< document::XEventListener >*)0) ); + cppu::UnoType<document::XEventListener>::get()); if( pIC ) { document::EventObject aEvent; @@ -596,7 +596,7 @@ void SAL_CALL ODummyEmbeddedObject::addStateChangeListener( const uno::Reference if ( !m_pInterfaceContainer ) m_pInterfaceContainer = new ::cppu::OMultiTypeInterfaceContainerHelper( m_aMutex ); - m_pInterfaceContainer->addInterface( ::getCppuType( (const uno::Reference< embed::XStateChangeListener >*)0 ), + m_pInterfaceContainer->addInterface( cppu::UnoType<embed::XStateChangeListener>::get(), xListener ); } @@ -607,7 +607,7 @@ void SAL_CALL ODummyEmbeddedObject::removeStateChangeListener( { ::osl::MutexGuard aGuard( m_aMutex ); if ( m_pInterfaceContainer ) - m_pInterfaceContainer->removeInterface( ::getCppuType( (const uno::Reference< embed::XStateChangeListener >*)0 ), + m_pInterfaceContainer->removeInterface( cppu::UnoType<embed::XStateChangeListener>::get(), xListener ); } @@ -626,7 +626,7 @@ void SAL_CALL ODummyEmbeddedObject::close( sal_Bool bDeliverOwnership ) if ( m_pInterfaceContainer ) { ::cppu::OInterfaceContainerHelper* pContainer = - m_pInterfaceContainer->getContainer( ::getCppuType( ( const uno::Reference< util::XCloseListener >*) NULL ) ); + m_pInterfaceContainer->getContainer( cppu::UnoType<util::XCloseListener>::get()); if ( pContainer != NULL ) { ::cppu::OInterfaceIteratorHelper pIterator(*pContainer); @@ -644,7 +644,7 @@ void SAL_CALL ODummyEmbeddedObject::close( sal_Bool bDeliverOwnership ) } pContainer = m_pInterfaceContainer->getContainer( - ::getCppuType( ( const uno::Reference< util::XCloseListener >*) NULL ) ); + cppu::UnoType<util::XCloseListener>::get()); if ( pContainer != NULL ) { ::cppu::OInterfaceIteratorHelper pCloseIterator(*pContainer); @@ -678,7 +678,7 @@ void SAL_CALL ODummyEmbeddedObject::addCloseListener( const uno::Reference< util if ( !m_pInterfaceContainer ) m_pInterfaceContainer = new ::cppu::OMultiTypeInterfaceContainerHelper( m_aMutex ); - m_pInterfaceContainer->addInterface( ::getCppuType( (const uno::Reference< util::XCloseListener >*)0 ), xListener ); + m_pInterfaceContainer->addInterface( cppu::UnoType<util::XCloseListener>::get(), xListener ); } @@ -687,7 +687,7 @@ void SAL_CALL ODummyEmbeddedObject::removeCloseListener( const uno::Reference< u { ::osl::MutexGuard aGuard( m_aMutex ); if ( m_pInterfaceContainer ) - m_pInterfaceContainer->removeInterface( ::getCppuType( (const uno::Reference< util::XCloseListener >*)0 ), + m_pInterfaceContainer->removeInterface( cppu::UnoType<util::XCloseListener>::get(), xListener ); } @@ -702,7 +702,7 @@ void SAL_CALL ODummyEmbeddedObject::addEventListener( const uno::Reference< docu if ( !m_pInterfaceContainer ) m_pInterfaceContainer = new ::cppu::OMultiTypeInterfaceContainerHelper( m_aMutex ); - m_pInterfaceContainer->addInterface( ::getCppuType( (const uno::Reference< document::XEventListener >*)0 ), xListener ); + m_pInterfaceContainer->addInterface( cppu::UnoType<document::XEventListener>::get(), xListener ); } @@ -711,7 +711,7 @@ void SAL_CALL ODummyEmbeddedObject::removeEventListener( const uno::Reference< d { ::osl::MutexGuard aGuard( m_aMutex ); if ( m_pInterfaceContainer ) - m_pInterfaceContainer->removeInterface( ::getCppuType( (const uno::Reference< document::XEventListener >*)0 ), + m_pInterfaceContainer->removeInterface( cppu::UnoType<document::XEventListener>::get(), xListener ); } diff --git a/embeddedobj/source/msole/olecomponent.cxx b/embeddedobj/source/msole/olecomponent.cxx index e8d65883f85d..8e000702f98a 100644 --- a/embeddedobj/source/msole/olecomponent.cxx +++ b/embeddedobj/source/msole/olecomponent.cxx @@ -1440,7 +1440,7 @@ void SAL_CALL OleComponent::close( sal_Bool bDeliverOwnership ) if ( m_pInterfaceContainer ) { ::cppu::OInterfaceContainerHelper* pContainer = - m_pInterfaceContainer->getContainer( ::getCppuType( ( const uno::Reference< util::XCloseListener >* ) NULL ) ); + m_pInterfaceContainer->getContainer( cppu::UnoType<util::XCloseListener>::get()); if ( pContainer != NULL ) { ::cppu::OInterfaceIteratorHelper pIterator( *pContainer ); @@ -1458,7 +1458,7 @@ void SAL_CALL OleComponent::close( sal_Bool bDeliverOwnership ) } pContainer = m_pInterfaceContainer->getContainer( - ::getCppuType( ( const uno::Reference< util::XCloseListener >* ) NULL ) ); + cppu::UnoType<util::XCloseListener>::get()); if ( pContainer != NULL ) { ::cppu::OInterfaceIteratorHelper pCloseIterator( *pContainer ); @@ -1490,7 +1490,7 @@ void SAL_CALL OleComponent::addCloseListener( const uno::Reference< util::XClose if ( !m_pInterfaceContainer ) m_pInterfaceContainer = new ::cppu::OMultiTypeInterfaceContainerHelper( m_aMutex ); - m_pInterfaceContainer->addInterface( ::getCppuType( ( const uno::Reference< util::XCloseListener >* )0 ), xListener ); + m_pInterfaceContainer->addInterface( cppu::UnoType<util::XCloseListener>::get(), xListener ); } @@ -1502,7 +1502,7 @@ void SAL_CALL OleComponent::removeCloseListener( const uno::Reference< util::XCl throw lang::DisposedException(); // TODO if ( m_pInterfaceContainer ) - m_pInterfaceContainer->removeInterface( ::getCppuType( ( const uno::Reference< util::XCloseListener >* )0 ), + m_pInterfaceContainer->removeInterface( cppu::UnoType<util::XCloseListener>::get(), xListener ); } @@ -1576,7 +1576,7 @@ uno::Any SAL_CALL OleComponent::getTransferData( const datatransfer::DataFlavor& } // TODO: Investigate if there is already the format name // and whether this format is really required - else if ( aFlavor.DataType == getCppuType( ( const uno::Reference< io::XInputStream >* ) 0 ) + else if ( aFlavor.DataType == cppu::UnoType<io::XInputStream>::get() && aFlavor.MimeType == "application/x-openoffice-contentstream" ) { // allow to retrieve stream-representation of the object persistence @@ -1670,7 +1670,7 @@ void SAL_CALL OleComponent::addEventListener( const uno::Reference< lang::XEvent if ( !m_pInterfaceContainer ) m_pInterfaceContainer = new ::cppu::OMultiTypeInterfaceContainerHelper( m_aMutex ); - m_pInterfaceContainer->addInterface( ::getCppuType( ( const uno::Reference< lang::XEventListener >* )0 ), xListener ); + m_pInterfaceContainer->addInterface( cppu::UnoType<lang::XEventListener>::get(), xListener ); } @@ -1682,7 +1682,7 @@ void SAL_CALL OleComponent::removeEventListener( const uno::Reference< lang::XEv throw lang::DisposedException(); // TODO if ( m_pInterfaceContainer ) - m_pInterfaceContainer->removeInterface( ::getCppuType( ( const uno::Reference< lang::XEventListener >* )0 ), + m_pInterfaceContainer->removeInterface( cppu::UnoType<lang::XEventListener>::get(), xListener ); } @@ -1732,7 +1732,7 @@ void SAL_CALL OleComponent::setModified( sal_Bool bModified ) if ( bModified && m_pInterfaceContainer ) { ::cppu::OInterfaceContainerHelper* pContainer = - m_pInterfaceContainer->getContainer( ::getCppuType( ( const uno::Reference< util::XModifyListener >* ) NULL ) ); + m_pInterfaceContainer->getContainer( cppu::UnoType<util::XModifyListener>::get()); if ( pContainer != NULL ) { ::cppu::OInterfaceIteratorHelper pIterator( *pContainer ); @@ -1761,7 +1761,7 @@ void SAL_CALL OleComponent::addModifyListener( const com::sun::star::uno::Refere if ( !m_pInterfaceContainer ) m_pInterfaceContainer = new ::cppu::OMultiTypeInterfaceContainerHelper( m_aMutex ); - m_pInterfaceContainer->addInterface( ::getCppuType( ( const uno::Reference< util::XModifyListener >* )0 ), xListener ); + m_pInterfaceContainer->addInterface( cppu::UnoType<util::XModifyListener>::get(), xListener ); } void SAL_CALL OleComponent::removeModifyListener( const com::sun::star::uno::Reference < com::sun::star::util::XModifyListener >& xListener) throw(::com::sun::star::uno::RuntimeException) @@ -1771,7 +1771,7 @@ void SAL_CALL OleComponent::removeModifyListener( const com::sun::star::uno::Ref throw lang::DisposedException(); // TODO if ( m_pInterfaceContainer ) - m_pInterfaceContainer->removeInterface( ::getCppuType( ( const uno::Reference< util::XModifyListener >* )0 ), + m_pInterfaceContainer->removeInterface( cppu::UnoType<util::XModifyListener>::get(), xListener ); } diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx index 9c6326bbb5df..4a43d1ed891d 100644 --- a/embeddedobj/source/msole/oleembed.cxx +++ b/embeddedobj/source/msole/oleembed.cxx @@ -125,7 +125,7 @@ void OleEmbeddedObject::MoveListeners() // move state change listeners { ::cppu::OInterfaceContainerHelper* pStateChangeContainer = - m_pInterfaceContainer->getContainer( ::getCppuType( ( const uno::Reference< embed::XStateChangeListener >*) NULL ) ); + m_pInterfaceContainer->getContainer( cppu::UnoType<embed::XStateChangeListener>::get()); if ( pStateChangeContainer != NULL ) { uno::Reference< embed::XStateChangeBroadcaster > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY ); @@ -150,7 +150,7 @@ void OleEmbeddedObject::MoveListeners() // move event listeners { ::cppu::OInterfaceContainerHelper* pEventContainer = - m_pInterfaceContainer->getContainer( ::getCppuType( ( const uno::Reference< document::XEventListener >*) NULL ) ); + m_pInterfaceContainer->getContainer( cppu::UnoType<document::XEventListener>::get()); if ( pEventContainer != NULL ) { uno::Reference< document::XEventBroadcaster > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY ); @@ -175,7 +175,7 @@ void OleEmbeddedObject::MoveListeners() // move close listeners { ::cppu::OInterfaceContainerHelper* pCloseContainer = - m_pInterfaceContainer->getContainer( ::getCppuType( ( const uno::Reference< util::XCloseListener >*) NULL ) ); + m_pInterfaceContainer->getContainer( cppu::UnoType<util::XCloseListener>::get()); if ( pCloseContainer != NULL ) { uno::Reference< util::XCloseBroadcaster > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY ); diff --git a/embeddedobj/source/msole/olemisc.cxx b/embeddedobj/source/msole/olemisc.cxx index 7bd0354d5f69..8e321806ccbf 100644 --- a/embeddedobj/source/msole/olemisc.cxx +++ b/embeddedobj/source/msole/olemisc.cxx @@ -167,7 +167,7 @@ void OleEmbeddedObject::MakeEventListenerNotification_Impl( const OUString& aEve { ::cppu::OInterfaceContainerHelper* pContainer = m_pInterfaceContainer->getContainer( - ::getCppuType( ( const uno::Reference< document::XEventListener >*) NULL ) ); + cppu::UnoType<document::XEventListener>::get()); if ( pContainer != NULL ) { document::EventObject aEvent( static_cast< ::cppu::OWeakObject* >( this ), aEventName ); @@ -192,7 +192,7 @@ void OleEmbeddedObject::StateChangeNotification_Impl( sal_Bool bBeforeChange, sa if ( m_pInterfaceContainer ) { ::cppu::OInterfaceContainerHelper* pContainer = m_pInterfaceContainer->getContainer( - ::getCppuType( ( const uno::Reference< embed::XStateChangeListener >*) NULL ) ); + cppu::UnoType<embed::XStateChangeListener>::get()); if ( pContainer != NULL ) { lang::EventObject aSource( static_cast< ::cppu::OWeakObject* >( this ) ); @@ -421,7 +421,7 @@ void SAL_CALL OleEmbeddedObject::addStateChangeListener( const uno::Reference< e if ( !m_pInterfaceContainer ) m_pInterfaceContainer = new ::cppu::OMultiTypeInterfaceContainerHelper( m_aMutex ); - m_pInterfaceContainer->addInterface( ::getCppuType( (const uno::Reference< embed::XStateChangeListener >*)0 ), + m_pInterfaceContainer->addInterface( cppu::UnoType<embed::XStateChangeListener>::get(), xListener ); } @@ -442,7 +442,7 @@ void SAL_CALL OleEmbeddedObject::removeStateChangeListener( ::osl::MutexGuard aGuard( m_aMutex ); if ( m_pInterfaceContainer ) - m_pInterfaceContainer->removeInterface( ::getCppuType( (const uno::Reference< embed::XStateChangeListener >*)0 ), + m_pInterfaceContainer->removeInterface( cppu::UnoType<embed::XStateChangeListener>::get(), xListener ); } @@ -472,7 +472,7 @@ void SAL_CALL OleEmbeddedObject::close( sal_Bool bDeliverOwnership ) if ( m_pInterfaceContainer ) { ::cppu::OInterfaceContainerHelper* pContainer = - m_pInterfaceContainer->getContainer( ::getCppuType( ( const uno::Reference< util::XCloseListener >*) NULL ) ); + m_pInterfaceContainer->getContainer( cppu::UnoType<util::XCloseListener>::get()); if ( pContainer != NULL ) { ::cppu::OInterfaceIteratorHelper pIterator(*pContainer); @@ -490,7 +490,7 @@ void SAL_CALL OleEmbeddedObject::close( sal_Bool bDeliverOwnership ) } pContainer = m_pInterfaceContainer->getContainer( - ::getCppuType( ( const uno::Reference< util::XCloseListener >*) NULL ) ); + cppu::UnoType<util::XCloseListener>::get()); if ( pContainer != NULL ) { ::cppu::OInterfaceIteratorHelper pCloseIterator(*pContainer); @@ -532,7 +532,7 @@ void SAL_CALL OleEmbeddedObject::addCloseListener( const uno::Reference< util::X if ( !m_pInterfaceContainer ) m_pInterfaceContainer = new ::cppu::OMultiTypeInterfaceContainerHelper( m_aMutex ); - m_pInterfaceContainer->addInterface( ::getCppuType( (const uno::Reference< util::XCloseListener >*)0 ), xListener ); + m_pInterfaceContainer->addInterface( cppu::UnoType<util::XCloseListener>::get(), xListener ); } @@ -554,7 +554,7 @@ void SAL_CALL OleEmbeddedObject::removeCloseListener( const uno::Reference< util throw lang::DisposedException(); // TODO if ( m_pInterfaceContainer ) - m_pInterfaceContainer->removeInterface( ::getCppuType( (const uno::Reference< util::XCloseListener >*)0 ), + m_pInterfaceContainer->removeInterface( cppu::UnoType<util::XCloseListener>::get(), xListener ); } @@ -579,7 +579,7 @@ void SAL_CALL OleEmbeddedObject::addEventListener( const uno::Reference< documen if ( !m_pInterfaceContainer ) m_pInterfaceContainer = new ::cppu::OMultiTypeInterfaceContainerHelper( m_aMutex ); - m_pInterfaceContainer->addInterface( ::getCppuType( (const uno::Reference< document::XEventListener >*)0 ), xListener ); + m_pInterfaceContainer->addInterface( cppu::UnoType<document::XEventListener>::get(), xListener ); } @@ -602,7 +602,7 @@ void SAL_CALL OleEmbeddedObject::removeEventListener( throw lang::DisposedException(); // TODO if ( m_pInterfaceContainer ) - m_pInterfaceContainer->removeInterface( ::getCppuType( (const uno::Reference< document::XEventListener >*)0 ), + m_pInterfaceContainer->removeInterface( cppu::UnoType<document::XEventListener>::get(), xListener ); } diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx index cd0b425773f0..d746eadcb279 100644 --- a/sc/source/core/data/dptabsrc.cxx +++ b/sc/source/core/data/dptabsrc.cxx @@ -1301,7 +1301,7 @@ sal_Bool SAL_CALL ScDPDimensions::hasByName( const OUString& aName ) throw(uno:: uno::Type SAL_CALL ScDPDimensions::getElementType() throw(uno::RuntimeException, std::exception) { - return getCppuType((uno::Reference<container::XNamed>*)0); + return cppu::UnoType<container::XNamed>::get(); } sal_Bool SAL_CALL ScDPDimensions::hasElements() throw(uno::RuntimeException, std::exception) @@ -1523,7 +1523,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPDimension::getPropertySetIn { OUString(SC_UNO_DP_ISDATALAYOUT), 0, getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0 }, { OUString(SC_UNO_DP_NUMBERFO), 0, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::READONLY, 0 }, { OUString(SC_UNO_DP_ORIENTATION), 0, cppu::UnoType<sheet::DataPilotFieldOrientation>::get(), 0, 0 }, - { OUString(SC_UNO_DP_ORIGINAL), 0, getCppuType((uno::Reference<container::XNamed>*)0), beans::PropertyAttribute::READONLY, 0 }, + { OUString(SC_UNO_DP_ORIGINAL), 0, cppu::UnoType<container::XNamed>::get(), beans::PropertyAttribute::READONLY, 0 }, { OUString(SC_UNO_DP_ORIGINAL_POS), 0, cppu::UnoType<sal_Int32>::get(), 0, 0 }, { OUString(SC_UNO_DP_POSITION), 0, cppu::UnoType<sal_Int32>::get(), 0, 0 }, { OUString(SC_UNO_DP_REFVALUE), 0, cppu::UnoType<sheet::DataPilotFieldReference>::get(), 0, 0 }, @@ -1779,7 +1779,7 @@ sal_Bool SAL_CALL ScDPHierarchies::hasByName( const OUString& aName ) throw(uno: uno::Type SAL_CALL ScDPHierarchies::getElementType() throw(uno::RuntimeException, std::exception) { - return getCppuType((uno::Reference<container::XNamed>*)0); + return cppu::UnoType<container::XNamed>::get(); } sal_Bool SAL_CALL ScDPHierarchies::hasElements() throw(uno::RuntimeException, std::exception) @@ -1958,7 +1958,7 @@ sal_Bool SAL_CALL ScDPLevels::hasByName( const OUString& aName ) throw(uno::Runt uno::Type SAL_CALL ScDPLevels::getElementType() throw(uno::RuntimeException, std::exception) { - return getCppuType((uno::Reference<container::XNamed>*)0); + return cppu::UnoType<container::XNamed>::get(); } sal_Bool SAL_CALL ScDPLevels::hasElements() throw(uno::RuntimeException, std::exception) @@ -2437,7 +2437,7 @@ sal_Bool SAL_CALL ScDPMembers::hasByName( const OUString& aName ) throw(uno::Run uno::Type SAL_CALL ScDPMembers::getElementType() throw(uno::RuntimeException, std::exception) { - return getCppuType((uno::Reference<container::XNamed>*)0); + return cppu::UnoType<container::XNamed>::get(); } sal_Bool SAL_CALL ScDPMembers::hasElements() throw(uno::RuntimeException, std::exception) diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx index 49b3ab2ebcfb..77567d4a4707 100644 --- a/sc/source/core/tool/addincol.cxx +++ b/sc/source/core/tool/addincol.cxx @@ -684,8 +684,8 @@ static bool lcl_ValidReturnType( const uno::Reference<reflection::XIdlClass>& xC OUString sName = xClass->getName(); return ( - IsTypeName( sName, getCppuType((uno::Reference<sheet::XVolatileResult>*)0) ) || - IsTypeName( sName, getCppuType((uno::Reference<uno::XInterface>*)0) ) ); + IsTypeName( sName, cppu::UnoType<util::DateTime>::get()) || + IsTypeName( sName, cppu::UnoType<uno::XInterface>::get()) ); } default: @@ -734,13 +734,13 @@ static ScAddInArgumentType lcl_GetArgType( const uno::Reference<reflection::XIdl if (IsTypeName( sName, getCppuType((uno::Sequence< uno::Sequence<uno::Any> >*)0) )) return SC_ADDINARG_MIXED_ARRAY; - if (IsTypeName( sName, getCppuType((uno::Any*)0) )) + if (IsTypeName( sName, cppu::UnoType<util::DateTime>::get())) return SC_ADDINARG_VALUE_OR_ARRAY; - if (IsTypeName( sName, getCppuType((uno::Reference<table::XCellRange>*)0) )) + if (IsTypeName( sName, cppu::UnoType<table::XCellRange>::get())) return SC_ADDINARG_CELLRANGE; - if (IsTypeName( sName, getCppuType((uno::Reference<beans::XPropertySet>*)0) )) + if (IsTypeName( sName, cppu::UnoType<beans::XPropertySet>::get())) return SC_ADDINARG_CALLER; if (IsTypeName( sName, getCppuType((uno::Sequence<uno::Any>*)0) )) @@ -819,13 +819,13 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Reference<uno::XInterface>& OUString sName = xClass->getName(); bSkip = ( IsTypeName( sName, - getCppuType((uno::Reference<uno::XInterface>*)0) ) || + cppu::UnoType<uno::XInterface>::get()) || IsTypeName( sName, - getCppuType((uno::Reference<lang::XServiceName>*)0) ) || + cppu::UnoType<util::DateTime>::get()) || IsTypeName( sName, - getCppuType((uno::Reference<lang::XServiceInfo>*)0) ) || + cppu::UnoType<lang::XServiceInfo>::get()) || IsTypeName( sName, - getCppuType((uno::Reference<sheet::XAddIn>*)0) ) ); + cppu::UnoType<util::DateTime>::get()) ); } if (!bSkip) { @@ -1491,10 +1491,10 @@ void ScUnoAddInCall::ExecuteCallWithArgs(uno::Sequence<uno::Any>& rCallArgs) catch(const reflection::InvocationTargetException& rWrapped) { if ( rWrapped.TargetException.getValueType().equals( - getCppuType( (lang::IllegalArgumentException*)0 ) ) ) + cppu::UnoType<util::DateTime>::get()) ) nErrCode = errIllegalArgument; else if ( rWrapped.TargetException.getValueType().equals( - getCppuType( (sheet::NoConvergenceException*)0 ) ) ) + cppu::UnoType<util::DateTime>::get()) ) nErrCode = errNoConvergence; else nErrCode = errNoValue; diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx index 6dea4937bb2d..e99fcdb8985b 100644 --- a/sc/source/filter/xml/xmlwrap.cxx +++ b/sc/source/filter/xml/xmlwrap.cxx @@ -333,14 +333,14 @@ bool ScXMLImportWrapper::Import(bool bStylesOnly, ErrCode& nError) { OUString("ProgressRange"), 0, ::cppu::UnoType<sal_Int32>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, { OUString("ProgressMax"), 0, ::cppu::UnoType<sal_Int32>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, { OUString("ProgressCurrent"), 0, ::cppu::UnoType<sal_Int32>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { OUString("NumberStyles"), 0, ::getCppuType((uno::Reference<container::XNameAccess> *)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { OUString("PrivateData"), 0, ::getCppuType( (uno::Reference<uno::XInterface> *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, + { OUString("NumberStyles"), 0, cppu::UnoType<container::XNameAccess>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, + { OUString("PrivateData"), 0, cppu::UnoType<uno::XInterface>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("BaseURI"), 0, ::cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("StreamRelPath"), 0, ::cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("StreamName"), 0, ::cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("BuildId"), 0, ::cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("VBACompatibilityMode"), 0, ::getBooleanCppuType(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, - { OUString("ScriptConfiguration"), 0, ::getCppuType((uno::Reference<container::XNameAccess> *)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, + { OUString("ScriptConfiguration"), 0, cppu::UnoType<container::XNameAccess>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, { OUString("OrganizerMode"), 0, ::getBooleanCppuType(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("SourceStorage"), 0, cppu::UnoType<embed::XStorage>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index c08555919085..3c48184dcfb3 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -1707,7 +1707,7 @@ uno::Any SAL_CALL ScAccessibleDocument::queryInterface( uno::Type const & rType throw (uno::RuntimeException, std::exception) { uno::Any aAnyTmp; - if(rType == ::getCppuType((com::sun::star::uno::Reference<XAccessibleGetAccFlowTo> *)NULL) ) + if(rType == cppu::UnoType<XAccessibleGetAccFlowTo>::get()) { com::sun::star::uno::Reference<XAccessibleGetAccFlowTo> AccFromXShape = this; aAnyTmp <<= AccFromXShape; diff --git a/sc/source/ui/Accessibility/AccessibleTableBase.cxx b/sc/source/ui/Accessibility/AccessibleTableBase.cxx index f3d641a0397d..246e09ac0876 100644 --- a/sc/source/ui/Accessibility/AccessibleTableBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleTableBase.cxx @@ -65,7 +65,7 @@ void SAL_CALL ScAccessibleTableBase::disposing() uno::Any SAL_CALL ScAccessibleTableBase::queryInterface( uno::Type const & rType ) throw (uno::RuntimeException, std::exception) { - if ( rType == ::getCppuType((uno::Reference<XAccessibleTableSelection> *)0) ) + if ( rType == cppu::UnoType<XAccessibleTableSelection>::get()) { return uno::Any(uno::Reference<XAccessibleTableSelection>(this)); } diff --git a/sc/source/ui/unoobj/addruno.cxx b/sc/source/ui/unoobj/addruno.cxx index d0571a97bd1b..82f540905501 100644 --- a/sc/source/ui/unoobj/addruno.cxx +++ b/sc/source/ui/unoobj/addruno.cxx @@ -100,7 +100,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScAddressConversionObj::getProp { static const SfxItemPropertyMapEntry aPropertyMap[] = { - { OUString(SC_UNONAME_ADDRESS), 0, getCppuType((table::CellRangeAddress*)0), 0, 0 }, + { OUString(SC_UNONAME_ADDRESS), 0, cppu::UnoType<table::CellRangeAddress>::get(), 0, 0 }, { OUString(SC_UNONAME_PERSREPR), 0, cppu::UnoType<OUString>::get(), 0, 0 }, { OUString(SC_UNONAME_XLA1REPR), 0, cppu::UnoType<OUString>::get(), 0, 0 }, { OUString(SC_UNONAME_REFSHEET), 0, cppu::UnoType<sal_Int32>::get(), 0, 0 }, @@ -115,7 +115,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScAddressConversionObj::getProp { static const SfxItemPropertyMapEntry aPropertyMap[] = { - { OUString(SC_UNONAME_ADDRESS), 0, getCppuType((table::CellAddress*)0), 0, 0 }, + { OUString(SC_UNONAME_ADDRESS), 0, cppu::UnoType<table::CellAddress>::get(), 0, 0 }, { OUString(SC_UNONAME_PERSREPR), 0, cppu::UnoType<OUString>::get(), 0, 0 }, { OUString(SC_UNONAME_XLA1REPR), 0, cppu::UnoType<OUString>::get(), 0, 0 }, { OUString(SC_UNONAME_REFSHEET), 0, cppu::UnoType<sal_Int32>::get(), 0, 0 }, diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx index 465cc605efdc..e08e22519477 100644 --- a/sc/source/ui/unoobj/afmtuno.cxx +++ b/sc/source/ui/unoobj/afmtuno.cxx @@ -335,7 +335,7 @@ uno::Any SAL_CALL ScAutoFormatsObj::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScAutoFormatsObj::getElementType() throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - return ::getCppuType((const uno::Reference< container::XNamed >*)0); // muss zu getByIndex passen + return cppu::UnoType<container::XNamed>::get(); // muss zu getByIndex passen } sal_Bool SAL_CALL ScAutoFormatsObj::hasElements() throw(uno::RuntimeException, std::exception) @@ -497,7 +497,7 @@ uno::Any SAL_CALL ScAutoFormatObj::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScAutoFormatObj::getElementType() throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - return ::getCppuType((const uno::Reference< beans::XPropertySet >*)0); // muss zu getByIndex passen + return cppu::UnoType<beans::XPropertySet>::get(); // muss zu getByIndex passen } sal_Bool SAL_CALL ScAutoFormatObj::hasElements() throw(uno::RuntimeException, std::exception) diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index c15fc3d007e1..f07ffd21eca2 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -206,9 +206,9 @@ static const SfxItemPropertySet* lcl_GetCellsPropertySet() {OUString(SC_UNONAME_CWORDMOD), ATTR_FONT_WORDLINE, getBooleanCppuType(), 0, 0 }, {OUString(SC_UNONAME_CHCOLHDR), SC_WID_UNO_CHCOLHDR,getBooleanCppuType(), 0, 0 }, {OUString(SC_UNONAME_CHROWHDR), SC_WID_UNO_CHROWHDR,getBooleanCppuType(), 0, 0 }, - {OUString(SC_UNONAME_CONDFMT), SC_WID_UNO_CONDFMT, getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 }, - {OUString(SC_UNONAME_CONDLOC), SC_WID_UNO_CONDLOC, getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 }, - {OUString(SC_UNONAME_CONDXML), SC_WID_UNO_CONDXML, getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 }, + {OUString(SC_UNONAME_CONDFMT), SC_WID_UNO_CONDFMT, cppu::UnoType<sheet::XSheetConditionalEntries>::get(), 0, 0 }, + {OUString(SC_UNONAME_CONDLOC), SC_WID_UNO_CONDLOC, cppu::UnoType<sheet::XSheetConditionalEntries>::get(), 0, 0 }, + {OUString(SC_UNONAME_CONDXML), SC_WID_UNO_CONDXML, cppu::UnoType<sheet::XSheetConditionalEntries>::get(), 0, 0 }, {OUString(SC_UNONAME_DIAGONAL_BLTR), ATTR_BORDER_BLTR, ::cppu::UnoType<table::BorderLine>::get(), 0, 0 | CONVERT_TWIPS }, {OUString(SC_UNONAME_DIAGONAL_BLTR2), ATTR_BORDER_BLTR, ::cppu::UnoType<table::BorderLine2>::get(), 0, 0 | CONVERT_TWIPS }, {OUString(SC_UNONAME_DIAGONAL_TLBR), ATTR_BORDER_TLBR, ::cppu::UnoType<table::BorderLine>::get(), 0, 0 | CONVERT_TWIPS }, @@ -220,7 +220,7 @@ static const SfxItemPropertySet* lcl_GetCellsPropertySet() {OUString(SC_UNONAME_LEFTBORDER),ATTR_BORDER, ::cppu::UnoType<table::BorderLine>::get(), 0, LEFT_BORDER | CONVERT_TWIPS }, {OUString(SC_UNONAME_LEFTBORDER2),ATTR_BORDER, ::cppu::UnoType<table::BorderLine2>::get(), 0, LEFT_BORDER | CONVERT_TWIPS }, {OUString(SC_UNONAME_NUMFMT), ATTR_VALUE_FORMAT, cppu::UnoType<sal_Int32>::get(), 0, 0 }, - {OUString(SC_UNONAME_NUMRULES), SC_WID_UNO_NUMRULES,getCppuType((const uno::Reference<container::XIndexReplace>*)0), 0, 0 }, + {OUString(SC_UNONAME_NUMRULES), SC_WID_UNO_NUMRULES,cppu::UnoType<container::XIndexReplace>::get(), 0, 0 }, {OUString(SC_UNONAME_CELLORI), ATTR_STACKED, cppu::UnoType<table::CellOrientation>::get(), 0, 0 }, {OUString(SC_UNONAME_PADJUST), ATTR_HOR_JUSTIFY, ::cppu::UnoType<sal_Int16>::get(), 0, MID_HORJUST_ADJUST }, {OUString(SC_UNONAME_PBMARGIN), ATTR_MARGIN, cppu::UnoType<sal_Int32>::get(), 0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS }, @@ -243,10 +243,10 @@ static const SfxItemPropertySet* lcl_GetCellsPropertySet() {OUString(SC_UNONAME_TBLBORD2), SC_WID_UNO_TBLBORD2, cppu::UnoType<table::TableBorder2>::get(), 0, 0 | CONVERT_TWIPS }, {OUString(SC_UNONAME_TOPBORDER),ATTR_BORDER, ::cppu::UnoType<table::BorderLine>::get(), 0, TOP_BORDER | CONVERT_TWIPS }, {OUString(SC_UNONAME_TOPBORDER2),ATTR_BORDER, ::cppu::UnoType<table::BorderLine2>::get(), 0, TOP_BORDER | CONVERT_TWIPS }, - {OUString(SC_UNONAME_USERDEF), ATTR_USERDEF, getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 }, - {OUString(SC_UNONAME_VALIDAT), SC_WID_UNO_VALIDAT, getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 }, - {OUString(SC_UNONAME_VALILOC), SC_WID_UNO_VALILOC, getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 }, - {OUString(SC_UNONAME_VALIXML), SC_WID_UNO_VALIXML, getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 }, + {OUString(SC_UNONAME_USERDEF), ATTR_USERDEF, cppu::UnoType<container::XNameContainer>::get(), 0, 0 }, + {OUString(SC_UNONAME_VALIDAT), SC_WID_UNO_VALIDAT, cppu::UnoType<beans::XPropertySet>::get(), 0, 0 }, + {OUString(SC_UNONAME_VALILOC), SC_WID_UNO_VALILOC, cppu::UnoType<beans::XPropertySet>::get(), 0, 0 }, + {OUString(SC_UNONAME_VALIXML), SC_WID_UNO_VALIXML, cppu::UnoType<beans::XPropertySet>::get(), 0, 0 }, {OUString(SC_UNONAME_CELLVJUS), ATTR_VER_JUSTIFY, cppu::UnoType<sal_Int32>::get(), 0, 0 }, {OUString(SC_UNONAME_CELLVJUS_METHOD), ATTR_VER_JUSTIFY_METHOD, ::cppu::UnoType<sal_Int32>::get(), 0, 0 }, {OUString(SC_UNONAME_WRITING), ATTR_WRITINGDIR, cppu::UnoType<sal_Int16>::get(), 0, 0 }, @@ -315,9 +315,9 @@ static const SfxItemPropertySet* lcl_GetRangePropertySet() {OUString(SC_UNONAME_CWORDMOD), ATTR_FONT_WORDLINE, getBooleanCppuType(), 0, 0 }, {OUString(SC_UNONAME_CHCOLHDR), SC_WID_UNO_CHCOLHDR,getBooleanCppuType(), 0, 0 }, {OUString(SC_UNONAME_CHROWHDR), SC_WID_UNO_CHROWHDR,getBooleanCppuType(), 0, 0 }, - {OUString(SC_UNONAME_CONDFMT), SC_WID_UNO_CONDFMT, getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 }, - {OUString(SC_UNONAME_CONDLOC), SC_WID_UNO_CONDLOC, getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 }, - {OUString(SC_UNONAME_CONDXML), SC_WID_UNO_CONDXML, getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 }, + {OUString(SC_UNONAME_CONDFMT), SC_WID_UNO_CONDFMT, cppu::UnoType<sheet::XSheetConditionalEntries>::get(), 0, 0 }, + {OUString(SC_UNONAME_CONDLOC), SC_WID_UNO_CONDLOC, cppu::UnoType<sheet::XSheetConditionalEntries>::get(), 0, 0 }, + {OUString(SC_UNONAME_CONDXML), SC_WID_UNO_CONDXML, cppu::UnoType<sheet::XSheetConditionalEntries>::get(), 0, 0 }, {OUString(SC_UNONAME_DIAGONAL_BLTR), ATTR_BORDER_BLTR, ::cppu::UnoType<table::BorderLine>::get(), 0, 0 | CONVERT_TWIPS }, {OUString(SC_UNONAME_DIAGONAL_BLTR2), ATTR_BORDER_BLTR, ::cppu::UnoType<table::BorderLine2>::get(), 0, 0 | CONVERT_TWIPS }, {OUString(SC_UNONAME_DIAGONAL_TLBR), ATTR_BORDER_TLBR, ::cppu::UnoType<table::BorderLine>::get(), 0, 0 | CONVERT_TWIPS }, @@ -329,7 +329,7 @@ static const SfxItemPropertySet* lcl_GetRangePropertySet() {OUString(SC_UNONAME_LEFTBORDER),ATTR_BORDER, ::cppu::UnoType<table::BorderLine>::get(), 0, LEFT_BORDER | CONVERT_TWIPS }, {OUString(SC_UNONAME_LEFTBORDER2),ATTR_BORDER, ::cppu::UnoType<table::BorderLine2>::get(), 0, LEFT_BORDER | CONVERT_TWIPS }, {OUString(SC_UNONAME_NUMFMT), ATTR_VALUE_FORMAT, cppu::UnoType<sal_Int32>::get(), 0, 0 }, - {OUString(SC_UNONAME_NUMRULES), SC_WID_UNO_NUMRULES,getCppuType((const uno::Reference<container::XIndexReplace>*)0), 0, 0 }, + {OUString(SC_UNONAME_NUMRULES), SC_WID_UNO_NUMRULES,cppu::UnoType<container::XIndexReplace>::get(), 0, 0 }, {OUString(SC_UNONAME_CELLORI), ATTR_STACKED, cppu::UnoType<table::CellOrientation>::get(), 0, 0 }, {OUString(SC_UNONAME_PADJUST), ATTR_HOR_JUSTIFY, ::cppu::UnoType<sal_Int16>::get(), 0, MID_HORJUST_ADJUST }, {OUString(SC_UNONAME_PBMARGIN), ATTR_MARGIN, cppu::UnoType<sal_Int32>::get(), 0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS }, @@ -342,7 +342,7 @@ static const SfxItemPropertySet* lcl_GetRangePropertySet() {OUString(SC_UNONAME_PLMARGIN), ATTR_MARGIN, cppu::UnoType<sal_Int32>::get(), 0, MID_MARGIN_L_MARGIN | CONVERT_TWIPS }, {OUString(SC_UNONAME_PRMARGIN), ATTR_MARGIN, cppu::UnoType<sal_Int32>::get(), 0, MID_MARGIN_R_MARGIN | CONVERT_TWIPS }, {OUString(SC_UNONAME_PTMARGIN), ATTR_MARGIN, cppu::UnoType<sal_Int32>::get(), 0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS }, - {OUString(SC_UNONAME_POS), SC_WID_UNO_POS, getCppuType((awt::Point*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, + {OUString(SC_UNONAME_POS), SC_WID_UNO_POS, cppu::UnoType<awt::Point>::get(), 0 | beans::PropertyAttribute::READONLY, 0 }, {OUString(SC_UNONAME_RIGHTBORDER),ATTR_BORDER, ::cppu::UnoType<table::BorderLine>::get(), 0, RIGHT_BORDER | CONVERT_TWIPS }, {OUString(SC_UNONAME_RIGHTBORDER2),ATTR_BORDER, ::cppu::UnoType<table::BorderLine2>::get(), 0, RIGHT_BORDER | CONVERT_TWIPS }, {OUString(SC_UNONAME_ROTANG), ATTR_ROTATE_VALUE, cppu::UnoType<sal_Int32>::get(), 0, 0 }, @@ -354,10 +354,10 @@ static const SfxItemPropertySet* lcl_GetRangePropertySet() {OUString(SC_UNONAME_TBLBORD2), SC_WID_UNO_TBLBORD2, cppu::UnoType<table::TableBorder2>::get(), 0, 0 | CONVERT_TWIPS }, {OUString(SC_UNONAME_TOPBORDER),ATTR_BORDER, ::cppu::UnoType<table::BorderLine>::get(), 0, TOP_BORDER | CONVERT_TWIPS }, {OUString(SC_UNONAME_TOPBORDER2),ATTR_BORDER, ::cppu::UnoType<table::BorderLine2>::get(), 0, TOP_BORDER | CONVERT_TWIPS }, - {OUString(SC_UNONAME_USERDEF), ATTR_USERDEF, getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 }, - {OUString(SC_UNONAME_VALIDAT), SC_WID_UNO_VALIDAT, getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 }, - {OUString(SC_UNONAME_VALILOC), SC_WID_UNO_VALILOC, getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 }, - {OUString(SC_UNONAME_VALIXML), SC_WID_UNO_VALIXML, getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 }, + {OUString(SC_UNONAME_USERDEF), ATTR_USERDEF, cppu::UnoType<container::XNameContainer>::get(), 0, 0 }, + {OUString(SC_UNONAME_VALIDAT), SC_WID_UNO_VALIDAT, cppu::UnoType<beans::XPropertySet>::get(), 0, 0 }, + {OUString(SC_UNONAME_VALILOC), SC_WID_UNO_VALILOC, cppu::UnoType<beans::XPropertySet>::get(), 0, 0 }, + {OUString(SC_UNONAME_VALIXML), SC_WID_UNO_VALIXML, cppu::UnoType<beans::XPropertySet>::get(), 0, 0 }, {OUString(SC_UNONAME_CELLVJUS), ATTR_VER_JUSTIFY, cppu::UnoType<sal_Int32>::get(), 0, 0 }, {OUString(SC_UNONAME_CELLVJUS_METHOD), ATTR_VER_JUSTIFY_METHOD, ::cppu::UnoType<sal_Int32>::get(), 0, 0 }, {OUString(SC_UNONAME_WRITING), ATTR_WRITINGDIR, cppu::UnoType<sal_Int16>::get(), 0, 0 }, @@ -425,15 +425,15 @@ static const SfxItemPropertySet* lcl_GetCellPropertySet() {OUString(SC_UNONAME_CWORDMOD), ATTR_FONT_WORDLINE, getBooleanCppuType(), 0, 0 }, {OUString(SC_UNONAME_CHCOLHDR), SC_WID_UNO_CHCOLHDR,getBooleanCppuType(), 0, 0 }, {OUString(SC_UNONAME_CHROWHDR), SC_WID_UNO_CHROWHDR,getBooleanCppuType(), 0, 0 }, - {OUString(SC_UNONAME_CONDFMT), SC_WID_UNO_CONDFMT, getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 }, - {OUString(SC_UNONAME_CONDLOC), SC_WID_UNO_CONDLOC, getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 }, - {OUString(SC_UNONAME_CONDXML), SC_WID_UNO_CONDXML, getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 }, + {OUString(SC_UNONAME_CONDFMT), SC_WID_UNO_CONDFMT, cppu::UnoType<sheet::XSheetConditionalEntries>::get(), 0, 0 }, + {OUString(SC_UNONAME_CONDLOC), SC_WID_UNO_CONDLOC, cppu::UnoType<sheet::XSheetConditionalEntries>::get(), 0, 0 }, + {OUString(SC_UNONAME_CONDXML), SC_WID_UNO_CONDXML, cppu::UnoType<sheet::XSheetConditionalEntries>::get(), 0, 0 }, {OUString(SC_UNONAME_DIAGONAL_BLTR), ATTR_BORDER_BLTR, ::cppu::UnoType<table::BorderLine>::get(), 0, 0 | CONVERT_TWIPS }, {OUString(SC_UNONAME_DIAGONAL_BLTR2), ATTR_BORDER_BLTR, ::cppu::UnoType<table::BorderLine2>::get(), 0, 0 | CONVERT_TWIPS }, {OUString(SC_UNONAME_DIAGONAL_TLBR), ATTR_BORDER_TLBR, ::cppu::UnoType<table::BorderLine>::get(), 0, 0 | CONVERT_TWIPS }, {OUString(SC_UNONAME_DIAGONAL_TLBR2), ATTR_BORDER_TLBR, ::cppu::UnoType<table::BorderLine2>::get(), 0, 0 | CONVERT_TWIPS }, {OUString(SC_UNONAME_FORMLOC), SC_WID_UNO_FORMLOC, cppu::UnoType<OUString>::get(), 0, 0 }, - {OUString(SC_UNONAME_FORMRT), SC_WID_UNO_FORMRT, getCppuType((table::CellContentType*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, + {OUString(SC_UNONAME_FORMRT), SC_WID_UNO_FORMRT, cppu::UnoType<table::CellContentType>::get(), 0 | beans::PropertyAttribute::READONLY, 0 }, {OUString(SC_UNONAME_CELLHJUS), ATTR_HOR_JUSTIFY, cppu::UnoType<table::CellHoriJustify>::get(), 0, MID_HORJUST_HORJUST }, {OUString(SC_UNONAME_CELLHJUS_METHOD), ATTR_HOR_JUSTIFY_METHOD, ::cppu::UnoType<sal_Int32>::get(), 0, 0 }, {OUString(SC_UNONAME_CELLTRAN), ATTR_BACKGROUND, getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT }, @@ -441,7 +441,7 @@ static const SfxItemPropertySet* lcl_GetCellPropertySet() {OUString(SC_UNONAME_LEFTBORDER),ATTR_BORDER, ::cppu::UnoType<table::BorderLine>::get(), 0, LEFT_BORDER | CONVERT_TWIPS }, {OUString(SC_UNONAME_LEFTBORDER2),ATTR_BORDER, ::cppu::UnoType<table::BorderLine2>::get(), 0, LEFT_BORDER | CONVERT_TWIPS }, {OUString(SC_UNONAME_NUMFMT), ATTR_VALUE_FORMAT, cppu::UnoType<sal_Int32>::get(), 0, 0 }, - {OUString(SC_UNONAME_NUMRULES), SC_WID_UNO_NUMRULES,getCppuType((const uno::Reference<container::XIndexReplace>*)0), 0, 0 }, + {OUString(SC_UNONAME_NUMRULES), SC_WID_UNO_NUMRULES,cppu::UnoType<container::XIndexReplace>::get(), 0, 0 }, {OUString(SC_UNONAME_CELLORI), ATTR_STACKED, cppu::UnoType<table::CellOrientation>::get(), 0, 0 }, {OUString(SC_UNONAME_PADJUST), ATTR_HOR_JUSTIFY, ::cppu::UnoType<sal_Int16>::get(), 0, MID_HORJUST_ADJUST }, {OUString(SC_UNONAME_PBMARGIN), ATTR_MARGIN, cppu::UnoType<sal_Int32>::get(), 0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS }, @@ -454,7 +454,7 @@ static const SfxItemPropertySet* lcl_GetCellPropertySet() {OUString(SC_UNONAME_PLMARGIN), ATTR_MARGIN, cppu::UnoType<sal_Int32>::get(), 0, MID_MARGIN_L_MARGIN | CONVERT_TWIPS }, {OUString(SC_UNONAME_PRMARGIN), ATTR_MARGIN, cppu::UnoType<sal_Int32>::get(), 0, MID_MARGIN_R_MARGIN | CONVERT_TWIPS }, {OUString(SC_UNONAME_PTMARGIN), ATTR_MARGIN, cppu::UnoType<sal_Int32>::get(), 0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS }, - {OUString(SC_UNONAME_POS), SC_WID_UNO_POS, getCppuType((awt::Point*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, + {OUString(SC_UNONAME_POS), SC_WID_UNO_POS, cppu::UnoType<awt::Point>::get(), 0 | beans::PropertyAttribute::READONLY, 0 }, {OUString(SC_UNONAME_RIGHTBORDER),ATTR_BORDER, ::cppu::UnoType<table::BorderLine>::get(), 0, RIGHT_BORDER | CONVERT_TWIPS }, {OUString(SC_UNONAME_RIGHTBORDER2),ATTR_BORDER, ::cppu::UnoType<table::BorderLine2>::get(), 0, RIGHT_BORDER | CONVERT_TWIPS }, {OUString(SC_UNONAME_ROTANG), ATTR_ROTATE_VALUE, cppu::UnoType<sal_Int32>::get(), 0, 0 }, @@ -466,10 +466,10 @@ static const SfxItemPropertySet* lcl_GetCellPropertySet() {OUString(SC_UNONAME_TBLBORD2), SC_WID_UNO_TBLBORD2, cppu::UnoType<table::TableBorder2>::get(), 0, 0 | CONVERT_TWIPS }, {OUString(SC_UNONAME_TOPBORDER),ATTR_BORDER, ::cppu::UnoType<table::BorderLine>::get(), 0, TOP_BORDER | CONVERT_TWIPS }, {OUString(SC_UNONAME_TOPBORDER2),ATTR_BORDER, ::cppu::UnoType<table::BorderLine2>::get(), 0, TOP_BORDER | CONVERT_TWIPS }, - {OUString(SC_UNONAME_USERDEF), ATTR_USERDEF, getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 }, - {OUString(SC_UNONAME_VALIDAT), SC_WID_UNO_VALIDAT, getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 }, - {OUString(SC_UNONAME_VALILOC), SC_WID_UNO_VALILOC, getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 }, - {OUString(SC_UNONAME_VALIXML), SC_WID_UNO_VALIXML, getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 }, + {OUString(SC_UNONAME_USERDEF), ATTR_USERDEF, cppu::UnoType<container::XNameContainer>::get(), 0, 0 }, + {OUString(SC_UNONAME_VALIDAT), SC_WID_UNO_VALIDAT, cppu::UnoType<beans::XPropertySet>::get(), 0, 0 }, + {OUString(SC_UNONAME_VALILOC), SC_WID_UNO_VALILOC, cppu::UnoType<beans::XPropertySet>::get(), 0, 0 }, + {OUString(SC_UNONAME_VALIXML), SC_WID_UNO_VALIXML, cppu::UnoType<beans::XPropertySet>::get(), 0, 0 }, {OUString(SC_UNONAME_CELLVJUS), ATTR_VER_JUSTIFY, cppu::UnoType<sal_Int32>::get(), 0, 0 }, {OUString(SC_UNONAME_CELLVJUS_METHOD), ATTR_VER_JUSTIFY_METHOD, ::cppu::UnoType<sal_Int32>::get(), 0, 0 }, {OUString(SC_UNONAME_WRITING), ATTR_WRITINGDIR, cppu::UnoType<sal_Int16>::get(), 0, 0 }, @@ -539,9 +539,9 @@ static const SfxItemPropertySet* lcl_GetColumnPropertySet() {OUString(SC_UNONAME_CWORDMOD), ATTR_FONT_WORDLINE, getBooleanCppuType(), 0, 0 }, {OUString(SC_UNONAME_CHCOLHDR), SC_WID_UNO_CHCOLHDR,getBooleanCppuType(), 0, 0 }, {OUString(SC_UNONAME_CHROWHDR), SC_WID_UNO_CHROWHDR,getBooleanCppuType(), 0, 0 }, - {OUString(SC_UNONAME_CONDFMT), SC_WID_UNO_CONDFMT, getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 }, - {OUString(SC_UNONAME_CONDLOC), SC_WID_UNO_CONDLOC, getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 }, - {OUString(SC_UNONAME_CONDXML), SC_WID_UNO_CONDXML, getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 }, + {OUString(SC_UNONAME_CONDFMT), SC_WID_UNO_CONDFMT, cppu::UnoType<sheet::XSheetConditionalEntries>::get(), 0, 0 }, + {OUString(SC_UNONAME_CONDLOC), SC_WID_UNO_CONDLOC, cppu::UnoType<sheet::XSheetConditionalEntries>::get(), 0, 0 }, + {OUString(SC_UNONAME_CONDXML), SC_WID_UNO_CONDXML, cppu::UnoType<sheet::XSheetConditionalEntries>::get(), 0, 0 }, {OUString(SC_UNONAME_DIAGONAL_BLTR), ATTR_BORDER_BLTR, ::cppu::UnoType<table::BorderLine>::get(), 0, 0 | CONVERT_TWIPS }, {OUString(SC_UNONAME_DIAGONAL_BLTR2), ATTR_BORDER_BLTR, ::cppu::UnoType<table::BorderLine2>::get(), 0, 0 | CONVERT_TWIPS }, {OUString(SC_UNONAME_DIAGONAL_TLBR), ATTR_BORDER_TLBR, ::cppu::UnoType<table::BorderLine>::get(), 0, 0 | CONVERT_TWIPS }, @@ -556,7 +556,7 @@ static const SfxItemPropertySet* lcl_GetColumnPropertySet() {OUString(SC_UNONAME_LEFTBORDER),ATTR_BORDER, ::cppu::UnoType<table::BorderLine>::get(), 0, LEFT_BORDER | CONVERT_TWIPS }, {OUString(SC_UNONAME_LEFTBORDER2),ATTR_BORDER, ::cppu::UnoType<table::BorderLine2>::get(), 0, LEFT_BORDER | CONVERT_TWIPS }, {OUString(SC_UNONAME_NUMFMT), ATTR_VALUE_FORMAT, cppu::UnoType<sal_Int32>::get(), 0, 0 }, - {OUString(SC_UNONAME_NUMRULES), SC_WID_UNO_NUMRULES,getCppuType((const uno::Reference<container::XIndexReplace>*)0), 0, 0 }, + {OUString(SC_UNONAME_NUMRULES), SC_WID_UNO_NUMRULES,cppu::UnoType<container::XIndexReplace>::get(), 0, 0 }, {OUString(SC_UNONAME_OWIDTH), SC_WID_UNO_OWIDTH, getBooleanCppuType(), 0, 0 }, {OUString(SC_UNONAME_CELLORI), ATTR_STACKED, cppu::UnoType<table::CellOrientation>::get(), 0, 0 }, {OUString(SC_UNONAME_PADJUST), ATTR_HOR_JUSTIFY, ::cppu::UnoType<sal_Int16>::get(), 0, MID_HORJUST_ADJUST }, @@ -570,7 +570,7 @@ static const SfxItemPropertySet* lcl_GetColumnPropertySet() {OUString(SC_UNONAME_PLMARGIN), ATTR_MARGIN, cppu::UnoType<sal_Int32>::get(), 0, MID_MARGIN_L_MARGIN | CONVERT_TWIPS }, {OUString(SC_UNONAME_PRMARGIN), ATTR_MARGIN, cppu::UnoType<sal_Int32>::get(), 0, MID_MARGIN_R_MARGIN | CONVERT_TWIPS }, {OUString(SC_UNONAME_PTMARGIN), ATTR_MARGIN, cppu::UnoType<sal_Int32>::get(), 0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS }, - {OUString(SC_UNONAME_POS), SC_WID_UNO_POS, getCppuType((awt::Point*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, + {OUString(SC_UNONAME_POS), SC_WID_UNO_POS, cppu::UnoType<awt::Point>::get(), 0 | beans::PropertyAttribute::READONLY, 0 }, {OUString(SC_UNONAME_RIGHTBORDER),ATTR_BORDER, ::cppu::UnoType<table::BorderLine>::get(), 0, RIGHT_BORDER | CONVERT_TWIPS }, {OUString(SC_UNONAME_RIGHTBORDER2),ATTR_BORDER, ::cppu::UnoType<table::BorderLine2>::get(), 0, RIGHT_BORDER | CONVERT_TWIPS }, {OUString(SC_UNONAME_ROTANG), ATTR_ROTATE_VALUE, cppu::UnoType<sal_Int32>::get(), 0, 0 }, @@ -582,10 +582,10 @@ static const SfxItemPropertySet* lcl_GetColumnPropertySet() {OUString(SC_UNONAME_TBLBORD2), SC_WID_UNO_TBLBORD2, cppu::UnoType<table::TableBorder2>::get(), 0, 0 | CONVERT_TWIPS }, {OUString(SC_UNONAME_TOPBORDER),ATTR_BORDER, ::cppu::UnoType<table::BorderLine>::get(), 0, TOP_BORDER | CONVERT_TWIPS }, {OUString(SC_UNONAME_TOPBORDER2),ATTR_BORDER, ::cppu::UnoType<table::BorderLine2>::get(), 0, TOP_BORDER | CONVERT_TWIPS }, - {OUString(SC_UNONAME_USERDEF), ATTR_USERDEF, getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 }, - {OUString(SC_UNONAME_VALIDAT), SC_WID_UNO_VALIDAT, getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 }, - {OUString(SC_UNONAME_VALILOC), SC_WID_UNO_VALILOC, getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 }, - {OUString(SC_UNONAME_VALIXML), SC_WID_UNO_VALIXML, getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 }, + {OUString(SC_UNONAME_USERDEF), ATTR_USERDEF, cppu::UnoType<container::XNameContainer>::get(), 0, 0 }, + {OUString(SC_UNONAME_VALIDAT), SC_WID_UNO_VALIDAT, cppu::UnoType<beans::XPropertySet>::get(), 0, 0 }, + {OUString(SC_UNONAME_VALILOC), SC_WID_UNO_VALILOC, cppu::UnoType<beans::XPropertySet>::get(), 0, 0 }, + {OUString(SC_UNONAME_VALIXML), SC_WID_UNO_VALIXML, cppu::UnoType<beans::XPropertySet>::get(), 0, 0 }, {OUString(SC_UNONAME_CELLVJUS), ATTR_VER_JUSTIFY, cppu::UnoType<sal_Int32>::get(), 0, 0 }, {OUString(SC_UNONAME_CELLVJUS_METHOD), ATTR_VER_JUSTIFY_METHOD, ::cppu::UnoType<sal_Int32>::get(), 0, 0 }, {OUString(SC_UNONAME_CELLWID), SC_WID_UNO_CELLWID, cppu::UnoType<sal_Int32>::get(), 0, 0 }, @@ -651,9 +651,9 @@ static const SfxItemPropertySet* lcl_GetRowPropertySet() {OUString(SC_UNONAME_CWORDMOD), ATTR_FONT_WORDLINE, getBooleanCppuType(), 0, 0 }, {OUString(SC_UNONAME_CHCOLHDR), SC_WID_UNO_CHCOLHDR,getBooleanCppuType(), 0, 0 }, {OUString(SC_UNONAME_CHROWHDR), SC_WID_UNO_CHROWHDR,getBooleanCppuType(), 0, 0 }, - {OUString(SC_UNONAME_CONDFMT), SC_WID_UNO_CONDFMT, getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 }, - {OUString(SC_UNONAME_CONDLOC), SC_WID_UNO_CONDLOC, getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 }, - {OUString(SC_UNONAME_CONDXML), SC_WID_UNO_CONDXML, getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 }, + {OUString(SC_UNONAME_CONDFMT), SC_WID_UNO_CONDFMT, cppu::UnoType<sheet::XSheetConditionalEntries>::get(), 0, 0 }, + {OUString(SC_UNONAME_CONDLOC), SC_WID_UNO_CONDLOC, cppu::UnoType<sheet::XSheetConditionalEntries>::get(), 0, 0 }, + {OUString(SC_UNONAME_CONDXML), SC_WID_UNO_CONDXML, cppu::UnoType<sheet::XSheetConditionalEntries>::get(), 0, 0 }, {OUString(SC_UNONAME_DIAGONAL_BLTR), ATTR_BORDER_BLTR, ::cppu::UnoType<table::BorderLine>::get(), 0, 0 | CONVERT_TWIPS }, {OUString(SC_UNONAME_DIAGONAL_BLTR2), ATTR_BORDER_BLTR, ::cppu::UnoType<table::BorderLine2>::get(), 0, 0 | CONVERT_TWIPS }, {OUString(SC_UNONAME_DIAGONAL_TLBR), ATTR_BORDER_TLBR, ::cppu::UnoType<table::BorderLine>::get(), 0, 0 | CONVERT_TWIPS }, @@ -670,7 +670,7 @@ static const SfxItemPropertySet* lcl_GetRowPropertySet() {OUString(SC_UNONAME_LEFTBORDER),ATTR_BORDER, ::cppu::UnoType<table::BorderLine>::get(), 0, LEFT_BORDER | CONVERT_TWIPS }, {OUString(SC_UNONAME_LEFTBORDER2),ATTR_BORDER, ::cppu::UnoType<table::BorderLine2>::get(), 0, LEFT_BORDER | CONVERT_TWIPS }, {OUString(SC_UNONAME_NUMFMT), ATTR_VALUE_FORMAT, cppu::UnoType<sal_Int32>::get(), 0, 0 }, - {OUString(SC_UNONAME_NUMRULES), SC_WID_UNO_NUMRULES,getCppuType((const uno::Reference<container::XIndexReplace>*)0), 0, 0 }, + {OUString(SC_UNONAME_NUMRULES), SC_WID_UNO_NUMRULES,cppu::UnoType<container::XIndexReplace>::get(), 0, 0 }, {OUString(SC_UNONAME_OHEIGHT), SC_WID_UNO_OHEIGHT, getBooleanCppuType(), 0, 0 }, {OUString(SC_UNONAME_CELLORI), ATTR_STACKED, cppu::UnoType<table::CellOrientation>::get(), 0, 0 }, {OUString(SC_UNONAME_PADJUST), ATTR_HOR_JUSTIFY, ::cppu::UnoType<sal_Int16>::get(), 0, MID_HORJUST_ADJUST }, @@ -684,7 +684,7 @@ static const SfxItemPropertySet* lcl_GetRowPropertySet() {OUString(SC_UNONAME_PLMARGIN), ATTR_MARGIN, cppu::UnoType<sal_Int32>::get(), 0, MID_MARGIN_L_MARGIN | CONVERT_TWIPS }, {OUString(SC_UNONAME_PRMARGIN), ATTR_MARGIN, cppu::UnoType<sal_Int32>::get(), 0, MID_MARGIN_R_MARGIN | CONVERT_TWIPS }, {OUString(SC_UNONAME_PTMARGIN), ATTR_MARGIN, cppu::UnoType<sal_Int32>::get(), 0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS }, - {OUString(SC_UNONAME_POS), SC_WID_UNO_POS, getCppuType((awt::Point*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, + {OUString(SC_UNONAME_POS), SC_WID_UNO_POS, cppu::UnoType<awt::Point>::get(), 0 | beans::PropertyAttribute::READONLY, 0 }, {OUString(SC_UNONAME_RIGHTBORDER),ATTR_BORDER, ::cppu::UnoType<table::BorderLine>::get(), 0, RIGHT_BORDER | CONVERT_TWIPS }, {OUString(SC_UNONAME_RIGHTBORDER2),ATTR_BORDER, ::cppu::UnoType<table::BorderLine2>::get(), 0, RIGHT_BORDER | CONVERT_TWIPS }, {OUString(SC_UNONAME_ROTANG), ATTR_ROTATE_VALUE, cppu::UnoType<sal_Int32>::get(), 0, 0 }, @@ -696,10 +696,10 @@ static const SfxItemPropertySet* lcl_GetRowPropertySet() {OUString(SC_UNONAME_TBLBORD2), SC_WID_UNO_TBLBORD2, cppu::UnoType<table::TableBorder2>::get(), 0, 0 | CONVERT_TWIPS }, {OUString(SC_UNONAME_TOPBORDER),ATTR_BORDER, ::cppu::UnoType<table::BorderLine>::get(), 0, TOP_BORDER | CONVERT_TWIPS }, {OUString(SC_UNONAME_TOPBORDER2),ATTR_BORDER, ::cppu::UnoType<table::BorderLine2>::get(), 0, TOP_BORDER | CONVERT_TWIPS }, - {OUString(SC_UNONAME_USERDEF), ATTR_USERDEF, getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 }, - {OUString(SC_UNONAME_VALIDAT), SC_WID_UNO_VALIDAT, getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 }, - {OUString(SC_UNONAME_VALILOC), SC_WID_UNO_VALILOC, getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 }, - {OUString(SC_UNONAME_VALIXML), SC_WID_UNO_VALIXML, getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 }, + {OUString(SC_UNONAME_USERDEF), ATTR_USERDEF, cppu::UnoType<container::XNameContainer>::get(), 0, 0 }, + {OUString(SC_UNONAME_VALIDAT), SC_WID_UNO_VALIDAT, cppu::UnoType<beans::XPropertySet>::get(), 0, 0 }, + {OUString(SC_UNONAME_VALILOC), SC_WID_UNO_VALILOC, cppu::UnoType<beans::XPropertySet>::get(), 0, 0 }, + {OUString(SC_UNONAME_VALIXML), SC_WID_UNO_VALIXML, cppu::UnoType<beans::XPropertySet>::get(), 0, 0 }, {OUString(SC_UNONAME_CELLVJUS), ATTR_VER_JUSTIFY, cppu::UnoType<sal_Int32>::get(), 0, 0 }, {OUString(SC_UNONAME_CELLVJUS_METHOD), ATTR_VER_JUSTIFY_METHOD, ::cppu::UnoType<sal_Int32>::get(), 0, 0 }, {OUString(SC_UNONAME_WRITING), ATTR_WRITINGDIR, cppu::UnoType<sal_Int16>::get(), 0, 0 }, @@ -766,9 +766,9 @@ static const SfxItemPropertySet* lcl_GetSheetPropertySet() {OUString(SC_UNONAME_CWORDMOD), ATTR_FONT_WORDLINE, getBooleanCppuType(), 0, 0 }, {OUString(SC_UNONAME_CHCOLHDR), SC_WID_UNO_CHCOLHDR,getBooleanCppuType(), 0, 0 }, {OUString(SC_UNONAME_CHROWHDR), SC_WID_UNO_CHROWHDR,getBooleanCppuType(), 0, 0 }, - {OUString(SC_UNONAME_CONDFMT), SC_WID_UNO_CONDFMT, getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 }, - {OUString(SC_UNONAME_CONDLOC), SC_WID_UNO_CONDLOC, getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 }, - {OUString(SC_UNONAME_CONDXML), SC_WID_UNO_CONDXML, getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 }, + {OUString(SC_UNONAME_CONDFMT), SC_WID_UNO_CONDFMT, cppu::UnoType<sheet::XSheetConditionalEntries>::get(), 0, 0 }, + {OUString(SC_UNONAME_CONDLOC), SC_WID_UNO_CONDLOC, cppu::UnoType<sheet::XSheetConditionalEntries>::get(), 0, 0 }, + {OUString(SC_UNONAME_CONDXML), SC_WID_UNO_CONDXML, cppu::UnoType<sheet::XSheetConditionalEntries>::get(), 0, 0 }, {OUString(SC_UNONAME_COPYBACK), SC_WID_UNO_COPYBACK,getBooleanCppuType(), 0, 0 }, {OUString(SC_UNONAME_COPYFORM), SC_WID_UNO_COPYFORM,getBooleanCppuType(), 0, 0 }, {OUString(SC_UNONAME_COPYSTYL), SC_WID_UNO_COPYSTYL,getBooleanCppuType(), 0, 0 }, @@ -784,10 +784,10 @@ static const SfxItemPropertySet* lcl_GetSheetPropertySet() {OUString(SC_UNONAME_CELLVIS), SC_WID_UNO_CELLVIS, getBooleanCppuType(), 0, 0 }, {OUString(SC_UNONAME_LEFTBORDER),ATTR_BORDER, ::cppu::UnoType<table::BorderLine>::get(), 0, LEFT_BORDER | CONVERT_TWIPS }, {OUString(SC_UNONAME_LEFTBORDER2),ATTR_BORDER, ::cppu::UnoType<table::BorderLine2>::get(), 0, LEFT_BORDER | CONVERT_TWIPS }, - {OUString(SC_UNO_LINKDISPBIT), SC_WID_UNO_LINKDISPBIT,getCppuType((uno::Reference<awt::XBitmap>*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, + {OUString(SC_UNO_LINKDISPBIT), SC_WID_UNO_LINKDISPBIT,cppu::UnoType<awt::XBitmap>::get(), 0 | beans::PropertyAttribute::READONLY, 0 }, {OUString(SC_UNO_LINKDISPNAME), SC_WID_UNO_LINKDISPNAME,cppu::UnoType<OUString>::get(), 0 | beans::PropertyAttribute::READONLY, 0 }, {OUString(SC_UNONAME_NUMFMT), ATTR_VALUE_FORMAT, cppu::UnoType<sal_Int32>::get(), 0, 0 }, - {OUString(SC_UNONAME_NUMRULES), SC_WID_UNO_NUMRULES,getCppuType((const uno::Reference<container::XIndexReplace>*)0), 0, 0 }, + {OUString(SC_UNONAME_NUMRULES), SC_WID_UNO_NUMRULES,cppu::UnoType<container::XIndexReplace>::get(), 0, 0 }, {OUString(SC_UNONAME_CELLORI), ATTR_STACKED, cppu::UnoType<table::CellOrientation>::get(), 0, 0 }, {OUString(SC_UNONAME_PAGESTL), SC_WID_UNO_PAGESTL, cppu::UnoType<OUString>::get(), 0, 0 }, {OUString(SC_UNONAME_PADJUST), ATTR_HOR_JUSTIFY, ::cppu::UnoType<sal_Int16>::get(), 0, MID_HORJUST_ADJUST }, @@ -801,7 +801,7 @@ static const SfxItemPropertySet* lcl_GetSheetPropertySet() {OUString(SC_UNONAME_PLMARGIN), ATTR_MARGIN, cppu::UnoType<sal_Int32>::get(), 0, MID_MARGIN_L_MARGIN | CONVERT_TWIPS }, {OUString(SC_UNONAME_PRMARGIN), ATTR_MARGIN, cppu::UnoType<sal_Int32>::get(), 0, MID_MARGIN_R_MARGIN | CONVERT_TWIPS }, {OUString(SC_UNONAME_PTMARGIN), ATTR_MARGIN, cppu::UnoType<sal_Int32>::get(), 0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS }, - {OUString(SC_UNONAME_POS), SC_WID_UNO_POS, getCppuType((awt::Point*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, + {OUString(SC_UNONAME_POS), SC_WID_UNO_POS, cppu::UnoType<awt::Point>::get(), 0 | beans::PropertyAttribute::READONLY, 0 }, {OUString(SC_UNONAME_PRINTBORD),SC_WID_UNO_PRINTBORD,getBooleanCppuType(), 0, 0 }, {OUString(SC_UNONAME_PROTECT), SC_WID_UNO_PROTECT, getBooleanCppuType(), 0, 0 }, {OUString(SC_UNONAME_RIGHTBORDER),ATTR_BORDER, ::cppu::UnoType<table::BorderLine>::get(), 0, RIGHT_BORDER | CONVERT_TWIPS }, @@ -817,16 +817,16 @@ static const SfxItemPropertySet* lcl_GetSheetPropertySet() {OUString(SC_UNONAME_TABLAYOUT),SC_WID_UNO_TABLAYOUT,cppu::UnoType<sal_Int16>::get(), 0, 0 }, {OUString(SC_UNONAME_TOPBORDER),ATTR_BORDER, ::cppu::UnoType<table::BorderLine>::get(), 0, TOP_BORDER | CONVERT_TWIPS }, {OUString(SC_UNONAME_TOPBORDER2),ATTR_BORDER, ::cppu::UnoType<table::BorderLine2>::get(), 0, TOP_BORDER | CONVERT_TWIPS }, - {OUString(SC_UNONAME_USERDEF), ATTR_USERDEF, getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 }, - {OUString(SC_UNONAME_VALIDAT), SC_WID_UNO_VALIDAT, getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 }, - {OUString(SC_UNONAME_VALILOC), SC_WID_UNO_VALILOC, getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 }, - {OUString(SC_UNONAME_VALIXML), SC_WID_UNO_VALIXML, getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 }, + {OUString(SC_UNONAME_USERDEF), ATTR_USERDEF, cppu::UnoType<container::XNameContainer>::get(), 0, 0 }, + {OUString(SC_UNONAME_VALIDAT), SC_WID_UNO_VALIDAT, cppu::UnoType<beans::XPropertySet>::get(), 0, 0 }, + {OUString(SC_UNONAME_VALILOC), SC_WID_UNO_VALILOC, cppu::UnoType<beans::XPropertySet>::get(), 0, 0 }, + {OUString(SC_UNONAME_VALIXML), SC_WID_UNO_VALIXML, cppu::UnoType<beans::XPropertySet>::get(), 0, 0 }, {OUString(SC_UNONAME_CELLVJUS), ATTR_VER_JUSTIFY, cppu::UnoType<sal_Int32>::get(), 0, 0 }, {OUString(SC_UNONAME_CELLVJUS_METHOD), ATTR_VER_JUSTIFY_METHOD, ::cppu::UnoType<sal_Int32>::get(), 0, 0 }, {OUString(SC_UNONAME_WRITING), ATTR_WRITINGDIR, cppu::UnoType<sal_Int16>::get(), 0, 0 }, {OUString(SC_UNONAME_TABCOLOR), SC_WID_UNO_TABCOLOR, cppu::UnoType<sal_Int32>::get(), 0, 0 }, {OUString(SC_UNO_CODENAME), SC_WID_UNO_CODENAME, cppu::UnoType<OUString>::get(), 0, 0}, - {OUString(SC_UNO_NAMEDRANGES), SC_WID_UNO_NAMES, getCppuType((uno::Reference<sheet::XNamedRanges>*)0), 0, 0 }, + {OUString(SC_UNO_NAMEDRANGES), SC_WID_UNO_NAMES, cppu::UnoType<sheet::XNamedRanges>::get(), 0, 0 }, { OUString(), 0, css::uno::Type(), 0, 0 } }; static SfxItemPropertySet aSheetPropertySet( aSheetPropertyMap_Impl ); @@ -841,8 +841,8 @@ static const SfxItemPropertyMapEntry* lcl_GetEditPropertyMap() SVX_UNOEDIT_FONT_PROPERTIES, SVX_UNOEDIT_PARA_PROPERTIES, SVX_UNOEDIT_NUMBERING_PROPERTIE, // for completeness of service ParagraphProperties - {OUString(SC_UNONAME_TEXTUSER), EE_CHAR_XMLATTRIBS, getCppuType((const uno::Reference< container::XNameContainer >*)0), 0, 0}, - {OUString(SC_UNONAME_USERDEF), EE_PARA_XMLATTRIBS, getCppuType((const uno::Reference< container::XNameContainer >*)0), 0, 0}, + {OUString(SC_UNONAME_TEXTUSER), EE_CHAR_XMLATTRIBS, cppu::UnoType<container::XNameContainer>::get(), 0, 0}, + {OUString(SC_UNONAME_USERDEF), EE_PARA_XMLATTRIBS, cppu::UnoType<container::XNameContainer>::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; return aEditPropertyMap_Impl; @@ -1762,19 +1762,19 @@ uno::Sequence<uno::Type> SAL_CALL ScCellRangesBase::getTypes() throw(uno::Runtim { aTypes.realloc(13); uno::Type* pPtr = aTypes.getArray(); - pPtr[0] = getCppuType((const uno::Reference<beans::XPropertySet>*)0); - pPtr[1] = getCppuType((const uno::Reference<beans::XMultiPropertySet>*)0); - pPtr[2] = getCppuType((const uno::Reference<beans::XPropertyState>*)0); - pPtr[3] = getCppuType((const uno::Reference<sheet::XSheetOperation>*)0); - pPtr[4] = getCppuType((const uno::Reference<chart::XChartDataArray>*)0); - pPtr[5] = getCppuType((const uno::Reference<util::XIndent>*)0); - pPtr[6] = getCppuType((const uno::Reference<sheet::XCellRangesQuery>*)0); - pPtr[7] = getCppuType((const uno::Reference<sheet::XFormulaQuery>*)0); - pPtr[8] = getCppuType((const uno::Reference<util::XReplaceable>*)0); - pPtr[9] = getCppuType((const uno::Reference<util::XModifyBroadcaster>*)0); - pPtr[10]= getCppuType((const uno::Reference<lang::XServiceInfo>*)0); - pPtr[11]= getCppuType((const uno::Reference<lang::XUnoTunnel>*)0); - pPtr[12]= getCppuType((const uno::Reference<lang::XTypeProvider>*)0); + pPtr[0] = cppu::UnoType<beans::XPropertySet>::get(); + pPtr[1] = cppu::UnoType<beans::XMultiPropertySet>::get(); + pPtr[2] = cppu::UnoType<beans::XPropertyState>::get(); + pPtr[3] = cppu::UnoType<sheet::XSheetOperation>::get(); + pPtr[4] = cppu::UnoType<chart::XChartDataArray>::get(); + pPtr[5] = cppu::UnoType<util::XIndent>::get(); + pPtr[6] = cppu::UnoType<sheet::XCellRangesQuery>::get(); + pPtr[7] = cppu::UnoType<sheet::XFormulaQuery>::get(); + pPtr[8] = cppu::UnoType<util::XReplaceable>::get(); + pPtr[9] = cppu::UnoType<util::XModifyBroadcaster>::get(); + pPtr[10]= cppu::UnoType<lang::XServiceInfo>::get(); + pPtr[11]= cppu::UnoType<lang::XUnoTunnel>::get(); + pPtr[12]= cppu::UnoType<lang::XTypeProvider>::get(); } return aTypes; } @@ -4171,9 +4171,9 @@ uno::Sequence<uno::Type> SAL_CALL ScCellRangesObj::getTypes() throw(uno::Runtime aTypes.realloc( nParentLen + 3 ); uno::Type* pPtr = aTypes.getArray(); - pPtr[nParentLen + 0] = getCppuType((const uno::Reference<sheet::XSheetCellRangeContainer>*)0); - pPtr[nParentLen + 1] = getCppuType((const uno::Reference<container::XNameContainer>*)0); - pPtr[nParentLen + 2] = getCppuType((const uno::Reference<container::XEnumerationAccess>*)0); + pPtr[nParentLen + 0] = cppu::UnoType<sheet::XSheetCellRangeContainer>::get(); + pPtr[nParentLen + 1] = cppu::UnoType<container::XNameContainer>::get(); + pPtr[nParentLen + 2] = cppu::UnoType<container::XEnumerationAccess>::get(); for (long i=0; i<nParentLen; i++) pPtr[i] = pParentPtr[i]; // parent types first @@ -4699,7 +4699,7 @@ uno::Any SAL_CALL ScCellRangesObj::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScCellRangesObj::getElementType() throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - return getCppuType((uno::Reference<table::XCellRange>*)0); + return cppu::UnoType<table::XCellRange>::get(); } sal_Bool SAL_CALL ScCellRangesObj::hasElements() throw(uno::RuntimeException, std::exception) @@ -4814,23 +4814,23 @@ uno::Sequence<uno::Type> SAL_CALL ScCellRangeObj::getTypes() throw(uno::RuntimeE aTypes.realloc( nParentLen + 17 ); uno::Type* pPtr = aTypes.getArray(); - pPtr[nParentLen + 0] = getCppuType((const uno::Reference<sheet::XCellRangeAddressable>*)0); - pPtr[nParentLen + 1] = getCppuType((const uno::Reference<sheet::XSheetCellRange>*)0); - pPtr[nParentLen + 2] = getCppuType((const uno::Reference<sheet::XArrayFormulaRange>*)0); - pPtr[nParentLen + 3] = getCppuType((const uno::Reference<sheet::XArrayFormulaTokens>*)0); - pPtr[nParentLen + 4] = getCppuType((const uno::Reference<sheet::XCellRangeData>*)0); - pPtr[nParentLen + 5] = getCppuType((const uno::Reference<sheet::XCellRangeFormula>*)0); - pPtr[nParentLen + 6] = getCppuType((const uno::Reference<sheet::XMultipleOperation>*)0); - pPtr[nParentLen + 7] = getCppuType((const uno::Reference<util::XMergeable>*)0); - pPtr[nParentLen + 8] = getCppuType((const uno::Reference<sheet::XCellSeries>*)0); - pPtr[nParentLen + 9] = getCppuType((const uno::Reference<table::XAutoFormattable>*)0); - pPtr[nParentLen +10] = getCppuType((const uno::Reference<util::XSortable>*)0); - pPtr[nParentLen +11] = getCppuType((const uno::Reference<sheet::XSheetFilterableEx>*)0); - pPtr[nParentLen +12] = getCppuType((const uno::Reference<sheet::XSubTotalCalculatable>*)0); - pPtr[nParentLen +13] = getCppuType((const uno::Reference<table::XColumnRowRange>*)0); - pPtr[nParentLen +14] = getCppuType((const uno::Reference<util::XImportable>*)0); - pPtr[nParentLen +15] = getCppuType((const uno::Reference<sheet::XCellFormatRangesSupplier>*)0); - pPtr[nParentLen +16] = getCppuType((const uno::Reference<sheet::XUniqueCellFormatRangesSupplier>*)0); + pPtr[nParentLen + 0] = cppu::UnoType<sheet::XCellRangeAddressable>::get(); + pPtr[nParentLen + 1] = cppu::UnoType<sheet::XSheetCellRange>::get(); + pPtr[nParentLen + 2] = cppu::UnoType<sheet::XArrayFormulaRange>::get(); + pPtr[nParentLen + 3] = cppu::UnoType<sheet::XArrayFormulaTokens>::get(); + pPtr[nParentLen + 4] = cppu::UnoType<sheet::XCellRangeData>::get(); + pPtr[nParentLen + 5] = cppu::UnoType<sheet::XCellRangeFormula>::get(); + pPtr[nParentLen + 6] = cppu::UnoType<sheet::XMultipleOperation>::get(); + pPtr[nParentLen + 7] = cppu::UnoType<util::XMergeable>::get(); + pPtr[nParentLen + 8] = cppu::UnoType<sheet::XCellSeries>::get(); + pPtr[nParentLen + 9] = cppu::UnoType<table::XAutoFormattable>::get(); + pPtr[nParentLen +10] = cppu::UnoType<util::XSortable>::get(); + pPtr[nParentLen +11] = cppu::UnoType<sheet::XSheetFilterableEx>::get(); + pPtr[nParentLen +12] = cppu::UnoType<sheet::XSubTotalCalculatable>::get(); + pPtr[nParentLen +13] = cppu::UnoType<table::XColumnRowRange>::get(); + pPtr[nParentLen +14] = cppu::UnoType<util::XImportable>::get(); + pPtr[nParentLen +15] = cppu::UnoType<sheet::XCellFormatRangesSupplier>::get(); + pPtr[nParentLen +16] = cppu::UnoType<sheet::XUniqueCellFormatRangesSupplier>::get(); for (long i=0; i<nParentLen; i++) pPtr[i] = pParentPtr[i]; // parent types first @@ -6107,15 +6107,15 @@ uno::Sequence<uno::Type> SAL_CALL ScCellObj::getTypes() throw(uno::RuntimeExcept aTypes.realloc( nParentLen + 9 ); uno::Type* pPtr = aTypes.getArray(); - pPtr[nParentLen + 0] = getCppuType((const uno::Reference<table::XCell>*)0); - pPtr[nParentLen + 1] = getCppuType((const uno::Reference<sheet::XCellAddressable>*)0); - pPtr[nParentLen + 2] = getCppuType((const uno::Reference<text::XText>*)0); - pPtr[nParentLen + 3] = getCppuType((const uno::Reference<container::XEnumerationAccess>*)0); - pPtr[nParentLen + 4] = getCppuType((const uno::Reference<sheet::XSheetAnnotationAnchor>*)0); - pPtr[nParentLen + 5] = getCppuType((const uno::Reference<text::XTextFieldsSupplier>*)0); - pPtr[nParentLen + 6] = getCppuType((const uno::Reference<document::XActionLockable>*)0); - pPtr[nParentLen + 7] = getCppuType((const uno::Reference<sheet::XFormulaTokens>*)0); - pPtr[nParentLen + 8] = getCppuType((const uno::Reference<table::XCell2>*)0); + pPtr[nParentLen + 0] = cppu::UnoType<table::XCell>::get(); + pPtr[nParentLen + 1] = cppu::UnoType<sheet::XCellAddressable>::get(); + pPtr[nParentLen + 2] = cppu::UnoType<text::XText>::get(); + pPtr[nParentLen + 3] = cppu::UnoType<container::XEnumerationAccess>::get(); + pPtr[nParentLen + 4] = cppu::UnoType<sheet::XSheetAnnotationAnchor>::get(); + pPtr[nParentLen + 5] = cppu::UnoType<text::XTextFieldsSupplier>::get(); + pPtr[nParentLen + 6] = cppu::UnoType<document::XActionLockable>::get(); + pPtr[nParentLen + 7] = cppu::UnoType<sheet::XFormulaTokens>::get(); + pPtr[nParentLen + 8] = cppu::UnoType<table::XCell2>::get(); for (long i=0; i<nParentLen; i++) pPtr[i] = pParentPtr[i]; // parent types first @@ -6852,24 +6852,24 @@ uno::Sequence<uno::Type> SAL_CALL ScTableSheetObj::getTypes() throw(uno::Runtime aTypes.realloc( nParentLen + 18 ); uno::Type* pPtr = aTypes.getArray(); - pPtr[nParentLen + 0] = getCppuType((const uno::Reference<sheet::XSpreadsheet>*)0); - pPtr[nParentLen + 1] = getCppuType((const uno::Reference<container::XNamed>*)0); - pPtr[nParentLen + 2] = getCppuType((const uno::Reference<sheet::XSheetPageBreak>*)0); - pPtr[nParentLen + 3] = getCppuType((const uno::Reference<sheet::XCellRangeMovement>*)0); - pPtr[nParentLen + 4] = getCppuType((const uno::Reference<table::XTableChartsSupplier>*)0); - pPtr[nParentLen + 5] = getCppuType((const uno::Reference<sheet::XDataPilotTablesSupplier>*)0); - pPtr[nParentLen + 6] = getCppuType((const uno::Reference<sheet::XScenariosSupplier>*)0); - pPtr[nParentLen + 7] = getCppuType((const uno::Reference<sheet::XSheetAnnotationsSupplier>*)0); - pPtr[nParentLen + 8] = getCppuType((const uno::Reference<drawing::XDrawPageSupplier>*)0); - pPtr[nParentLen + 9] = getCppuType((const uno::Reference<sheet::XPrintAreas>*)0); - pPtr[nParentLen +10] = getCppuType((const uno::Reference<sheet::XSheetAuditing>*)0); - pPtr[nParentLen +11] = getCppuType((const uno::Reference<sheet::XSheetOutline>*)0); - pPtr[nParentLen +12] = getCppuType((const uno::Reference<util::XProtectable>*)0); - pPtr[nParentLen +13] = getCppuType((const uno::Reference<sheet::XScenario>*)0); - pPtr[nParentLen +14] = getCppuType((const uno::Reference<sheet::XScenarioEnhanced>*)0); - pPtr[nParentLen +15] = getCppuType((const uno::Reference<sheet::XSheetLinkable>*)0); - pPtr[nParentLen +16] = getCppuType((const uno::Reference<sheet::XExternalSheetName>*)0); - pPtr[nParentLen +17] = getCppuType((const uno::Reference<document::XEventsSupplier>*)0); + pPtr[nParentLen + 0] = cppu::UnoType<sheet::XSpreadsheet>::get(); + pPtr[nParentLen + 1] = cppu::UnoType<container::XNamed>::get(); + pPtr[nParentLen + 2] = cppu::UnoType<sheet::XSheetPageBreak>::get(); + pPtr[nParentLen + 3] = cppu::UnoType<sheet::XCellRangeMovement>::get(); + pPtr[nParentLen + 4] = cppu::UnoType<table::XTableChartsSupplier>::get(); + pPtr[nParentLen + 5] = cppu::UnoType<sheet::XDataPilotTablesSupplier>::get(); + pPtr[nParentLen + 6] = cppu::UnoType<sheet::XScenariosSupplier>::get(); + pPtr[nParentLen + 7] = cppu::UnoType<sheet::XSheetAnnotationsSupplier>::get(); + pPtr[nParentLen + 8] = cppu::UnoType<drawing::XDrawPageSupplier>::get(); + pPtr[nParentLen + 9] = cppu::UnoType<sheet::XPrintAreas>::get(); + pPtr[nParentLen +10] = cppu::UnoType<sheet::XSheetAuditing>::get(); + pPtr[nParentLen +11] = cppu::UnoType<sheet::XSheetOutline>::get(); + pPtr[nParentLen +12] = cppu::UnoType<util::XProtectable>::get(); + pPtr[nParentLen +13] = cppu::UnoType<sheet::XScenario>::get(); + pPtr[nParentLen +14] = cppu::UnoType<sheet::XScenarioEnhanced>::get(); + pPtr[nParentLen +15] = cppu::UnoType<sheet::XSheetLinkable>::get(); + pPtr[nParentLen +16] = cppu::UnoType<sheet::XExternalSheetName>::get(); + pPtr[nParentLen +17] = cppu::UnoType<document::XEventsSupplier>::get(); for (long i=0; i<nParentLen; i++) pPtr[i] = pParentPtr[i]; // parent types first @@ -8679,7 +8679,7 @@ uno::Sequence<uno::Type> SAL_CALL ScTableColumnObj::getTypes() throw(uno::Runtim aTypes.realloc( nParentLen + 1 ); uno::Type* pPtr = aTypes.getArray(); - pPtr[nParentLen + 0] = getCppuType((const uno::Reference<container::XNamed>*)0); + pPtr[nParentLen + 0] = cppu::UnoType<container::XNamed>::get(); for (long i=0; i<nParentLen; i++) pPtr[i] = pParentPtr[i]; // parent types first @@ -9037,7 +9037,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScCellsObj::createEnumeration() uno::Type SAL_CALL ScCellsObj::getElementType() throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - return getCppuType((uno::Reference<table::XCell>*)0); + return cppu::UnoType<table::XCell>::get(); } sal_Bool SAL_CALL ScCellsObj::hasElements() throw(uno::RuntimeException, std::exception) @@ -9284,7 +9284,7 @@ uno::Any SAL_CALL ScCellFormatsObj::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScCellFormatsObj::getElementType() throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - return getCppuType((uno::Reference<table::XCellRange>*)0); + return cppu::UnoType<table::XCellRange>::get(); } sal_Bool SAL_CALL ScCellFormatsObj::hasElements() throw(uno::RuntimeException, std::exception) @@ -9652,7 +9652,7 @@ uno::Any SAL_CALL ScUniqueCellFormatsObj::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScUniqueCellFormatsObj::getElementType() throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - return getCppuType((uno::Reference<sheet::XSheetCellRangeContainer>*)0); + return cppu::UnoType<sheet::XSheetCellRangeContainer>::get(); } sal_Bool SAL_CALL ScUniqueCellFormatsObj::hasElements() throw(uno::RuntimeException, std::exception) diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index 0a4b0c8021b1..4792d86b4b78 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -92,7 +92,7 @@ const SfxItemPropertyMapEntry* lcl_GetDataSequencePropertyMap() static const SfxItemPropertyMapEntry aDataSequencePropertyMap_Impl[] = { {OUString(SC_UNONAME_HIDDENVALUES), 0, getCppuType((uno::Sequence<sal_Int32>*)0 ), 0, 0 }, - {OUString(SC_UNONAME_ROLE), 0, getCppuType((::com::sun::star::chart2::data::DataSequenceRole*)0), 0, 0 }, + {OUString(SC_UNONAME_ROLE), 0, cppu::UnoType<com::sun::star::chart2::data::DataSequenceRole>::get(), 0, 0 }, {OUString(SC_UNONAME_INCLUDEHIDDENCELLS), 0, getBooleanCppuType(), 0, 0 }, { OUString(), 0, css::uno::Type(), 0, 0 } }; diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx index 57539f006da2..23e31cd8bf75 100644 --- a/sc/source/ui/unoobj/chartuno.cxx +++ b/sc/source/ui/unoobj/chartuno.cxx @@ -365,7 +365,7 @@ uno::Any SAL_CALL ScChartsObj::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScChartsObj::getElementType() throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - return getCppuType((uno::Reference<table::XTableChart>*)0); + return cppu::UnoType<util::DateTime>::get(); } sal_Bool SAL_CALL ScChartsObj::hasElements() throw(uno::RuntimeException, std::exception) diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx index 5dbe4a3583b7..9099f91eaae7 100644 --- a/sc/source/ui/unoobj/confuno.cxx +++ b/sc/source/ui/unoobj/confuno.cxx @@ -65,7 +65,7 @@ static const SfxItemPropertyMapEntry* lcl_GetConfigPropertyMap() {OUString(SC_UNO_PRINTERNAME), 0, cppu::UnoType<OUString>::get(), 0, 0}, {OUString(SC_UNO_PRINTERSETUP), 0, getCppuType((uno::Sequence<sal_Int8>*)0), 0, 0}, {OUString(SC_UNO_APPLYDOCINF), 0, getBooleanCppuType(), 0, 0}, - {OUString(SC_UNO_FORBIDDEN), 0, getCppuType((uno::Reference<i18n::XForbiddenCharacters>*)0), beans::PropertyAttribute::READONLY, 0}, + {OUString(SC_UNO_FORBIDDEN), 0, cppu::UnoType<util::DateTime>::get(), beans::PropertyAttribute::READONLY, 0}, {OUString(SC_UNO_CHARCOMP), 0, cppu::UnoType<sal_Int16>::get(), 0, 0}, {OUString(SC_UNO_ASIANKERN), 0, getBooleanCppuType(), 0, 0}, {OUString(SCSAVEVERSION), 0, getBooleanCppuType(), 0, 0}, diff --git a/sc/source/ui/unoobj/cursuno.cxx b/sc/source/ui/unoobj/cursuno.cxx index 4f69c25005fa..a50792d8cb49 100644 --- a/sc/source/ui/unoobj/cursuno.cxx +++ b/sc/source/ui/unoobj/cursuno.cxx @@ -76,9 +76,9 @@ uno::Sequence<uno::Type> SAL_CALL ScCellCursorObj::getTypes() throw(uno::Runtime aTypes.realloc( nParentLen + 3 ); uno::Type* pPtr = aTypes.getArray(); - pPtr[nParentLen + 0] = getCppuType((const uno::Reference<sheet::XSheetCellCursor>*)0); - pPtr[nParentLen + 1] = getCppuType((const uno::Reference<sheet::XUsedAreaCursor>*)0); - pPtr[nParentLen + 2] = getCppuType((const uno::Reference<table::XCellCursor>*)0); + pPtr[nParentLen + 0] = cppu::UnoType<sheet::XSheetCellCursor>::get(); + pPtr[nParentLen + 1] = cppu::UnoType<sheet::XUsedAreaCursor>::get(); + pPtr[nParentLen + 2] = cppu::UnoType<table::XCellCursor>::get(); for (long i=0; i<nParentLen; i++) pPtr[i] = pParentPtr[i]; // parent types first diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx index f8607ca9570f..0ca52759bfcd 100644 --- a/sc/source/ui/unoobj/dapiuno.cxx +++ b/sc/source/ui/unoobj/dapiuno.cxx @@ -113,20 +113,20 @@ const SfxItemPropertyMapEntry* lcl_GetDataPilotFieldMap() using namespace ::com::sun::star::beans::PropertyAttribute; static const SfxItemPropertyMapEntry aDataPilotFieldMap_Impl[] = { - {OUString(SC_UNONAME_AUTOSHOW), 0, getCppuType((DataPilotFieldAutoShowInfo*)0), MAYBEVOID, 0 }, - {OUString(SC_UNONAME_FUNCTION), 0, getCppuType((GeneralFunction*)0), 0, 0 }, - {OUString(SC_UNONAME_GROUPINFO), 0, getCppuType((DataPilotFieldGroupInfo*)0), MAYBEVOID, 0 }, + {OUString(SC_UNONAME_AUTOSHOW), 0, cppu::UnoType<DataPilotFieldAutoShowInfo>::get(), MAYBEVOID, 0 }, + {OUString(SC_UNONAME_FUNCTION), 0, cppu::UnoType<GeneralFunction>::get(), 0, 0 }, + {OUString(SC_UNONAME_GROUPINFO), 0, cppu::UnoType<DataPilotFieldGroupInfo>::get(), MAYBEVOID, 0 }, {OUString(SC_UNONAME_HASAUTOSHOW), 0, getBooleanCppuType(), 0, 0 }, {OUString(SC_UNONAME_HASLAYOUTINFO),0, getBooleanCppuType(), 0, 0 }, {OUString(SC_UNONAME_HASREFERENCE), 0, getBooleanCppuType(), 0, 0 }, {OUString(SC_UNONAME_HASSORTINFO), 0, getBooleanCppuType(), 0, 0 }, {OUString(SC_UNONAME_ISGROUP), 0, getBooleanCppuType(), 0, 0 }, - {OUString(SC_UNONAME_LAYOUTINFO), 0, getCppuType((DataPilotFieldLayoutInfo*)0), MAYBEVOID, 0 }, - {OUString(SC_UNONAME_ORIENT), 0, getCppuType((DataPilotFieldOrientation*)0), MAYBEVOID, 0 }, - {OUString(SC_UNONAME_REFERENCE), 0, getCppuType((DataPilotFieldReference*)0), MAYBEVOID, 0 }, + {OUString(SC_UNONAME_LAYOUTINFO), 0, cppu::UnoType<DataPilotFieldLayoutInfo>::get(), MAYBEVOID, 0 }, + {OUString(SC_UNONAME_ORIENT), 0, cppu::UnoType<DataPilotFieldOrientation>::get(), MAYBEVOID, 0 }, + {OUString(SC_UNONAME_REFERENCE), 0, cppu::UnoType<DataPilotFieldReference>::get(), MAYBEVOID, 0 }, {OUString(SC_UNONAME_SELPAGE), 0, cppu::UnoType<OUString>::get(), 0, 0 }, {OUString(SC_UNONAME_SHOWEMPTY), 0, getBooleanCppuType(), 0, 0 }, - {OUString(SC_UNONAME_SORTINFO), 0, getCppuType((DataPilotFieldSortInfo*)0), MAYBEVOID, 0 }, + {OUString(SC_UNONAME_SORTINFO), 0, cppu::UnoType<DataPilotFieldSortInfo>::get(), MAYBEVOID, 0 }, {OUString(SC_UNONAME_SUBTOTALS), 0, getCppuType((Sequence<GeneralFunction>*)0), 0, 0 }, {OUString(SC_UNONAME_USESELPAGE), 0, getBooleanCppuType(), 0, 0 }, { OUString(), 0, css::uno::Type(), 0, 0 } diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx index 8103bb390e02..b8d6bb282e35 100644 --- a/sc/source/ui/unoobj/datauno.cxx +++ b/sc/source/ui/unoobj/datauno.cxx @@ -96,7 +96,7 @@ static const SfxItemPropertyMapEntry* lcl_GetFilterPropertyMap() {OUString(SC_UNONAME_ISCASE), 0, getBooleanCppuType(), 0, 0}, {OUString(SC_UNONAME_MAXFLD), 0, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::READONLY, 0}, {OUString(SC_UNONAME_ORIENT), 0, getCppuType((table::TableOrientation*)0), 0, 0}, - {OUString(SC_UNONAME_OUTPOS), 0, getCppuType((table::CellAddress*)0), 0, 0}, + {OUString(SC_UNONAME_OUTPOS), 0, cppu::UnoType<table::CellAddress>::get(), 0, 0}, {OUString(SC_UNONAME_SAVEOUT), 0, getBooleanCppuType(), 0, 0}, {OUString(SC_UNONAME_SKIPDUP), 0, getBooleanCppuType(), 0, 0}, {OUString(SC_UNONAME_USEREGEX), 0, getBooleanCppuType(), 0, 0}, @@ -110,11 +110,11 @@ static const SfxItemPropertyMapEntry* lcl_GetDBRangePropertyMap() static const SfxItemPropertyMapEntry aDBRangePropertyMap_Impl[] = { {OUString(SC_UNONAME_AUTOFLT), 0, getBooleanCppuType(), 0, 0}, - {OUString(SC_UNONAME_FLTCRT), 0, getCppuType((table::CellRangeAddress*)0), 0, 0}, + {OUString(SC_UNONAME_FLTCRT), 0, cppu::UnoType<table::CellRangeAddress>::get(), 0, 0}, {OUString(SC_UNONAME_FROMSELECT),0, getBooleanCppuType(), 0, 0}, {OUString(SC_UNONAME_ISUSER), 0, getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0 }, {OUString(SC_UNONAME_KEEPFORM), 0, getBooleanCppuType(), 0, 0}, - {OUString(SC_UNO_LINKDISPBIT), 0, getCppuType((uno::Reference<awt::XBitmap>*)0), beans::PropertyAttribute::READONLY, 0 }, + {OUString(SC_UNO_LINKDISPBIT), 0, cppu::UnoType<awt::XBitmap>::get(), beans::PropertyAttribute::READONLY, 0 }, {OUString(SC_UNO_LINKDISPNAME), 0, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0 }, {OUString(SC_UNONAME_MOVCELLS), 0, getBooleanCppuType(), 0, 0}, {OUString(SC_UNONAME_REFPERIOD), 0, cppu::UnoType<sal_Int32>::get(), 0, 0}, @@ -669,7 +669,7 @@ uno::Any SAL_CALL ScSubTotalDescriptorBase::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScSubTotalDescriptorBase::getElementType() throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - return getCppuType((uno::Reference<sheet::XSubTotalField>*)0); + return cppu::UnoType<util::DateTime>::get(); } sal_Bool SAL_CALL ScSubTotalDescriptorBase::hasElements() throw(uno::RuntimeException, std::exception) @@ -2332,7 +2332,7 @@ uno::Any SAL_CALL ScDatabaseRangesObj::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScDatabaseRangesObj::getElementType() throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - return getCppuType((uno::Reference<sheet::XDatabaseRange>*)0); + return cppu::UnoType<util::DateTime>::get(); } sal_Bool SAL_CALL ScDatabaseRangesObj::hasElements() throw(uno::RuntimeException, std::exception) diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index d752bea59f44..983721734313 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -111,20 +111,20 @@ static const SfxItemPropertyMapEntry* lcl_GetDocOptPropertyMap() static const SfxItemPropertyMapEntry aDocOptPropertyMap_Impl[] = { {OUString(SC_UNO_APPLYFMDES), 0, getBooleanCppuType(), 0, 0}, - {OUString(SC_UNO_AREALINKS), 0, getCppuType((uno::Reference<sheet::XAreaLinks>*)0), 0, 0}, + {OUString(SC_UNO_AREALINKS), 0, cppu::UnoType<util::DateTime>::get(), 0, 0}, {OUString(SC_UNO_AUTOCONTFOC), 0, getBooleanCppuType(), 0, 0}, - {OUString(SC_UNO_BASICLIBRARIES), 0, getCppuType((uno::Reference< script::XLibraryContainer >*)0), beans::PropertyAttribute::READONLY, 0}, - {OUString(SC_UNO_DIALOGLIBRARIES), 0, getCppuType((uno::Reference< script::XLibraryContainer >*)0), beans::PropertyAttribute::READONLY, 0}, + {OUString(SC_UNO_BASICLIBRARIES), 0, cppu::UnoType<util::DateTime>::get(), beans::PropertyAttribute::READONLY, 0}, + {OUString(SC_UNO_DIALOGLIBRARIES), 0, cppu::UnoType<util::DateTime>::get(), beans::PropertyAttribute::READONLY, 0}, {OUString(SC_UNO_VBAGLOBNAME), 0, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0}, {OUString(SC_UNO_CALCASSHOWN), PROP_UNO_CALCASSHOWN, getBooleanCppuType(), 0, 0}, {OUString(SC_UNONAME_CLOCAL), 0, cppu::UnoType<lang::Locale>::get(), 0, 0}, {OUString(SC_UNO_CJK_CLOCAL), 0, cppu::UnoType<lang::Locale>::get(), 0, 0}, {OUString(SC_UNO_CTL_CLOCAL), 0, cppu::UnoType<lang::Locale>::get(), 0, 0}, - {OUString(SC_UNO_COLLABELRNG), 0, getCppuType((uno::Reference<sheet::XLabelRanges>*)0), 0, 0}, - {OUString(SC_UNO_DDELINKS), 0, getCppuType((uno::Reference<container::XNameAccess>*)0), 0, 0}, + {OUString(SC_UNO_COLLABELRNG), 0, cppu::UnoType<sheet::XLabelRanges>::get(), 0, 0}, + {OUString(SC_UNO_DDELINKS), 0, cppu::UnoType<container::XNameAccess>::get(), 0, 0}, {OUString(SC_UNO_DEFTABSTOP), PROP_UNO_DEFTABSTOP, cppu::UnoType<sal_Int16>::get(), 0, 0}, - {OUString(SC_UNO_EXTERNALDOCLINKS), 0, getCppuType((uno::Reference<sheet::XExternalDocLinks>*)0), 0, 0}, - {OUString(SC_UNO_FORBIDDEN), 0, getCppuType((uno::Reference<i18n::XForbiddenCharacters>*)0), beans::PropertyAttribute::READONLY, 0}, + {OUString(SC_UNO_EXTERNALDOCLINKS), 0, cppu::UnoType<util::DateTime>::get(), 0, 0}, + {OUString(SC_UNO_FORBIDDEN), 0, cppu::UnoType<util::DateTime>::get(), beans::PropertyAttribute::READONLY, 0}, {OUString(SC_UNO_HASDRAWPAGES), 0, getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0}, {OUString(SC_UNO_IGNORECASE), PROP_UNO_IGNORECASE, getBooleanCppuType(), 0, 0}, {OUString(SC_UNO_ITERENABLED), PROP_UNO_ITERENABLED, getBooleanCppuType(), 0, 0}, @@ -132,11 +132,11 @@ static const SfxItemPropertyMapEntry* lcl_GetDocOptPropertyMap() {OUString(SC_UNO_ITEREPSILON), PROP_UNO_ITEREPSILON, cppu::UnoType<double>::get(), 0, 0}, {OUString(SC_UNO_LOOKUPLABELS), PROP_UNO_LOOKUPLABELS, getBooleanCppuType(), 0, 0}, {OUString(SC_UNO_MATCHWHOLE), PROP_UNO_MATCHWHOLE, getBooleanCppuType(), 0, 0}, - {OUString(SC_UNO_NAMEDRANGES), 0, getCppuType((uno::Reference<sheet::XNamedRanges>*)0), 0, 0}, - {OUString(SC_UNO_DATABASERNG), 0, getCppuType((uno::Reference<sheet::XDatabaseRanges>*)0), 0, 0}, - {OUString(SC_UNO_NULLDATE), PROP_UNO_NULLDATE, getCppuType((util::Date*)0), 0, 0}, - {OUString(SC_UNO_ROWLABELRNG), 0, getCppuType((uno::Reference<sheet::XLabelRanges>*)0), 0, 0}, - {OUString(SC_UNO_SHEETLINKS), 0, getCppuType((uno::Reference<container::XNameAccess>*)0), 0, 0}, + {OUString(SC_UNO_NAMEDRANGES), 0, cppu::UnoType<sheet::XNamedRanges>::get(), 0, 0}, + {OUString(SC_UNO_DATABASERNG), 0, cppu::UnoType<util::DateTime>::get(), 0, 0}, + {OUString(SC_UNO_NULLDATE), PROP_UNO_NULLDATE, cppu::UnoType<util::Date>::get(), 0, 0}, + {OUString(SC_UNO_ROWLABELRNG), 0, cppu::UnoType<sheet::XLabelRanges>::get(), 0, 0}, + {OUString(SC_UNO_SHEETLINKS), 0, cppu::UnoType<container::XNameAccess>::get(), 0, 0}, {OUString(SC_UNO_SPELLONLINE), PROP_UNO_SPELLONLINE, getBooleanCppuType(), 0, 0}, {OUString(SC_UNO_STANDARDDEC), PROP_UNO_STANDARDDEC, cppu::UnoType<sal_Int16>::get(), 0, 0}, {OUString(SC_UNO_REGEXENABLED), PROP_UNO_REGEXENABLED, getBooleanCppuType(), 0, 0}, @@ -147,7 +147,7 @@ static const SfxItemPropertyMapEntry* lcl_GetDocOptPropertyMap() {OUString(SC_UNO_ISADJUSTHEIGHTENABLED), 0, getBooleanCppuType(), 0, 0}, {OUString(SC_UNO_ISEXECUTELINKENABLED), 0, getBooleanCppuType(), 0, 0}, {OUString(SC_UNO_ISCHANGEREADONLYENABLED), 0, getBooleanCppuType(), 0, 0}, - {OUString(SC_UNO_REFERENCEDEVICE), 0, getCppuType((uno::Reference<awt::XDevice>*)0), beans::PropertyAttribute::READONLY, 0}, + {OUString(SC_UNO_REFERENCEDEVICE), 0, cppu::UnoType<awt::XDevice>::get(), beans::PropertyAttribute::READONLY, 0}, {OUString("BuildId"), 0, ::cppu::UnoType<OUString>::get(), 0, 0}, {OUString(SC_UNO_CODENAME), 0, cppu::UnoType<OUString>::get(), 0, 0}, {OUString(SC_UNO_INTEROPGRABBAG), 0, ::getCppuType((uno::Sequence< beans::PropertyValue >*)0), 0, 0}, @@ -468,12 +468,12 @@ uno::Any SAL_CALL ScModelObj::queryInterface( const uno::Type& rType ) uno::Any aRet(SfxBaseModel::queryInterface( rType )); if ( !aRet.hasValue() - && rType != ::getCppuType((uno::Reference< com::sun::star::document::XDocumentEventBroadcaster>*)0) - && rType != ::getCppuType((uno::Reference< com::sun::star::frame::XController>*)0) - && rType != ::getCppuType((uno::Reference< com::sun::star::frame::XFrame>*)0) - && rType != ::getCppuType((uno::Reference< com::sun::star::script::XInvocation>*)0) - && rType != ::getCppuType((uno::Reference< com::sun::star::beans::XFastPropertySet>*)0) - && rType != ::getCppuType((uno::Reference< com::sun::star::awt::XWindow>*)0)) + && rType != cppu::UnoType<com::sun::star::document::XDocumentEventBroadcaster>::get() + && rType != cppu::UnoType<com::sun::star::frame::XController>::get() + && rType != cppu::UnoType<com::sun::star::frame::XFrame>::get() + && rType != cppu::UnoType<com::sun::star::script::XInvocation>::get() + && rType != cppu::UnoType<com::sun::star::beans::XFastPropertySet>::get() + && rType != cppu::UnoType<com::sun::star::awt::XWindow>::get()) { GetFormatter(); if ( xNumberAgg.is() ) @@ -505,7 +505,7 @@ uno::Sequence<uno::Type> SAL_CALL ScModelObj::getTypes() throw(uno::RuntimeExcep uno::Sequence<uno::Type> aAggTypes; if ( GetFormatter().is() ) { - const uno::Type& rProvType = ::getCppuType((uno::Reference<lang::XTypeProvider>*) 0); + const uno::Type& rProvType = cppu::UnoType<lang::XTypeProvider>::get(); uno::Any aNumProv(xNumberAgg->queryAggregation(rProvType)); if(aNumProv.getValueType() == rProvType) { @@ -520,22 +520,22 @@ uno::Sequence<uno::Type> SAL_CALL ScModelObj::getTypes() throw(uno::RuntimeExcep const long nThisLen = 16; aTypes.realloc( nParentLen + nAggLen + nThisLen ); uno::Type* pPtr = aTypes.getArray(); - pPtr[nParentLen + 0] = getCppuType((const uno::Reference<sheet::XSpreadsheetDocument>*)0); - pPtr[nParentLen + 1] = getCppuType((const uno::Reference<document::XActionLockable>*)0); - pPtr[nParentLen + 2] = getCppuType((const uno::Reference<sheet::XCalculatable>*)0); - pPtr[nParentLen + 3] = getCppuType((const uno::Reference<util::XProtectable>*)0); - pPtr[nParentLen + 4] = getCppuType((const uno::Reference<drawing::XDrawPagesSupplier>*)0); - pPtr[nParentLen + 5] = getCppuType((const uno::Reference<sheet::XGoalSeek>*)0); - pPtr[nParentLen + 6] = getCppuType((const uno::Reference<sheet::XConsolidatable>*)0); - pPtr[nParentLen + 7] = getCppuType((const uno::Reference<sheet::XDocumentAuditing>*)0); - pPtr[nParentLen + 8] = getCppuType((const uno::Reference<style::XStyleFamiliesSupplier>*)0); - pPtr[nParentLen + 9] = getCppuType((const uno::Reference<view::XRenderable>*)0); - pPtr[nParentLen +10] = getCppuType((const uno::Reference<document::XLinkTargetSupplier>*)0); - pPtr[nParentLen +11] = getCppuType((const uno::Reference<beans::XPropertySet>*)0); - pPtr[nParentLen +12] = getCppuType((const uno::Reference<lang::XMultiServiceFactory>*)0); - pPtr[nParentLen +13] = getCppuType((const uno::Reference<lang::XServiceInfo>*)0); - pPtr[nParentLen +14] = getCppuType((const uno::Reference<util::XChangesNotifier>*)0); - pPtr[nParentLen +15] = getCppuType((const uno::Reference<sheet::opencl::XOpenCLSelection>*)0); + pPtr[nParentLen + 0] = cppu::UnoType<sheet::XSpreadsheetDocument>::get(); + pPtr[nParentLen + 1] = cppu::UnoType<document::XActionLockable>::get(); + pPtr[nParentLen + 2] = cppu::UnoType<sheet::XCalculatable>::get(); + pPtr[nParentLen + 3] = cppu::UnoType<util::XProtectable>::get(); + pPtr[nParentLen + 4] = cppu::UnoType<drawing::XDrawPagesSupplier>::get(); + pPtr[nParentLen + 5] = cppu::UnoType<sheet::XGoalSeek>::get(); + pPtr[nParentLen + 6] = cppu::UnoType<sheet::XConsolidatable>::get(); + pPtr[nParentLen + 7] = cppu::UnoType<sheet::XDocumentAuditing>::get(); + pPtr[nParentLen + 8] = cppu::UnoType<style::XStyleFamiliesSupplier>::get(); + pPtr[nParentLen + 9] = cppu::UnoType<view::XRenderable>::get(); + pPtr[nParentLen +10] = cppu::UnoType<document::XLinkTargetSupplier>::get(); + pPtr[nParentLen +11] = cppu::UnoType<beans::XPropertySet>::get(); + pPtr[nParentLen +12] = cppu::UnoType<lang::XMultiServiceFactory>::get(); + pPtr[nParentLen +13] = cppu::UnoType<lang::XServiceInfo>::get(); + pPtr[nParentLen +14] = cppu::UnoType<util::XChangesNotifier>::get(); + pPtr[nParentLen +15] = cppu::UnoType<sheet::opencl::XOpenCLSelection>::get(); long i; for (i=0; i<nParentLen; i++) @@ -2076,7 +2076,7 @@ sal_Int64 SAL_CALL ScModelObj::getSomething( if ( GetFormatter().is() ) { - const uno::Type& rTunnelType = ::getCppuType((uno::Reference<lang::XUnoTunnel>*) 0); + const uno::Type& rTunnelType = cppu::UnoType<lang::XUnoTunnel>::get(); uno::Any aNumTunnel(xNumberAgg->queryAggregation(rTunnelType)); if(aNumTunnel.getValueType() == rTunnelType) { @@ -2478,7 +2478,7 @@ uno::Any SAL_CALL ScDrawPagesObj::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScDrawPagesObj::getElementType() throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - return getCppuType((uno::Reference<drawing::XDrawPage>*)0); + return cppu::UnoType<drawing::XDrawPage>::get(); } sal_Bool SAL_CALL ScDrawPagesObj::hasElements() throw(uno::RuntimeException, std::exception) @@ -2835,7 +2835,7 @@ uno::Any SAL_CALL ScTableSheetsObj::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScTableSheetsObj::getElementType() throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - return getCppuType((uno::Reference<sheet::XSpreadsheet>*)0); + return cppu::UnoType<sheet::XSpreadsheet>::get(); } sal_Bool SAL_CALL ScTableSheetsObj::hasElements() throw(uno::RuntimeException, std::exception) @@ -3006,7 +3006,7 @@ uno::Any SAL_CALL ScTableColumnsObj::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScTableColumnsObj::getElementType() throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - return getCppuType((uno::Reference<table::XCellRange>*)0); + return cppu::UnoType<table::XCellRange>::get(); } sal_Bool SAL_CALL ScTableColumnsObj::hasElements() throw(uno::RuntimeException, std::exception) @@ -3261,7 +3261,7 @@ uno::Any SAL_CALL ScTableRowsObj::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScTableRowsObj::getElementType() throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - return getCppuType((uno::Reference<table::XCellRange>*)0); + return cppu::UnoType<table::XCellRange>::get(); } sal_Bool SAL_CALL ScTableRowsObj::hasElements() throw(uno::RuntimeException, std::exception) @@ -3608,7 +3608,7 @@ uno::Any SAL_CALL ScAnnotationsObj::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScAnnotationsObj::getElementType() throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - return getCppuType((uno::Reference<sheet::XSheetAnnotation>*)0); + return cppu::UnoType<sheet::XSheetAnnotation>::get(); } sal_Bool SAL_CALL ScAnnotationsObj::hasElements() throw(uno::RuntimeException, std::exception) @@ -3775,7 +3775,7 @@ uno::Any SAL_CALL ScScenariosObj::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScScenariosObj::getElementType() throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - return getCppuType((uno::Reference<sheet::XScenario>*)0); + return cppu::UnoType<sheet::XScenario>::get(); } sal_Bool SAL_CALL ScScenariosObj::hasElements() throw(uno::RuntimeException, std::exception) diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx index 459561af6744..e91cfe10b652 100644 --- a/sc/source/ui/unoobj/fielduno.cxx +++ b/sc/source/ui/unoobj/fielduno.cxx @@ -56,7 +56,7 @@ const SfxItemPropertySet* getDateTimePropertySet() { static const SfxItemPropertyMapEntry aMapContent[] = { - { OUString(SC_UNONAME_DATETIME), 0, getCppuType((const util::DateTime*)0), 0, 0 }, + { OUString(SC_UNONAME_DATETIME), 0, cppu::UnoType<util::DateTime>::get(), 0, 0 }, { OUString(SC_UNONAME_ISFIXED), 0, getBooleanCppuType(), 0, 0 }, { OUString(SC_UNONAME_ISDATE), 0, getBooleanCppuType(), 0, 0 }, { OUString(SC_UNONAME_NUMFMT), 0, cppu::UnoType<sal_Int32>::get(), 0, 0 }, @@ -373,7 +373,7 @@ uno::Any SAL_CALL ScCellFieldsObj::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScCellFieldsObj::getElementType() throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - return getCppuType((uno::Reference<text::XTextField>*)0); + return cppu::UnoType<text::XTextField>::get(); } sal_Bool SAL_CALL ScCellFieldsObj::hasElements() throw(uno::RuntimeException, std::exception) @@ -553,7 +553,7 @@ uno::Any SAL_CALL ScHeaderFieldsObj::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScHeaderFieldsObj::getElementType() throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - return getCppuType((uno::Reference<text::XTextField>*)0); + return cppu::UnoType<text::XTextField>::get(); } sal_Bool SAL_CALL ScHeaderFieldsObj::hasElements() throw(uno::RuntimeException, std::exception) @@ -1457,10 +1457,10 @@ uno::Sequence<uno::Type> SAL_CALL ScEditFieldObj::getTypes() throw(uno::RuntimeE aTypes.realloc( nParentLen + 4 ); uno::Type* pPtr = aTypes.getArray(); - pPtr[nParentLen + 0] = getCppuType((const uno::Reference<text::XTextField>*)0); - pPtr[nParentLen + 1] = getCppuType((const uno::Reference<beans::XPropertySet>*)0); - pPtr[nParentLen + 2] = getCppuType((const uno::Reference<lang::XUnoTunnel>*)0); - pPtr[nParentLen + 3] = getCppuType((const uno::Reference<lang::XServiceInfo>*)0); + pPtr[nParentLen + 0] = cppu::UnoType<text::XTextField>::get(); + pPtr[nParentLen + 1] = cppu::UnoType<beans::XPropertySet>::get(); + pPtr[nParentLen + 2] = cppu::UnoType<lang::XUnoTunnel>::get(); + pPtr[nParentLen + 3] = cppu::UnoType<lang::XServiceInfo>::get(); for (long i=0; i<nParentLen; i++) pPtr[i] = pParentPtr[i]; // parent types first diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx index cb523063412f..2ffacb4c7888 100644 --- a/sc/source/ui/unoobj/fmtuno.cxx +++ b/sc/source/ui/unoobj/fmtuno.cxx @@ -46,7 +46,7 @@ static const SfxItemPropertyMapEntry* lcl_GetValidatePropertyMap() { static const SfxItemPropertyMapEntry aValidatePropertyMap_Impl[] = { - {OUString(SC_UNONAME_ERRALSTY), 0, getCppuType((sheet::ValidationAlertStyle*)0), 0, 0}, + {OUString(SC_UNONAME_ERRALSTY), 0, cppu::UnoType<sheet::ValidationAlertStyle>::get(), 0, 0}, {OUString(SC_UNONAME_ERRMESS), 0, cppu::UnoType<OUString>::get(), 0, 0}, {OUString(SC_UNONAME_ERRTITLE), 0, cppu::UnoType<OUString>::get(), 0, 0}, {OUString(SC_UNONAME_IGNOREBL), 0, getBooleanCppuType(), 0, 0}, @@ -55,7 +55,7 @@ static const SfxItemPropertyMapEntry* lcl_GetValidatePropertyMap() {OUString(SC_UNONAME_SHOWERR), 0, getBooleanCppuType(), 0, 0}, {OUString(SC_UNONAME_SHOWINP), 0, getBooleanCppuType(), 0, 0}, {OUString(SC_UNONAME_SHOWLIST), 0, cppu::UnoType<sal_Int16>::get(), 0, 0}, - {OUString(SC_UNONAME_TYPE), 0, getCppuType((sheet::ValidationType*)0), 0, 0}, + {OUString(SC_UNONAME_TYPE), 0, cppu::UnoType<sheet::ValidationType>::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; return aValidatePropertyMap_Impl; @@ -400,7 +400,7 @@ uno::Any SAL_CALL ScTableConditionalFormat::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScTableConditionalFormat::getElementType() throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - return getCppuType((uno::Reference<sheet::XSheetConditionalEntry>*)0); + return cppu::UnoType<sheet::XSheetConditionalEntry>::get(); } sal_Bool SAL_CALL ScTableConditionalFormat::hasElements() throw(uno::RuntimeException, std::exception) diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx index fe8ce61f9522..c5a2e4805c84 100644 --- a/sc/source/ui/unoobj/funcuno.cxx +++ b/sc/source/ui/unoobj/funcuno.cxx @@ -578,7 +578,7 @@ uno::Any SAL_CALL ScFunctionAccess::callFunction( const OUString& aName, { ArrayOfArrayProc<uno::Any>::processSequences( pDoc, rArg, aTokenArr, nDocRow, bArgErr, bOverflow ); } - else if ( aType.equals( getCppuType( (uno::Reference<table::XCellRange>*)0 ) ) ) + else if ( aType.equals( cppu::UnoType<table::XCellRange>::get()) ) { // currently, only our own cell ranges are supported diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx index b8315127c2ab..3fbeb9d455ae 100644 --- a/sc/source/ui/unoobj/linkuno.cxx +++ b/sc/source/ui/unoobj/linkuno.cxx @@ -498,7 +498,7 @@ uno::Any SAL_CALL ScSheetLinksObj::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScSheetLinksObj::getElementType() throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - return getCppuType((uno::Reference<beans::XPropertySet>*)0); + return cppu::UnoType<beans::XPropertySet>::get(); } sal_Bool SAL_CALL ScSheetLinksObj::hasElements() throw(uno::RuntimeException, std::exception) @@ -1026,7 +1026,7 @@ uno::Any SAL_CALL ScAreaLinksObj::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScAreaLinksObj::getElementType() throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - return getCppuType((uno::Reference<sheet::XAreaLink>*)0); + return cppu::UnoType<util::DateTime>::get(); } sal_Bool SAL_CALL ScAreaLinksObj::hasElements() throw(uno::RuntimeException, std::exception) @@ -1333,7 +1333,7 @@ uno::Any SAL_CALL ScDDELinksObj::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScDDELinksObj::getElementType() throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - return getCppuType((uno::Reference<sheet::XDDELink>*)0); + return cppu::UnoType<util::DateTime>::get(); } sal_Bool SAL_CALL ScDDELinksObj::hasElements() throw(uno::RuntimeException, std::exception) diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx index f062f42b9768..14bcecac00d4 100644 --- a/sc/source/ui/unoobj/nameuno.cxx +++ b/sc/source/ui/unoobj/nameuno.cxx @@ -50,7 +50,7 @@ static const SfxItemPropertyMapEntry* lcl_GetNamedRangeMap() { static const SfxItemPropertyMapEntry aNamedRangeMap_Impl[] = { - {OUString(SC_UNO_LINKDISPBIT), 0, getCppuType((uno::Reference<awt::XBitmap>*)0), beans::PropertyAttribute::READONLY, 0 }, + {OUString(SC_UNO_LINKDISPBIT), 0, cppu::UnoType<awt::XBitmap>::get(), beans::PropertyAttribute::READONLY, 0 }, {OUString(SC_UNO_LINKDISPNAME), 0, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0 }, {OUString(SC_UNONAME_TOKENINDEX), 0, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::READONLY, 0 }, {OUString(SC_UNONAME_ISSHAREDFMLA), 0, getBooleanCppuType(), 0, 0 }, @@ -642,7 +642,7 @@ uno::Any SAL_CALL ScNamedRangesObj::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScNamedRangesObj::getElementType() throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - return ::getCppuType((const uno::Reference< sheet::XNamedRange >*)0); // must be suitable for getByIndex + return cppu::UnoType<sheet::XNamedRange>::get(); // must be suitable for getByIndex } sal_Bool SAL_CALL ScNamedRangesObj::hasElements() throw(uno::RuntimeException, std::exception) @@ -1204,7 +1204,7 @@ uno::Any SAL_CALL ScLabelRangesObj::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScLabelRangesObj::getElementType() throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - return ::getCppuType((const uno::Reference< sheet::XLabelRange >*)0); // must be suitable for getByIndex + return cppu::UnoType<sheet::XLabelRange>::get(); // must be suitable for getByIndex } diff --git a/sc/source/ui/unoobj/optuno.cxx b/sc/source/ui/unoobj/optuno.cxx index 86c8187726c7..cab74069f1a2 100644 --- a/sc/source/ui/unoobj/optuno.cxx +++ b/sc/source/ui/unoobj/optuno.cxx @@ -41,7 +41,7 @@ const SfxItemPropertyMapEntry* ScDocOptionsHelper::GetPropertyMap() {OUString(SC_UNO_ITEREPSILON), PROP_UNO_ITEREPSILON , cppu::UnoType<double>::get(), 0, 0}, {OUString(SC_UNO_LOOKUPLABELS), PROP_UNO_LOOKUPLABELS, getBooleanCppuType(), 0, 0}, {OUString(SC_UNO_MATCHWHOLE), PROP_UNO_MATCHWHOLE , getBooleanCppuType(), 0, 0}, - {OUString(SC_UNO_NULLDATE), PROP_UNO_NULLDATE , getCppuType((util::Date*)0), 0, 0}, + {OUString(SC_UNO_NULLDATE), PROP_UNO_NULLDATE , cppu::UnoType<util::Date>::get(), 0, 0}, {OUString(SC_UNO_SPELLONLINE), PROP_UNO_SPELLONLINE , getBooleanCppuType(), 0, 0}, {OUString(SC_UNO_STANDARDDEC), PROP_UNO_STANDARDDEC , cppu::UnoType<sal_Int16>::get(), 0, 0}, {OUString(SC_UNO_REGEXENABLED), PROP_UNO_REGEXENABLED, getBooleanCppuType(), 0, 0}, diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx index 3d9eeb6dcb8b..2d2643375896 100644 --- a/sc/source/ui/unoobj/shapeuno.cxx +++ b/sc/source/ui/unoobj/shapeuno.cxx @@ -50,9 +50,9 @@ static const SfxItemPropertyMapEntry* lcl_GetShapeMap() { static const SfxItemPropertyMapEntry aShapeMap_Impl[] = { - {OUString(SC_UNONAME_ANCHOR), 0, getCppuType((uno::Reference<uno::XInterface>*)0), 0, 0 }, + {OUString(SC_UNONAME_ANCHOR), 0, cppu::UnoType<uno::XInterface>::get(), 0, 0 }, {OUString(SC_UNONAME_HORIPOS), 0, cppu::UnoType<sal_Int32>::get(), 0, 0 }, - {OUString(SC_UNONAME_IMAGEMAP), 0, getCppuType((uno::Reference<container::XIndexContainer>*)0), 0, 0 }, + {OUString(SC_UNONAME_IMAGEMAP), 0, cppu::UnoType<container::XIndexContainer>::get(), 0, 0 }, {OUString(SC_UNONAME_VERTPOS), 0, cppu::UnoType<sal_Int32>::get(), 0, 0 }, {OUString(SC_UNONAME_MOVEPROTECT), 0, cppu::UnoType<sal_Bool>::get(), 0, 0 }, // #i66550 HLINK_FOR_SHAPES @@ -171,7 +171,7 @@ void ScShapeObj::GetShapePropertySet() { uno::Reference<beans::XPropertySet> xProp; if ( mxShapeAgg.is() ) - mxShapeAgg->queryAggregation( getCppuType((uno::Reference<beans::XPropertySet>*) 0) ) >>= xProp; + mxShapeAgg->queryAggregation( cppu::UnoType<beans::XPropertySet>::get()) >>= xProp; pShapePropertySet = xProp.get(); } } @@ -185,7 +185,7 @@ void ScShapeObj::GetShapePropertyState() { uno::Reference<beans::XPropertyState> xState; if ( mxShapeAgg.is() ) - mxShapeAgg->queryAggregation( getCppuType((uno::Reference<beans::XPropertyState>*) 0) ) >>= xState; + mxShapeAgg->queryAggregation( cppu::UnoType<beans::XPropertyState>::get()) >>= xState; pShapePropertyState = xState.get(); } } @@ -194,7 +194,7 @@ static uno::Reference<lang::XComponent> lcl_GetComponent( const uno::Reference<u { uno::Reference<lang::XComponent> xRet; if ( xAgg.is() ) - xAgg->queryAggregation( getCppuType((uno::Reference<lang::XComponent>*) 0) ) >>= xRet; + xAgg->queryAggregation( cppu::UnoType<lang::XComponent>::get()) >>= xRet; return xRet; } @@ -202,7 +202,7 @@ static uno::Reference<text::XText> lcl_GetText( const uno::Reference<uno::XAggre { uno::Reference<text::XText> xRet; if ( xAgg.is() ) - xAgg->queryAggregation( getCppuType((uno::Reference<text::XText>*) 0) ) >>= xRet; + xAgg->queryAggregation( cppu::UnoType<text::XText>::get()) >>= xRet; return xRet; } @@ -210,7 +210,7 @@ static uno::Reference<text::XSimpleText> lcl_GetSimpleText( const uno::Reference { uno::Reference<text::XSimpleText> xRet; if ( xAgg.is() ) - xAgg->queryAggregation( getCppuType((uno::Reference<text::XSimpleText>*) 0) ) >>= xRet; + xAgg->queryAggregation( cppu::UnoType<text::XSimpleText>::get()) >>= xRet; return xRet; } @@ -218,7 +218,7 @@ static uno::Reference<text::XTextRange> lcl_GetTextRange( const uno::Reference<u { uno::Reference<text::XTextRange> xRet; if ( xAgg.is() ) - xAgg->queryAggregation( getCppuType((uno::Reference<text::XTextRange>*) 0) ) >>= xRet; + xAgg->queryAggregation( cppu::UnoType<text::XTextRange>::get()) >>= xRet; return xRet; } @@ -1329,7 +1329,7 @@ uno::Sequence<uno::Type> SAL_CALL ScShapeObj::getTypes() throw(uno::RuntimeExcep uno::Reference<lang::XTypeProvider> xBaseProvider; if ( mxShapeAgg.is() ) - mxShapeAgg->queryAggregation( getCppuType((uno::Reference<lang::XTypeProvider>*) 0) ) >>= xBaseProvider; + mxShapeAgg->queryAggregation( cppu::UnoType<lang::XTypeProvider>::get()) >>= xBaseProvider; OSL_ENSURE( xBaseProvider.is(), "ScShapeObj: No XTypeProvider from aggregated shape!" ); uno::Sequence< uno::Type > aAggTypes; diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx index 712ef014b91c..fbf4fb6cc44c 100644 --- a/sc/source/ui/unoobj/styleuno.cxx +++ b/sc/source/ui/unoobj/styleuno.cxx @@ -131,7 +131,7 @@ static const SfxItemPropertySet* lcl_GetCellStyleSet() {OUString(SC_UNONAME_LEFTBORDER),ATTR_BORDER, ::cppu::UnoType<table::BorderLine>::get(), 0, LEFT_BORDER | CONVERT_TWIPS }, {OUString(SC_UNONAME_LEFTBORDER2),ATTR_BORDER, ::cppu::UnoType<table::BorderLine2>::get(), 0, LEFT_BORDER | CONVERT_TWIPS }, {OUString(SC_UNONAME_NUMFMT), ATTR_VALUE_FORMAT, ::cppu::UnoType<sal_Int32>::get(), 0, 0 }, -// {SC_UNONAME_NUMRULES, SC_WID_UNO_NUMRULES,getCppuType((const uno::Reference<container::XIndexReplace>*)0), 0, 0 }, +// {SC_UNONAME_NUMRULES, SC_WID_UNO_NUMRULES,cppu::UnoType<container::XIndexReplace>::get(), 0, 0 }, {OUString(SC_UNONAME_CELLORI), ATTR_STACKED, ::cppu::UnoType<table::CellOrientation>::get(), 0, 0 }, {OUString(SC_UNONAME_PADJUST), ATTR_HOR_JUSTIFY, ::cppu::UnoType<sal_Int16>::get(), 0, MID_HORJUST_ADJUST }, {OUString(SC_UNONAME_PBMARGIN), ATTR_MARGIN, ::cppu::UnoType<sal_Int32>::get(), 0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS }, @@ -154,7 +154,7 @@ static const SfxItemPropertySet* lcl_GetCellStyleSet() {OUString(SC_UNONAME_TBLBORD), SC_WID_UNO_TBLBORD2, ::cppu::UnoType<table::TableBorder2>::get(), 0, 0 | CONVERT_TWIPS }, {OUString(SC_UNONAME_TOPBORDER),ATTR_BORDER, ::cppu::UnoType<table::BorderLine>::get(), 0, TOP_BORDER | CONVERT_TWIPS }, {OUString(SC_UNONAME_TOPBORDER2),ATTR_BORDER, ::cppu::UnoType<table::BorderLine2>::get(), 0, TOP_BORDER | CONVERT_TWIPS }, - {OUString(SC_UNONAME_USERDEF), ATTR_USERDEF, getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 }, + {OUString(SC_UNONAME_USERDEF), ATTR_USERDEF, cppu::UnoType<container::XNameContainer>::get(), 0, 0 }, {OUString(SC_UNONAME_CELLVJUS), ATTR_VER_JUSTIFY, ::cppu::UnoType<sal_Int32>::get(), 0, 0 }, {OUString(SC_UNONAME_CELLVJUS_METHOD), ATTR_VER_JUSTIFY_METHOD, ::cppu::UnoType<sal_Int32>::get(), 0, 0 }, {OUString(SC_UNONAME_WRITING), ATTR_WRITINGDIR, cppu::UnoType<sal_Int16>::get(), 0, 0 }, @@ -247,8 +247,8 @@ static const SfxItemPropertySet * lcl_GetPageStyleSet() {OUString(SC_UNO_PAGE_LEFTBORDER), ATTR_BORDER, ::cppu::UnoType<table::BorderLine>::get(), 0, LEFT_BORDER | CONVERT_TWIPS }, {OUString(SC_UNO_PAGE_LEFTBRDDIST), ATTR_BORDER, ::cppu::UnoType<sal_Int32>::get(), 0, LEFT_BORDER_DISTANCE | CONVERT_TWIPS }, {OUString(SC_UNO_PAGE_LEFTMARGIN), ATTR_LRSPACE, ::cppu::UnoType<sal_Int32>::get(), 0, MID_L_MARGIN | CONVERT_TWIPS }, - {OUString(SC_UNO_PAGE_LEFTFTRCONT), ATTR_PAGE_FOOTERLEFT,::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0), 0, 0 }, - {OUString(SC_UNO_PAGE_LEFTHDRCONT), ATTR_PAGE_HEADERLEFT,::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0), 0, 0 }, + {OUString(SC_UNO_PAGE_LEFTFTRCONT), ATTR_PAGE_FOOTERLEFT,cppu::UnoType<sheet::XHeaderFooterContent>::get(), 0, 0 }, + {OUString(SC_UNO_PAGE_LEFTHDRCONT), ATTR_PAGE_HEADERLEFT,cppu::UnoType<sheet::XHeaderFooterContent>::get(), 0, 0 }, {OUString(SC_UNO_PAGE_NUMBERTYPE), ATTR_PAGE, ::cppu::UnoType<sal_Int16>::get(), 0, MID_PAGE_NUMTYPE }, {OUString(SC_UNO_PAGE_SCALEVAL), ATTR_PAGE_SCALE, ::cppu::UnoType<sal_Int16>::get(), 0, 0 }, {OUString(SC_UNO_PAGE_SYTLELAYOUT), ATTR_PAGE, ::cppu::UnoType<style::PageStyleLayout>::get(), 0, MID_PAGE_LAYOUT }, @@ -265,8 +265,8 @@ static const SfxItemPropertySet * lcl_GetPageStyleSet() {OUString(SC_UNO_PAGE_RIGHTBORDER), ATTR_BORDER, ::cppu::UnoType<table::BorderLine>::get(), 0, RIGHT_BORDER | CONVERT_TWIPS }, {OUString(SC_UNO_PAGE_RIGHTBRDDIST),ATTR_BORDER, ::cppu::UnoType<sal_Int32>::get(), 0, RIGHT_BORDER_DISTANCE | CONVERT_TWIPS }, {OUString(SC_UNO_PAGE_RIGHTMARGIN), ATTR_LRSPACE, ::cppu::UnoType<sal_Int32>::get(), 0, MID_R_MARGIN | CONVERT_TWIPS }, - {OUString(SC_UNO_PAGE_RIGHTFTRCON), ATTR_PAGE_FOOTERRIGHT,::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0), 0, 0 }, - {OUString(SC_UNO_PAGE_RIGHTHDRCON), ATTR_PAGE_HEADERRIGHT,::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0), 0, 0 }, + {OUString(SC_UNO_PAGE_RIGHTFTRCON), ATTR_PAGE_FOOTERRIGHT,cppu::UnoType<sheet::XHeaderFooterContent>::get(), 0, 0 }, + {OUString(SC_UNO_PAGE_RIGHTHDRCON), ATTR_PAGE_HEADERRIGHT,cppu::UnoType<sheet::XHeaderFooterContent>::get(), 0, 0 }, {OUString(SC_UNO_PAGE_SCALETOPAG), ATTR_PAGE_SCALETOPAGES,::cppu::UnoType<sal_Int16>::get(), 0, 0 }, {OUString(SC_UNO_PAGE_SCALETOX), ATTR_PAGE_SCALETO, ::cppu::UnoType<sal_Int16>::get(), 0, 0 }, {OUString(SC_UNO_PAGE_SCALETOY), ATTR_PAGE_SCALETO, ::cppu::UnoType<sal_Int16>::get(), 0, 0 }, @@ -277,7 +277,7 @@ static const SfxItemPropertySet * lcl_GetPageStyleSet() {OUString(SC_UNO_PAGE_TOPMARGIN), ATTR_ULSPACE, ::cppu::UnoType<sal_Int32>::get(), 0, MID_UP_MARGIN | CONVERT_TWIPS }, {OUString(OLD_UNO_PAGE_FTRBACKTRAN),SC_WID_UNO_FOOTERSET,::getBooleanCppuType(), 0, 0 }, {OUString(OLD_UNO_PAGE_HDRBACKTRAN),SC_WID_UNO_HEADERSET,::getBooleanCppuType(), 0, 0 }, - {OUString(SC_UNONAME_USERDEF), ATTR_USERDEF, getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 }, + {OUString(SC_UNONAME_USERDEF), ATTR_USERDEF, cppu::UnoType<container::XNameContainer>::get(), 0, 0 }, {OUString(SC_UNO_PAGE_WIDTH), ATTR_PAGE_SIZE, ::cppu::UnoType<sal_Int32>::get(), 0, MID_SIZE_WIDTH | CONVERT_TWIPS }, {OUString(SC_UNONAME_WRITING), ATTR_WRITINGDIR, cppu::UnoType<sal_Int16>::get(), 0, 0 }, {OUString(SC_UNONAME_HIDDEN), ATTR_HIDDEN, cppu::UnoType<sal_Bool>::get(), 0, 0 }, @@ -479,7 +479,7 @@ uno::Any SAL_CALL ScStyleFamiliesObj::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScStyleFamiliesObj::getElementType() throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - return ::getCppuType((const uno::Reference< container::XNameContainer >*)0); // muss zu getByIndex passen + return cppu::UnoType<container::XNameContainer>::get(); // muss zu getByIndex passen } sal_Bool SAL_CALL ScStyleFamiliesObj::hasElements() throw(uno::RuntimeException, std::exception) @@ -789,7 +789,7 @@ uno::Any SAL_CALL ScStyleFamilyObj::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScStyleFamilyObj::getElementType() throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - return ::getCppuType((const uno::Reference< style::XStyle >*)0); // muss zu getByIndex passen + return cppu::UnoType<style::XStyle>::get(); // muss zu getByIndex passen } sal_Bool SAL_CALL ScStyleFamilyObj::hasElements() throw(uno::RuntimeException, std::exception) diff --git a/sc/source/ui/unoobj/targuno.cxx b/sc/source/ui/unoobj/targuno.cxx index 2ad797371a7d..df1b80de2ee5 100644 --- a/sc/source/ui/unoobj/targuno.cxx +++ b/sc/source/ui/unoobj/targuno.cxx @@ -50,7 +50,7 @@ static const SfxItemPropertyMapEntry* lcl_GetLinkTargetMap() { static const SfxItemPropertyMapEntry aLinkTargetMap_Impl[] = { - {OUString(SC_UNO_LINKDISPBIT), 0, getCppuType((const uno::Reference<awt::XBitmap>*)0), beans::PropertyAttribute::READONLY, 0 }, + {OUString(SC_UNO_LINKDISPBIT), 0, cppu::UnoType<awt::XBitmap>::get(), beans::PropertyAttribute::READONLY, 0 }, {OUString(SC_UNO_LINKDISPNAME), 0, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0 }, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -123,7 +123,7 @@ sal_Bool SAL_CALL ScLinkTargetTypesObj::hasByName(const OUString& aName) throw( uno::Type SAL_CALL ScLinkTargetTypesObj::getElementType(void) throw( uno::RuntimeException, std::exception ) { - return ::getCppuType((const uno::Reference< beans::XPropertySet >*)0); + return cppu::UnoType<beans::XPropertySet>::get(); } sal_Bool SAL_CALL ScLinkTargetTypesObj::hasElements(void) throw( uno::RuntimeException, std::exception ) @@ -278,7 +278,7 @@ sal_Bool SAL_CALL ScLinkTargetsObj::hasByName(const OUString& aName) throw( uno: uno::Type SAL_CALL ScLinkTargetsObj::getElementType(void) throw( uno::RuntimeException, std::exception ) { - return ::getCppuType((const uno::Reference< beans::XPropertySet >*)0); + return cppu::UnoType<beans::XPropertySet>::get(); } sal_Bool SAL_CALL ScLinkTargetsObj::hasElements(void) throw( uno::RuntimeException, std::exception ) diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index ecb51c105e94..4c40d4a39284 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -106,10 +106,10 @@ static const SfxItemPropertyMapEntry* lcl_GetViewOptPropertyMap() {OUString(SC_UNO_SHOWZERO), 0, getBooleanCppuType(), 0, 0}, {OUString(OLD_UNO_VALUEHIGH), 0, getBooleanCppuType(), 0, 0}, {OUString(OLD_UNO_VERTSCROLL), 0, getBooleanCppuType(), 0, 0}, - {OUString(SC_UNO_VISAREA), 0, getCppuType((awt::Rectangle*)0), 0, 0}, + {OUString(SC_UNO_VISAREA), 0, cppu::UnoType<awt::Rectangle>::get(), 0, 0}, {OUString(SC_UNO_ZOOMTYPE), 0, cppu::UnoType<sal_Int16>::get(), 0, 0}, {OUString(SC_UNO_ZOOMVALUE), 0, cppu::UnoType<sal_Int16>::get(), 0, 0}, - {OUString(SC_UNO_VISAREASCREEN),0, getCppuType((awt::Rectangle*)0), 0, 0}, + {OUString(SC_UNO_VISAREASCREEN),0, cppu::UnoType<awt::Rectangle>::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; return aViewOptPropertyMap_Impl; @@ -161,11 +161,11 @@ uno::Sequence<uno::Type> SAL_CALL ScViewPaneBase::getTypes() throw(uno::RuntimeE { aTypes.realloc(5); uno::Type* pPtr = aTypes.getArray(); - pPtr[0] = getCppuType((const uno::Reference<sheet::XViewPane>*)0); - pPtr[1] = getCppuType((const uno::Reference<sheet::XCellRangeReferrer>*)0); - pPtr[2] = getCppuType((const uno::Reference<view::XFormLayerAccess>*)0); - pPtr[3] = getCppuType((const uno::Reference<lang::XServiceInfo>*)0); - pPtr[4] = getCppuType((const uno::Reference<lang::XTypeProvider>*)0); + pPtr[0] = cppu::UnoType<sheet::XViewPane>::get(); + pPtr[1] = cppu::UnoType<sheet::XCellRangeReferrer>::get(); + pPtr[2] = cppu::UnoType<view::XFormLayerAccess>::get(); + pPtr[3] = cppu::UnoType<lang::XServiceInfo>::get(); + pPtr[4] = cppu::UnoType<lang::XTypeProvider>::get(); } return aTypes; } @@ -602,18 +602,18 @@ uno::Sequence<uno::Type> SAL_CALL ScTabViewObj::getTypes() throw(uno::RuntimeExc aTypes.realloc( nParentLen + 12 ); uno::Type* pPtr = aTypes.getArray(); - pPtr[nParentLen + 0] = getCppuType((const uno::Reference<sheet::XSpreadsheetView>*)0); - pPtr[nParentLen + 1] = getCppuType((const uno::Reference<container::XEnumerationAccess>*)0); - pPtr[nParentLen + 2] = getCppuType((const uno::Reference<container::XIndexAccess>*)0); - pPtr[nParentLen + 3] = getCppuType((const uno::Reference<view::XSelectionSupplier>*)0); - pPtr[nParentLen + 4] = getCppuType((const uno::Reference<beans::XPropertySet>*)0); - pPtr[nParentLen + 5] = getCppuType((const uno::Reference<sheet::XViewSplitable>*)0); - pPtr[nParentLen + 6] = getCppuType((const uno::Reference<sheet::XViewFreezable>*)0); - pPtr[nParentLen + 7] = getCppuType((const uno::Reference<sheet::XRangeSelection>*)0); - pPtr[nParentLen + 8] = getCppuType((const uno::Reference<lang::XUnoTunnel>*)0); - pPtr[nParentLen + 9] = getCppuType((const uno::Reference<sheet::XEnhancedMouseClickBroadcaster>*)0); - pPtr[nParentLen + 10] = getCppuType((const uno::Reference<sheet::XActivationBroadcaster>*)0); - pPtr[nParentLen + 11] = getCppuType((const uno::Reference<datatransfer::XTransferableSupplier>*)0); + pPtr[nParentLen + 0] = cppu::UnoType<sheet::XSpreadsheetView>::get(); + pPtr[nParentLen + 1] = cppu::UnoType<container::XEnumerationAccess>::get(); + pPtr[nParentLen + 2] = cppu::UnoType<container::XIndexAccess>::get(); + pPtr[nParentLen + 3] = cppu::UnoType<view::XSelectionSupplier>::get(); + pPtr[nParentLen + 4] = cppu::UnoType<beans::XPropertySet>::get(); + pPtr[nParentLen + 5] = cppu::UnoType<sheet::XViewSplitable>::get(); + pPtr[nParentLen + 6] = cppu::UnoType<sheet::XViewFreezable>::get(); + pPtr[nParentLen + 7] = cppu::UnoType<sheet::XRangeSelection>::get(); + pPtr[nParentLen + 8] = cppu::UnoType<lang::XUnoTunnel>::get(); + pPtr[nParentLen + 9] = cppu::UnoType<sheet::XEnhancedMouseClickBroadcaster>::get(); + pPtr[nParentLen + 10] = cppu::UnoType<sheet::XActivationBroadcaster>::get(); + pPtr[nParentLen + 11] = cppu::UnoType<datatransfer::XTransferableSupplier>::get(); long i; for (i=0; i<nViewPaneLen; i++) @@ -1013,7 +1013,7 @@ uno::Any SAL_CALL ScTabViewObj::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScTabViewObj::getElementType() throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - return getCppuType((uno::Reference<sheet::XViewPane>*)0); + return cppu::UnoType<sheet::XViewPane>::get(); } sal_Bool SAL_CALL ScTabViewObj::hasElements() throw(uno::RuntimeException, std::exception) diff --git a/ucbhelper/source/provider/resultsetmetadata.cxx b/ucbhelper/source/provider/resultsetmetadata.cxx index ed9339e4c981..b894f74c5c63 100644 --- a/ucbhelper/source/provider/resultsetmetadata.cxx +++ b/ucbhelper/source/provider/resultsetmetadata.cxx @@ -456,7 +456,7 @@ sal_Int32 SAL_CALL ResultSetMetaData::getColumnType( sal_Int32 column ) const Type& rType = m_aProps.getConstArray()[ column - 1 ].Type; sal_Int32 nType = DataType::OTHER; - if ( rType == getCppuType( static_cast< const OUString * >( 0 ) ) ) + if ( rType == cppu::UnoType<OUString>::get() ) nType = DataType::VARCHAR; // XRow::getString else if ( rType == getCppuBooleanType() ) nType = DataType::BIT; // XRow::getBoolean |