diff options
38 files changed, 145 insertions, 145 deletions
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx index 3a53c0c9cba8..df5c3610b3c5 100644 --- a/basic/source/basmgr/basmgr.cxx +++ b/basic/source/basmgr/basmgr.cxx @@ -1931,7 +1931,7 @@ public: uno::Type ModuleContainer_Impl::getElementType() throw(uno::RuntimeException, std::exception) { - uno::Type aModuleType = ::getCppuType( (const uno::Reference< script::XStarBasicModuleInfo > *)0 ); + uno::Type aModuleType = cppu::UnoType<script::XStarBasicModuleInfo>::get(); return aModuleType; } @@ -1993,7 +1993,7 @@ void ModuleContainer_Impl::replaceByName( const OUString& aName, const uno::Any& void ModuleContainer_Impl::insertByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { - uno::Type aModuleType = ::getCppuType( (const uno::Reference< script::XStarBasicModuleInfo > *)0 ); + uno::Type aModuleType = cppu::UnoType<script::XStarBasicModuleInfo>::get(); uno::Type aAnyType = aElement.getValueType(); if( aModuleType != aAnyType ) { @@ -2080,7 +2080,7 @@ public: uno::Type DialogContainer_Impl::getElementType() throw(uno::RuntimeException, std::exception) { - uno::Type aModuleType = ::getCppuType( (const uno::Reference< script::XStarBasicDialogInfo > *)0 ); + uno::Type aModuleType = cppu::UnoType<script::XStarBasicDialogInfo>::get(); return aModuleType; } @@ -2173,7 +2173,7 @@ void DialogContainer_Impl::insertByName( const OUString& aName, const uno::Any& throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { (void)aName; - uno::Type aModuleType = ::getCppuType( (const uno::Reference< script::XStarBasicDialogInfo > *)0 ); + uno::Type aModuleType = cppu::UnoType<script::XStarBasicDialogInfo>::get(); uno::Type aAnyType = aElement.getValueType(); if( aModuleType != aAnyType ) { @@ -2240,7 +2240,7 @@ public: uno::Type LibraryContainer_Impl::getElementType() throw(uno::RuntimeException, std::exception) { - uno::Type aType = ::getCppuType( (const uno::Reference< script::XStarBasicLibraryInfo > *)0 ); + uno::Type aType = cppu::UnoType<script::XStarBasicLibraryInfo>::get(); return aType; } diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index 102fe6c52a4d..85343b2dc4ae 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -848,26 +848,26 @@ Type getUnoTypeForSbxBaseType( SbxDataType eType ) switch( eType ) { case SbxNULL: aRetType = ::getCppuType( (const Reference< XInterface > *)0 ); break; - case SbxINTEGER: aRetType = ::cppu::UnoType<sal_Int16>::get(); break; - case SbxLONG: aRetType = ::cppu::UnoType<sal_Int32>::get(); break; - case SbxSINGLE: aRetType = ::cppu::UnoType<float>::get(); break; - case SbxDOUBLE: aRetType = ::cppu::UnoType<double>::get(); break; - case SbxCURRENCY: aRetType = ::getCppuType( (oleautomation::Currency*)0 ); break; - case SbxDECIMAL: aRetType = ::getCppuType( (oleautomation::Decimal*)0 ); break; + case SbxINTEGER: aRetType = cppu::UnoType<sal_Int16>::get(); break; + case SbxLONG: aRetType = cppu::UnoType<sal_Int32>::get(); break; + case SbxSINGLE: aRetType = cppu::UnoType<float>::get(); break; + case SbxDOUBLE: aRetType = cppu::UnoType<double>::get(); break; + case SbxCURRENCY: aRetType = cppu::UnoType<oleautomation::Currency>::get(); break; + case SbxDECIMAL: aRetType = cppu::UnoType<oleautomation::Decimal>::get(); break; case SbxDATE: { SbiInstance* pInst = GetSbData()->pInst; if( pInst && pInst->IsCompatibility() ) - aRetType = ::cppu::UnoType<double>::get(); + aRetType = cppu::UnoType<double>::get(); else - aRetType = ::getCppuType( (oleautomation::Date*)0 ); + aRetType = cppu::UnoType<oleautomation::Date>::get(); } break; - case SbxSTRING: aRetType = ::cppu::UnoType<OUString>::get(); break; - case SbxBOOL: aRetType = ::getCppuType( (sal_Bool*)0 ); break; - case SbxVARIANT: aRetType = ::getCppuType( (Any*)0 ); break; - case SbxCHAR: aRetType = ::getCppuType( (sal_Unicode*)0 ); break; - case SbxBYTE: aRetType = ::cppu::UnoType<sal_Int8>::get(); break; - case SbxUSHORT: aRetType = ::getCppuType( (sal_uInt16*)0 ); break; + case SbxSTRING: aRetType = cppu::UnoType<OUString>::get(); break; + case SbxBOOL: aRetType = cppu::UnoType<sal_Bool>::get(); break; + case SbxVARIANT: aRetType = cppu::UnoType<Any>::get(); break; + case SbxCHAR: aRetType = cppu::UnoType<cppu::UnoCharType>::get(); break; + case SbxBYTE: aRetType = cppu::UnoType<sal_Int8>::get(); break; + case SbxUSHORT: aRetType = cppu::UnoType<cppu::UnoUnsignedShortType>::get(); break; case SbxULONG: aRetType = ::cppu::UnoType<sal_uInt32>::get(); break; // map machine-dependent ones to long for consistency case SbxINT: aRetType = ::cppu::UnoType<sal_Int32>::get(); break; @@ -926,7 +926,7 @@ Type getUnoTypeForSbxValue( const SbxValue* pVal ) { // if only first element is void: different types -> []any // if all elements are void: []void is not allowed -> []any - aElementType = getCppuType( (Any*)0 ); + aElementType = cppu::UnoType<Any>::get(); break; } aElementType = aType; @@ -935,7 +935,7 @@ Type getUnoTypeForSbxValue( const SbxValue* pVal ) else if( aElementType != aType ) { // different types -> AnySequence - aElementType = getCppuType( (Any*)0 ); + aElementType = cppu::UnoType<Any>::get(); break; } } @@ -963,7 +963,7 @@ Type getUnoTypeForSbxValue( const SbxValue* pVal ) { // if only first element is void: different types -> []any // if all elements are void: []void is not allowed -> []any - aElementType = getCppuType( (Any*)0 ); + aElementType = cppu::UnoType<Any>::get(); break; } aElementType = aType; @@ -972,7 +972,7 @@ Type getUnoTypeForSbxValue( const SbxValue* pVal ) else if( aElementType != aType ) { // different types -> AnySequence - aElementType = getCppuType( (Any*)0 ); + aElementType = cppu::UnoType<Any>::get(); break; } } @@ -1087,16 +1087,16 @@ Any sbxToUnoValueImpl( const SbxValue* pVar, bool bBlockConversionToSmallestType { sal_uInt16 n = pVar->GetUShort(); if( n <= 255 ) - aType = ::getCppuType( (sal_uInt8*)0 ); + aType = cppu::UnoType<sal_uInt8>::get(); break; } case TypeClass_UNSIGNED_LONG: { sal_uInt32 n = pVar->GetLong(); if( n <= 255 ) - aType = ::getCppuType( (sal_uInt8*)0 ); + aType = cppu::UnoType<sal_uInt8>::get(); else if( n <= SbxMAXUINT ) - aType = ::getCppuType( (sal_uInt16*)0 ); + aType = cppu::UnoType<cppu::UnoUnsignedShortType>::get(); break; } // TODO: need to add hyper types ? @@ -1247,20 +1247,20 @@ Any sbxToUnoValue( const SbxValue* pVar, const Type& rType, Property* pUnoProper SbiInstance* pInst = GetSbData()->pInst; if( pInst && pInst->IsCompatibility() ) { - if( rType == ::getCppuType( (oleautomation::Decimal*)0 ) ) + if( rType == cppu::UnoType<oleautomation::Decimal>::get()) { oleautomation::Decimal aDecimal; pVar->fillAutomationDecimal( aDecimal ); aRetVal <<= aDecimal; break; } - else if( rType == ::getCppuType( (oleautomation::Currency*)0 ) ) + else if( rType == cppu::UnoType<oleautomation::Currency>::get()) { // assumes per previous code that ole Currency is Int64 aRetVal <<= (sal_Int64)( pVar->GetInt64() ); break; } - else if( rType == ::getCppuType( (oleautomation::Date*)0 ) ) + else if( rType == cppu::UnoType<oleautomation::Date>::get()) { oleautomation::Date aDate; aDate.Value = pVar->GetDate(); diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index 1dfeb8f2406a..fe2f00d3a178 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -1887,7 +1887,7 @@ RTLFUNC(CDateFromUnoDate) return; } - Any aAny (sbxToUnoValue(rPar.Get(1), ::getCppuType( (com::sun::star::util::Date*)0 ))); + Any aAny (sbxToUnoValue(rPar.Get(1), cppu::UnoType<com::sun::star::util::Date>::get())); com::sun::star::util::Date aUnoDate; if(aAny >>= aUnoDate) SbxDateFromUNODate(rPar.Get(0), aUnoDate); @@ -1940,7 +1940,7 @@ RTLFUNC(CDateFromUnoTime) return; } - Any aAny (sbxToUnoValue(rPar.Get(1), ::getCppuType( (com::sun::star::util::Time*)0 ))); + Any aAny (sbxToUnoValue(rPar.Get(1), cppu::UnoType<com::sun::star::util::Time>::get())); com::sun::star::util::Time aUnoTime; if(aAny >>= aUnoTime) SbxDateFromUNOTime(rPar.Get(0), aUnoTime); @@ -2002,7 +2002,7 @@ RTLFUNC(CDateFromUnoDateTime) return; } - Any aAny (sbxToUnoValue(rPar.Get(1), ::getCppuType( (com::sun::star::util::DateTime*)0 ))); + Any aAny (sbxToUnoValue(rPar.Get(1), cppu::UnoType<com::sun::star::util::DateTime>::get())); com::sun::star::util::DateTime aUnoDT; if(aAny >>= aUnoDT) SbxDateFromUNODateTime(rPar.Get(0), aUnoDT); diff --git a/framework/inc/macros/xtypeprovider.hxx b/framework/inc/macros/xtypeprovider.hxx index 498c87710a2f..0aa9bbfa5a2a 100644 --- a/framework/inc/macros/xtypeprovider.hxx +++ b/framework/inc/macros/xtypeprovider.hxx @@ -243,7 +243,7 @@ ________________________________________________________________________________ #define PRIVATE_DEFINE_XTYPEPROVIDER_PURE( CLASS ) \ PRIVATE_DEFINE_XTYPEPROVIDER_GETIMPLEMENTATIONID( CLASS ) \ - PRIVATE_DEFINE_XTYPEPROVIDER_GETTYPES( CLASS, ::getCppuType(( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider >*)NULL ) ) + PRIVATE_DEFINE_XTYPEPROVIDER_GETTYPES( CLASS, cppu::UnoType<com::sun::star::lang::XTypeProvider>::get()) #define PRIVATE_DEFINE_XTYPEPROVIDER( CLASS, TYPES ) \ PRIVATE_DEFINE_XTYPEPROVIDER_GETIMPLEMENTATIONID( CLASS ) \ diff --git a/framework/source/fwe/classes/actiontriggerpropertyset.cxx b/framework/source/fwe/classes/actiontriggerpropertyset.cxx index 6e5a12d35b91..a1d0e5e275a6 100644 --- a/framework/source/fwe/classes/actiontriggerpropertyset.cxx +++ b/framework/source/fwe/classes/actiontriggerpropertyset.cxx @@ -307,10 +307,10 @@ const Sequence< Property > ActionTriggerPropertySet::impl_getStaticPropertyDescr { const Property pActionTriggerPropertys[] = { - Property( OUString( "CommandURL" ), HANDLE_COMMANDURL , ::getCppuType((OUString*)0) , PropertyAttribute::TRANSIENT ), - Property( OUString( "HelpURL" ), HANDLE_HELPURL , ::getCppuType((OUString*)0) , PropertyAttribute::TRANSIENT ), + Property( OUString( "CommandURL" ), HANDLE_COMMANDURL , cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT ), + Property( OUString( "HelpURL" ), HANDLE_HELPURL , cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT ), Property( OUString( "Image" ), HANDLE_IMAGE , ::getCppuType((Reference<XBitmap>*)0) , PropertyAttribute::TRANSIENT ), - Property( OUString( "SubContainer" ), HANDLE_SUBCONTAINER , ::getCppuType((OUString*)0) , PropertyAttribute::TRANSIENT ), + Property( OUString( "SubContainer" ), HANDLE_SUBCONTAINER , cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT ), Property( OUString( "Text" ), HANDLE_TEXT , ::getCppuType((Reference<XInterface>*)0) , PropertyAttribute::TRANSIENT ) }; diff --git a/framework/source/fwi/uielement/constitemcontainer.cxx b/framework/source/fwi/uielement/constitemcontainer.cxx index 87324dd1586a..2622311d4363 100644 --- a/framework/source/fwi/uielement/constitemcontainer.cxx +++ b/framework/source/fwi/uielement/constitemcontainer.cxx @@ -398,7 +398,7 @@ const com::sun::star::uno::Sequence< com::sun::star::beans::Property > ConstItem const com::sun::star::beans::Property pProperties[] = { com::sun::star::beans::Property( OUString(PROPNAME_UINAME), PROPHANDLE_UINAME , - ::getCppuType((const OUString*)NULL), + cppu::UnoType<OUString>::get(), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ) }; // Use it to initialize sequence! diff --git a/framework/source/fwi/uielement/rootitemcontainer.cxx b/framework/source/fwi/uielement/rootitemcontainer.cxx index 9ff376acd1a1..b7a914139584 100644 --- a/framework/source/fwi/uielement/rootitemcontainer.cxx +++ b/framework/source/fwi/uielement/rootitemcontainer.cxx @@ -367,7 +367,7 @@ const com::sun::star::uno::Sequence< com::sun::star::beans::Property > RootItemC const com::sun::star::beans::Property pProperties[] = { com::sun::star::beans::Property( OUString(PROPNAME_UINAME), PROPHANDLE_UINAME , - ::getCppuType((const OUString*)NULL), + cppu::UnoType<OUString>::get(), com::sun::star::beans::PropertyAttribute::TRANSIENT ) }; // Use it to initialize sequence! diff --git a/framework/source/helper/uiconfigelementwrapperbase.cxx b/framework/source/helper/uiconfigelementwrapperbase.cxx index 300d8c86e53b..741b9ea6c29a 100644 --- a/framework/source/helper/uiconfigelementwrapperbase.cxx +++ b/framework/source/helper/uiconfigelementwrapperbase.cxx @@ -95,12 +95,12 @@ Sequence< Type > SAL_CALL UIConfigElementWrapperBase::getTypes( ) throw(Runtime // XComponent void SAL_CALL UIConfigElementWrapperBase::addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) { - m_aListenerContainer.addInterface( ::getCppuType( ( const css::uno::Reference< css::lang::XEventListener >* ) NULL ), xListener ); + m_aListenerContainer.addInterface( cppu::UnoType<css::lang::XEventListener>::get(), xListener ); } void SAL_CALL UIConfigElementWrapperBase::removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) { - m_aListenerContainer.removeInterface( ::getCppuType( ( const css::uno::Reference< css::lang::XEventListener >* ) NULL ), aListener ); + m_aListenerContainer.removeInterface( cppu::UnoType<css::lang::XEventListener>::get(), aListener ); } // XEventListener @@ -434,13 +434,13 @@ const com::sun::star::uno::Sequence< com::sun::star::beans::Property > UIConfigE const com::sun::star::beans::Property pProperties[] = { - com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_CONFIGLISTENER), UIELEMENT_PROPHANDLE_CONFIGLISTENER , ::getCppuType((const sal_Bool*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT ), + com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_CONFIGLISTENER), UIELEMENT_PROPHANDLE_CONFIGLISTENER , cppu::UnoType<sal_Bool>::get(), com::sun::star::beans::PropertyAttribute::TRANSIENT ), com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_CONFIGSOURCE), UIELEMENT_PROPHANDLE_CONFIGSOURCE , ::getCppuType((const Reference< ::com::sun::star::ui::XUIConfigurationManager >*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT ), com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_FRAME), UIELEMENT_PROPHANDLE_FRAME , ::getCppuType((const Reference< com::sun::star::frame::XFrame >*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ), - com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_NOCLOSE), UIELEMENT_PROPHANDLE_NOCLOSE , ::getCppuType((const sal_Bool*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT ), - com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_PERSISTENT), UIELEMENT_PROPHANDLE_PERSISTENT , ::getCppuType((const sal_Bool*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT ), - com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_RESOURCEURL), UIELEMENT_PROPHANDLE_RESOURCEURL , ::getCppuType((const OUString*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ), - com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_TYPE), UIELEMENT_PROPHANDLE_TYPE , ::getCppuType((const OUString*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ), + com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_NOCLOSE), UIELEMENT_PROPHANDLE_NOCLOSE , cppu::UnoType<sal_Bool>::get(), com::sun::star::beans::PropertyAttribute::TRANSIENT ), + com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_PERSISTENT), UIELEMENT_PROPHANDLE_PERSISTENT , cppu::UnoType<sal_Bool>::get(), com::sun::star::beans::PropertyAttribute::TRANSIENT ), + com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_RESOURCEURL), UIELEMENT_PROPHANDLE_RESOURCEURL , cppu::UnoType<OUString>::get(), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ), + com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_TYPE), UIELEMENT_PROPHANDLE_TYPE , cppu::UnoType<OUString>::get(), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ), com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_XMENUBAR), UIELEMENT_PROPHANDLE_XMENUBAR , ::getCppuType((const Reference< com::sun::star::awt::XMenuBar >*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ) }; // Use it to initialize sequence! diff --git a/framework/source/helper/uielementwrapperbase.cxx b/framework/source/helper/uielementwrapperbase.cxx index 6fade1148862..1273c83a6b9b 100644 --- a/framework/source/helper/uielementwrapperbase.cxx +++ b/framework/source/helper/uielementwrapperbase.cxx @@ -75,12 +75,12 @@ Sequence< Type > SAL_CALL UIElementWrapperBase::getTypes( ) throw(RuntimeExcept void SAL_CALL UIElementWrapperBase::addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) { - m_aListenerContainer.addInterface( ::getCppuType( ( const css::uno::Reference< css::lang::XEventListener >* ) NULL ), xListener ); + m_aListenerContainer.addInterface( cppu::UnoType<css::lang::XEventListener>::get(), xListener ); } void SAL_CALL UIElementWrapperBase::removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) { - m_aListenerContainer.removeInterface( ::getCppuType( ( const css::uno::Reference< css::lang::XEventListener >* ) NULL ), xListener ); + m_aListenerContainer.removeInterface( cppu::UnoType<css::lang::XEventListener>::get(), xListener ); } void SAL_CALL UIElementWrapperBase::initialize( const Sequence< Any >& aArguments ) @@ -230,7 +230,7 @@ const com::sun::star::uno::Sequence< com::sun::star::beans::Property > UIElement { com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_FRAME), UIELEMENT_PROPHANDLE_FRAME , ::getCppuType((Reference< XFrame >*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ), com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_RESOURCEURL), UIELEMENT_PROPHANDLE_RESOURCEURL , ::getCppuType((sal_Int16*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ), - com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_TYPE), UIELEMENT_PROPHANDLE_TYPE , ::getCppuType((const OUString*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ) + com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_TYPE), UIELEMENT_PROPHANDLE_TYPE , cppu::UnoType<OUString>::get(), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ) }; // Use it to initialize sequence! const com::sun::star::uno::Sequence< com::sun::star::beans::Property > lPropertyDescriptor( pProperties, UIELEMENT_PROPCOUNT ); diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index 89e9109a8808..a58ddd2ad104 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -2616,19 +2616,19 @@ IMPL_LINK_NOARG(LayoutManager, SettingsChanged) void SAL_CALL LayoutManager::addLayoutManagerEventListener( const uno::Reference< frame::XLayoutManagerListener >& xListener ) throw (uno::RuntimeException, std::exception) { - m_aListenerContainer.addInterface( ::getCppuType( (const uno::Reference< frame::XLayoutManagerListener >*)NULL ), xListener ); + m_aListenerContainer.addInterface( cppu::UnoType<frame::XLayoutManagerListener>::get(), xListener ); } void SAL_CALL LayoutManager::removeLayoutManagerEventListener( const uno::Reference< frame::XLayoutManagerListener >& xListener ) throw (uno::RuntimeException, std::exception) { - m_aListenerContainer.removeInterface( ::getCppuType( (const uno::Reference< frame::XLayoutManagerListener >*)NULL ), xListener ); + m_aListenerContainer.removeInterface( cppu::UnoType<frame::XLayoutManagerListener>::get(), xListener ); } void LayoutManager::implts_notifyListeners( short nEvent, uno::Any aInfoParam ) { lang::EventObject aSource( static_cast< ::cppu::OWeakObject*>(this) ); - ::cppu::OInterfaceContainerHelper* pContainer = m_aListenerContainer.getContainer( ::getCppuType( ( const uno::Reference< frame::XLayoutManagerListener >*) NULL ) ); + ::cppu::OInterfaceContainerHelper* pContainer = m_aListenerContainer.getContainer( cppu::UnoType<frame::XLayoutManagerListener>::get()); if (pContainer!=NULL) { ::cppu::OInterfaceIteratorHelper pIterator(*pContainer); diff --git a/framework/source/recording/dispatchrecorder.cxx b/framework/source/recording/dispatchrecorder.cxx index a97f3a39a08a..c5bbaebb70cc 100644 --- a/framework/source/recording/dispatchrecorder.cxx +++ b/framework/source/recording/dispatchrecorder.cxx @@ -382,7 +382,7 @@ void SAL_CALL DispatchRecorder::implts_recordMacro( const OUString& aURL, com::sun::star::uno::Type SAL_CALL DispatchRecorder::getElementType() throw (::com::sun::star::uno::RuntimeException, std::exception) { - return ::getCppuType((const com::sun::star::frame::DispatchStatement *)NULL); + return cppu::UnoType<com::sun::star::frame::DispatchStatement>::get(); } sal_Bool SAL_CALL DispatchRecorder::hasElements() throw (::com::sun::star::uno::RuntimeException, std::exception) @@ -405,7 +405,7 @@ com::sun::star::uno::Any SAL_CALL DispatchRecorder::getByIndex(sal_Int32 idx) t } Any element(&m_aStatements[idx], - ::getCppuType((const com::sun::star::frame::DispatchStatement *)NULL)); + cppu::UnoType<com::sun::star::frame::DispatchStatement>::get()); return element; } @@ -413,7 +413,7 @@ com::sun::star::uno::Any SAL_CALL DispatchRecorder::getByIndex(sal_Int32 idx) t void SAL_CALL DispatchRecorder::replaceByIndex(sal_Int32 idx, const com::sun::star::uno::Any& element) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { if (element.getValueType() != - ::getCppuType((const com::sun::star::frame::DispatchStatement *)NULL)) { + cppu::UnoType<com::sun::star::frame::DispatchStatement>::get()) { throw com::sun::star::lang::IllegalArgumentException( OUString( "Illegal argument in dispatch recorder" ), Reference< XInterface >(), 2 ); diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index fddecae94bee..771dfa609b59 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -396,7 +396,7 @@ void SAL_CALL Desktop::addTerminateListener( const css::uno::Reference< css::fra } // No lock required ... container is threadsafe by itself. - m_aListenerContainer.addInterface( ::getCppuType( ( const css::uno::Reference< css::frame::XTerminateListener >*) NULL ), xListener ); + m_aListenerContainer.addInterface( cppu::UnoType<css::frame::XTerminateListener>::get(), xListener ); } void SAL_CALL Desktop::removeTerminateListener( const css::uno::Reference< css::frame::XTerminateListener >& xListener ) @@ -437,7 +437,7 @@ void SAL_CALL Desktop::removeTerminateListener( const css::uno::Reference< css:: } // No lock required ... container is threadsafe by itself. - m_aListenerContainer.removeInterface( ::getCppuType( ( const css::uno::Reference< css::frame::XTerminateListener >*) NULL ), xListener ); + m_aListenerContainer.removeInterface( cppu::UnoType<css::frame::XTerminateListener>::get(), xListener ); } /*-************************************************************************************************************ @@ -1100,7 +1100,7 @@ void SAL_CALL Desktop::addEventListener( const css::uno::Reference< css::lang::X // Register transaction and reject wrong calls. TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS ); - m_aListenerContainer.addInterface( ::getCppuType( ( const css::uno::Reference< css::lang::XEventListener >*) NULL ), xListener ); + m_aListenerContainer.addInterface( cppu::UnoType<css::lang::XEventListener>::get(), xListener ); } void SAL_CALL Desktop::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) @@ -1112,7 +1112,7 @@ void SAL_CALL Desktop::removeEventListener( const css::uno::Reference< css::lang // Register transaction and reject wrong calls. TransactionGuard aTransaction( m_aTransactionManager, E_SOFTEXCEPTIONS ); - m_aListenerContainer.removeInterface( ::getCppuType( ( const css::uno::Reference< css::lang::XEventListener >*) NULL ), xListener ); + m_aListenerContainer.removeInterface( cppu::UnoType<css::lang::XEventListener>::get(), xListener ); } /*-************************************************************************************************************ @@ -1585,7 +1585,7 @@ const css::uno::Sequence< css::beans::Property > Desktop::impl_getStaticProperty css::beans::Property( DESKTOP_PROPNAME_DISPATCHRECORDERSUPPLIER , DESKTOP_PROPHANDLE_DISPATCHRECORDERSUPPLIER, ::getCppuType((const css::uno::Reference< css::frame::XDispatchRecorderSupplier >*)NULL), css::beans::PropertyAttribute::TRANSIENT ), css::beans::Property( DESKTOP_PROPNAME_ISPLUGGED , DESKTOP_PROPHANDLE_ISPLUGGED , ::getBooleanCppuType() , css::beans::PropertyAttribute::TRANSIENT | css::beans::PropertyAttribute::READONLY ), css::beans::Property( DESKTOP_PROPNAME_SUSPENDQUICKSTARTVETO , DESKTOP_PROPHANDLE_SUSPENDQUICKSTARTVETO , ::getBooleanCppuType() , css::beans::PropertyAttribute::TRANSIENT ), - css::beans::Property( DESKTOP_PROPNAME_TITLE , DESKTOP_PROPHANDLE_TITLE , ::getCppuType((const OUString*)NULL) , css::beans::PropertyAttribute::TRANSIENT ), + css::beans::Property( DESKTOP_PROPNAME_TITLE , DESKTOP_PROPHANDLE_TITLE , cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::TRANSIENT ), }; // Use it to initialize sequence! const css::uno::Sequence< css::beans::Property > lPropertyDescriptor( pProperties, DESKTOP_PROPCOUNT ); @@ -1600,7 +1600,7 @@ void Desktop::impl_sendQueryTerminationEvent(Desktop::TTerminateListenerList& lC TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS ); - ::cppu::OInterfaceContainerHelper* pContainer = m_aListenerContainer.getContainer( ::getCppuType( ( const css::uno::Reference< css::frame::XTerminateListener >*) NULL ) ); + ::cppu::OInterfaceContainerHelper* pContainer = m_aListenerContainer.getContainer( cppu::UnoType<css::frame::XTerminateListener>::get()); if ( ! pContainer ) return; @@ -1661,7 +1661,7 @@ void Desktop::impl_sendNotifyTerminationEvent() { TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS ); - ::cppu::OInterfaceContainerHelper* pContainer = m_aListenerContainer.getContainer( ::getCppuType( ( const css::uno::Reference< css::frame::XTerminateListener >*) NULL ) ); + ::cppu::OInterfaceContainerHelper* pContainer = m_aListenerContainer.getContainer( cppu::UnoType<css::frame::XTerminateListener>::get()); if ( ! pContainer ) return; diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index 9c78eab4f98e..e374471a5df4 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -2128,7 +2128,7 @@ void SAL_CALL Frame::addEventListener( const css::uno::Reference< css::lang::XEv TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS ); /* SAFE AREA ----------------------------------------------------------------------------------------------- */ - m_aListenerContainer.addInterface( ::getCppuType( ( const css::uno::Reference< css::lang::XEventListener >* ) NULL ), xListener ); + m_aListenerContainer.addInterface( cppu::UnoType<css::lang::XEventListener>::get(), xListener ); } void SAL_CALL Frame::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) @@ -2142,7 +2142,7 @@ void SAL_CALL Frame::removeEventListener( const css::uno::Reference< css::lang:: TransactionGuard aTransaction( m_aTransactionManager, E_SOFTEXCEPTIONS ); /* SAFE AREA ----------------------------------------------------------------------------------------------- */ - m_aListenerContainer.removeInterface( ::getCppuType( ( const css::uno::Reference< css::lang::XEventListener >* ) NULL ), xListener ); + m_aListenerContainer.removeInterface( cppu::UnoType<css::lang::XEventListener>::get(), xListener ); } /*-**************************************************************************************************** @@ -2684,7 +2684,7 @@ void Frame::impl_initializePropInfo() css::beans::Property( FRAME_PROPNAME_TITLE, FRAME_PROPHANDLE_TITLE, - ::getCppuType((const OUString*)NULL), + cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::TRANSIENT)); } diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx index ea757853de58..763938846cfa 100644 --- a/framework/source/services/pathsettings.cxx +++ b/framework/source/services/pathsettings.cxx @@ -1090,7 +1090,7 @@ void PathSettings::impl_rebuildPropertyDescriptor() pProp = &(m_lPropDesc[i]); pProp->Name = rPath.sPathName; pProp->Handle = i; - pProp->Type = ::getCppuType((OUString*)0); + pProp->Type = cppu::UnoType<OUString>::get(); pProp->Attributes = css::beans::PropertyAttribute::BOUND; if (rPath.bIsReadonly) pProp->Attributes |= css::beans::PropertyAttribute::READONLY; @@ -1116,7 +1116,7 @@ void PathSettings::impl_rebuildPropertyDescriptor() pProp = &(m_lPropDesc[i]); pProp->Name = rPath.sPathName+POSTFIX_WRITE_PATH; pProp->Handle = i; - pProp->Type = ::getCppuType((OUString*)0); + pProp->Type = cppu::UnoType<OUString>::get(); pProp->Attributes = css::beans::PropertyAttribute::BOUND; if (rPath.bIsReadonly) pProp->Attributes |= css::beans::PropertyAttribute::READONLY; diff --git a/framework/source/services/tabwindowservice.cxx b/framework/source/services/tabwindowservice.cxx index b1ebfb81f20e..8aa1e640947f 100644 --- a/framework/source/services/tabwindowservice.cxx +++ b/framework/source/services/tabwindowservice.cxx @@ -368,7 +368,7 @@ void SAL_CALL TabWindowService::dispose() void SAL_CALL TabWindowService::addEventListener(const css::uno::Reference< css::lang::XEventListener >& xListener) throw (css::uno::RuntimeException, std::exception) { - m_lListener.addInterface(::getCppuType((const css::uno::Reference< css::lang::XEventListener >*)NULL), xListener); + m_lListener.addInterface(cppu::UnoType<css::lang::XEventListener>::get(), xListener); } // XComponent @@ -376,7 +376,7 @@ void SAL_CALL TabWindowService::addEventListener(const css::uno::Reference< css: void SAL_CALL TabWindowService::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener) throw (css::uno::RuntimeException, std::exception) { - m_lListener.removeInterface(::getCppuType((const css::uno::Reference< css::lang::XEventListener >*)NULL), xListener); + m_lListener.removeInterface(cppu::UnoType<css::lang::XEventListener>::get(), xListener); } void TabWindowService::impl_initializePropInfo() @@ -387,7 +387,7 @@ void TabWindowService::impl_initializePropInfo() css::beans::Property( OUString("Window"), TABWINDOWSERVICE_PROPHANDLE_WINDOW, - ::getCppuType((const css::uno::Reference< css::awt::XWindow >*)NULL), + cppu::UnoType<css::awt::XWindow>::get(), css::beans::PropertyAttribute::TRANSIENT)); } diff --git a/framework/source/tabwin/tabwindow.cxx b/framework/source/tabwin/tabwindow.cxx index 94e988b5824d..05c1afc4dd15 100644 --- a/framework/source/tabwin/tabwindow.cxx +++ b/framework/source/tabwin/tabwindow.cxx @@ -462,7 +462,7 @@ throw (css::uno::RuntimeException, std::exception) aLock.clear(); /* SAFE AREA ----------------------------------------------------------------------------------------------- */ - m_aListenerContainer.addInterface( ::getCppuType( ( const css::uno::Reference< css::lang::XEventListener >* ) NULL ), xListener ); + m_aListenerContainer.addInterface( cppu::UnoType<css::lang::XEventListener>::get(), xListener ); } void SAL_CALL TabWindow::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) @@ -475,7 +475,7 @@ throw (css::uno::RuntimeException, std::exception) aLock.clear(); /* SAFE AREA ----------------------------------------------------------------------------------------------- */ - m_aListenerContainer.removeInterface( ::getCppuType( ( const css::uno::Reference< css::lang::XEventListener >* ) NULL ), xListener ); + m_aListenerContainer.removeInterface( cppu::UnoType<css::lang::XEventListener>::get(), xListener ); } // XEventListener @@ -911,11 +911,11 @@ const css::uno::Sequence< css::beans::Property > TabWindow::impl_getStaticProper { com::sun::star::beans::Property( TABWINDOW_PROPNAME_PARENTWINDOW, TABWINDOW_PROPHANDLE_PARENTWINDOW, - ::getCppuType((const css::uno::Reference< css::awt::XWindow >*)NULL), + cppu::UnoType<css::awt::XWindow>::get(), com::sun::star::beans::PropertyAttribute::READONLY ), com::sun::star::beans::Property( TABWINDOW_PROPNAME_TOPWINDOW, TABWINDOW_PROPHANDLE_TOPWINDOW, - ::getCppuType((const css::uno::Reference< css::awt::XWindow >*)NULL), + cppu::UnoType<css::awt::XWindow>::get(), com::sun::star::beans::PropertyAttribute::READONLY ) }; // Use it to initialize sequence! const com::sun::star::uno::Sequence< com::sun::star::beans::Property > lPropertyDescriptor( pProperties, TABWINDOW_PROPCOUNT ); diff --git a/framework/source/uiconfiguration/graphicnameaccess.cxx b/framework/source/uiconfiguration/graphicnameaccess.cxx index e127152624be..e81a79797181 100644 --- a/framework/source/uiconfiguration/graphicnameaccess.cxx +++ b/framework/source/uiconfiguration/graphicnameaccess.cxx @@ -88,7 +88,7 @@ throw( uno::RuntimeException, std::exception ) uno::Type SAL_CALL GraphicNameAccess::getElementType() throw( uno::RuntimeException, std::exception ) { - return ::getCppuType( (const uno::Reference< graphic::XGraphic > *)NULL ); + return cppu::UnoType<graphic::XGraphic>::get(); } } // namespace framework diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx index 2beaa001cf51..347c7e6f87a1 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.cxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx @@ -721,13 +721,13 @@ void ImageManagerImpl::addEventListener( const uno::Reference< XEventListener >& throw DisposedException(); } - m_aListenerContainer.addInterface( ::getCppuType( ( const uno::Reference< XEventListener >* ) NULL ), xListener ); + m_aListenerContainer.addInterface( cppu::UnoType<XEventListener>::get(), xListener ); } void ImageManagerImpl::removeEventListener( const uno::Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ - m_aListenerContainer.removeInterface( ::getCppuType( ( const uno::Reference< XEventListener >* ) NULL ), xListener ); + m_aListenerContainer.removeInterface( cppu::UnoType<XEventListener>::get(), xListener ); } // XInitialization @@ -1372,20 +1372,20 @@ throw (::com::sun::star::uno::RuntimeException) throw DisposedException(); } - m_aListenerContainer.addInterface( ::getCppuType( ( const uno::Reference< XUIConfigurationListener >* ) NULL ), xListener ); + m_aListenerContainer.addInterface( cppu::UnoType<XUIConfigurationListener>::get(), xListener ); } void ImageManagerImpl::removeConfigurationListener( const uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ - m_aListenerContainer.removeInterface( ::getCppuType( ( const uno::Reference< XUIConfigurationListener >* ) NULL ), xListener ); + m_aListenerContainer.removeInterface( cppu::UnoType<XUIConfigurationListener>::get(), xListener ); } void ImageManagerImpl::implts_notifyContainerListener( const ConfigurationEvent& aEvent, NotifyOp eOp ) { ::cppu::OInterfaceContainerHelper* pContainer = m_aListenerContainer.getContainer( - ::getCppuType( ( const css::uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >*) NULL ) ); + cppu::UnoType<com::sun::star::ui::XUIConfigurationListener>::get()); if ( pContainer != NULL ) { ::cppu::OInterfaceIteratorHelper pIterator( *pContainer ); diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx index 384ba7a3f78b..42c57f0bc882 100644 --- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx @@ -1677,7 +1677,7 @@ sal_Bool SAL_CALL ModuleUIConfigurationManager::isReadOnly() throw (::com::sun:: void ModuleUIConfigurationManager::implts_notifyContainerListener( const ui::ConfigurationEvent& aEvent, NotifyOp eOp ) { - ::cppu::OInterfaceContainerHelper* pContainer = m_aListenerContainer.getContainer( ::getCppuType( ( const css::uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >*) NULL ) ); + ::cppu::OInterfaceContainerHelper* pContainer = m_aListenerContainer.getContainer( cppu::UnoType<com::sun::star::ui::XUIConfigurationListener>::get()); if ( pContainer != NULL ) { ::cppu::OInterfaceIteratorHelper pIterator( *pContainer ); diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx index d2d5a124bc02..a2c69479a20b 100644 --- a/framework/source/uiconfiguration/uicategorydescription.cxx +++ b/framework/source/uiconfiguration/uicategorydescription.cxx @@ -181,7 +181,7 @@ throw (::com::sun::star::uno::RuntimeException, std::exception) Type SAL_CALL ConfigurationAccess_UICategory::getElementType() throw ( RuntimeException, std::exception ) { - return( ::getCppuType( (const OUString*)NULL ) ); + return( cppu::UnoType<OUString>::get()); } sal_Bool SAL_CALL ConfigurationAccess_UICategory::hasElements() diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx index 8ac7dcc83bf7..717a3cfd4061 100644 --- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx @@ -1384,7 +1384,7 @@ sal_Bool SAL_CALL UIConfigurationManager::isReadOnly() throw (::com::sun::star:: void UIConfigurationManager::implts_notifyContainerListener( const ConfigurationEvent& aEvent, NotifyOp eOp ) { - ::cppu::OInterfaceContainerHelper* pContainer = m_aListenerContainer.getContainer( ::getCppuType( ( const css::uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >*) NULL ) ); + ::cppu::OInterfaceContainerHelper* pContainer = m_aListenerContainer.getContainer( cppu::UnoType<com::sun::star::ui::XUIConfigurationListener>::get()); if ( pContainer != NULL ) { ::cppu::OInterfaceIteratorHelper pIterator( *pContainer ); diff --git a/toolkit/source/awt/vclxbitmap.cxx b/toolkit/source/awt/vclxbitmap.cxx index b64cdfdeb584..e989da30f8ff 100644 --- a/toolkit/source/awt/vclxbitmap.cxx +++ b/toolkit/source/awt/vclxbitmap.cxx @@ -44,8 +44,8 @@ IMPL_XUNOTUNNEL( VCLXBitmap ) // ::com::sun::star::lang::XTypeProvider IMPL_XTYPEPROVIDER_START( VCLXBitmap ) - getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap>* ) NULL ), - getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDisplayBitmap>* ) NULL ) + cppu::UnoType<com::sun::star::awt::XBitmap>::get(), + cppu::UnoType<com::sun::star::awt::XDisplayBitmap>::get() IMPL_XTYPEPROVIDER_END diff --git a/toolkit/source/awt/vclxcontainer.cxx b/toolkit/source/awt/vclxcontainer.cxx index 90bc1266f9f2..45b5e20b3f3f 100644 --- a/toolkit/source/awt/vclxcontainer.cxx +++ b/toolkit/source/awt/vclxcontainer.cxx @@ -57,8 +57,8 @@ VCLXContainer::~VCLXContainer() // ::com::sun::star::lang::XTypeProvider IMPL_XTYPEPROVIDER_START( VCLXContainer ) - getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclContainer>* ) NULL ), - getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclContainerPeer>* ) NULL ), + cppu::UnoType<com::sun::star::awt::XVclContainer>::get(), + cppu::UnoType<com::sun::star::awt::XVclContainerPeer>::get(), VCLXWindow::getTypes() IMPL_XTYPEPROVIDER_END diff --git a/toolkit/source/awt/vclxdevice.cxx b/toolkit/source/awt/vclxdevice.cxx index f9b1c4f3a383..ce0e3de429ca 100644 --- a/toolkit/source/awt/vclxdevice.cxx +++ b/toolkit/source/awt/vclxdevice.cxx @@ -82,8 +82,8 @@ IMPL_XUNOTUNNEL( VCLXDevice ) // ::com::sun::star::lang::XTypeProvider IMPL_XTYPEPROVIDER_START( VCLXDevice ) - getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice>* ) NULL ), - getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XUnitConversion>* ) NULL ) + cppu::UnoType<com::sun::star::awt::XDevice>::get(), + cppu::UnoType<com::sun::star::awt::XUnitConversion>::get() IMPL_XTYPEPROVIDER_END diff --git a/toolkit/source/awt/vclxfont.cxx b/toolkit/source/awt/vclxfont.cxx index 06a440b24b09..14174f25b5d7 100644 --- a/toolkit/source/awt/vclxfont.cxx +++ b/toolkit/source/awt/vclxfont.cxx @@ -84,7 +84,7 @@ IMPL_XUNOTUNNEL( VCLXFont ) // ::com::sun::star::lang::XTypeProvider IMPL_XTYPEPROVIDER_START( VCLXFont ) - getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont2>* ) NULL ) + cppu::UnoType<com::sun::star::awt::XFont2>::get() IMPL_XTYPEPROVIDER_END diff --git a/toolkit/source/awt/vclxgraphics.cxx b/toolkit/source/awt/vclxgraphics.cxx index 82efe1620adf..6a3a479a44dc 100644 --- a/toolkit/source/awt/vclxgraphics.cxx +++ b/toolkit/source/awt/vclxgraphics.cxx @@ -53,7 +53,7 @@ IMPL_XUNOTUNNEL( VCLXGraphics ) // lang::XTypeProvider IMPL_XTYPEPROVIDER_START( VCLXGraphics ) - getCppuType( ( uno::Reference< awt::XGraphics>* ) NULL ) + cppu::UnoType<awt::XGraphics>::get() IMPL_XTYPEPROVIDER_END VCLXGraphics::VCLXGraphics() diff --git a/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx index 97ccd04ef2ad..7a691e3b4434 100644 --- a/toolkit/source/awt/vclxmenu.cxx +++ b/toolkit/source/awt/vclxmenu.cxx @@ -250,10 +250,10 @@ throw(css::uno::RuntimeException, std::exception) if( !pCollectionPopupMenu ) { static ::cppu::OTypeCollection collectionPopupMenu( - getCppuType( ( css::uno::Reference< css::lang::XTypeProvider>* ) NULL ), - getCppuType( ( css::uno::Reference< css::awt::XMenu>* ) NULL ), - getCppuType( ( css::uno::Reference< css::awt::XPopupMenu>* ) NULL ), - getCppuType( ( css::uno::Reference< css::lang::XServiceInfo>* ) NULL ) ); + cppu::UnoType<css::lang::XTypeProvider>::get(), + cppu::UnoType<css::awt::XMenu>::get(), + cppu::UnoType<css::awt::XPopupMenu>::get(), + cppu::UnoType<css::lang::XServiceInfo>::get()); pCollectionPopupMenu = &collectionPopupMenu; } } @@ -268,10 +268,10 @@ throw(css::uno::RuntimeException, std::exception) if( !pCollectionMenuBar ) { static ::cppu::OTypeCollection collectionMenuBar( - getCppuType( ( css::uno::Reference< css::lang::XTypeProvider>* ) NULL ), - getCppuType( ( css::uno::Reference< css::awt::XMenu>* ) NULL ), - getCppuType( ( css::uno::Reference< css::awt::XMenuBar>* ) NULL ), - getCppuType( ( css::uno::Reference< css::lang::XServiceInfo>* ) NULL ) ); + cppu::UnoType<css::lang::XTypeProvider>::get(), + cppu::UnoType<css::awt::XMenu>::get(), + cppu::UnoType<css::awt::XMenuBar>::get(), + cppu::UnoType<css::lang::XServiceInfo>::get()); pCollectionMenuBar = &collectionMenuBar; } } diff --git a/toolkit/source/awt/vclxpointer.cxx b/toolkit/source/awt/vclxpointer.cxx index faa7f9a1d629..7a3df1e50ece 100644 --- a/toolkit/source/awt/vclxpointer.cxx +++ b/toolkit/source/awt/vclxpointer.cxx @@ -48,7 +48,7 @@ IMPL_XUNOTUNNEL( VCLXPointer ) // ::com::sun::star::lang::XTypeProvider IMPL_XTYPEPROVIDER_START( VCLXPointer ) - getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPointer>* ) NULL ) + cppu::UnoType<com::sun::star::awt::XPointer>::get() IMPL_XTYPEPROVIDER_END void VCLXPointer::setType( sal_Int32 nType ) throw(::com::sun::star::uno::RuntimeException, std::exception) diff --git a/toolkit/source/awt/vclxprinter.cxx b/toolkit/source/awt/vclxprinter.cxx index 14677c51a104..206201f40a44 100644 --- a/toolkit/source/awt/vclxprinter.cxx +++ b/toolkit/source/awt/vclxprinter.cxx @@ -49,7 +49,7 @@ { static ::com::sun::star::beans::Property aPropTable[] = { - ::com::sun::star::beans::Property( OUString("Orientation"), PROPERTY_Orientation, ::getCppuType((const sal_Int16*)0), 0 ), + ::com::sun::star::beans::Property( OUString("Orientation"), PROPERTY_Orientation, cppu::UnoType<sal_Int16>::get(), 0 ), ::com::sun::star::beans::Property( OUString("Horizontal"), PROPERTY_Horizontal, ::getBooleanCppuType(), 0 ) }; pProperties = aPropTable; diff --git a/toolkit/source/awt/vclxregion.cxx b/toolkit/source/awt/vclxregion.cxx index 8ac1dce7edeb..ae777e654592 100644 --- a/toolkit/source/awt/vclxregion.cxx +++ b/toolkit/source/awt/vclxregion.cxx @@ -51,7 +51,7 @@ IMPL_XUNOTUNNEL( VCLXRegion ) // ::com::sun::star::lang::XTypeProvider IMPL_XTYPEPROVIDER_START( VCLXRegion ) - getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion>* ) NULL ) + cppu::UnoType<com::sun::star::awt::XRegion>::get() IMPL_XTYPEPROVIDER_END diff --git a/toolkit/source/awt/vclxsystemdependentwindow.cxx b/toolkit/source/awt/vclxsystemdependentwindow.cxx index 05dc3856287e..17b1877f73ff 100644 --- a/toolkit/source/awt/vclxsystemdependentwindow.cxx +++ b/toolkit/source/awt/vclxsystemdependentwindow.cxx @@ -58,7 +58,7 @@ VCLXSystemDependentWindow::~VCLXSystemDependentWindow() // ::com::sun::star::lang::XTypeProvider IMPL_XTYPEPROVIDER_START( VCLXSystemDependentWindow ) - getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XSystemDependentWindowPeer>* ) NULL ), + cppu::UnoType<com::sun::star::awt::XSystemDependentWindowPeer>::get(), VCLXWindow::getTypes() IMPL_XTYPEPROVIDER_END diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index cb174ffe1fe9..78637d42adcd 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -795,8 +795,8 @@ VCLXCheckBox::VCLXCheckBox() : maActionListeners( *this ), maItemListeners( *th // ::com::sun::star::lang::XTypeProvider IMPL_XTYPEPROVIDER_START( VCLXCheckBox ) - getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XButton>* ) NULL ), - getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XCheckBox>* ) NULL ), + cppu::UnoType<com::sun::star::awt::XButton>::get(), + cppu::UnoType<com::sun::star::awt::XCheckBox>::get(), VCLXGraphicControl::getTypes() IMPL_XTYPEPROVIDER_END @@ -1096,8 +1096,8 @@ VCLXRadioButton::VCLXRadioButton() : maItemListeners( *this ), maActionListeners // ::com::sun::star::lang::XTypeProvider IMPL_XTYPEPROVIDER_START( VCLXRadioButton ) - getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRadioButton>* ) NULL ), - getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XButton>* ) NULL ), + cppu::UnoType<com::sun::star::awt::XRadioButton>::get(), + cppu::UnoType<com::sun::star::awt::XButton>::get(), VCLXGraphicControl::getTypes() IMPL_XTYPEPROVIDER_END @@ -1356,7 +1356,7 @@ VCLXSpinField::VCLXSpinField() : maSpinListeners( *this ) // ::com::sun::star::lang::XTypeProvider IMPL_XTYPEPROVIDER_START( VCLXSpinField ) - getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XSpinField>* ) NULL ), + cppu::UnoType<com::sun::star::awt::XSpinField>::get(), VCLXEdit::getTypes() IMPL_XTYPEPROVIDER_END @@ -2201,7 +2201,7 @@ VCLXMessageBox::~VCLXMessageBox() // ::com::sun::star::lang::XTypeProvider IMPL_XTYPEPROVIDER_START( VCLXMessageBox ) - getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMessageBox>* ) NULL ), + cppu::UnoType<com::sun::star::awt::XMessageBox>::get(), VCLXTopWindow::getTypes() IMPL_XTYPEPROVIDER_END @@ -2288,8 +2288,8 @@ VCLXDialog::~VCLXDialog() // ::com::sun::star::lang::XTypeProvider IMPL_XTYPEPROVIDER_START( VCLXDialog ) - getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDialog2>* ) NULL ), - getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDialog>* ) NULL ), + cppu::UnoType<com::sun::star::awt::XDialog2>::get(), + cppu::UnoType<com::sun::star::awt::XDialog>::get(), VCLXTopWindow::getTypes() IMPL_XTYPEPROVIDER_END @@ -2899,7 +2899,7 @@ void VCLXFixedHyperlink::dispose() throw(::com::sun::star::uno::RuntimeException // ::com::sun::star::lang::XTypeProvider IMPL_XTYPEPROVIDER_START( VCLXFixedHyperlink ) - getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFixedHyperlink>* ) NULL ), + cppu::UnoType<com::sun::star::awt::XFixedHyperlink>::get(), VCLXWindow::getTypes() IMPL_XTYPEPROVIDER_END @@ -3203,7 +3203,7 @@ VCLXFixedText::~VCLXFixedText() // ::com::sun::star::lang::XTypeProvider IMPL_XTYPEPROVIDER_START( VCLXFixedText ) - getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFixedText>* ) NULL ), + cppu::UnoType<com::sun::star::awt::XFixedText>::get(), VCLXWindow::getTypes() IMPL_XTYPEPROVIDER_END @@ -3345,7 +3345,7 @@ VCLXScrollBar::VCLXScrollBar() : maAdjustmentListeners( *this ) // ::com::sun::star::lang::XTypeProvider IMPL_XTYPEPROVIDER_START( VCLXScrollBar ) - getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XScrollBar>* ) NULL ), + cppu::UnoType<com::sun::star::awt::XScrollBar>::get(), VCLXWindow::getTypes() IMPL_XTYPEPROVIDER_END @@ -3831,9 +3831,9 @@ VCLXEdit::VCLXEdit() : maTextListeners( *this ) // ::com::sun::star::lang::XTypeProvider IMPL_XTYPEPROVIDER_START( VCLXEdit ) - getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent>* ) NULL ), - getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextEditField>* ) NULL ), - getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextLayoutConstrains>* ) NULL ), + cppu::UnoType<com::sun::star::awt::XTextComponent>::get(), + cppu::UnoType<com::sun::star::awt::XTextEditField>::get(), + cppu::UnoType<com::sun::star::awt::XTextLayoutConstrains>::get(), VCLXWindow::getTypes() IMPL_XTYPEPROVIDER_END @@ -4819,7 +4819,7 @@ VCLXDateField::~VCLXDateField() // ::com::sun::star::lang::XTypeProvider IMPL_XTYPEPROVIDER_START( VCLXDateField ) - getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDateField>* ) NULL ), + cppu::UnoType<com::sun::star::awt::XDateField>::get(), VCLXFormattedSpinField::getTypes() IMPL_XTYPEPROVIDER_END @@ -5167,7 +5167,7 @@ VCLXTimeField::~VCLXTimeField() // ::com::sun::star::lang::XTypeProvider IMPL_XTYPEPROVIDER_START( VCLXTimeField ) - getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTimeField>* ) NULL ), + cppu::UnoType<com::sun::star::awt::XTimeField>::get(), VCLXFormattedSpinField::getTypes() IMPL_XTYPEPROVIDER_END @@ -5466,7 +5466,7 @@ VCLXNumericField::~VCLXNumericField() // ::com::sun::star::lang::XTypeProvider IMPL_XTYPEPROVIDER_START( VCLXNumericField ) - getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XNumericField>* ) NULL ), + cppu::UnoType<com::sun::star::awt::XNumericField>::get(), VCLXFormattedSpinField::getTypes() IMPL_XTYPEPROVIDER_END @@ -5823,7 +5823,7 @@ MetricField *VCLXMetricField::GetMetricField() throw(::com::sun::star::uno::Runt // ::com::sun::star::lang::XTypeProvider IMPL_XTYPEPROVIDER_START( VCLXMetricField ) - getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMetricField>* ) NULL ), + cppu::UnoType<com::sun::star::awt::XMetricField>::get(), VCLXFormattedSpinField::getTypes() IMPL_XTYPEPROVIDER_END @@ -6062,7 +6062,7 @@ VCLXCurrencyField::~VCLXCurrencyField() // ::com::sun::star::lang::XTypeProvider IMPL_XTYPEPROVIDER_START( VCLXCurrencyField ) - getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XCurrencyField>* ) NULL ), + cppu::UnoType<com::sun::star::awt::XCurrencyField>::get(), VCLXFormattedSpinField::getTypes() IMPL_XTYPEPROVIDER_END @@ -6411,7 +6411,7 @@ VCLXPatternField::~VCLXPatternField() // ::com::sun::star::lang::XTypeProvider IMPL_XTYPEPROVIDER_START( VCLXPatternField ) - getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPatternField>* ) NULL ), + cppu::UnoType<com::sun::star::awt::XPatternField>::get(), VCLXFormattedSpinField::getTypes() IMPL_XTYPEPROVIDER_END diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx index 7c01058b290a..0faf34fb3bfc 100644 --- a/toolkit/source/controls/dialogcontrol.cxx +++ b/toolkit/source/controls/dialogcontrol.cxx @@ -763,8 +763,8 @@ void SAL_CALL UnoMultiPageControl::removeTabListener( const Reference< XTabListe // lang::XTypeProvider IMPL_XTYPEPROVIDER_START( UnoMultiPageControl ) - getCppuType( ( uno::Reference< awt::XSimpleTabController>* ) NULL ), - getCppuType( ( uno::Reference< awt::XTabListener>* ) NULL ), + cppu::UnoType<awt::XSimpleTabController>::get(), + cppu::UnoType<awt::XTabListener>::get(), ControlContainerBase::getTypes() IMPL_XTYPEPROVIDER_END diff --git a/toolkit/source/controls/eventcontainer.cxx b/toolkit/source/controls/eventcontainer.cxx index 4c8c35561835..f90e18c52e0b 100644 --- a/toolkit/source/controls/eventcontainer.cxx +++ b/toolkit/source/controls/eventcontainer.cxx @@ -188,7 +188,7 @@ void NameContainer_Impl::removeContainerListener( const ::com::sun::star::uno::R // Ctor ScriptEventContainer::ScriptEventContainer( void ) - : NameContainer_Impl( getCppuType( (ScriptEventDescriptor*) NULL ) ) + : NameContainer_Impl( cppu::UnoType<ScriptEventDescriptor>::get()) { } diff --git a/toolkit/source/controls/stdtabcontrollermodel.cxx b/toolkit/source/controls/stdtabcontrollermodel.cxx index 5c58e5c43dfa..d61e723f4afe 100644 --- a/toolkit/source/controls/stdtabcontrollermodel.cxx +++ b/toolkit/source/controls/stdtabcontrollermodel.cxx @@ -224,9 +224,9 @@ void ImplWriteControls( const ::com::sun::star::uno::Reference< ::com::sun::star // ::com::sun::star::lang::XTypeProvider IMPL_XTYPEPROVIDER_START( StdTabControllerModel ) - getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabControllerModel>* ) NULL ), - getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XServiceInfo>* ) NULL ), - getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::io::XPersistObject>* ) NULL ) + cppu::UnoType<com::sun::star::awt::XTabControllerModel>::get(), + cppu::UnoType<com::sun::star::lang::XServiceInfo>::get(), + cppu::UnoType<com::sun::star::io::XPersistObject>::get() IMPL_XTYPEPROVIDER_END sal_Bool StdTabControllerModel::getGroupControl( ) throw(::com::sun::star::uno::RuntimeException, std::exception) diff --git a/toolkit/source/controls/tkscrollbar.cxx b/toolkit/source/controls/tkscrollbar.cxx index f0b627e15e6d..04d8c5bde437 100644 --- a/toolkit/source/controls/tkscrollbar.cxx +++ b/toolkit/source/controls/tkscrollbar.cxx @@ -107,8 +107,8 @@ namespace toolkit // ::com::sun::star::lang::XTypeProvider IMPL_XTYPEPROVIDER_START( UnoScrollBarControl ) - getCppuType( ( uno::Reference< awt::XAdjustmentListener>* ) NULL ), - getCppuType( ( uno::Reference< awt::XScrollBar>* ) NULL ), + cppu::UnoType<awt::XAdjustmentListener>::get(), + cppu::UnoType<awt::XScrollBar>::get(), UnoControlBase::getTypes() IMPL_XTYPEPROVIDER_END diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx index f3c85ef16def..c9ada6b734a1 100644 --- a/toolkit/source/controls/unocontrolcontainer.cxx +++ b/toolkit/source/controls/unocontrolcontainer.cxx @@ -611,7 +611,7 @@ void UnoControlContainer::addingControl( const uno::Reference< awt::XControl >& if ( _rxControl.is() ) { uno::Reference< uno::XInterface > xThis; - OWeakAggObject::queryInterface( ::getCppuType( static_cast< uno::Reference< uno::XInterface >* >( NULL ) ) ) >>= xThis; + OWeakAggObject::queryInterface( cppu::UnoType<uno::XInterface>::get() ) >>= xThis; _rxControl->setContext( xThis ); _rxControl->addEventListener( this ); diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx index 38598c0ed177..3f759dbf3c4a 100644 --- a/toolkit/source/controls/unocontrols.cxx +++ b/toolkit/source/controls/unocontrols.cxx @@ -1533,8 +1533,8 @@ uno::Any UnoFixedHyperlinkControl::queryAggregation( const uno::Type & rType ) t // lang::XTypeProvider IMPL_XTYPEPROVIDER_START( UnoFixedHyperlinkControl ) - getCppuType( ( uno::Reference< awt::XFixedHyperlink>* ) NULL ), - getCppuType( ( uno::Reference< awt::XLayoutConstrains>* ) NULL ), + cppu::UnoType<awt::XFixedHyperlink>::get(), + cppu::UnoType<awt::XLayoutConstrains>::get(), UnoControlBase::getTypes() IMPL_XTYPEPROVIDER_END @@ -1729,8 +1729,8 @@ uno::Any UnoFixedTextControl::queryAggregation( const uno::Type & rType ) throw( // lang::XTypeProvider IMPL_XTYPEPROVIDER_START( UnoFixedTextControl ) - getCppuType( ( uno::Reference< awt::XFixedText>* ) NULL ), - getCppuType( ( uno::Reference< awt::XLayoutConstrains>* ) NULL ), + cppu::UnoType<awt::XFixedText>::get(), + cppu::UnoType<awt::XLayoutConstrains>::get(), UnoControlBase::getTypes() IMPL_XTYPEPROVIDER_END @@ -2994,9 +2994,9 @@ uno::Any UnoComboBoxControl::queryAggregation( const uno::Type & rType ) throw(u } // lang::XTypeProvider IMPL_XTYPEPROVIDER_START( UnoComboBoxControl ) - getCppuType( ( uno::Reference< awt::XComboBox>* ) NULL ), - getCppuType( ( uno::Reference< awt::XItemListener>* ) NULL ), - getCppuType( ( uno::Reference< awt::XItemListListener>* ) NULL ), + cppu::UnoType<awt::XComboBox>::get(), + cppu::UnoType<awt::XItemListener>::get(), + cppu::UnoType<awt::XItemListListener>::get(), UnoEditControl::getTypes() IMPL_XTYPEPROVIDER_END @@ -3291,7 +3291,7 @@ uno::Any UnoSpinFieldControl::queryAggregation( const uno::Type & rType ) throw( // lang::XTypeProvider IMPL_XTYPEPROVIDER_START( UnoSpinFieldControl ) - getCppuType( ( uno::Reference< awt::XSpinField>* ) NULL ), + cppu::UnoType<awt::XSpinField>::get(), UnoEditControl::getTypes() IMPL_XTYPEPROVIDER_END @@ -3441,7 +3441,7 @@ uno::Any UnoDateFieldControl::queryAggregation( const uno::Type & rType ) throw( // lang::XTypeProvider IMPL_XTYPEPROVIDER_START( UnoDateFieldControl ) - getCppuType( ( uno::Reference< awt::XDateField>* ) NULL ), + cppu::UnoType<awt::XDateField>::get(), UnoSpinFieldControl::getTypes() IMPL_XTYPEPROVIDER_END @@ -3696,7 +3696,7 @@ uno::Any UnoTimeFieldControl::queryAggregation( const uno::Type & rType ) throw( // lang::XTypeProvider IMPL_XTYPEPROVIDER_START( UnoTimeFieldControl ) - getCppuType( ( uno::Reference< awt::XTimeField>* ) NULL ), + cppu::UnoType<awt::XTimeField>::get(), UnoSpinFieldControl::getTypes() IMPL_XTYPEPROVIDER_END @@ -3911,7 +3911,7 @@ uno::Any UnoNumericFieldControl::queryAggregation( const uno::Type & rType ) thr // lang::XTypeProvider IMPL_XTYPEPROVIDER_START( UnoNumericFieldControl ) - getCppuType( ( uno::Reference< awt::XNumericField>* ) NULL ), + cppu::UnoType<awt::XNumericField>::get(), UnoSpinFieldControl::getTypes() IMPL_XTYPEPROVIDER_END @@ -4129,7 +4129,7 @@ uno::Any UnoCurrencyFieldControl::queryAggregation( const uno::Type & rType ) th // lang::XTypeProvider IMPL_XTYPEPROVIDER_START( UnoCurrencyFieldControl ) - getCppuType( ( uno::Reference< awt::XCurrencyField>* ) NULL ), + cppu::UnoType<awt::XCurrencyField>::get(), UnoSpinFieldControl::getTypes() IMPL_XTYPEPROVIDER_END @@ -4362,7 +4362,7 @@ uno::Any UnoPatternFieldControl::queryAggregation( const uno::Type & rType ) thr // lang::XTypeProvider IMPL_XTYPEPROVIDER_START( UnoPatternFieldControl ) - getCppuType( ( uno::Reference< awt::XPatternField>* ) NULL ), + cppu::UnoType<awt::XPatternField>::get(), UnoSpinFieldControl::getTypes() IMPL_XTYPEPROVIDER_END @@ -4498,7 +4498,7 @@ uno::Any UnoProgressBarControl::queryAggregation( const uno::Type & rType ) thro // lang::XTypeProvider IMPL_XTYPEPROVIDER_START( UnoProgressBarControl ) - getCppuType( ( uno::Reference< awt::XProgressBar>* ) NULL ), + cppu::UnoType<awt::XProgressBar>::get(), UnoControlBase::getTypes() IMPL_XTYPEPROVIDER_END |