[Libreoffice-commits] core.git: dtrans/source embeddedobj/source sc/source ucbhelper/source
Julien Nabet
serval2412 at yahoo.fr
Fri May 16 15:24:58 PDT 2014
dtrans/source/generic/generic_clipboard.cxx | 2
embeddedobj/source/commonembedding/embedobj.cxx | 2
embeddedobj/source/commonembedding/miscobj.cxx | 44 +--
embeddedobj/source/commonembedding/specialobject.cxx | 6
embeddedobj/source/general/dummyobject.cxx | 18 -
embeddedobj/source/msole/olecomponent.cxx | 20 -
embeddedobj/source/msole/oleembed.cxx | 6
embeddedobj/source/msole/olemisc.cxx | 20 -
sc/source/core/data/dptabsrc.cxx | 10
sc/source/core/tool/addincol.cxx | 22 -
sc/source/filter/xml/xmlwrap.cxx | 6
sc/source/ui/Accessibility/AccessibleDocument.cxx | 2
sc/source/ui/Accessibility/AccessibleTableBase.cxx | 2
sc/source/ui/unoobj/addruno.cxx | 4
sc/source/ui/unoobj/afmtuno.cxx | 4
sc/source/ui/unoobj/cellsuno.cxx | 246 +++++++++----------
sc/source/ui/unoobj/chart2uno.cxx | 2
sc/source/ui/unoobj/chartuno.cxx | 2
sc/source/ui/unoobj/confuno.cxx | 2
sc/source/ui/unoobj/cursuno.cxx | 6
sc/source/ui/unoobj/dapiuno.cxx | 14 -
sc/source/ui/unoobj/datauno.cxx | 10
sc/source/ui/unoobj/docuno.cxx | 86 +++---
sc/source/ui/unoobj/fielduno.cxx | 14 -
sc/source/ui/unoobj/fmtuno.cxx | 6
sc/source/ui/unoobj/funcuno.cxx | 2
sc/source/ui/unoobj/linkuno.cxx | 6
sc/source/ui/unoobj/nameuno.cxx | 6
sc/source/ui/unoobj/optuno.cxx | 2
sc/source/ui/unoobj/shapeuno.cxx | 18 -
sc/source/ui/unoobj/styleuno.cxx | 18 -
sc/source/ui/unoobj/targuno.cxx | 6
sc/source/ui/unoobj/viewuno.cxx | 40 +--
ucbhelper/source/provider/resultsetmetadata.cxx | 2
34 files changed, 328 insertions(+), 328 deletions(-)
New commits:
commit dd33f91581aaca03a83a70d94195338516742fa2
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Sat May 17 00:23:39 2014 +0200
Prefer cppu::UnoType<T>::get() to ::getCppuType((T*)0) part14
Change-Id: Ibccaa2138426c22cd63d273a1b6cdc927ebe80dc
diff --git a/dtrans/source/generic/generic_clipboard.cxx b/dtrans/source/generic/generic_clipboard.cxx
index fee7607..d711619 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 2bb477c..048655c 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 eda750f..8df625d 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 1342103..c98b797 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 531cb8f..d4a1481 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 e8d6588..8e00070 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 9c6326b..4a43d1e 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 7bd0354..8e32180 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 cd0b425..d746ead 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 49b3ab2..77567d4 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 6dea493..e99fcdb 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 c085559..3c48184 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 f3d641a..246e09a 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 d0571a9..82f5409 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 465cc60..e08e225 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 c15fc3d..f07ffd2 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 0a4b0c8..4792d86 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 57539f0..23e31cd 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 5dbe4a3..9099f91 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 4f69c25..a50792d 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 f8607ca..0ca5275 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 8103bb3..b8d6bb2 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();
}
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list