diff options
82 files changed, 585 insertions, 586 deletions
diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx index 4633f2ac8607..caccf120ae00 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx @@ -195,7 +195,7 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "AddIn", PROP_DOCUMENT_ADDIN, - ::getCppuType( reinterpret_cast< Reference< util::XRefreshable > * >(0)), + cppu::UnoType<util::XRefreshable>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( @@ -207,7 +207,7 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "AdditionalShapes", PROP_DOCUMENT_ADDITIONAL_SHAPES, - ::getCppuType( reinterpret_cast< Reference< drawing::XShapes > * >(0)), + cppu::UnoType<drawing::XShapes>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::READONLY )); diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx index 796d755912a3..c7d808cc8147 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx @@ -1059,21 +1059,21 @@ void WrappedStatisticProperties::addProperties( ::std::vector< Property > & rOut rOutProperties.push_back( Property( "DataRegressionProperties", PROP_CHART_STATISTIC_REGRESSION_PROPERTIES, - ::getCppuType( reinterpret_cast< const Reference< beans::XPropertySet > * >(0)), + cppu::UnoType<beans::XPropertySet>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( Property( "DataErrorProperties", PROP_CHART_STATISTIC_ERROR_PROPERTIES, - ::getCppuType( reinterpret_cast< const Reference< beans::XPropertySet > * >(0)), + cppu::UnoType<beans::XPropertySet>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( Property( "DataMeanValueProperties", PROP_CHART_STATISTIC_MEAN_VALUE_PROPERTIES, - ::getCppuType( reinterpret_cast< const Reference< beans::XPropertySet > * >(0)), + cppu::UnoType<beans::XPropertySet>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY | beans::PropertyAttribute::MAYBEVOID )); diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx index 9fef7daa751e..2469312207fe 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx @@ -266,14 +266,14 @@ void WrappedStockProperties::addProperties( ::std::vector< Property > & rOutProp rOutProperties.push_back( Property( "Volume", PROP_CHART_STOCK_VOLUME, - ::getCppuType( reinterpret_cast< sal_Bool * >(0)), + cppu::UnoType<sal_Bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( Property( "UpDown", PROP_CHART_STOCK_UPDOWN, - ::getCppuType( reinterpret_cast< sal_Bool * >(0)), + cppu::UnoType<sal_Bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT | beans::PropertyAttribute::MAYBEVOID )); diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx index 32f0419f8b22..bc5f4940a33c 100644 --- a/chart2/source/model/filter/XMLFilter.cxx +++ b/chart2/source/model/filter/XMLFilter.cxx @@ -339,7 +339,7 @@ sal_Int32 XMLFilter::impl_Import( { 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("PrivateData"), 0, - ::getCppuType( (Reference<XInterface> *)0 ), + cppu::UnoType<XInterface>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("BaseURI"), 0, ::cppu::UnoType<OUString>::get(), diff --git a/chart2/source/model/template/CandleStickChartType.cxx b/chart2/source/model/template/CandleStickChartType.cxx index 57320b90e3e6..faf5f39627eb 100644 --- a/chart2/source/model/template/CandleStickChartType.cxx +++ b/chart2/source/model/template/CandleStickChartType.cxx @@ -59,13 +59,13 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "WhiteDay", PROP_CANDLESTICKCHARTTYPE_WHITE_DAY, - ::getCppuType( reinterpret_cast< Reference< beans::XPropertySet > *>(0)), + cppu::UnoType<beans::XPropertySet>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( Property( "BlackDay", PROP_CANDLESTICKCHARTTYPE_BLACK_DAY, - ::getCppuType( reinterpret_cast< Reference< beans::XPropertySet > *>(0)), + cppu::UnoType<beans::XPropertySet>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); diff --git a/chart2/source/model/template/PieChartTypeTemplate.cxx b/chart2/source/model/template/PieChartTypeTemplate.cxx index b30f633ec171..e49decf1150e 100644 --- a/chart2/source/model/template/PieChartTypeTemplate.cxx +++ b/chart2/source/model/template/PieChartTypeTemplate.cxx @@ -63,7 +63,7 @@ static void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "OffsetMode", PROP_PIE_TEMPLATE_OFFSET_MODE, - ::getCppuType( reinterpret_cast< const chart2::PieChartOffsetMode * >(0)), + cppu::UnoType<chart2::PieChartOffsetMode>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( diff --git a/chart2/source/tools/FillProperties.cxx b/chart2/source/tools/FillProperties.cxx index a6177d69b312..5316984b10fc 100644 --- a/chart2/source/tools/FillProperties.cxx +++ b/chart2/source/tools/FillProperties.cxx @@ -94,7 +94,7 @@ void lcl_AddPropertiesToVector_without_BitmapProperties( ::std::vector< ::com::s rOutProperties.push_back( Property( "FillBackground", FillProperties::PROP_FILL_BACKGROUND, - ::getCppuType( reinterpret_cast< const sal_Bool * >(0)), + cppu::UnoType<sal_Bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); } @@ -147,7 +147,7 @@ void lcl_AddPropertiesToVector_only_BitmapProperties( ::std::vector< ::com::sun: rOutProperties.push_back( Property( "FillBitmapLogicalSize", FillProperties::PROP_FILL_BITMAP_LOGICALSIZE, - ::getCppuType( reinterpret_cast< const sal_Bool * >(0)), + cppu::UnoType<sal_Bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); diff --git a/chart2/source/tools/ModifyListenerHelper.cxx b/chart2/source/tools/ModifyListenerHelper.cxx index 3245ca527c1a..ae5e5d0ddf53 100644 --- a/chart2/source/tools/ModifyListenerHelper.cxx +++ b/chart2/source/tools/ModifyListenerHelper.cxx @@ -39,7 +39,7 @@ void lcl_fireModifyEvent( const lang::EventObject * pEvent ) { ::cppu::OInterfaceContainerHelper * pCntHlp = rBroadcastHelper.getContainer( - ::getCppuType( reinterpret_cast< Reference< util::XModifyListener > * >(0))); + cppu::UnoType<util::XModifyListener>::get()); if( pCntHlp ) { lang::EventObject aEventToSend; @@ -156,7 +156,7 @@ void ModifyEventForwarder::RemoveListener( const Reference< util::XModifyListene void ModifyEventForwarder::DisposeAndClear( const Reference< uno::XWeak > & xSource ) { ::cppu::OInterfaceContainerHelper * pCntHlp = m_aModifyListeners.getContainer( - ::getCppuType( reinterpret_cast< Reference< util::XModifyListener > * >(0))); + cppu::UnoType<util::XModifyListener>::get()); if( pCntHlp ) pCntHlp->disposeAndClear( lang::EventObject( xSource ) ); } diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx index d3fb0eda2f2d..335d69708bb4 100644 --- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx +++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx @@ -736,7 +736,7 @@ OUString SAL_CALL ScAccessibleCsvRuler::getImplementationName() throw( RuntimeEx Sequence< ::com::sun::star::uno::Type > SAL_CALL ScAccessibleCsvRuler::getTypes() throw( RuntimeException, std::exception ) { Sequence< ::com::sun::star::uno::Type > aSeq( 1 ); - aSeq[ 0 ] = getCppuType( static_cast< const Reference< XAccessibleText >* >( NULL ) ); + aSeq[ 0 ] = cppu::UnoType<XAccessibleText>::get(); return ::comphelper::concatSequences( ScAccessibleCsvControl::getTypes(), aSeq ); } @@ -1234,8 +1234,8 @@ OUString SAL_CALL ScAccessibleCsvGrid::getImplementationName() throw( RuntimeExc Sequence< ::com::sun::star::uno::Type > SAL_CALL ScAccessibleCsvGrid::getTypes() throw( RuntimeException, std::exception ) { Sequence< ::com::sun::star::uno::Type > aSeq( 2 ); - aSeq[ 0 ] = getCppuType( static_cast< const Reference< XAccessibleTable >* >( NULL ) ); - aSeq[ 1 ] = getCppuType( static_cast< const Reference< XAccessibleSelection >* >( NULL ) ); + aSeq[ 0 ] = cppu::UnoType<XAccessibleTable>::get(); + aSeq[ 1 ] = cppu::UnoType<XAccessibleSelection>::get(); return ::comphelper::concatSequences( ScAccessibleCsvControl::getTypes(), aSeq ); } diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx index 0ca52759bfcd..3ace2c48bd14 100644 --- a/sc/source/ui/unoobj/dapiuno.cxx +++ b/sc/source/ui/unoobj/dapiuno.cxx @@ -493,7 +493,7 @@ Any SAL_CALL ScDataPilotTablesObj::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScDataPilotTablesObj::getElementType() throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; - return getCppuType((Reference<XDataPilotTable2>*)0); + return cppu::UnoType<XDataPilotTable2>::get(); } sal_Bool SAL_CALL ScDataPilotTablesObj::hasElements() throw(RuntimeException, std::exception) @@ -620,12 +620,12 @@ Sequence< uno::Type > SAL_CALL ScDataPilotDescriptorBase::getTypes() { aTypes.realloc( 6 ); uno::Type* pPtr = aTypes.getArray(); - pPtr[ 0 ] = getCppuType( (const Reference< XDataPilotDescriptor >*)0 ); - pPtr[ 1 ] = getCppuType( (const Reference< XPropertySet >*)0 ); - pPtr[ 2 ] = getCppuType( (const Reference< XDataPilotDataLayoutFieldSupplier >*)0 ); - pPtr[ 3 ] = getCppuType( (const Reference< lang::XUnoTunnel >*)0 ); - pPtr[ 4 ] = getCppuType( (const Reference< lang::XTypeProvider >*)0 ); - pPtr[ 5 ] = getCppuType( (const Reference< lang::XServiceInfo >*)0 ); + pPtr[ 0 ] = cppu::UnoType<XDataPilotDescriptor>::get(); + pPtr[ 1 ] = cppu::UnoType<XPropertySet>::get(); + pPtr[ 2 ] = cppu::UnoType<XDataPilotDataLayoutFieldSupplier>::get(); + pPtr[ 3 ] = cppu::UnoType<lang::XUnoTunnel>::get(); + pPtr[ 4 ] = cppu::UnoType<lang::XTypeProvider>::get(); + pPtr[ 5 ] = cppu::UnoType<lang::XServiceInfo>::get(); } return aTypes; } @@ -1128,8 +1128,8 @@ Sequence< uno::Type > SAL_CALL ScDataPilotTableObj::getTypes() throw(RuntimeExce for (sal_Int32 i = 0; i < nParentLen; ++i) pPtr[ i ] = pParentPtr[ i ]; // parent types first - pPtr[ nParentLen ] = getCppuType( (const Reference< XDataPilotTable2 >*)0 ); - pPtr[ nParentLen+1 ] = getCppuType( (const Reference< XModifyBroadcaster >*)0 ); + pPtr[ nParentLen ] = cppu::UnoType<XDataPilotTable2>::get(); + pPtr[ nParentLen+1 ] = cppu::UnoType<XModifyBroadcaster>::get(); } return aTypes; } @@ -1737,7 +1737,7 @@ Any SAL_CALL ScDataPilotFieldsObj::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScDataPilotFieldsObj::getElementType() throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; - return getCppuType((Reference<XPropertySet>*)0); + return cppu::UnoType<XPropertySet>::get(); } sal_Bool SAL_CALL ScDataPilotFieldsObj::hasElements() throw(RuntimeException, std::exception) @@ -2969,7 +2969,7 @@ Reference<XEnumeration> SAL_CALL ScDataPilotFieldGroupsObj::createEnumeration() uno::Type SAL_CALL ScDataPilotFieldGroupsObj::getElementType() throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; - return getCppuType( (Reference< XNameAccess >*)0 ); + return cppu::UnoType<XNameAccess>::get(); } sal_Bool SAL_CALL ScDataPilotFieldGroupsObj::hasElements() throw(RuntimeException, std::exception) @@ -3153,7 +3153,7 @@ Reference< XEnumeration > SAL_CALL ScDataPilotFieldGroupObj::createEnumeration() uno::Type SAL_CALL ScDataPilotFieldGroupObj::getElementType() throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; - return getCppuType( (Reference< XNamed >*)0 ); + return cppu::UnoType<XNamed>::get(); } sal_Bool SAL_CALL ScDataPilotFieldGroupObj::hasElements() throw(RuntimeException, std::exception) @@ -3312,7 +3312,7 @@ Any SAL_CALL ScDataPilotItemsObj::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScDataPilotItemsObj::getElementType() throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; - return getCppuType((Reference<XPropertySet>*)0); + return cppu::UnoType<XPropertySet>::get(); } sal_Bool SAL_CALL ScDataPilotItemsObj::hasElements() throw(RuntimeException, std::exception) diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx index fd160cfb811d..09762b1f1402 100644 --- a/sc/source/ui/unoobj/datauno.cxx +++ b/sc/source/ui/unoobj/datauno.cxx @@ -95,7 +95,7 @@ static const SfxItemPropertyMapEntry* lcl_GetFilterPropertyMap() {OUString(SC_UNONAME_COPYOUT), 0, getBooleanCppuType(), 0, 0}, {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_ORIENT), 0, cppu::UnoType<table::TableOrientation>::get(), 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}, diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx index 27cc39578ac9..86e7fc84581d 100644 --- a/sc/source/ui/unoobj/linkuno.cxx +++ b/sc/source/ui/unoobj/linkuno.cxx @@ -1675,7 +1675,7 @@ uno::Type SAL_CALL ScExternalDocLinkObj::getElementType() throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; - return getCppuType(static_cast<Reference<sheet::XExternalDocLink>*>(0)); + return cppu::UnoType<sheet::XExternalDocLink>::get(); } sal_Bool SAL_CALL ScExternalDocLinkObj::hasElements() @@ -1789,7 +1789,7 @@ uno::Type SAL_CALL ScExternalDocLinksObj::getElementType() throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; - return getCppuType(static_cast<Reference<sheet::XExternalDocLinks>*>(0)); + return cppu::UnoType<sheet::XExternalDocLinks>::get(); } sal_Bool SAL_CALL ScExternalDocLinksObj::hasElements() diff --git a/sd/source/core/text/textapi.cxx b/sd/source/core/text/textapi.cxx index 0eedb57ce646..b705e417d6ae 100644 --- a/sd/source/core/text/textapi.cxx +++ b/sd/source/core/text/textapi.cxx @@ -120,10 +120,10 @@ const SvxItemPropertySet* ImplGetSdTextPortionPropertyMap() SVX_UNOEDIT_FONT_PROPERTIES, SVX_UNOEDIT_OUTLINER_PROPERTIES, SVX_UNOEDIT_PARA_PROPERTIES, - {OUString("TextField"), EE_FEATURE_FIELD, ::getCppuType((const Reference< XTextField >*)0), PropertyAttribute::READONLY, 0 }, + {OUString("TextField"), EE_FEATURE_FIELD, cppu::UnoType<XTextField>::get(), PropertyAttribute::READONLY, 0 }, {OUString("TextPortionType"), WID_PORTIONTYPE, ::cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0 }, - {OUString("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS, ::getCppuType((const Reference< XNameContainer >*)0) , 0, 0}, - {OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, ::getCppuType((const Reference< XNameContainer >*)0) , 0, 0}, + {OUString("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS, cppu::UnoType<XNameContainer>::get(), 0, 0}, + {OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType<XNameContainer>::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; static SvxItemPropertySet aSdTextPortionPropertyMap( aSdTextPortionPropertyEntries, SdrObject::GetGlobalDrawObjectItemPool() ); diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx index 4205bf9b2ae4..411ffad05a14 100644 --- a/sd/source/filter/eppt/pptx-epptbase.cxx +++ b/sd/source/filter/eppt/pptx-epptbase.cxx @@ -727,7 +727,7 @@ bool PPTWriterBase::GetShapeByIndex( sal_uInt32 nIndex, bool bGroup ) if ( !mXShape.is() ) break; - Any aAny( mXShape->queryInterface( ::getCppuType( (const Reference< XPropertySet >*) 0 ) )); + Any aAny( mXShape->queryInterface( cppu::UnoType<XPropertySet>::get())); aAny >>= mXPropSet; if ( !mXPropSet.is() ) diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx index 1befad1fd752..411e7b15ce54 100644 --- a/sd/source/filter/xml/sdxmlwrp.cxx +++ b/sd/source/filter/xml/sdxmlwrp.cxx @@ -447,7 +447,7 @@ bool SdXMLFilter::Import( ErrCode& nError ) { OUString("Preview"), 0, ::cppu::UnoType<sal_Bool>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, { OUString("PageLayouts"), 0, cppu::UnoType<container::XNameAccess>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, { OUString("PrivateData"), 0, - ::getCppuType( (Reference<XInterface> *)0 ), + cppu::UnoType<XInterface>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("BaseURI"), 0, ::cppu::UnoType<OUString>::get(), diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index 8ccd1176f812..28914899d915 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -1671,7 +1671,7 @@ void CustomAnimationPane::onChange( bool bCreate ) Reference< XSelectionSupplier > xSel( mxView, UNO_QUERY_THROW ); maViewSelection = xSel->getSelection(); - if( maViewSelection.getValueType() == ::getCppuType((const Reference< XShapes >*)0) ) + if( maViewSelection.getValueType() == cppu::UnoType<XShapes>::get()) { Reference< XIndexAccess > xShapes; maViewSelection >>= xShapes; @@ -1691,7 +1691,7 @@ void CustomAnimationPane::onChange( bool bCreate ) } } } - else if ( maViewSelection.getValueType() == ::getCppuType((const Reference< XShape >*)0) ) + else if ( maViewSelection.getValueType() == cppu::UnoType<XShape>::get()) { aTargets.push_back( maViewSelection ); Reference< XText > xText; @@ -1699,7 +1699,7 @@ void CustomAnimationPane::onChange( bool bCreate ) if( !xText.is() || xText->getString().isEmpty() ) bHasText = false; } - else if ( maViewSelection.getValueType() == ::getCppuType((const Reference< XTextCursor >*)0) ) + else if ( maViewSelection.getValueType() == cppu::UnoType<XTextCursor>::get()) { Reference< XShape > xShape; std::list< sal_Int16 > aParaList; diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx index f5ed766c5f91..380b69c2478b 100644 --- a/sd/source/ui/unoidl/DrawController.cxx +++ b/sd/source/ui/unoidl/DrawController.cxx @@ -68,7 +68,7 @@ DrawController::DrawController (ViewShellBase& rBase) throw() OMultiTypeInterfaceContainerHelper::keyType>& >( BroadcastHelperOwner::maBroadcastHelper)), m_aSelectionTypeIdentifier( - ::getCppuType( (Reference<view::XSelectionChangeListener > *)0 )), + cppu::UnoType<view::XSelectionChangeListener>::get()), mpBase(&rBase), maLastVisArea(), mpCurrentPage(NULL), @@ -125,9 +125,9 @@ Sequence<Type> SAL_CALL DrawController::getTypes (void) // OPropertySetHelper does not provide getTypes, so we have to // implement this method manually and list its three interfaces. OTypeCollection aTypeCollection ( - ::getCppuType (( const Reference<beans::XMultiPropertySet>*)NULL), - ::getCppuType (( const Reference<beans::XFastPropertySet>*)NULL), - ::getCppuType (( const Reference<beans::XPropertySet>*)NULL)); + cppu::UnoType<beans::XMultiPropertySet>::get(), + cppu::UnoType<beans::XFastPropertySet>::get(), + cppu::UnoType<beans::XPropertySet>::get()); return ::comphelper::concatSequences( SfxBaseController::getTypes(), @@ -328,7 +328,7 @@ void SAL_CALL ThrowIfDisposed(); // Have to forward the event to our selection change listeners. OInterfaceContainerHelper* pListeners = BroadcastHelperOwner::maBroadcastHelper.getContainer( - ::getCppuType((Reference<view::XSelectionChangeListener>*)0)); + cppu::UnoType<view::XSelectionChangeListener>::get()); if (pListeners) { // Re-send the event to all of our listeners. @@ -706,13 +706,13 @@ void DrawController::FillPropertyTable ( beans::Property( "SubController", PROPERTY_SUB_CONTROLLER, - ::getCppuType((const Reference<drawing::XDrawSubController>*)0), + cppu::UnoType<drawing::XDrawSubController>::get(), beans::PropertyAttribute::BOUND)); rProperties.push_back( beans::Property( "CurrentPage", PROPERTY_CURRENTPAGE, - ::getCppuType((const Reference< drawing::XDrawPage > *)0), + cppu::UnoType<drawing::XDrawPage>::get(), beans::PropertyAttribute::BOUND )); rProperties.push_back( beans::Property("IsLayerMode", @@ -727,7 +727,7 @@ void DrawController::FillPropertyTable ( rProperties.push_back( beans::Property("ActiveLayer", PROPERTY_ACTIVE_LAYER, - ::getCppuType((const Reference< drawing::XLayer > *)0), + cppu::UnoType<drawing::XLayer>::get(), beans::PropertyAttribute::BOUND )); rProperties.push_back( beans::Property("ZoomValue", diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx index f84a973e917e..9ba698d32e12 100644 --- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx +++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx @@ -190,7 +190,7 @@ enum SdDocumentSettingsPropertyHandles { OUString("GradientTableURL"), HANDLE_GRADIENTTABLEURL, ::cppu::UnoType<OUString>::get(), 0, 0 }, { OUString("BitmapTableURL"), HANDLE_BITMAPTABLEURL, ::cppu::UnoType<OUString>::get(), 0, 0 }, - { OUString("ForbiddenCharacters"), HANDLE_FORBIDDENCHARS, ::getCppuType((const Reference< XForbiddenCharacters >*)0), 0, 0 }, + { OUString("ForbiddenCharacters"), HANDLE_FORBIDDENCHARS, cppu::UnoType<XForbiddenCharacters>::get(), 0, 0 }, { OUString("ApplyUserData"), HANDLE_APPLYUSERDATA, ::getBooleanCppuType(), 0, 0 }, { OUString("PageNumberFormat"), HANDLE_PAGENUMFMT, ::cppu::UnoType<sal_Int32>::get(), 0, 0 }, diff --git a/sd/source/ui/unoidl/randomnode.cxx b/sd/source/ui/unoidl/randomnode.cxx index b9c84b99a163..7ed6c841312a 100644 --- a/sd/source/ui/unoidl/randomnode.cxx +++ b/sd/source/ui/unoidl/randomnode.cxx @@ -547,7 +547,7 @@ Reference< XCloneable > SAL_CALL RandomAnimationNode::createClone() throw (Runti // XElementAccess Type SAL_CALL RandomAnimationNode::getElementType() throw (RuntimeException, std::exception) { - return ::getCppuType((const Reference< XAnimationNode >*)0); + return cppu::UnoType<XAnimationNode>::get(); } diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index ebc9d65c9f53..a4fd2e2a758d 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -124,10 +124,10 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( bool bImpress, PageKind eP { OUString(UNO_NAME_PAGE_PREVIEW), WID_PAGE_PREVIEW, ::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { OUString(UNO_NAME_PAGE_PREVIEWBITMAP), WID_PAGE_PREVIEWBITMAP, ::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { OUString(UNO_NAME_PAGE_VISIBLE), WID_PAGE_VISIBLE, ::getBooleanCppuType(), 0, 0}, - { OUString(UNO_NAME_OBJ_SOUNDFILE), WID_PAGE_SOUNDFILE, ::getCppuType((const Any*)0), 0, 0}, + { OUString(UNO_NAME_OBJ_SOUNDFILE), WID_PAGE_SOUNDFILE, cppu::UnoType<Any>::get(), 0, 0}, { OUString(sUNO_Prop_IsBackgroundVisible), WID_PAGE_BACKVIS, ::getBooleanCppuType(), 0, 0}, { OUString(sUNO_Prop_IsBackgroundObjectsVisible), WID_PAGE_BACKOBJVIS, ::getBooleanCppuType(), 0, 0}, - { OUString(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, ::getCppuType((const Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, + { OUString(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0}, { OUString(sUNO_Prop_BookmarkURL), WID_PAGE_BOOKMARK, ::cppu::UnoType<OUString>::get(), 0, 0}, { OUString("HighResDuration"), WID_PAGE_HIGHRESDURATION, ::cppu::UnoType<double>::get(), 0, 0}, { OUString("IsBackgroundDark") , WID_PAGE_ISDARK, ::getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0}, @@ -198,7 +198,7 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( bool bImpress, PageKind eP { OUString(UNO_NAME_PAGE_WIDTH), WID_PAGE_WIDTH, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ { OUString(UNO_NAME_PAGE_PREVIEW), WID_PAGE_PREVIEW, ::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \ { OUString(UNO_NAME_PAGE_PREVIEWBITMAP), WID_PAGE_PREVIEWBITMAP, ::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},\ - { OUString(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, ::getCppuType((const Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, \ + { OUString(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0}, \ { OUString(sUNO_Prop_BookmarkURL), WID_PAGE_BOOKMARK, ::cppu::UnoType<OUString>::get(), 0, 0}, \ { OUString("IsBackgroundDark"), WID_PAGE_ISDARK, ::getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0}, \ { OUString("NavigationOrder"), WID_NAVORDER, cppu::UnoType<css::container::XIndexAccess>::get(),0, 0}, \ @@ -271,7 +271,7 @@ const SvxItemPropertySet* ImplGetMasterPagePropertySet( PageKind ePageKind ) { OUString(UNO_NAME_PAGE_ORIENTATION), WID_PAGE_ORIENT, ::cppu::UnoType<view::PaperOrientation>::get(),0, 0}, { OUString(UNO_NAME_PAGE_WIDTH), WID_PAGE_WIDTH, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, { OUString("BackgroundFullSize"), WID_PAGE_BACKFULL, ::getBooleanCppuType(), 0, 0}, - { OUString(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, ::getCppuType((const Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, + { OUString(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0}, { OUString("IsBackgroundDark"), WID_PAGE_ISDARK, ::getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -287,7 +287,7 @@ const SvxItemPropertySet* ImplGetMasterPagePropertySet( PageKind ePageKind ) { OUString(UNO_NAME_PAGE_NUMBER), WID_PAGE_NUMBER, ::cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::READONLY, 0}, { OUString(UNO_NAME_PAGE_WIDTH), WID_PAGE_WIDTH, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, { OUString(UNO_NAME_PAGE_LAYOUT), WID_PAGE_LAYOUT, ::cppu::UnoType<sal_Int16>::get(), 0, 0}, - { OUString(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, ::getCppuType((const Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, + { OUString(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0}, { OUString("IsBackgroundDark"), WID_PAGE_ISDARK, ::getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0}, { OUString("IsHeaderVisible"), WID_PAGE_HEADERVISIBLE, ::getBooleanCppuType(), 0, 0}, { OUString("HeaderText"), WID_PAGE_HEADERTEXT, ::cppu::UnoType<OUString>::get(), 0, 0}, diff --git a/sfx2/source/dialog/backingcomp.cxx b/sfx2/source/dialog/backingcomp.cxx index 355a37357fdf..4a3d45ff90c0 100644 --- a/sfx2/source/dialog/backingcomp.cxx +++ b/sfx2/source/dialog/backingcomp.cxx @@ -268,13 +268,13 @@ css::uno::Sequence< css::uno::Type > SAL_CALL BackingComp::getTypes() lWindowTypes = xProvider->getTypes(); static ::cppu::OTypeCollection aTypeCollection( - ::getCppuType((const ::com::sun::star::uno::Reference< css::lang::XInitialization >*)NULL ), - ::getCppuType((const ::com::sun::star::uno::Reference< css::lang::XTypeProvider >*)NULL ), - ::getCppuType((const ::com::sun::star::uno::Reference< css::lang::XServiceInfo >*)NULL ), - ::getCppuType((const ::com::sun::star::uno::Reference< css::frame::XController >*)NULL ), - ::getCppuType((const ::com::sun::star::uno::Reference< css::lang::XComponent >*)NULL ), - ::getCppuType((const ::com::sun::star::uno::Reference< css::frame::XDispatchProvider >*)NULL ), - ::getCppuType((const ::com::sun::star::uno::Reference< css::frame::XDispatch >*)NULL ), + cppu::UnoType<css::lang::XInitialization>::get(), + cppu::UnoType<css::lang::XTypeProvider>::get(), + cppu::UnoType<css::lang::XServiceInfo>::get(), + cppu::UnoType<css::frame::XController>::get(), + cppu::UnoType<css::lang::XComponent>::get(), + cppu::UnoType<css::frame::XDispatchProvider>::get(), + cppu::UnoType<css::frame::XDispatch>::get(), lWindowTypes); pTypeCollection = &aTypeCollection; diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx index c0631e0e8bb5..bfa748502772 100644 --- a/sfx2/source/doc/iframe.cxx +++ b/sfx2/source/doc/iframe.cxx @@ -143,10 +143,10 @@ const SfxItemPropertyMapEntry* lcl_GetIFramePropertyMap_Impl() { OUString("FrameIsAutoScroll"), WID_FRAME_IS_AUTO_SCROLL, ::getBooleanCppuType(), PROPERTY_UNBOUND, 0 }, { OUString("FrameIsBorder"), WID_FRAME_IS_BORDER, ::getBooleanCppuType(), PROPERTY_UNBOUND, 0 }, { OUString("FrameIsScrollingMode"), WID_FRAME_IS_SCROLLING_MODE,::getBooleanCppuType(), PROPERTY_UNBOUND, 0 }, - { OUString("FrameMarginHeight"), WID_FRAME_MARGIN_HEIGHT, ::getCppuType( (sal_Int32*)0 ), PROPERTY_UNBOUND, 0 }, - { OUString("FrameMarginWidth"), WID_FRAME_MARGIN_WIDTH, ::getCppuType( (sal_Int32*)0 ), PROPERTY_UNBOUND, 0 }, - { OUString("FrameName"), WID_FRAME_NAME, ::getCppuType((const OUString*)0), PROPERTY_UNBOUND, 0 }, - { OUString("FrameURL"), WID_FRAME_URL, ::getCppuType((const OUString*)0), PROPERTY_UNBOUND, 0 }, + { OUString("FrameMarginHeight"), WID_FRAME_MARGIN_HEIGHT, cppu::UnoType<sal_Int32>::get(), PROPERTY_UNBOUND, 0 }, + { OUString("FrameMarginWidth"), WID_FRAME_MARGIN_WIDTH, cppu::UnoType<sal_Int32>::get(), PROPERTY_UNBOUND, 0 }, + { OUString("FrameName"), WID_FRAME_NAME, cppu::UnoType<OUString>::get(), PROPERTY_UNBOUND, 0 }, + { OUString("FrameURL"), WID_FRAME_URL, cppu::UnoType<OUString>::get(), PROPERTY_UNBOUND, 0 }, { OUString(), 0, css::uno::Type(), 0, 0 } }; return aIFramePropertyMap_Impl; diff --git a/sfx2/source/doc/plugin.cxx b/sfx2/source/doc/plugin.cxx index a1743fdd16d5..51ce5b185bea 100644 --- a/sfx2/source/doc/plugin.cxx +++ b/sfx2/source/doc/plugin.cxx @@ -73,8 +73,8 @@ const SfxItemPropertyMapEntry* lcl_GetPluginPropertyMap_Impl() static const SfxItemPropertyMapEntry aPluginPropertyMap_Impl[] = { { OUString("PluginCommands"), WID_COMMANDS, ::getCppuType((::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >*)0), PROPERTY_UNBOUND, 0}, - { OUString("PluginMimeType"), WID_MIMETYPE, ::getCppuType((const OUString*)0), PROPERTY_UNBOUND, 0 }, - { OUString("PluginURL"), WID_URL , ::getCppuType((const OUString*)0), PROPERTY_UNBOUND, 0 }, + { OUString("PluginMimeType"), WID_MIMETYPE, cppu::UnoType<OUString>::get(), PROPERTY_UNBOUND, 0 }, + { OUString("PluginURL"), WID_URL , cppu::UnoType<OUString>::get(), PROPERTY_UNBOUND, 0 }, { OUString(), 0, css::uno::Type(), 0, 0 } }; return aPluginPropertyMap_Impl; diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx index e87d2a7ddf34..87e2ca8675ae 100644 --- a/sfx2/source/doc/printhelper.cxx +++ b/sfx2/source/doc/printhelper.cxx @@ -623,7 +623,7 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >& // unpack th URL and check for a valid and well known protocol OUString sTemp; if ( - ( rProp.Value.getValueType()!=::getCppuType((const OUString*)0)) || + ( rProp.Value.getValueType()!=cppu::UnoType<OUString>::get()) || (!(rProp.Value>>=sTemp)) ) { @@ -807,7 +807,7 @@ void IMPL_PrintListener_DataContainer::Notify( SfxBroadcaster& rBC, const SfxHin } ::cppu::OInterfaceContainerHelper* pContainer = m_aInterfaceContainer.getContainer( - ::getCppuType( ( const uno::Reference< view::XPrintJobListener >*) NULL ) ); + cppu::UnoType<view::XPrintJobListener>::get()); if ( !pContainer ) return; @@ -823,13 +823,13 @@ void IMPL_PrintListener_DataContainer::Notify( SfxBroadcaster& rBC, const SfxHin void SAL_CALL SfxPrintHelper::addPrintJobListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XPrintJobListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - m_pData->m_aInterfaceContainer.addInterface( ::getCppuType((const uno::Reference < view::XPrintJobListener>*)0), xListener ); + m_pData->m_aInterfaceContainer.addInterface( cppu::UnoType<view::XPrintJobListener>::get(), xListener ); } void SAL_CALL SfxPrintHelper::removePrintJobListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XPrintJobListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - m_pData->m_aInterfaceContainer.removeInterface( ::getCppuType((const uno::Reference < view::XPrintJobListener>*)0), xListener ); + m_pData->m_aInterfaceContainer.removeInterface( cppu::UnoType<view::XPrintJobListener>::get(), xListener ); } diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index b50afe1ea866..40ab2128492f 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -333,7 +333,7 @@ void SAL_CALL SfxPrintHelperListener_Impl::disposing( const lang::EventObject& ) void SAL_CALL SfxPrintHelperListener_Impl::printJobEvent( const view::PrintJobEvent& rEvent ) throw (RuntimeException, std::exception) { - ::cppu::OInterfaceContainerHelper* pContainer = m_pData->m_aInterfaceContainer.getContainer( ::getCppuType( ( const Reference< view::XPrintJobListener >*) NULL ) ); + ::cppu::OInterfaceContainerHelper* pContainer = m_pData->m_aInterfaceContainer.getContainer( cppu::UnoType<view::XPrintJobListener>::get()); if ( pContainer!=NULL ) { ::cppu::OInterfaceIteratorHelper pIterator(*pContainer); @@ -802,7 +802,7 @@ void SAL_CALL SfxBaseModel::addEventListener( const Reference< lang::XEventListe throw(RuntimeException, std::exception) { SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING ); - m_pData->m_aInterfaceContainer.addInterface( ::getCppuType((const Reference< lang::XEventListener >*)0), aListener ); + m_pData->m_aInterfaceContainer.addInterface( cppu::UnoType<lang::XEventListener>::get(), aListener ); } @@ -813,7 +813,7 @@ void SAL_CALL SfxBaseModel::removeEventListener( const Reference< lang::XEventLi throw(RuntimeException, std::exception) { SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING ); - m_pData->m_aInterfaceContainer.removeInterface( ::getCppuType((const Reference< lang::XEventListener >*)0), aListener ); + m_pData->m_aInterfaceContainer.removeInterface( cppu::UnoType<lang::XEventListener>::get(), aListener ); } void @@ -859,11 +859,11 @@ void SAL_CALL SfxBaseModel::disposing( const lang::EventObject& aObject ) Reference< document::XEventListener > xDocListener( aObject.Source, UNO_QUERY ); if ( xMod.is() ) - m_pData->m_aInterfaceContainer.removeInterface( ::getCppuType((const Reference< util::XModifyListener >*)0), xMod ); + m_pData->m_aInterfaceContainer.removeInterface( cppu::UnoType<util::XModifyListener>::get(), xMod ); else if ( xListener.is() ) - m_pData->m_aInterfaceContainer.removeInterface( ::getCppuType((const Reference< lang::XEventListener >*)0), xListener ); + m_pData->m_aInterfaceContainer.removeInterface( cppu::UnoType<lang::XEventListener>::get(), xListener ); else if ( xDocListener.is() ) - m_pData->m_aInterfaceContainer.removeInterface( ::getCppuType((const Reference< document::XEventListener >*)0), xListener ); + m_pData->m_aInterfaceContainer.removeInterface( cppu::UnoType<document::XEventListener>::get(), xListener ); } @@ -1337,7 +1337,7 @@ void SAL_CALL SfxBaseModel::addModifyListener(const Reference< util::XModifyList { SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING ); - m_pData->m_aInterfaceContainer.addInterface( ::getCppuType((const Reference< util::XModifyListener >*)0),xListener ); + m_pData->m_aInterfaceContainer.addInterface( cppu::UnoType<util::XModifyListener>::get(),xListener ); } @@ -1348,7 +1348,7 @@ void SAL_CALL SfxBaseModel::removeModifyListener(const Reference< util::XModifyL { SfxModelGuard aGuard( *this ); - m_pData->m_aInterfaceContainer.removeInterface( ::getCppuType((const Reference< util::XModifyListener >*)0), xListener ); + m_pData->m_aInterfaceContainer.removeInterface( cppu::UnoType<util::XModifyListener>::get(), xListener ); } @@ -1363,7 +1363,7 @@ void SAL_CALL SfxBaseModel::close( sal_Bool bDeliverOwnership ) throw (util::Clo Reference< XInterface > xSelfHold( static_cast< ::cppu::OWeakObject* >(this) ); lang::EventObject aSource (static_cast< ::cppu::OWeakObject*>(this)); - ::cppu::OInterfaceContainerHelper* pContainer = m_pData->m_aInterfaceContainer.getContainer( ::getCppuType( ( const Reference< util::XCloseListener >*) NULL ) ); + ::cppu::OInterfaceContainerHelper* pContainer = m_pData->m_aInterfaceContainer.getContainer( cppu::UnoType<util::XCloseListener>::get()); if (pContainer!=NULL) { ::cppu::OInterfaceIteratorHelper pIterator(*pContainer); @@ -1391,7 +1391,7 @@ void SAL_CALL SfxBaseModel::close( sal_Bool bDeliverOwnership ) throw (util::Clo // no own objections against closing! m_pData->m_bClosing = true; - pContainer = m_pData->m_aInterfaceContainer.getContainer( ::getCppuType( ( const Reference< util::XCloseListener >*) NULL ) ); + pContainer = m_pData->m_aInterfaceContainer.getContainer( cppu::UnoType<util::XCloseListener>::get()); if (pContainer!=NULL) { ::cppu::OInterfaceIteratorHelper pCloseIterator(*pContainer); @@ -1422,7 +1422,7 @@ void SAL_CALL SfxBaseModel::addCloseListener( const Reference< util::XCloseListe { SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING ); - m_pData->m_aInterfaceContainer.addInterface( ::getCppuType((const Reference< util::XCloseListener >*)0), xListener ); + m_pData->m_aInterfaceContainer.addInterface( cppu::UnoType<util::XCloseListener>::get(), xListener ); } @@ -1433,7 +1433,7 @@ void SAL_CALL SfxBaseModel::removeCloseListener( const Reference< util::XCloseLi { SfxModelGuard aGuard( *this ); - m_pData->m_aInterfaceContainer.removeInterface( ::getCppuType((const Reference< util::XCloseListener >*)0), xListener ); + m_pData->m_aInterfaceContainer.removeInterface( cppu::UnoType<util::XCloseListener>::get(), xListener ); } @@ -2058,7 +2058,7 @@ Any SAL_CALL SfxBaseModel::getTransferData( const datatransfer::DataFlavor& aFla } } else if ( GraphicHelper::supportsMetaFileHandle_Impl() - && aFlavor.DataType == getCppuType( (const sal_uInt64*) 0 ) ) + && aFlavor.DataType == cppu::UnoType<sal_uInt64>::get()) { ::boost::shared_ptr<GDIMetaFile> pMetaFile = m_pData->m_pObjectShell->GetPreviewMetaFile( true ); @@ -2094,7 +2094,7 @@ Any SAL_CALL SfxBaseModel::getTransferData( const datatransfer::DataFlavor& aFla } } else if ( GraphicHelper::supportsMetaFileHandle_Impl() - && aFlavor.DataType == getCppuType( (const sal_uInt64*) 0 ) ) + && aFlavor.DataType == cppu::UnoType<sal_uInt64>::get()) { // means HGLOBAL handler to memory storage containing METAFILEPICT structure @@ -2225,12 +2225,12 @@ Sequence< datatransfer::DataFlavor > SAL_CALL SfxBaseModel::getTransferDataFlavo aFlavorSeq[8].MimeType = OUString( "application/x-openoffice-emf;windows_formatname=\"Image EMF\"" ); aFlavorSeq[8].HumanPresentableName = "Enhanced Windows MetaFile"; - aFlavorSeq[8].DataType = getCppuType( (const sal_uInt64*) 0 ); + aFlavorSeq[8].DataType = cppu::UnoType<sal_uInt64>::get(); aFlavorSeq[9].MimeType = OUString( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" ); aFlavorSeq[9].HumanPresentableName = "Windows MetaFile"; - aFlavorSeq[9].DataType = getCppuType( (const sal_uInt64*) 0 ); + aFlavorSeq[9].DataType = cppu::UnoType<sal_uInt64>::get(); } return aFlavorSeq; @@ -2261,7 +2261,7 @@ sal_Bool SAL_CALL SfxBaseModel::isDataFlavorSupported( const datatransfer::DataF if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) ) return sal_True; else if ( GraphicHelper::supportsMetaFileHandle_Impl() - && aFlavor.DataType == getCppuType( (const sal_uInt64*) 0 ) ) + && aFlavor.DataType == cppu::UnoType<sal_uInt64>::get()) return sal_True; } else if ( aFlavor.MimeType == "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" ) @@ -2269,7 +2269,7 @@ sal_Bool SAL_CALL SfxBaseModel::isDataFlavorSupported( const datatransfer::DataF if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) ) return sal_True; else if ( GraphicHelper::supportsMetaFileHandle_Impl() - && aFlavor.DataType == getCppuType( (const sal_uInt64*) 0 ) ) + && aFlavor.DataType == cppu::UnoType<sal_uInt64>::get()) return sal_True; } else if ( aFlavor.MimeType == "application/x-openoffice-objectdescriptor-xml;windows_formatname=\"Star Object Descriptor (XML)\"" ) @@ -2390,7 +2390,7 @@ void SAL_CALL SfxBaseModel::addEventListener( const Reference< document::XEventL { SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING ); - m_pData->m_aInterfaceContainer.addInterface( ::getCppuType((const Reference< document::XEventListener >*)0), aListener ); + m_pData->m_aInterfaceContainer.addInterface( cppu::UnoType<document::XEventListener>::get(), aListener ); } @@ -2401,7 +2401,7 @@ void SAL_CALL SfxBaseModel::removeEventListener( const Reference< document::XEve { SfxModelGuard aGuard( *this ); - m_pData->m_aInterfaceContainer.removeInterface( ::getCppuType((const Reference< document::XEventListener >*)0), aListener ); + m_pData->m_aInterfaceContainer.removeInterface( cppu::UnoType<document::XEventListener>::get(), aListener ); } @@ -2412,7 +2412,7 @@ void SAL_CALL SfxBaseModel::addDocumentEventListener( const Reference< document: throw ( RuntimeException, std::exception ) { SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING ); - m_pData->m_aInterfaceContainer.addInterface( ::getCppuType((const Reference< document::XDocumentEventListener >*)0), aListener ); + m_pData->m_aInterfaceContainer.addInterface( cppu::UnoType<document::XDocumentEventListener>::get(), aListener ); } @@ -2420,7 +2420,7 @@ void SAL_CALL SfxBaseModel::removeDocumentEventListener( const Reference< docume throw ( RuntimeException, std::exception ) { SfxModelGuard aGuard( *this ); - m_pData->m_aInterfaceContainer.removeInterface( ::getCppuType((const Reference< document::XDocumentEventListener >*)0), aListener ); + m_pData->m_aInterfaceContainer.removeInterface( cppu::UnoType<document::XDocumentEventListener>::get(), aListener ); } @@ -2834,7 +2834,7 @@ void SfxBaseModel::Notify( SfxBroadcaster& rBC , void SfxBaseModel::NotifyModifyListeners_Impl() const { - ::cppu::OInterfaceContainerHelper* pIC = m_pData->m_aInterfaceContainer.getContainer( ::getCppuType((const Reference< util::XModifyListener >*)0) ); + ::cppu::OInterfaceContainerHelper* pIC = m_pData->m_aInterfaceContainer.getContainer( cppu::UnoType<util::XModifyListener>::get()); if ( pIC ) { lang::EventObject aEvent( (frame::XModel *)this ); @@ -3164,7 +3164,7 @@ void SfxBaseModel::postEvent_Impl( const OUString& aName, const Reference< frame return; ::cppu::OInterfaceContainerHelper* pIC = - m_pData->m_aInterfaceContainer.getContainer( ::getCppuType( (const Reference< document::XDocumentEventListener >*)0 ) ); + m_pData->m_aInterfaceContainer.getContainer( cppu::UnoType<document::XDocumentEventListener>::get()); if ( pIC ) { SAL_INFO("sfx.doc", "SfxDocumentEvent: " + aName); @@ -3177,7 +3177,7 @@ void SfxBaseModel::postEvent_Impl( const OUString& aName, const Reference< frame aDocumentEvent ) ); } - pIC = m_pData->m_aInterfaceContainer.getContainer( ::getCppuType( (const Reference< document::XEventListener >*)0 ) ); + pIC = m_pData->m_aInterfaceContainer.getContainer( cppu::UnoType<document::XEventListener>::get()); if ( pIC ) { SAL_INFO("sfx.doc", "SfxEvent: " + aName); @@ -3250,7 +3250,7 @@ void SfxBaseModel::notifyEvent( const document::EventObject& aEvent ) const return; ::cppu::OInterfaceContainerHelper* pIC = m_pData->m_aInterfaceContainer.getContainer( - ::getCppuType((const Reference< document::XEventListener >*)0) ); + cppu::UnoType<document::XEventListener>::get()); if( pIC ) { @@ -3272,7 +3272,7 @@ void SfxBaseModel::notifyEvent( const document::EventObject& aEvent ) const /** returns true if someone added a XEventListener to this XEventBroadcaster */ bool SfxBaseModel::hasEventListeners() const { - return !impl_isDisposed() && (NULL != m_pData->m_aInterfaceContainer.getContainer( ::getCppuType((const Reference< document::XEventListener >*)0) ) ); + return !impl_isDisposed() && (NULL != m_pData->m_aInterfaceContainer.getContainer( cppu::UnoType<document::XEventListener>::get()) ); } void SAL_CALL SfxBaseModel::addPrintJobListener( const Reference< view::XPrintJobListener >& xListener ) throw (RuntimeException, std::exception) @@ -3869,7 +3869,7 @@ void SAL_CALL SfxBaseModel::addStorageChangeListener( SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING ); m_pData->m_aInterfaceContainer.addInterface( - ::getCppuType((const Reference< document::XStorageChangeListener >*)0), xListener ); + cppu::UnoType<document::XStorageChangeListener>::get(), xListener ); } void SAL_CALL SfxBaseModel::removeStorageChangeListener( @@ -3879,7 +3879,7 @@ void SAL_CALL SfxBaseModel::removeStorageChangeListener( SfxModelGuard aGuard( *this ); m_pData->m_aInterfaceContainer.removeInterface( - ::getCppuType((const Reference< document::XStorageChangeListener >*)0), xListener ); + cppu::UnoType<document::XStorageChangeListener>::get(), xListener ); } #include "printhelper.hxx" diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx index 151cfed648e2..701a09474082 100644 --- a/sfx2/source/sidebar/Theme.cxx +++ b/sfx2/source/sidebar/Theme.cxx @@ -904,22 +904,22 @@ cssu::Type Theme::GetCppuType (const PropertyType eType) switch(eType) { case PT_Image: - return getCppuType((rtl::OUString*)NULL); + return cppu::UnoType<rtl::OUString>::get(); case PT_Color: - return getCppuType((sal_uInt32*)NULL); + return cppu::UnoType<sal_uInt32>::get(); case PT_Paint: return getCppuVoidType(); case PT_Integer: - return getCppuType((sal_Int32*)NULL); + return cppu::UnoType<sal_Int32>::get(); case PT_Boolean: - return getCppuType((sal_Bool*)NULL); + return cppu::UnoType<sal_Bool>::get(); case PT_Rectangle: - return getCppuType((awt::Rectangle*)NULL); + return cppu::UnoType<awt::Rectangle>::get(); case PT_Invalid: default: diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index 98ad17d9c978..9c07350be105 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -911,14 +911,14 @@ frame::BorderWidths SAL_CALL SfxBaseController::getBorder() void SAL_CALL SfxBaseController::addBorderResizeListener( const Reference< frame::XBorderResizeListener >& xListener ) throw ( RuntimeException, std::exception ) { - m_pData->m_aListenerContainer.addInterface( ::getCppuType((const Reference< frame::XBorderResizeListener >*)0), + m_pData->m_aListenerContainer.addInterface( cppu::UnoType<frame::XBorderResizeListener>::get(), xListener ); } void SAL_CALL SfxBaseController::removeBorderResizeListener( const Reference< frame::XBorderResizeListener >& xListener ) throw ( RuntimeException, std::exception ) { - m_pData->m_aListenerContainer.removeInterface( ::getCppuType((const Reference< frame::XBorderResizeListener >*)0), + m_pData->m_aListenerContainer.removeInterface( cppu::UnoType<frame::XBorderResizeListener>::get(), xListener ); } @@ -939,7 +939,7 @@ awt::Rectangle SAL_CALL SfxBaseController::queryBorderedArea( const awt::Rectang void SfxBaseController::BorderWidthsChanged_Impl() { ::cppu::OInterfaceContainerHelper* pContainer = m_pData->m_aListenerContainer.getContainer( - ::getCppuType( ( const Reference< frame::XBorderResizeListener >*) NULL ) ); + cppu::UnoType<frame::XBorderResizeListener>::get()); if ( pContainer ) { frame::BorderWidths aBWidths = getBorder(); @@ -1037,7 +1037,7 @@ void SAL_CALL SfxBaseController::dispose() throw( RuntimeException, std::excepti void SAL_CALL SfxBaseController::addEventListener( const Reference< lang::XEventListener >& aListener ) throw( RuntimeException, std::exception ) { - m_pData->m_aListenerContainer.addInterface( ::getCppuType((const Reference< lang::XEventListener >*)0), aListener ); + m_pData->m_aListenerContainer.addInterface( cppu::UnoType<lang::XEventListener>::get(), aListener ); } @@ -1046,7 +1046,7 @@ void SAL_CALL SfxBaseController::addEventListener( const Reference< lang::XEvent void SAL_CALL SfxBaseController::removeEventListener( const Reference< lang::XEventListener >& aListener ) throw( RuntimeException, std::exception ) { - m_pData->m_aListenerContainer.removeInterface( ::getCppuType((const Reference< lang::XEventListener >*)0), aListener ); + m_pData->m_aListenerContainer.removeInterface( cppu::UnoType<lang::XEventListener>::get(), aListener ); } void SfxBaseController::ReleaseShell_Impl() diff --git a/svtools/source/java/javacontext.cxx b/svtools/source/java/javacontext.cxx index f5be4776dcae..66c85d56edb1 100644 --- a/svtools/source/java/javacontext.cxx +++ b/svtools/source/java/javacontext.cxx @@ -43,9 +43,9 @@ JavaContext::~JavaContext() Any SAL_CALL JavaContext::queryInterface(const Type& aType ) throw (RuntimeException, std::exception) { - if (aType == getCppuType(reinterpret_cast<Reference<XInterface>*>(0))) + if (aType == cppu::UnoType<XInterface>::get()) return Any(Reference<XInterface>(static_cast<XInterface*>(this))); - else if (aType == getCppuType(reinterpret_cast<Reference<XCurrentContext>*>(0))) + else if (aType == cppu::UnoType<XCurrentContext>::get()) return Any(Reference<XCurrentContext>( static_cast<XCurrentContext*>(this))); return Any(); } diff --git a/svtools/source/java/javainteractionhandler.cxx b/svtools/source/java/javainteractionhandler.cxx index 943e4f6085f3..6d2e5494e914 100644 --- a/svtools/source/java/javainteractionhandler.cxx +++ b/svtools/source/java/javainteractionhandler.cxx @@ -64,9 +64,9 @@ JavaInteractionHandler::~JavaInteractionHandler() Any SAL_CALL JavaInteractionHandler::queryInterface(const Type& aType ) throw (RuntimeException, std::exception) { - if (aType == getCppuType(reinterpret_cast<Reference<XInterface>*>(0))) + if (aType == cppu::UnoType<XInterface>::get()) return Any( static_cast<XInterface*>(this), aType); - else if (aType == getCppuType(reinterpret_cast<Reference<XInteractionHandler>*>(0))) + else if (aType == cppu::UnoType<XInteractionHandler>::get()) return Any( static_cast<XInteractionHandler*>(this), aType); return Any(); } diff --git a/svtools/source/uno/statusbarcontroller.cxx b/svtools/source/uno/statusbarcontroller.cxx index 0573aa6b20af..a0fb056e090c 100644 --- a/svtools/source/uno/statusbarcontroller.cxx +++ b/svtools/source/uno/statusbarcontroller.cxx @@ -236,13 +236,13 @@ throw (::com::sun::star::uno::RuntimeException, std::exception) void SAL_CALL StatusbarController::addEventListener( const Reference< XEventListener >& xListener ) throw ( RuntimeException, std::exception ) { - m_aListenerContainer.addInterface( ::getCppuType( ( const Reference< XEventListener >* ) NULL ), xListener ); + m_aListenerContainer.addInterface( cppu::UnoType<XEventListener>::get(), xListener ); } void SAL_CALL StatusbarController::removeEventListener( const Reference< XEventListener >& aListener ) throw ( RuntimeException, std::exception ) { - m_aListenerContainer.removeInterface( ::getCppuType( ( const Reference< XEventListener >* ) NULL ), aListener ); + m_aListenerContainer.removeInterface( cppu::UnoType<XEventListener>::get(), aListener ); } // XEventListener diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx index da94dd0439a1..81c70292140c 100644 --- a/svtools/source/uno/toolboxcontroller.cxx +++ b/svtools/source/uno/toolboxcontroller.cxx @@ -277,13 +277,13 @@ throw (::com::sun::star::uno::RuntimeException, std::exception) void SAL_CALL ToolboxController::addEventListener( const Reference< XEventListener >& xListener ) throw ( RuntimeException, std::exception ) { - m_aListenerContainer.addInterface( ::getCppuType( ( const Reference< XEventListener >* ) NULL ), xListener ); + m_aListenerContainer.addInterface( cppu::UnoType<XEventListener>::get(), xListener ); } void SAL_CALL ToolboxController::removeEventListener( const Reference< XEventListener >& aListener ) throw ( RuntimeException, std::exception ) { - m_aListenerContainer.removeInterface( ::getCppuType( ( const Reference< XEventListener >* ) NULL ), aListener ); + m_aListenerContainer.removeInterface( cppu::UnoType<XEventListener>::get(), aListener ); } // XEventListener diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx index 8e55f446d6ab..dda3dcdc0949 100644 --- a/svtools/source/uno/unoimap.cxx +++ b/svtools/source/uno/unoimap.cxx @@ -316,17 +316,17 @@ Any SAL_CALL SvUnoImageMapObject::queryAggregation( const Type & rType ) { Any aAny; - if( rType == ::getCppuType((const Reference< XServiceInfo >*)0) ) + if( rType == cppu::UnoType<XServiceInfo>::get()) aAny <<= Reference< XServiceInfo >(this); - else if( rType == ::getCppuType((const Reference< XTypeProvider >*)0) ) + else if( rType == cppu::UnoType<XTypeProvider>::get()) aAny <<= Reference< XTypeProvider >(this); - else if( rType == ::getCppuType((const Reference< XPropertySet >*)0) ) + else if( rType == cppu::UnoType<XPropertySet>::get()) aAny <<= Reference< XPropertySet >(this); - else if( rType == ::getCppuType((const Reference< XEventsSupplier >*)0) ) + else if( rType == cppu::UnoType<XEventsSupplier>::get()) aAny <<= Reference< XEventsSupplier >(this); - else if( rType == ::getCppuType((const Reference< XMultiPropertySet >*)0) ) + else if( rType == cppu::UnoType<XMultiPropertySet>::get()) aAny <<= Reference< XMultiPropertySet >(this); - else if( rType == ::getCppuType((const Reference< XUnoTunnel >*)0) ) + else if( rType == cppu::UnoType<XUnoTunnel>::get()) aAny <<= Reference< XUnoTunnel >(this); else aAny <<= OWeakAggObject::queryAggregation( rType ); @@ -684,7 +684,7 @@ Any SAL_CALL SvUnoImageMap::getByIndex( sal_Int32 Index ) throw(IndexOutOfBounds // XElementAccess Type SAL_CALL SvUnoImageMap::getElementType( ) throw(RuntimeException, std::exception) { - return ::getCppuType((const Reference< XPropertySet >*)0); + return cppu::UnoType<XPropertySet>::get(); } sal_Bool SAL_CALL SvUnoImageMap::hasElements( ) throw(RuntimeException, std::exception) diff --git a/svx/source/accessibility/AccessibleGraphicShape.cxx b/svx/source/accessibility/AccessibleGraphicShape.cxx index 1407e2f50578..476ac63856eb 100644 --- a/svx/source/accessibility/AccessibleGraphicShape.cxx +++ b/svx/source/accessibility/AccessibleGraphicShape.cxx @@ -158,7 +158,7 @@ uno::Sequence<uno::Type> SAL_CALL long nTypeCount = aTypeList.getLength(); aTypeList.realloc (nTypeCount + 1); const uno::Type aImageType = - ::getCppuType((const uno::Reference<XAccessibleImage>*)0); + cppu::UnoType<XAccessibleImage>::get(); aTypeList[nTypeCount] = aImageType; return aTypeList; diff --git a/svx/source/accessibility/AccessibleOLEShape.cxx b/svx/source/accessibility/AccessibleOLEShape.cxx index 8fa575c4802c..0e62c15e37da 100644 --- a/svx/source/accessibility/AccessibleOLEShape.cxx +++ b/svx/source/accessibility/AccessibleOLEShape.cxx @@ -166,7 +166,7 @@ uno::Sequence<uno::Type> SAL_CALL long nTypeCount = aTypeList.getLength(); aTypeList.realloc (nTypeCount + 1); const uno::Type aActionType = - ::getCppuType((const uno::Reference<XAccessibleAction>*)0); + cppu::UnoType<XAccessibleAction>::get(); aTypeList[nTypeCount] = aActionType; return aTypeList; diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx index 1e5fae376e87..49c1a1d4c310 100644 --- a/svx/source/accessibility/AccessibleShape.cxx +++ b/svx/source/accessibility/AccessibleShape.cxx @@ -1032,11 +1032,11 @@ uno::Sequence<uno::Type> SAL_CALL uno::Sequence<uno::Type> aComponentTypeList (AccessibleComponentBase::getTypes()); // ... define local types, ... const uno::Type aLangEventListenerType = - ::getCppuType((const uno::Reference<lang::XEventListener>*)0); + cppu::UnoType<lang::XEventListener>::get(); const uno::Type aDocumentEventListenerType = - ::getCppuType((const uno::Reference<document::XEventListener>*)0); + cppu::UnoType<document::XEventListener>::get(); const uno::Type aUnoTunnelType = - ::getCppuType((const uno::Reference<lang::XUnoTunnel>*)0); + cppu::UnoType<lang::XUnoTunnel>::get(); // ... and merge them all into one list. sal_Int32 nTypeCount (aTypeList.getLength()), diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index b2bb990b833f..902c821ab8d6 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -930,7 +930,7 @@ sal_Bool SAL_CALL FmXGridControl::hasElements() throw( RuntimeException, std::ex Type SAL_CALL FmXGridControl::getElementType( ) throw(RuntimeException, std::exception) { - return ::getCppuType((const Reference< ::com::sun::star::awt::XTextComponent >*)NULL); + return cppu::UnoType<com::sun::star::awt::XTextComponent>::get(); } // XEnumerationAccess @@ -2350,7 +2350,7 @@ sal_Bool FmXGridPeer::hasElements() throw( RuntimeException, std::exception ) Type SAL_CALL FmXGridPeer::getElementType( ) throw(RuntimeException, std::exception) { - return ::getCppuType((Reference< ::com::sun::star::awt::XControl> *)NULL); + return cppu::UnoType<com::sun::star::awt::XControl>::get(); } // XEnumerationAccess diff --git a/svx/source/form/dataaccessdescriptor.cxx b/svx/source/form/dataaccessdescriptor.cxx index 2063760f98e9..efabc93b1d6f 100644 --- a/svx/source/form/dataaccessdescriptor.cxx +++ b/svx/source/form/dataaccessdescriptor.cxx @@ -187,15 +187,15 @@ namespace svx { static PropertyMapEntry const s_aDesriptorProperties[] = { - { OUString("ActiveConnection"), daConnection, ::getCppuType( static_cast< Reference< XConnection >* >(NULL) ), PropertyAttribute::TRANSIENT, 0 }, + { OUString("ActiveConnection"), daConnection, cppu::UnoType<XConnection>::get(), PropertyAttribute::TRANSIENT, 0 }, { OUString("BookmarkSelection"), daBookmarkSelection, ::getBooleanCppuType( ), PropertyAttribute::TRANSIENT, 0 }, - { OUString("Column"), daColumnObject, ::getCppuType( static_cast< Reference< XPropertySet >* >(NULL) ), PropertyAttribute::TRANSIENT, 0 }, + { OUString("Column"), daColumnObject, cppu::UnoType<XPropertySet>::get(), PropertyAttribute::TRANSIENT, 0 }, { OUString("ColumnName"), daColumnName, ::cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT, 0 }, { OUString("Command"), daCommand, ::cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT, 0 }, { OUString("CommandType"), daCommandType, ::cppu::UnoType<sal_Int32>::get(), PropertyAttribute::TRANSIENT, 0 }, - { OUString("Component"), daComponent, ::getCppuType( static_cast< Reference< XContent >* >(NULL) ), PropertyAttribute::TRANSIENT, 0 }, + { OUString("Component"), daComponent, cppu::UnoType<XContent>::get(), PropertyAttribute::TRANSIENT, 0 }, { OUString("ConnectionResource"), daConnectionResource, ::cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT, 0 }, - { OUString("Cursor"), daCursor, ::getCppuType( static_cast< Reference< XResultSet>* >(NULL) ), PropertyAttribute::TRANSIENT, 0 }, + { OUString("Cursor"), daCursor, cppu::UnoType<XResultSet>::get(), PropertyAttribute::TRANSIENT, 0 }, { OUString("DataSourceName"), daDataSource, ::cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT, 0 }, { OUString("DatabaseLocation"), daDatabaseLocation, ::cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT, 0 }, { OUString("EscapeProcessing"), daEscapeProcessing, ::getBooleanCppuType( ), PropertyAttribute::TRANSIENT, 0 }, diff --git a/svx/source/form/fmdpage.cxx b/svx/source/form/fmdpage.cxx index ca6c1fd76f3b..c0867cc9ed77 100644 --- a/svx/source/form/fmdpage.cxx +++ b/svx/source/form/fmdpage.cxx @@ -64,7 +64,7 @@ Any SAL_CALL SvxFmDrawPage::queryAggregation( const ::com::sun::star::uno::Type& aTypes.realloc(aTypes.getLength() + 1); ::com::sun::star::uno::Type* pTypes = aTypes.getArray(); - pTypes[aTypes.getLength()-1] = ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormsSupplier>*)0); + pTypes[aTypes.getLength()-1] = cppu::UnoType<com::sun::star::form::XFormsSupplier>::get(); return aTypes; } diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx index 9cbf5a9a7e6c..cc7ea753b31a 100644 --- a/svx/source/form/fmundo.cxx +++ b/svx/source/form/fmundo.cxx @@ -1089,7 +1089,7 @@ void FmUndoContainerAction::implReInsert( ) SAL_THROW( ( Exception ) ) { // insert the element Any aVal; - if ( m_xContainer->getElementType() == ::getCppuType( static_cast< const Reference< XFormComponent >* >( NULL ) ) ) + if ( m_xContainer->getElementType() == cppu::UnoType<XFormComponent>::get() ) { aVal <<= Reference< XFormComponent >( m_xElement, UNO_QUERY ); } diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index f72fe7af4dcf..af99789063b6 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -240,7 +240,7 @@ sal_Bool SAL_CALL FormViewPageWindowAdapter::hasElements(void) throw( RuntimeExc Type SAL_CALL FormViewPageWindowAdapter::getElementType(void) throw( RuntimeException, std::exception ) { - return ::getCppuType((const Reference< XFormController>*)0); + return cppu::UnoType<XFormController>::get(); } // XEnumerationAccess diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index fd872b4e5c61..0d4457cb9a31 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -1091,7 +1091,7 @@ sal_Bool SAL_CALL FormController::hasElements(void) throw( RuntimeException, std Type SAL_CALL FormController::getElementType(void) throw( RuntimeException, std::exception ) { - return ::getCppuType((const Reference< XFormController>*)0); + return cppu::UnoType<XFormController>::get(); } diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx index 213eef999e76..9df5153eb98d 100644 --- a/svx/source/form/navigatortreemodel.cxx +++ b/svx/source/form/navigatortreemodel.cxx @@ -310,14 +310,14 @@ namespace svxform // das Element muss den Typ haben, den der Container erwartet if (xContainer->getElementType() == - ::getCppuType((const Reference< XForm>*)0)) + cppu::UnoType<XForm>::get()) { Reference< XForm > xElementAsForm(xElement, UNO_QUERY); xContainer->insertByIndex(nRelPos, makeAny(xElementAsForm)); } else if (xContainer->getElementType() == - ::getCppuType((const Reference< XFormComponent>*)0)) + cppu::UnoType<XFormComponent>::get()) { Reference< XFormComponent > xElementAsComponent(xElement, UNO_QUERY); @@ -531,7 +531,7 @@ namespace svxform FmFormData* pSubFormData; for (sal_Int32 i=0; i<xForms->getCount(); ++i) { - DBG_ASSERT( xForms->getByIndex(i).getValueType() == ::getCppuType((const Reference< XForm>*)NULL), + DBG_ASSERT( xForms->getByIndex(i).getValueType() == cppu::UnoType<XForm>::get(), "NavigatorTreeModel::FillBranch : the root container should supply only elements of type XForm"); xForms->getByIndex(i) >>= xSubForm; diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx index 5b09a69a920d..e95685093b05 100644 --- a/svx/source/table/accessibletableshape.cxx +++ b/svx/source/table/accessibletableshape.cxx @@ -360,7 +360,7 @@ SvxTableController* AccessibleTableShape::getTableController() Any SAL_CALL AccessibleTableShape::queryInterface( const Type& aType ) throw (RuntimeException, std::exception) { - if ( aType == ::getCppuType((Reference<XAccessibleTableSelection> *)0) ) + if ( aType == cppu::UnoType<XAccessibleTableSelection>::get()) { Reference<XAccessibleTableSelection> xThis( this ); Any aRet; diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index ad69f65cb16d..3ab9b683006f 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -74,20 +74,20 @@ static const SvxItemPropertySet* ImplGetSvxCellPropertySet() FILL_PROPERTIES // { "HasLevels", OWN_ATTR_HASLEVELS, ::getBooleanCppuType(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { OUString("Style"), OWN_ATTR_STYLE, cppu::UnoType< ::com::sun::star::style::XStyle >::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { OUString(UNO_NAME_TEXT_WRITINGMODE), SDRATTR_TEXTDIRECTION, ::getCppuType( (::com::sun::star::text::WritingMode*) 0 ), 0, 0}, - { OUString(UNO_NAME_TEXT_HORZADJUST), SDRATTR_TEXT_HORZADJUST, ::getCppuType((const ::com::sun::star::drawing::TextHorizontalAdjust*)0), 0, 0}, \ + { OUString(UNO_NAME_TEXT_WRITINGMODE), SDRATTR_TEXTDIRECTION, cppu::UnoType<com::sun::star::text::WritingMode>::get(), 0, 0}, + { OUString(UNO_NAME_TEXT_HORZADJUST), SDRATTR_TEXT_HORZADJUST, cppu::UnoType<com::sun::star::drawing::TextHorizontalAdjust>::get(), 0, 0}, \ { OUString(UNO_NAME_TEXT_LEFTDIST), SDRATTR_TEXT_LEFTDIST, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \ { OUString(UNO_NAME_TEXT_LOWERDIST), SDRATTR_TEXT_LOWERDIST, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \ { OUString(UNO_NAME_TEXT_RIGHTDIST), SDRATTR_TEXT_RIGHTDIST, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \ { OUString(UNO_NAME_TEXT_UPPERDIST), SDRATTR_TEXT_UPPERDIST, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \ - { OUString(UNO_NAME_TEXT_VERTADJUST), SDRATTR_TEXT_VERTADJUST, ::getCppuType((const ::com::sun::star::drawing::TextVerticalAdjust*)0), 0, 0},\ + { OUString(UNO_NAME_TEXT_VERTADJUST), SDRATTR_TEXT_VERTADJUST, cppu::UnoType<com::sun::star::drawing::TextVerticalAdjust>::get(), 0, 0},\ { OUString(UNO_NAME_TEXT_WORDWRAP), SDRATTR_TEXT_WORDWRAP, ::getBooleanCppuType(), 0, 0}, \ - { OUString("TableBorder"), OWN_ATTR_TABLEBORDER, ::getCppuType((const TableBorder*)0), 0, 0 }, \ - { OUString("TopBorder"), SDRATTR_TABLE_BORDER, ::getCppuType((const BorderLine*)0), 0, TOP_BORDER }, \ - { OUString("BottomBorder"), SDRATTR_TABLE_BORDER, ::getCppuType((const BorderLine*)0), 0, BOTTOM_BORDER }, \ - { OUString("LeftBorder"), SDRATTR_TABLE_BORDER, ::getCppuType((const BorderLine*)0), 0, LEFT_BORDER }, \ - { OUString("RightBorder"), SDRATTR_TABLE_BORDER, ::getCppuType((const BorderLine*)0), 0, RIGHT_BORDER }, \ + { OUString("TableBorder"), OWN_ATTR_TABLEBORDER, cppu::UnoType<TableBorder>::get(), 0, 0 }, \ + { OUString("TopBorder"), SDRATTR_TABLE_BORDER, cppu::UnoType<BorderLine>::get(), 0, TOP_BORDER }, \ + { OUString("BottomBorder"), SDRATTR_TABLE_BORDER, cppu::UnoType<BorderLine>::get(), 0, BOTTOM_BORDER }, \ + { OUString("LeftBorder"), SDRATTR_TABLE_BORDER, cppu::UnoType<BorderLine>::get(), 0, LEFT_BORDER }, \ + { OUString("RightBorder"), SDRATTR_TABLE_BORDER, cppu::UnoType<BorderLine>::get(), 0, RIGHT_BORDER }, \ SVX_UNOEDIT_OUTLINER_PROPERTIES, SVX_UNOEDIT_CHAR_PROPERTIES, @@ -1037,7 +1037,7 @@ void SAL_CALL Cell::setPropertyValue( const OUString& rPropertyName, const Any& } case OWN_ATTR_TABLEBORDER: { - if(rValue.getValueType() != ::getCppuType((const TableBorder*)0) ) + if(rValue.getValueType() != cppu::UnoType<TableBorder>::get()) break; const TableBorder* pBorder = (const TableBorder* )rValue.getValue(); diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx index 5d30c42b8a46..22c30fe41404 100644 --- a/svx/source/unodraw/XPropertyTable.cxx +++ b/svx/source/unodraw/XPropertyTable.cxx @@ -348,7 +348,7 @@ uno::Any SvxUnoXLineEndTable::getAny( const XPropertyEntry* pEntry ) const throw XPropertyEntry* SvxUnoXLineEndTable::getEntry( const OUString& rName, const uno::Any& rAny ) const throw() { - if( !rAny.getValue() || rAny.getValueType() != ::getCppuType((const drawing::PolyPolygonBezierCoords*)0) ) + if( !rAny.getValue() || rAny.getValueType() != cppu::UnoType<drawing::PolyPolygonBezierCoords>::get()) return NULL; basegfx::B2DPolyPolygon aPolyPolygon; @@ -366,7 +366,7 @@ XPropertyEntry* SvxUnoXLineEndTable::getEntry( const OUString& rName, const uno: uno::Type SAL_CALL SvxUnoXLineEndTable::getElementType() throw( uno::RuntimeException, std::exception ) { - return ::getCppuType((const drawing::PolyPolygonBezierCoords*)0); + return cppu::UnoType<drawing::PolyPolygonBezierCoords>::get(); } // XServiceInfo @@ -447,7 +447,7 @@ XPropertyEntry* SvxUnoXDashTable::getEntry( const OUString& rName, const uno::An uno::Type SAL_CALL SvxUnoXDashTable::getElementType() throw( uno::RuntimeException, std::exception ) { - return ::getCppuType((const drawing::LineDash*)0); + return cppu::UnoType<drawing::LineDash>::get(); } // XServiceInfo @@ -523,7 +523,7 @@ XPropertyEntry* SvxUnoXHatchTable::getEntry( const OUString& rName, const uno::A uno::Type SAL_CALL SvxUnoXHatchTable::getElementType() throw( uno::RuntimeException, std::exception ) { - return ::getCppuType((const drawing::Hatch*)0); + return cppu::UnoType<drawing::Hatch>::get(); } // XServiceInfo @@ -611,7 +611,7 @@ XPropertyEntry* SvxUnoXGradientTable::getEntry( const OUString& rName, const uno uno::Type SAL_CALL SvxUnoXGradientTable::getElementType() throw( uno::RuntimeException, std::exception ) { - return ::getCppuType((const awt::Gradient*)0); + return cppu::UnoType<awt::Gradient>::get(); } // XServiceInfo diff --git a/svx/source/unodraw/gluepts.cxx b/svx/source/unodraw/gluepts.cxx index 0e38b867802d..09601a0579ec 100644 --- a/svx/source/unodraw/gluepts.cxx +++ b/svx/source/unodraw/gluepts.cxx @@ -520,7 +520,7 @@ uno::Any SAL_CALL SvxUnoGluePointAccess::getByIndex( sal_Int32 Index ) uno::Type SAL_CALL SvxUnoGluePointAccess::getElementType() throw( uno::RuntimeException, std::exception) { - return ::getCppuType((const struct drawing::GluePoint2*)0); + return cppu::UnoType<drawing::GluePoint2>::get(); } sal_Bool SAL_CALL SvxUnoGluePointAccess::hasElements() diff --git a/svx/source/unodraw/unodtabl.cxx b/svx/source/unodraw/unodtabl.cxx index b860a322f104..8f9e3161395c 100644 --- a/svx/source/unodraw/unodtabl.cxx +++ b/svx/source/unodraw/unodtabl.cxx @@ -83,7 +83,7 @@ NameOrIndex* SvxUnoDashTable::createItem() const throw() uno::Type SAL_CALL SvxUnoDashTable::getElementType( ) throw( uno::RuntimeException, std::exception ) { - return ::getCppuType((const struct drawing::LineDash*)0); + return cppu::UnoType<drawing::LineDash>::get(); } /** diff --git a/svx/source/unodraw/unogtabl.cxx b/svx/source/unodraw/unogtabl.cxx index 93f5eadff829..dc72188e8b1a 100644 --- a/svx/source/unodraw/unogtabl.cxx +++ b/svx/source/unodraw/unogtabl.cxx @@ -82,7 +82,7 @@ NameOrIndex* SvxUnoGradientTable::createItem() const throw() uno::Type SAL_CALL SvxUnoGradientTable::getElementType( ) throw( uno::RuntimeException, std::exception ) { - return ::getCppuType((const struct awt::Gradient*)0); + return cppu::UnoType<awt::Gradient>::get(); } /** diff --git a/svx/source/unodraw/unohtabl.cxx b/svx/source/unodraw/unohtabl.cxx index 2e17ada2f740..1b0adc19dd42 100644 --- a/svx/source/unodraw/unohtabl.cxx +++ b/svx/source/unodraw/unohtabl.cxx @@ -80,7 +80,7 @@ NameOrIndex* SvxUnoHatchTable::createItem() const throw() uno::Type SAL_CALL SvxUnoHatchTable::getElementType( ) throw( uno::RuntimeException, std::exception ) { - return ::getCppuType((const struct drawing::Hatch*)0); + return cppu::UnoType<drawing::Hatch>::get(); } /** diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx index 5575e3e7fa10..bd92c96c8a54 100644 --- a/svx/source/unodraw/unopool.cxx +++ b/svx/source/unodraw/unopool.cxx @@ -340,15 +340,15 @@ uno::Any SAL_CALL SvxUnoDrawPool::queryAggregation( const uno::Type & rType ) { uno::Any aAny; - if( rType == ::getCppuType((const uno::Reference< lang::XServiceInfo >*)0) ) + if( rType == cppu::UnoType<lang::XServiceInfo>::get()) aAny <<= uno::Reference< lang::XServiceInfo >(this); - else if( rType == ::getCppuType((const uno::Reference< lang::XTypeProvider >*)0) ) + else if( rType == cppu::UnoType<lang::XTypeProvider>::get()) aAny <<= uno::Reference< lang::XTypeProvider >(this); - else if( rType == ::getCppuType((const uno::Reference< beans::XPropertySet >*)0) ) + else if( rType == cppu::UnoType<beans::XPropertySet>::get()) aAny <<= uno::Reference< beans::XPropertySet >(this); - else if( rType == ::getCppuType((const uno::Reference< beans::XPropertyState >*)0) ) + else if( rType == cppu::UnoType<beans::XPropertyState>::get()) aAny <<= uno::Reference< beans::XPropertyState >(this); - else if( rType == ::getCppuType((const uno::Reference< beans::XMultiPropertySet >*)0) ) + else if( rType == cppu::UnoType<beans::XMultiPropertySet>::get()) aAny <<= uno::Reference< beans::XMultiPropertySet >(this); else aAny <<= OWeakAggObject::queryAggregation( rType ); @@ -372,12 +372,12 @@ uno::Sequence< uno::Type > SAL_CALL SvxUnoDrawPool::getTypes() uno::Sequence< uno::Type > aTypes( 6 ); uno::Type* pTypes = aTypes.getArray(); - *pTypes++ = ::getCppuType((const uno::Reference< uno::XAggregation>*)0); - *pTypes++ = ::getCppuType((const uno::Reference< lang::XServiceInfo>*)0); - *pTypes++ = ::getCppuType((const uno::Reference< lang::XTypeProvider>*)0); - *pTypes++ = ::getCppuType((const uno::Reference< beans::XPropertySet>*)0); - *pTypes++ = ::getCppuType((const uno::Reference< beans::XPropertyState>*)0); - *pTypes++ = ::getCppuType((const uno::Reference< beans::XMultiPropertySet>*)0); + *pTypes++ = cppu::UnoType<uno::XAggregation>::get(); + *pTypes++ = cppu::UnoType<lang::XServiceInfo>::get(); + *pTypes++ = cppu::UnoType<lang::XTypeProvider>::get(); + *pTypes++ = cppu::UnoType<beans::XPropertySet>::get(); + *pTypes++ = cppu::UnoType<beans::XPropertyState>::get(); + *pTypes++ = cppu::UnoType<beans::XMultiPropertySet>::get(); return aTypes; } diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index ca70ab716147..b3bdd2c176a3 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -66,8 +66,8 @@ SfxItemPropertyMapEntry const * ImplGetSvxShapePropertyMap() // #FontWork# FONTWORK_PROPERTIES CUSTOMSHAPE_PROPERTIES - { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, - { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, + { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0}, + { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -90,8 +90,8 @@ SfxItemPropertyMapEntry const * ImplGetSvxTextShapePropertyMap() // #FontWork# FONTWORK_PROPERTIES CUSTOMSHAPE_PROPERTIES - { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, - { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, + { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0}, + { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -114,8 +114,8 @@ SfxItemPropertyMapEntry const * ImplGetSvxConnectorPropertyMap() TEXT_PROPERTIES // #FontWork# FONTWORK_PROPERTIES - { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, - { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, + { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0}, + { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -138,8 +138,8 @@ SfxItemPropertyMapEntry const * ImplGetSvxDimensioningPropertyMap() TEXT_PROPERTIES // #FontWork# FONTWORK_PROPERTIES - { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, - { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, + { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0}, + { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -163,8 +163,8 @@ SfxItemPropertyMapEntry const * ImplGetSvxCirclePropertyMap() // #FontWork# FONTWORK_PROPERTIES CUSTOMSHAPE_PROPERTIES - { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, - { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, + { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0}, + { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -189,8 +189,8 @@ SfxItemPropertyMapEntry const * ImplGetSvxPolyPolygonPropertyMap() // #FontWork# FONTWORK_PROPERTIES CUSTOMSHAPE_PROPERTIES - { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, - { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, + { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0}, + { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -201,7 +201,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxPolyPolygonBezierPropertyMap() { static SfxItemPropertyMapEntry const aPolyPolygonBezierPropertyMap_Impl[] = { - { OUString("Geometry"), OWN_ATTR_BASE_GEOMETRY, ::getCppuType((const ::com::sun::star::drawing::PolyPolygonBezierCoords*)0), 0, 0 }, + { OUString("Geometry"), OWN_ATTR_BASE_GEOMETRY, cppu::UnoType<com::sun::star::drawing::PolyPolygonBezierCoords>::get(), 0, 0 }, SPECIAL_POLYGON_PROPERTIES SPECIAL_POLYPOLYGONBEZIER_PROPERTIES FILL_PROPERTIES @@ -215,8 +215,8 @@ SfxItemPropertyMapEntry const * ImplGetSvxPolyPolygonBezierPropertyMap() // #FontWork# FONTWORK_PROPERTIES CUSTOMSHAPE_PROPERTIES - { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, - { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, + { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0}, + { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -245,8 +245,8 @@ SfxItemPropertyMapEntry const * ImplGetSvxGraphicObjectPropertyMap() // #FontWork# FONTWORK_PROPERTIES { OUString("IsMirrored"), OWN_ATTR_MIRRORED, ::getCppuBooleanType(), 0, 0}, - { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, - { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, + { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0}, + { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0}, { OUString("GraphicStream"), OWN_ATTR_GRAPHIC_STREAM, cppu::UnoType<css::io::XInputStream>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -285,8 +285,8 @@ SfxItemPropertyMapEntry const * ImplGetSvx3DCubeObjectPropertyMap() MISC_OBJ_PROPERTIES LINKTARGET_PROPERTIES SHADOW_PROPERTIES - { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, - { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, + { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0}, + { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -306,8 +306,8 @@ SfxItemPropertyMapEntry const * ImplGetSvx3DSphereObjectPropertyMap() MISC_OBJ_PROPERTIES LINKTARGET_PROPERTIES SHADOW_PROPERTIES - { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, - { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, + { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0}, + { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; return a3DSphereObjectPropertyMap_Impl; @@ -331,8 +331,8 @@ SfxItemPropertyMapEntry const * ImplGetSvx3DLatheObjectPropertyMap() MISC_OBJ_PROPERTIES LINKTARGET_PROPERTIES SHADOW_PROPERTIES - { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, - { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, + { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0}, + { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -357,8 +357,8 @@ SfxItemPropertyMapEntry const * ImplGetSvx3DExtrudeObjectPropertyMap() MISC_OBJ_PROPERTIES LINKTARGET_PROPERTIES SHADOW_PROPERTIES - { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, - { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, + { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0}, + { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -378,8 +378,8 @@ SfxItemPropertyMapEntry const * ImplGetSvx3DPolygonObjectPropertyMap() MISC_OBJ_PROPERTIES LINKTARGET_PROPERTIES SHADOW_PROPERTIES - { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, - { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, + { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0}, + { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -421,8 +421,8 @@ SfxItemPropertyMapEntry const * ImplGetSvxAllPropertyMap() SPECIAL_3DBACKSCALE_PROPERTIES SPECIAL_3DPOLYGONOBJECT_PROPERTIES CUSTOMSHAPE_PROPERTIES - { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, - { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, + { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0}, + { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -457,18 +457,18 @@ SfxItemPropertyMapEntry const * ImplGetSvxOle2PropertyMap() TEXT_PROPERTIES FONTWORK_PROPERTIES - { OUString("ThumbnailGraphicURL"), OWN_ATTR_THUMBNAIL , ::cppu::UnoType<OUString>::get(), 0, 0 }, - { OUString("Model"), OWN_ATTR_OLEMODEL , ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { OUString("EmbeddedObject"), OWN_ATTR_OLE_EMBEDDED_OBJECT, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { OUString("EmbeddedObjectNoNewClient"),OWN_ATTR_OLE_EMBEDDED_OBJECT_NONEWCLIENT, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { OUString("OriginalSize"), OWN_ATTR_OLESIZE , ::getCppuType(( const ::com::sun::star::awt::Size*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { OUString("CLSID"), OWN_ATTR_CLSID , ::cppu::UnoType<OUString>::get(), 0, 0 }, + { OUString("ThumbnailGraphicURL"), OWN_ATTR_THUMBNAIL , cppu::UnoType<OUString>::get(), 0, 0 }, + { OUString("Model"), OWN_ATTR_OLEMODEL , cppu::UnoType<com::sun::star::frame::XModel>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { OUString("EmbeddedObject"), OWN_ATTR_OLE_EMBEDDED_OBJECT, cppu::UnoType<com::sun::star::embed::XEmbeddedObject>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { OUString("EmbeddedObjectNoNewClient"),OWN_ATTR_OLE_EMBEDDED_OBJECT_NONEWCLIENT, cppu::UnoType<com::sun::star::embed::XEmbeddedObject>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { OUString("OriginalSize"), OWN_ATTR_OLESIZE , cppu::UnoType<com::sun::star::awt::Size>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { OUString("CLSID"), OWN_ATTR_CLSID , cppu::UnoType<OUString>::get(), 0, 0 }, { OUString("IsInternal"), OWN_ATTR_INTERNAL_OLE , ::getBooleanCppuType() , ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { OUString("VisibleArea"), OWN_ATTR_OLE_VISAREA , ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), 0, 0}, - { OUString("Aspect"), OWN_ATTR_OLE_ASPECT , ::getCppuType((const sal_Int64*)0), 0, 0}, - { OUString(UNO_NAME_OLE2_PERSISTNAME), OWN_ATTR_PERSISTNAME , ::cppu::UnoType<OUString>::get(), 0, 0 }, - { OUString("LinkURL"), OWN_ATTR_OLE_LINKURL , ::cppu::UnoType<OUString>::get(), 0, 0 }, - { OUString(UNO_NAME_GRAPHOBJ_GRAPHIC), OWN_ATTR_VALUE_GRAPHIC , ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic>*)0), 0, 0}, + { OUString("VisibleArea"), OWN_ATTR_OLE_VISAREA , cppu::UnoType<com::sun::star::awt::Rectangle>::get(), 0, 0}, + { OUString("Aspect"), OWN_ATTR_OLE_ASPECT , cppu::UnoType<sal_Int64>::get(), 0, 0}, + { OUString(UNO_NAME_OLE2_PERSISTNAME), OWN_ATTR_PERSISTNAME , cppu::UnoType<OUString>::get(), 0, 0 }, + { OUString("LinkURL"), OWN_ATTR_OLE_LINKURL , cppu::UnoType<OUString>::get(), 0, 0 }, + { OUString(UNO_NAME_GRAPHOBJ_GRAPHIC), OWN_ATTR_VALUE_GRAPHIC , cppu::UnoType<com::sun::star::graphic::XGraphic>::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -479,26 +479,26 @@ SfxItemPropertyMapEntry const * ImplGetSvxPluginPropertyMap() { static SfxItemPropertyMapEntry const aPluginPropertyMap_Impl[] = { - { OUString("PluginMimeType"), OWN_ATTR_PLUGIN_MIMETYPE , ::cppu::UnoType<OUString>::get(), 0, 0}, - { OUString("PluginURL"), OWN_ATTR_PLUGIN_URL , ::cppu::UnoType<OUString>::get(), 0, 0}, + { OUString("PluginMimeType"), OWN_ATTR_PLUGIN_MIMETYPE , cppu::UnoType<OUString>::get(), 0, 0}, + { OUString("PluginURL"), OWN_ATTR_PLUGIN_URL , cppu::UnoType<OUString>::get(), 0, 0}, { OUString("PluginCommands"), OWN_ATTR_PLUGIN_COMMANDS , ::getCppuType((::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >*)0), 0, 0}, - { OUString("Transformation"), OWN_ATTR_TRANSFORMATION , ::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 }, - { OUString(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER , ::cppu::UnoType<sal_Int32>::get(), 0, 0}, - { OUString(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID , ::cppu::UnoType<sal_Int16>::get(), 0, 0}, - { OUString(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME , ::cppu::UnoType<OUString>::get(), 0, 0}, - { OUString(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP , ::getCppuType(( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { OUString(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , ::cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { OUString("Transformation"), OWN_ATTR_TRANSFORMATION , cppu::UnoType<com::sun::star::drawing::HomogenMatrix3>::get(), 0, 0 }, + { OUString(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER , cppu::UnoType<sal_Int32>::get(), 0, 0}, + { OUString(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID , cppu::UnoType<sal_Int16>::get(), 0, 0}, + { OUString(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME , cppu::UnoType<OUString>::get(), 0, 0}, + { OUString(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP , cppu::UnoType<com::sun::star::awt::XBitmap>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { OUString(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { OUString(UNO_NAME_OLE2_METAFILE), OWN_ATTR_METAFILE , ::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { OUString("ThumbnailGraphicURL"), OWN_ATTR_THUMBNAIL , ::cppu::UnoType<OUString>::get(), 0, 0 }, + { OUString("ThumbnailGraphicURL"), OWN_ATTR_THUMBNAIL , cppu::UnoType<OUString>::get(), 0, 0 }, { OUString(UNO_NAME_MISC_OBJ_MOVEPROTECT), SDRATTR_OBJMOVEPROTECT, ::getBooleanCppuType(),0, 0}, { OUString(UNO_NAME_MISC_OBJ_SIZEPROTECT), SDRATTR_OBJSIZEPROTECT, ::getBooleanCppuType(),0, 0}, - { OUString(UNO_NAME_OLE2_PERSISTNAME), OWN_ATTR_PERSISTNAME , ::cppu::UnoType<OUString>::get(), 0, 0 }, - { OUString("LinkURL"), OWN_ATTR_OLE_LINKURL , ::cppu::UnoType<OUString>::get(), 0, 0 }, - { OUString(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { OUString("VisibleArea"), OWN_ATTR_OLE_VISAREA , ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), 0, 0}, + { OUString(UNO_NAME_OLE2_PERSISTNAME), OWN_ATTR_PERSISTNAME , cppu::UnoType<OUString>::get(), 0, 0 }, + { OUString("LinkURL"), OWN_ATTR_OLE_LINKURL , cppu::UnoType<OUString>::get(), 0, 0 }, + { OUString(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, cppu::UnoType<com::sun::star::awt::Rectangle>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { OUString("VisibleArea"), OWN_ATTR_OLE_VISAREA , cppu::UnoType<com::sun::star::awt::Rectangle>::get(), 0, 0}, // #i68101# - { OUString(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , ::cppu::UnoType<OUString>::get(), 0, 0}, - { OUString(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , ::cppu::UnoType<OUString>::get(), 0, 0}, + { OUString(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , cppu::UnoType<OUString>::get(), 0, 0}, + { OUString(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , cppu::UnoType<OUString>::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -510,29 +510,29 @@ SfxItemPropertyMapEntry const * ImplGetSvxFramePropertyMap() //TODO/LATER: new properties for ScrollingMode and DefaultBorder static SfxItemPropertyMapEntry const aFramePropertyMap_Impl[] = { - { OUString("FrameURL"), OWN_ATTR_FRAME_URL , ::cppu::UnoType<OUString>::get(), 0, 0}, - { OUString("FrameName"), OWN_ATTR_FRAME_NAME , ::cppu::UnoType<OUString>::get(), 0, 0}, + { OUString("FrameURL"), OWN_ATTR_FRAME_URL , cppu::UnoType<OUString>::get(), 0, 0}, + { OUString("FrameName"), OWN_ATTR_FRAME_NAME , cppu::UnoType<OUString>::get(), 0, 0}, { OUString("FrameIsAutoScroll"), OWN_ATTR_FRAME_ISAUTOSCROLL , ::getBooleanCppuType() , ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, { OUString("FrameIsBorder"), OWN_ATTR_FRAME_ISBORDER , ::getBooleanCppuType() , 0, 0}, - { OUString("FrameMarginWidth"), OWN_ATTR_FRAME_MARGIN_WIDTH , ::cppu::UnoType<sal_Int32>::get(), 0, 0}, - { OUString("FrameMarginHeight"), OWN_ATTR_FRAME_MARGIN_HEIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, - { OUString("Transformation"), OWN_ATTR_TRANSFORMATION , ::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 }, - { OUString(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER , ::cppu::UnoType<sal_Int32>::get(), 0, 0}, - { OUString(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID , ::cppu::UnoType<sal_Int16>::get(), 0, 0}, - { OUString(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME , ::cppu::UnoType<OUString>::get(), 0, 0}, - { OUString(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP , ::getCppuType(( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { OUString(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , ::cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { OUString("FrameMarginWidth"), OWN_ATTR_FRAME_MARGIN_WIDTH , cppu::UnoType<sal_Int32>::get(), 0, 0}, + { OUString("FrameMarginHeight"), OWN_ATTR_FRAME_MARGIN_HEIGHT, cppu::UnoType<sal_Int32>::get(), 0, 0}, + { OUString("Transformation"), OWN_ATTR_TRANSFORMATION , cppu::UnoType<com::sun::star::drawing::HomogenMatrix3>::get(), 0, 0 }, + { OUString(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER , cppu::UnoType<sal_Int32>::get(), 0, 0}, + { OUString(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID , cppu::UnoType<sal_Int16>::get(), 0, 0}, + { OUString(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME , cppu::UnoType<OUString>::get(), 0, 0}, + { OUString(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP , cppu::UnoType<com::sun::star::awt::XBitmap>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { OUString(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { OUString(UNO_NAME_OLE2_METAFILE), OWN_ATTR_METAFILE , ::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { OUString("ThumbnailGraphicURL"), OWN_ATTR_THUMBNAIL , ::cppu::UnoType<OUString>::get(), 0, 0 }, + { OUString("ThumbnailGraphicURL"), OWN_ATTR_THUMBNAIL , cppu::UnoType<OUString>::get(), 0, 0 }, { OUString(UNO_NAME_MISC_OBJ_MOVEPROTECT), SDRATTR_OBJMOVEPROTECT, ::getBooleanCppuType(),0, 0}, { OUString(UNO_NAME_MISC_OBJ_SIZEPROTECT), SDRATTR_OBJSIZEPROTECT, ::getBooleanCppuType(),0, 0}, - { OUString(UNO_NAME_OLE2_PERSISTNAME), OWN_ATTR_PERSISTNAME , ::cppu::UnoType<OUString>::get(), 0, 0 }, - { OUString("LinkURL"), OWN_ATTR_OLE_LINKURL , ::cppu::UnoType<OUString>::get(), 0, 0 }, - { OUString(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { OUString("VisibleArea"), OWN_ATTR_OLE_VISAREA , ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), 0, 0}, + { OUString(UNO_NAME_OLE2_PERSISTNAME), OWN_ATTR_PERSISTNAME , cppu::UnoType<OUString>::get(), 0, 0 }, + { OUString("LinkURL"), OWN_ATTR_OLE_LINKURL , cppu::UnoType<OUString>::get(), 0, 0 }, + { OUString(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, cppu::UnoType<com::sun::star::awt::Rectangle>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { OUString("VisibleArea"), OWN_ATTR_OLE_VISAREA , cppu::UnoType<com::sun::star::awt::Rectangle>::get(), 0, 0}, // #i68101# - { OUString(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , ::cppu::UnoType<OUString>::get(), 0, 0}, - { OUString(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , ::cppu::UnoType<OUString>::get(), 0, 0}, + { OUString(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , cppu::UnoType<OUString>::get(), 0, 0}, + { OUString(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , cppu::UnoType<OUString>::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -543,29 +543,29 @@ SfxItemPropertyMapEntry const * ImplGetSvxAppletPropertyMap() { static SfxItemPropertyMapEntry const aAppletPropertyMap_Impl[] = { - { OUString("AppletCodeBase"), OWN_ATTR_APPLET_CODEBASE , ::cppu::UnoType<OUString>::get(), 0, 0}, - { OUString("AppletName"), OWN_ATTR_APPLET_NAME , ::cppu::UnoType<OUString>::get(), 0, 0}, - { OUString("AppletCode"), OWN_ATTR_APPLET_CODE , ::cppu::UnoType<OUString>::get(), 0, 0}, + { OUString("AppletCodeBase"), OWN_ATTR_APPLET_CODEBASE , cppu::UnoType<OUString>::get(), 0, 0}, + { OUString("AppletName"), OWN_ATTR_APPLET_NAME , cppu::UnoType<OUString>::get(), 0, 0}, + { OUString("AppletCode"), OWN_ATTR_APPLET_CODE , cppu::UnoType<OUString>::get(), 0, 0}, { OUString("AppletCommands"), OWN_ATTR_APPLET_COMMANDS , ::getCppuType((::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >*)0), 0, 0}, - { OUString("AppletDocBase"), OWN_ATTR_APPLET_DOCBASE , ::cppu::UnoType<OUString>::get(), 0, 0}, + { OUString("AppletDocBase"), OWN_ATTR_APPLET_DOCBASE , cppu::UnoType<OUString>::get(), 0, 0}, { OUString("AppletIsScript"), OWN_ATTR_APPLET_ISSCRIPT , ::getBooleanCppuType(), 0, 0 }, - { OUString("Transformation"), OWN_ATTR_TRANSFORMATION , ::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 }, - { OUString(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER , ::cppu::UnoType<sal_Int32>::get(), 0, 0}, - { OUString(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID , ::cppu::UnoType<sal_Int16>::get(), 0, 0}, - { OUString(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME , ::cppu::UnoType<OUString>::get(), 0, 0}, - { OUString(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP , ::getCppuType(( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { OUString(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , ::cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { OUString("Transformation"), OWN_ATTR_TRANSFORMATION , cppu::UnoType<com::sun::star::drawing::HomogenMatrix3>::get(), 0, 0 }, + { OUString(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER , cppu::UnoType<sal_Int32>::get(), 0, 0}, + { OUString(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID , cppu::UnoType<sal_Int16>::get(), 0, 0}, + { OUString(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME , cppu::UnoType<OUString>::get(), 0, 0}, + { OUString(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP , cppu::UnoType<com::sun::star::awt::XBitmap>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { OUString(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { OUString(UNO_NAME_OLE2_METAFILE), OWN_ATTR_METAFILE , ::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { OUString("ThumbnailGraphicURL"), OWN_ATTR_THUMBNAIL , ::cppu::UnoType<OUString>::get(), 0, 0 }, + { OUString("ThumbnailGraphicURL"), OWN_ATTR_THUMBNAIL , cppu::UnoType<OUString>::get(), 0, 0 }, { OUString(UNO_NAME_MISC_OBJ_MOVEPROTECT), SDRATTR_OBJMOVEPROTECT, ::getBooleanCppuType(),0, 0}, { OUString(UNO_NAME_MISC_OBJ_SIZEPROTECT), SDRATTR_OBJSIZEPROTECT, ::getBooleanCppuType(),0, 0}, - { OUString(UNO_NAME_OLE2_PERSISTNAME), OWN_ATTR_PERSISTNAME , ::cppu::UnoType<OUString>::get(), 0, 0 }, - { OUString("LinkURL"), OWN_ATTR_OLE_LINKURL , ::cppu::UnoType<OUString>::get(), 0, 0 }, - { OUString(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { OUString("VisibleArea"), OWN_ATTR_OLE_VISAREA , ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), 0, 0}, + { OUString(UNO_NAME_OLE2_PERSISTNAME), OWN_ATTR_PERSISTNAME , cppu::UnoType<OUString>::get(), 0, 0 }, + { OUString("LinkURL"), OWN_ATTR_OLE_LINKURL , cppu::UnoType<OUString>::get(), 0, 0 }, + { OUString(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, cppu::UnoType<com::sun::star::awt::Rectangle>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { OUString("VisibleArea"), OWN_ATTR_OLE_VISAREA , cppu::UnoType<com::sun::star::awt::Rectangle>::get(), 0, 0}, // #i68101# - { OUString(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , ::cppu::UnoType<OUString>::get(), 0, 0}, - { OUString(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , ::cppu::UnoType<OUString>::get(), 0, 0}, + { OUString(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , cppu::UnoType<OUString>::get(), 0, 0}, + { OUString(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , cppu::UnoType<OUString>::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -577,46 +577,46 @@ SfxItemPropertyMapEntry const * ImplGetSvxControlShapePropertyMap() static SfxItemPropertyMapEntry const aControlPropertyMap_Impl[] = { // the following properties are mapped to the XControl Model of this shape - { OUString(UNO_NAME_EDIT_CHAR_FONTNAME), 0, ::cppu::UnoType<OUString>::get(), 0, 0 }, - { OUString(UNO_NAME_EDIT_CHAR_FONTSTYLENAME), 0, ::cppu::UnoType<OUString>::get(), 0, 0 }, - { OUString(UNO_NAME_EDIT_CHAR_FONTFAMILY), 0, ::cppu::UnoType<sal_Int16>::get(), 0, 0 }, - { OUString(UNO_NAME_EDIT_CHAR_FONTCHARSET), 0, ::cppu::UnoType<sal_Int16>::get(), 0, 0 }, - { OUString(UNO_NAME_EDIT_CHAR_HEIGHT), 0, ::getCppuType((const float*)0), 0, 0 }, - { OUString(UNO_NAME_EDIT_CHAR_FONTPITCH), 0, ::cppu::UnoType<sal_Int16>::get(), 0, 0 }, - { OUString(UNO_NAME_EDIT_CHAR_POSTURE), 0, ::getCppuType((const ::com::sun::star::awt::FontSlant*)0),0, 0 }, - { OUString(UNO_NAME_EDIT_CHAR_WEIGHT), 0, ::getCppuType((const float*)0), 0, 0 }, - { OUString(UNO_NAME_EDIT_CHAR_UNDERLINE), 0, ::cppu::UnoType<sal_Int16>::get(), 0, 0 }, - { OUString(UNO_NAME_EDIT_CHAR_STRIKEOUT), 0, ::cppu::UnoType<sal_Int16>::get(), 0, 0}, - { OUString(UNO_NAME_EDIT_CHAR_CASEMAP), 0, ::cppu::UnoType<sal_Int16>::get(), 0, 0 }, - { OUString(UNO_NAME_EDIT_CHAR_COLOR), 0, ::cppu::UnoType<sal_Int32>::get(), 0, 0 }, - { OUString("CharRelief"), 0, ::cppu::UnoType<sal_Int16>::get(), 0, 0 }, - { OUString("CharUnderlineColor"), 0, ::cppu::UnoType<sal_Int32>::get(), 0, 0 }, - { OUString("CharKerning"), 0, ::cppu::UnoType<sal_Int16>::get(), 0, 0 }, + { OUString(UNO_NAME_EDIT_CHAR_FONTNAME), 0, cppu::UnoType<OUString>::get(), 0, 0 }, + { OUString(UNO_NAME_EDIT_CHAR_FONTSTYLENAME), 0, cppu::UnoType<OUString>::get(), 0, 0 }, + { OUString(UNO_NAME_EDIT_CHAR_FONTFAMILY), 0, cppu::UnoType<sal_Int16>::get(), 0, 0 }, + { OUString(UNO_NAME_EDIT_CHAR_FONTCHARSET), 0, cppu::UnoType<sal_Int16>::get(), 0, 0 }, + { OUString(UNO_NAME_EDIT_CHAR_HEIGHT), 0, cppu::UnoType<float>::get(), 0, 0 }, + { OUString(UNO_NAME_EDIT_CHAR_FONTPITCH), 0, cppu::UnoType<sal_Int16>::get(), 0, 0 }, + { OUString(UNO_NAME_EDIT_CHAR_POSTURE), 0, cppu::UnoType<com::sun::star::awt::FontSlant>::get(),0, 0 }, + { OUString(UNO_NAME_EDIT_CHAR_WEIGHT), 0, cppu::UnoType<float>::get(), 0, 0 }, + { OUString(UNO_NAME_EDIT_CHAR_UNDERLINE), 0, cppu::UnoType<sal_Int16>::get(), 0, 0 }, + { OUString(UNO_NAME_EDIT_CHAR_STRIKEOUT), 0, cppu::UnoType<sal_Int16>::get(), 0, 0}, + { OUString(UNO_NAME_EDIT_CHAR_CASEMAP), 0, cppu::UnoType<sal_Int16>::get(), 0, 0 }, + { OUString(UNO_NAME_EDIT_CHAR_COLOR), 0, cppu::UnoType<sal_Int32>::get(), 0, 0 }, + { OUString("CharRelief"), 0, cppu::UnoType<sal_Int16>::get(), 0, 0 }, + { OUString("CharUnderlineColor"), 0, cppu::UnoType<sal_Int32>::get(), 0, 0 }, + { OUString("CharKerning"), 0, cppu::UnoType<sal_Int16>::get(), 0, 0 }, { OUString("CharWordMode"), 0, ::getBooleanCppuType(), 0, 0 }, - { OUString(UNO_NAME_EDIT_PARA_ADJUST), 0, ::cppu::UnoType<sal_Int16>::get(), 0, 0 }, - { OUString("TextVerticalAdjust"), 0, ::getCppuType((const TextVerticalAdjust*)0), MAYBEVOID, 0 }, - { OUString("ControlBackground"), 0, ::cppu::UnoType<sal_Int32>::get(), 0, 0 }, - { OUString("ControlBorder"), 0, ::cppu::UnoType<sal_Int16>::get(), 0, 0 }, - { OUString("ControlBorderColor"), 0, ::cppu::UnoType<sal_Int32>::get(), 0, 0 }, - { OUString("ControlSymbolColor"), 0, ::cppu::UnoType<sal_Int16>::get(), 0, 0 }, - { OUString("ImageScaleMode"), 0, ::cppu::UnoType<sal_Int16>::get(), 0, 0 }, + { OUString(UNO_NAME_EDIT_PARA_ADJUST), 0, cppu::UnoType<sal_Int16>::get(), 0, 0 }, + { OUString("TextVerticalAdjust"), 0, cppu::UnoType<TextVerticalAdjust>::get(), MAYBEVOID, 0 }, + { OUString("ControlBackground"), 0, cppu::UnoType<sal_Int32>::get(), 0, 0 }, + { OUString("ControlBorder"), 0, cppu::UnoType<sal_Int16>::get(), 0, 0 }, + { OUString("ControlBorderColor"), 0, cppu::UnoType<sal_Int32>::get(), 0, 0 }, + { OUString("ControlSymbolColor"), 0, cppu::UnoType<sal_Int16>::get(), 0, 0 }, + { OUString("ImageScaleMode"), 0, cppu::UnoType<sal_Int16>::get(), 0, 0 }, { OUString(UNO_NAME_MISC_OBJ_MOVEPROTECT), SDRATTR_OBJMOVEPROTECT, ::getBooleanCppuType(),0, 0}, { OUString(UNO_NAME_MISC_OBJ_SIZEPROTECT), SDRATTR_OBJSIZEPROTECT, ::getBooleanCppuType(),0, 0}, - { OUString("ControlTextEmphasis"), 0, ::cppu::UnoType<sal_Int16>::get(), 0, 0 }, - { OUString("ControlWritingMode"), 0, ::cppu::UnoType< sal_Int16 >::get(), 0, 0}, + { OUString("ControlTextEmphasis"), 0, cppu::UnoType<sal_Int16>::get(), 0, 0 }, + { OUString("ControlWritingMode"), 0, cppu::UnoType< sal_Int16 >::get(), 0, 0}, // the following properties are handled by SvxShape - { OUString("Transformation"), OWN_ATTR_TRANSFORMATION , ::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 }, - { OUString(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER , ::cppu::UnoType<sal_Int32>::get(), 0, 0}, - { OUString(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID , ::cppu::UnoType<sal_Int16>::get(), 0, 0}, - { OUString(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME , ::cppu::UnoType<OUString>::get(), 0, 0}, - { OUString(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP , ::getCppuType(( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { OUString(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , ::cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, - {OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, - { OUString(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { OUString("Transformation"), OWN_ATTR_TRANSFORMATION , cppu::UnoType<com::sun::star::drawing::HomogenMatrix3>::get(), 0, 0 }, + { OUString(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER , cppu::UnoType<sal_Int32>::get(), 0, 0}, + { OUString(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID , cppu::UnoType<sal_Int16>::get(), 0, 0}, + { OUString(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME , cppu::UnoType<OUString>::get(), 0, 0}, + { OUString(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP , cppu::UnoType<com::sun::star::awt::XBitmap>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { OUString(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0}, + {OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0}, + { OUString(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, cppu::UnoType<com::sun::star::awt::Rectangle>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, // #i68101# - { OUString(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , ::cppu::UnoType<OUString>::get(), 0, 0}, - { OUString(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , ::cppu::UnoType<OUString>::get(), 0, 0}, + { OUString(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , cppu::UnoType<OUString>::get(), 0, 0}, + { OUString(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , cppu::UnoType<OUString>::get(), 0, 0}, // #i112587# { OUString(UNO_NAME_MISC_OBJ_PRINTABLE), SDRATTR_OBJPRINTABLE , ::getBooleanCppuType(), 0, 0}, { OUString("Visible"), SDRATTR_OBJVISIBLE , ::getBooleanCppuType(), 0, 0}, @@ -631,19 +631,19 @@ SfxItemPropertyMapEntry const * ImplGetSvxPageShapePropertyMap() { static SfxItemPropertyMapEntry const aPageShapePropertyMap_Impl[] = { - { OUString("PageNumber"), OWN_ATTR_PAGE_NUMBER , ::cppu::UnoType<sal_Int32>::get(), 0, 0}, - { OUString("Transformation"), OWN_ATTR_TRANSFORMATION , ::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 }, - { OUString(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER , ::cppu::UnoType<sal_Int32>::get(), 0, 0}, - { OUString(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID , ::cppu::UnoType<sal_Int16>::get(), 0, 0}, - { OUString(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME , ::cppu::UnoType<OUString>::get(), 0, 0}, - { OUString(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP , ::getCppuType(( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { OUString(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , ::cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { OUString("PageNumber"), OWN_ATTR_PAGE_NUMBER , cppu::UnoType<sal_Int32>::get(), 0, 0}, + { OUString("Transformation"), OWN_ATTR_TRANSFORMATION , cppu::UnoType<com::sun::star::drawing::HomogenMatrix3>::get(), 0, 0 }, + { OUString(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER , cppu::UnoType<sal_Int32>::get(), 0, 0}, + { OUString(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID , cppu::UnoType<sal_Int16>::get(), 0, 0}, + { OUString(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME , cppu::UnoType<OUString>::get(), 0, 0}, + { OUString(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP , cppu::UnoType<com::sun::star::awt::XBitmap>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { OUString(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { OUString(UNO_NAME_MISC_OBJ_MOVEPROTECT), SDRATTR_OBJMOVEPROTECT, ::getBooleanCppuType(),0, 0}, { OUString(UNO_NAME_MISC_OBJ_SIZEPROTECT), SDRATTR_OBJSIZEPROTECT, ::getBooleanCppuType(),0, 0}, - { OUString(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { OUString(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, cppu::UnoType<com::sun::star::awt::Rectangle>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, // #i68101# - { OUString(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , ::cppu::UnoType<OUString>::get(), 0, 0}, - { OUString(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , ::cppu::UnoType<OUString>::get(), 0, 0}, + { OUString(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , cppu::UnoType<OUString>::get(), 0, 0}, + { OUString(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , cppu::UnoType<OUString>::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -654,16 +654,16 @@ SfxItemPropertyMapEntry const * ImplGetSvxCaptionPropertyMap() { static SfxItemPropertyMapEntry const aCaptionPropertyMap_Impl[] = { - { OUString("CaptionPoint"), OWN_ATTR_CAPTION_POINT, ::getCppuType((const com::sun::star::awt::Point*)0), 0, 0 }, - { OUString("CaptionType"), SDRATTR_CAPTIONTYPE, ::cppu::UnoType<sal_Int16>::get(), 0, 0}, + { OUString("CaptionPoint"), OWN_ATTR_CAPTION_POINT, cppu::UnoType<com::sun::star::awt::Point>::get(), 0, 0 }, + { OUString("CaptionType"), SDRATTR_CAPTIONTYPE, cppu::UnoType<sal_Int16>::get(), 0, 0}, { OUString("CaptionIsFixedAngle"), SDRATTR_CAPTIONFIXEDANGLE, ::getBooleanCppuType(), 0, 0}, - { OUString("CaptionAngle"), SDRATTR_CAPTIONANGLE, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, - { OUString("CaptionGap"), SDRATTR_CAPTIONGAP, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, - { OUString("CaptionEscapeDirection"), SDRATTR_CAPTIONESCDIR, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, + { OUString("CaptionAngle"), SDRATTR_CAPTIONANGLE, cppu::UnoType<sal_Int32>::get(), 0, 0}, + { OUString("CaptionGap"), SDRATTR_CAPTIONGAP, cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, + { OUString("CaptionEscapeDirection"), SDRATTR_CAPTIONESCDIR, cppu::UnoType<sal_Int32>::get(), 0, 0}, { OUString("CaptionIsEscapeRelative"), SDRATTR_CAPTIONESCISREL, ::getBooleanCppuType(), 0, 0}, - { OUString("CaptionEscapeRelative"), SDRATTR_CAPTIONESCREL, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, - { OUString("CaptionEscapeAbsolute"), SDRATTR_CAPTIONESCABS, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, - { OUString("CaptionLineLength"), SDRATTR_CAPTIONLINELEN, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, + { OUString("CaptionEscapeRelative"), SDRATTR_CAPTIONESCREL, cppu::UnoType<sal_Int32>::get(), 0, 0}, + { OUString("CaptionEscapeAbsolute"), SDRATTR_CAPTIONESCABS, cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, + { OUString("CaptionLineLength"), SDRATTR_CAPTIONLINELEN, cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, { OUString("CaptionIsFitLineLength"), SDRATTR_CAPTIONFITLINELEN, ::getBooleanCppuType(), 0, 0}, EDGERADIUS_PROPERTIES FILL_PROPERTIES @@ -676,8 +676,8 @@ SfxItemPropertyMapEntry const * ImplGetSvxCaptionPropertyMap() TEXT_PROPERTIES // #FontWork# FONTWORK_PROPERTIES - { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, - {OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, + { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0}, + {OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -688,10 +688,10 @@ SfxItemPropertyMapEntry const * ImplGetSvxCustomShapePropertyMap() { static SfxItemPropertyMapEntry const aCustomShapePropertyMap_Impl[] = { - { OUString("CustomShapeEngine"), SDRATTR_CUSTOMSHAPE_ENGINE, ::cppu::UnoType<OUString>::get(), 0, 0 }, - { OUString("CustomShapeData"), SDRATTR_CUSTOMSHAPE_DATA, ::cppu::UnoType<OUString>::get(), 0, 0 }, + { OUString("CustomShapeEngine"), SDRATTR_CUSTOMSHAPE_ENGINE, cppu::UnoType<OUString>::get(), 0, 0 }, + { OUString("CustomShapeData"), SDRATTR_CUSTOMSHAPE_DATA, cppu::UnoType<OUString>::get(), 0, 0 }, { OUString("CustomShapeGeometry"), SDRATTR_CUSTOMSHAPE_GEOMETRY, ::getCppuType((::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >*)0), 0, 0 }, - { OUString("CustomShapeGraphicURL"), SDRATTR_CUSTOMSHAPE_REPLACEMENT_URL, ::cppu::UnoType<OUString>::get(), 0, 0}, + { OUString("CustomShapeGraphicURL"), SDRATTR_CUSTOMSHAPE_REPLACEMENT_URL, cppu::UnoType<OUString>::get(), 0, 0}, CUSTOMSHAPE_PROPERTIES FILL_PROPERTIES LINE_PROPERTIES @@ -701,8 +701,8 @@ SfxItemPropertyMapEntry const * ImplGetSvxCustomShapePropertyMap() LINKTARGET_PROPERTIES SHADOW_PROPERTIES TEXT_PROPERTIES - {OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, - {OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, + {OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0}, + {OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; return aCustomShapePropertyMap_Impl; @@ -712,27 +712,27 @@ SfxItemPropertyMapEntry const * ImplGetSvxMediaShapePropertyMap() { static SfxItemPropertyMapEntry const aMediaShapePropertyMap_Impl[] = { - { OUString(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, - { OUString(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID, ::cppu::UnoType<sal_Int16>::get(), 0, 0}, - { OUString(UNO_NAME_MISC_OBJ_LAYERNAME), SDRATTR_LAYERNAME, ::cppu::UnoType<OUString>::get(), 0, 0}, - { OUString(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP, ::getCppuType(( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { OUString(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME, ::cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { OUString("Transformation"), OWN_ATTR_TRANSFORMATION, ::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 }, - { OUString("MediaURL"), OWN_ATTR_MEDIA_URL, ::cppu::UnoType<OUString>::get(), 0, 0}, - { OUString("PreferredSize"), OWN_ATTR_MEDIA_PREFERREDSIZE, ::getCppuType((const ::com::sun::star::awt::Size*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { OUString("Loop"), OWN_ATTR_MEDIA_LOOP, ::getCppuType((const sal_Bool*)0), 0, 0}, - { OUString("Mute"), OWN_ATTR_MEDIA_MUTE, ::getCppuType((const sal_Bool*)0), 0, 0}, - { OUString("VolumeDB"), OWN_ATTR_MEDIA_VOLUMEDB, ::cppu::UnoType<sal_Int16>::get(), 0, 0}, - { OUString("Zoom"), OWN_ATTR_MEDIA_ZOOM, ::getCppuType((const ::com::sun::star::media::ZoomLevel*)0), 0, 0}, + { OUString(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER, cppu::UnoType<sal_Int32>::get(), 0, 0}, + { OUString(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID, cppu::UnoType<sal_Int16>::get(), 0, 0}, + { OUString(UNO_NAME_MISC_OBJ_LAYERNAME), SDRATTR_LAYERNAME, cppu::UnoType<OUString>::get(), 0, 0}, + { OUString(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP, cppu::UnoType<com::sun::star::awt::XBitmap>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { OUString(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME, cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { OUString("Transformation"), OWN_ATTR_TRANSFORMATION, cppu::UnoType<com::sun::star::drawing::HomogenMatrix3>::get(), 0, 0 }, + { OUString("MediaURL"), OWN_ATTR_MEDIA_URL, cppu::UnoType<OUString>::get(), 0, 0}, + { OUString("PreferredSize"), OWN_ATTR_MEDIA_PREFERREDSIZE, cppu::UnoType<com::sun::star::awt::Size>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { OUString("Loop"), OWN_ATTR_MEDIA_LOOP, cppu::UnoType<sal_Bool>::get(), 0, 0}, + { OUString("Mute"), OWN_ATTR_MEDIA_MUTE, cppu::UnoType<sal_Bool>::get(), 0, 0}, + { OUString("VolumeDB"), OWN_ATTR_MEDIA_VOLUMEDB, cppu::UnoType<sal_Int16>::get(), 0, 0}, + { OUString("Zoom"), OWN_ATTR_MEDIA_ZOOM, cppu::UnoType<com::sun::star::media::ZoomLevel>::get(), 0, 0}, { OUString(UNO_NAME_MISC_OBJ_MOVEPROTECT), SDRATTR_OBJMOVEPROTECT, ::getBooleanCppuType(),0, 0}, { OUString(UNO_NAME_MISC_OBJ_SIZEPROTECT), SDRATTR_OBJSIZEPROTECT, ::getBooleanCppuType(),0, 0}, - { OUString(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { OUString(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, cppu::UnoType<com::sun::star::awt::Rectangle>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, // #i68101# - { OUString(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , ::cppu::UnoType<OUString>::get(), 0, 0}, - { OUString(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , ::cppu::UnoType<OUString>::get(), 0, 0}, + { OUString(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , cppu::UnoType<OUString>::get(), 0, 0}, + { OUString(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , cppu::UnoType<OUString>::get(), 0, 0}, {OUString("PrivateStream"), OWN_ATTR_MEDIA_STREAM, cppu::UnoType<css::io::XInputStream>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - {OUString("PrivateTempFileURL"), OWN_ATTR_MEDIA_TEMPFILEURL, ::cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { OUString("MediaMimeType"), OWN_ATTR_MEDIA_MIMETYPE, ::cppu::UnoType<OUString>::get(), 0, 0}, + {OUString("PrivateTempFileURL"), OWN_ATTR_MEDIA_TEMPFILEURL, cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { OUString("MediaMimeType"), OWN_ATTR_MEDIA_MIMETYPE, cppu::UnoType<OUString>::get(), 0, 0}, { OUString("FallbackGraphic"), OWN_ATTR_FALLBACK_GRAPHIC, cppu::UnoType<css::graphic::XGraphic>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -744,18 +744,18 @@ SfxItemPropertyMapEntry const * ImplGetSvxTableShapePropertyMap() { static SfxItemPropertyMapEntry const aTableShapePropertyMap_Impl[] = { - { OUString(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, - { OUString(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID, ::cppu::UnoType<sal_Int16>::get(), 0, 0}, - { OUString(UNO_NAME_MISC_OBJ_LAYERNAME), SDRATTR_LAYERNAME, ::cppu::UnoType<OUString>::get(), 0, 0}, + { OUString(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER, cppu::UnoType<sal_Int32>::get(), 0, 0}, + { OUString(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID, cppu::UnoType<sal_Int16>::get(), 0, 0}, + { OUString(UNO_NAME_MISC_OBJ_LAYERNAME), SDRATTR_LAYERNAME, cppu::UnoType<OUString>::get(), 0, 0}, { OUString(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP, cppu::UnoType<css::awt::XBitmap>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { OUString(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME, ::cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { OUString("Transformation"), OWN_ATTR_TRANSFORMATION, ::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 }, + { OUString(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME, cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { OUString("Transformation"), OWN_ATTR_TRANSFORMATION, cppu::UnoType<com::sun::star::drawing::HomogenMatrix3>::get(), 0, 0 }, { OUString(UNO_NAME_MISC_OBJ_MOVEPROTECT), SDRATTR_OBJMOVEPROTECT, ::getBooleanCppuType(),0, 0}, { OUString(UNO_NAME_MISC_OBJ_SIZEPROTECT), SDRATTR_OBJSIZEPROTECT, ::getBooleanCppuType(),0, 0}, - { OUString(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { OUString(UNO_NAME_MISC_OBJ_NAME), SDRATTR_OBJECTNAME, ::getCppuType((const ::rtl::OUString*)0), 0, 0}, - { OUString(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , ::cppu::UnoType<OUString>::get(), 0, 0}, - { OUString(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , ::cppu::UnoType<OUString>::get(), 0, 0}, + { OUString(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, cppu::UnoType<com::sun::star::awt::Rectangle>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { OUString(UNO_NAME_MISC_OBJ_NAME), SDRATTR_OBJECTNAME, cppu::UnoType<rtl::OUString>::get(), 0, 0}, + { OUString(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , cppu::UnoType<OUString>::get(), 0, 0}, + { OUString(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , cppu::UnoType<OUString>::get(), 0, 0}, { OUString("Model"), OWN_ATTR_OLEMODEL , cppu::UnoType<css::table::XTable>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { OUString("TableTemplate"), OWN_ATTR_TABLETEMPLATE , cppu::UnoType<css::container::XIndexAccess>::get(), 0, 0}, { OUString("UseFirstRowStyle"), OWN_ATTR_TABLETEMPLATE_FIRSTROW, ::getBooleanCppuType(),0, 0}, diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index ec78f4716a71..c5043e2ea138 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -348,7 +348,7 @@ uno::Any SAL_CALL SvxShapeGroup::getByIndex( sal_Int32 Index ) uno::Type SAL_CALL SvxShapeGroup::getElementType() throw( uno::RuntimeException, std::exception ) { - return ::getCppuType(( const Reference< drawing::XShape >*)0); + return cppu::UnoType<drawing::XShape>::get(); } @@ -1322,7 +1322,7 @@ bool SvxShapePolyPolygonBezier::setPropertyValueImpl( const OUString& rName, con { case OWN_ATTR_VALUE_POLYPOLYGONBEZIER: { - if( rValue.getValue() && (rValue.getValueType() == ::getCppuType(( const drawing::PolyPolygonBezierCoords*)0) ) ) + if( rValue.getValue() && (rValue.getValueType() == cppu::UnoType<drawing::PolyPolygonBezierCoords>::get()) ) { basegfx::B2DPolyPolygon aNewPolyPolygon( basegfx::unotools::polyPolygonBezierToB2DPolyPolygon( @@ -1334,7 +1334,7 @@ bool SvxShapePolyPolygonBezier::setPropertyValueImpl( const OUString& rName, con } case OWN_ATTR_BASE_GEOMETRY: { - if( rValue.getValue() && (rValue.getValueType() == ::getCppuType(( const drawing::PolyPolygonBezierCoords*)0)) ) + if( rValue.getValue() && (rValue.getValueType() == cppu::UnoType<drawing::PolyPolygonBezierCoords>::get()) ) { if( mpObj.is() ) { diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx index 125bfc8174e3..bdd66d1279bc 100644 --- a/svx/source/unodraw/unoshap3.cxx +++ b/svx/source/unodraw/unoshap3.cxx @@ -235,7 +235,7 @@ uno::Any SAL_CALL Svx3DSceneObject::getByIndex( sal_Int32 Index ) uno::Type SAL_CALL Svx3DSceneObject::getElementType() throw( uno::RuntimeException, std::exception ) { - return ::getCppuType(( const Reference< drawing::XShape>*)0); + return cppu::UnoType<drawing::XShape>::get(); } diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index bd389bc6d365..55afb1ff01a2 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -767,18 +767,18 @@ uno::Sequence< uno::Type > SAL_CALL SvxShape::_getTypes() aTypeSequence.realloc( 12 ); uno::Type* pTypes = aTypeSequence.getArray(); - *pTypes++ = ::getCppuType((const uno::Reference< drawing::XShape >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< lang::XComponent >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< beans::XPropertySet >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< beans::XMultiPropertySet >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< beans::XPropertyState >*)0); + *pTypes++ = cppu::UnoType<drawing::XShape>::get(); + *pTypes++ = cppu::UnoType<lang::XComponent>::get(); + *pTypes++ = cppu::UnoType<beans::XPropertySet>::get(); + *pTypes++ = cppu::UnoType<beans::XMultiPropertySet>::get(); + *pTypes++ = cppu::UnoType<beans::XPropertyState>::get(); *pTypes++ = cppu::UnoType<beans::XMultiPropertyStates>::get(); - *pTypes++ = ::getCppuType((const uno::Reference< drawing::XGluePointsSupplier >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< container::XChild >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< lang::XServiceInfo >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< lang::XTypeProvider >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< lang::XUnoTunnel >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< container::XNamed >*)0); + *pTypes++ = cppu::UnoType<drawing::XGluePointsSupplier>::get(); + *pTypes++ = cppu::UnoType<container::XChild>::get(); + *pTypes++ = cppu::UnoType<lang::XServiceInfo>::get(); + *pTypes++ = cppu::UnoType<lang::XTypeProvider>::get(); + *pTypes++ = cppu::UnoType<lang::XUnoTunnel>::get(); + *pTypes++ = cppu::UnoType<container::XNamed>::get(); } } return aTypeSequence; @@ -799,20 +799,20 @@ uno::Sequence< uno::Type > SAL_CALL SvxShape::_getTypes() aTypeSequence.realloc( 14 ); uno::Type* pTypes = aTypeSequence.getArray(); - *pTypes++ = ::getCppuType((const uno::Reference< drawing::XShape >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< lang::XComponent >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< beans::XPropertySet >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< beans::XMultiPropertySet >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< beans::XPropertyState >*)0); + *pTypes++ = cppu::UnoType<drawing::XShape>::get(); + *pTypes++ = cppu::UnoType<lang::XComponent>::get(); + *pTypes++ = cppu::UnoType<beans::XPropertySet>::get(); + *pTypes++ = cppu::UnoType<beans::XMultiPropertySet>::get(); + *pTypes++ = cppu::UnoType<beans::XPropertyState>::get(); *pTypes++ = cppu::UnoType<beans::XMultiPropertyStates>::get(); - *pTypes++ = ::getCppuType((const uno::Reference< drawing::XGluePointsSupplier >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< container::XChild >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< lang::XServiceInfo >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< lang::XTypeProvider >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< lang::XUnoTunnel >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< container::XNamed >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< drawing::XShapes>*)0); - *pTypes++ = ::getCppuType((const uno::Reference< drawing::XShapeGroup>*)0); + *pTypes++ = cppu::UnoType<drawing::XGluePointsSupplier>::get(); + *pTypes++ = cppu::UnoType<container::XChild>::get(); + *pTypes++ = cppu::UnoType<lang::XServiceInfo>::get(); + *pTypes++ = cppu::UnoType<lang::XTypeProvider>::get(); + *pTypes++ = cppu::UnoType<lang::XUnoTunnel>::get(); + *pTypes++ = cppu::UnoType<container::XNamed>::get(); + *pTypes++ = cppu::UnoType<drawing::XShapes>::get(); + *pTypes++ = cppu::UnoType<drawing::XShapeGroup>::get(); } } return aTypeSequence; @@ -833,24 +833,24 @@ uno::Sequence< uno::Type > SAL_CALL SvxShape::_getTypes() aTypeSequence.realloc( 17 ); uno::Type* pTypes = aTypeSequence.getArray(); - *pTypes++ = ::getCppuType((const uno::Reference< drawing::XShape >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< lang::XComponent >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< beans::XPropertySet >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< beans::XMultiPropertySet >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< beans::XPropertyState >*)0); + *pTypes++ = cppu::UnoType<drawing::XShape>::get(); + *pTypes++ = cppu::UnoType<lang::XComponent>::get(); + *pTypes++ = cppu::UnoType<beans::XPropertySet>::get(); + *pTypes++ = cppu::UnoType<beans::XMultiPropertySet>::get(); + *pTypes++ = cppu::UnoType<beans::XPropertyState>::get(); *pTypes++ = cppu::UnoType<beans::XMultiPropertyStates>::get(); - *pTypes++ = ::getCppuType((const uno::Reference< drawing::XGluePointsSupplier >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< container::XChild >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< lang::XServiceInfo >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< lang::XTypeProvider >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< lang::XUnoTunnel >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< container::XNamed >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< drawing::XConnectorShape>*)0); + *pTypes++ = cppu::UnoType<drawing::XGluePointsSupplier>::get(); + *pTypes++ = cppu::UnoType<container::XChild>::get(); + *pTypes++ = cppu::UnoType<lang::XServiceInfo>::get(); + *pTypes++ = cppu::UnoType<lang::XTypeProvider>::get(); + *pTypes++ = cppu::UnoType<lang::XUnoTunnel>::get(); + *pTypes++ = cppu::UnoType<container::XNamed>::get(); + *pTypes++ = cppu::UnoType<drawing::XConnectorShape>::get(); // from SvxUnoTextBase::getTypes() - *pTypes++ = ::getCppuType(( const uno::Reference< text::XTextAppend >*)0); - *pTypes++ = ::getCppuType(( const uno::Reference< text::XTextCopy >*)0); - *pTypes++ = ::getCppuType(( const uno::Reference< container::XEnumerationAccess >*)0); - *pTypes++ = ::getCppuType(( const uno::Reference< text::XTextRangeMover >*)0); + *pTypes++ = cppu::UnoType<text::XTextAppend>::get(); + *pTypes++ = cppu::UnoType<text::XTextCopy>::get(); + *pTypes++ = cppu::UnoType<container::XEnumerationAccess>::get(); + *pTypes++ = cppu::UnoType<text::XTextRangeMover>::get(); } } return aTypeSequence; @@ -871,19 +871,19 @@ uno::Sequence< uno::Type > SAL_CALL SvxShape::_getTypes() aTypeSequence.realloc( 13 ); uno::Type* pTypes = aTypeSequence.getArray(); - *pTypes++ = ::getCppuType((const uno::Reference< drawing::XShape >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< lang::XComponent >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< beans::XPropertySet >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< beans::XMultiPropertySet >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< beans::XPropertyState >*)0); + *pTypes++ = cppu::UnoType<drawing::XShape>::get(); + *pTypes++ = cppu::UnoType<lang::XComponent>::get(); + *pTypes++ = cppu::UnoType<beans::XPropertySet>::get(); + *pTypes++ = cppu::UnoType<beans::XMultiPropertySet>::get(); + *pTypes++ = cppu::UnoType<beans::XPropertyState>::get(); *pTypes++ = cppu::UnoType<beans::XMultiPropertyStates>::get(); - *pTypes++ = ::getCppuType((const uno::Reference< drawing::XGluePointsSupplier >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< container::XChild >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< lang::XServiceInfo >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< lang::XTypeProvider >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< lang::XUnoTunnel >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< container::XNamed >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< drawing::XControlShape>*)0); + *pTypes++ = cppu::UnoType<drawing::XGluePointsSupplier>::get(); + *pTypes++ = cppu::UnoType<container::XChild>::get(); + *pTypes++ = cppu::UnoType<lang::XServiceInfo>::get(); + *pTypes++ = cppu::UnoType<lang::XTypeProvider>::get(); + *pTypes++ = cppu::UnoType<lang::XUnoTunnel>::get(); + *pTypes++ = cppu::UnoType<container::XNamed>::get(); + *pTypes++ = cppu::UnoType<drawing::XControlShape>::get(); } } return aTypeSequence; @@ -904,19 +904,19 @@ uno::Sequence< uno::Type > SAL_CALL SvxShape::_getTypes() aTypeSequence.realloc( 13 ); uno::Type* pTypes = aTypeSequence.getArray(); - *pTypes++ = ::getCppuType((const uno::Reference< drawing::XShape >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< lang::XComponent >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< beans::XPropertySet >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< beans::XMultiPropertySet >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< beans::XPropertyState >*)0); + *pTypes++ = cppu::UnoType<drawing::XShape>::get(); + *pTypes++ = cppu::UnoType<lang::XComponent>::get(); + *pTypes++ = cppu::UnoType<beans::XPropertySet>::get(); + *pTypes++ = cppu::UnoType<beans::XMultiPropertySet>::get(); + *pTypes++ = cppu::UnoType<beans::XPropertyState>::get(); *pTypes++ = cppu::UnoType<beans::XMultiPropertyStates>::get(); - *pTypes++ = ::getCppuType((const uno::Reference< drawing::XGluePointsSupplier >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< container::XChild >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< lang::XServiceInfo >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< lang::XTypeProvider >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< lang::XUnoTunnel >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< container::XNamed >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< drawing::XShapes>*)0); + *pTypes++ = cppu::UnoType<drawing::XGluePointsSupplier>::get(); + *pTypes++ = cppu::UnoType<container::XChild>::get(); + *pTypes++ = cppu::UnoType<lang::XServiceInfo>::get(); + *pTypes++ = cppu::UnoType<lang::XTypeProvider>::get(); + *pTypes++ = cppu::UnoType<lang::XUnoTunnel>::get(); + *pTypes++ = cppu::UnoType<container::XNamed>::get(); + *pTypes++ = cppu::UnoType<drawing::XShapes>::get(); } } return aTypeSequence; @@ -936,23 +936,23 @@ uno::Sequence< uno::Type > SAL_CALL SvxShape::_getTypes() aTypeSequence.realloc( 16 ); uno::Type* pTypes = aTypeSequence.getArray(); - *pTypes++ = ::getCppuType((const uno::Reference< drawing::XShape >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< lang::XComponent >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< beans::XPropertySet >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< beans::XMultiPropertySet >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< beans::XPropertyState >*)0); + *pTypes++ = cppu::UnoType<drawing::XShape>::get(); + *pTypes++ = cppu::UnoType<lang::XComponent>::get(); + *pTypes++ = cppu::UnoType<beans::XPropertySet>::get(); + *pTypes++ = cppu::UnoType<beans::XMultiPropertySet>::get(); + *pTypes++ = cppu::UnoType<beans::XPropertyState>::get(); *pTypes++ = cppu::UnoType<beans::XMultiPropertyStates>::get(); - *pTypes++ = ::getCppuType((const uno::Reference< drawing::XGluePointsSupplier >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< container::XChild >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< lang::XServiceInfo >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< lang::XTypeProvider >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< lang::XUnoTunnel >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< container::XNamed >*)0); + *pTypes++ = cppu::UnoType<drawing::XGluePointsSupplier>::get(); + *pTypes++ = cppu::UnoType<container::XChild>::get(); + *pTypes++ = cppu::UnoType<lang::XServiceInfo>::get(); + *pTypes++ = cppu::UnoType<lang::XTypeProvider>::get(); + *pTypes++ = cppu::UnoType<lang::XUnoTunnel>::get(); + *pTypes++ = cppu::UnoType<container::XNamed>::get(); // from SvxUnoTextBase::getTypes() - *pTypes++ = ::getCppuType(( const uno::Reference< text::XText >*)0); - *pTypes++ = ::getCppuType(( const uno::Reference< container::XEnumerationAccess >*)0); - *pTypes++ = ::getCppuType(( const uno::Reference< text::XTextRangeMover >*)0); - *pTypes++ = ::getCppuType(( const uno::Reference< drawing::XEnhancedCustomShapeDefaulter >*)0); + *pTypes++ = cppu::UnoType<text::XText>::get(); + *pTypes++ = cppu::UnoType<container::XEnumerationAccess>::get(); + *pTypes++ = cppu::UnoType<text::XTextRangeMover>::get(); + *pTypes++ = cppu::UnoType<drawing::XEnhancedCustomShapeDefaulter>::get(); } } return aTypeSequence; @@ -990,23 +990,23 @@ uno::Sequence< uno::Type > SAL_CALL SvxShape::_getTypes() aTypeSequence.realloc( 16 ); uno::Type* pTypes = aTypeSequence.getArray(); - *pTypes++ = ::getCppuType((const uno::Reference< drawing::XShape >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< lang::XComponent >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< beans::XPropertySet >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< beans::XMultiPropertySet >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< beans::XPropertyState >*)0); + *pTypes++ = cppu::UnoType<drawing::XShape>::get(); + *pTypes++ = cppu::UnoType<lang::XComponent>::get(); + *pTypes++ = cppu::UnoType<beans::XPropertySet>::get(); + *pTypes++ = cppu::UnoType<beans::XMultiPropertySet>::get(); + *pTypes++ = cppu::UnoType<beans::XPropertyState>::get(); *pTypes++ = cppu::UnoType<beans::XMultiPropertyStates>::get(); - *pTypes++ = ::getCppuType((const uno::Reference< drawing::XGluePointsSupplier >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< container::XChild >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< lang::XServiceInfo >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< lang::XTypeProvider >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< lang::XUnoTunnel >*)0); - *pTypes++ = ::getCppuType((const uno::Reference< container::XNamed >*)0); + *pTypes++ = cppu::UnoType<drawing::XGluePointsSupplier>::get(); + *pTypes++ = cppu::UnoType<container::XChild>::get(); + *pTypes++ = cppu::UnoType<lang::XServiceInfo>::get(); + *pTypes++ = cppu::UnoType<lang::XTypeProvider>::get(); + *pTypes++ = cppu::UnoType<lang::XUnoTunnel>::get(); + *pTypes++ = cppu::UnoType<container::XNamed>::get(); // from SvxUnoTextBase::getTypes() - *pTypes++ = ::getCppuType(( const uno::Reference< text::XTextAppend >*)0); - *pTypes++ = ::getCppuType(( const uno::Reference< text::XTextCopy >*)0); - *pTypes++ = ::getCppuType(( const uno::Reference< container::XEnumerationAccess >*)0); - *pTypes++ = ::getCppuType(( const uno::Reference< text::XTextRangeMover >*)0); + *pTypes++ = cppu::UnoType<text::XTextAppend>::get(); + *pTypes++ = cppu::UnoType<text::XTextCopy>::get(); + *pTypes++ = cppu::UnoType<container::XEnumerationAccess>::get(); + *pTypes++ = cppu::UnoType<text::XTextRangeMover>::get(); } } return aTypeSequence; @@ -1871,7 +1871,7 @@ void SAL_CALL SvxShape::setPropertyValues( const ::com::sun::star::uno::Sequence else { uno::Reference< beans::XPropertySet > xSet; - queryInterface( ::getCppuType( (const uno::Reference< beans::XPropertySet >*) 0) ) >>= xSet; + queryInterface( cppu::UnoType<beans::XPropertySet>::get()) >>= xSet; for( sal_Int32 nIdx = 0; nIdx < nCount; nIdx++, pNames++, pValues++ ) { @@ -1933,7 +1933,7 @@ void SvxShape::endSetPropertyValues() else { uno::Reference< beans::XPropertySet > xSet; - queryInterface( ::getCppuType( (const uno::Reference< beans::XPropertySet >*) 0) ) >>= xSet; + queryInterface( cppu::UnoType<beans::XPropertySet>::get()) >>= xSet; for( sal_Int32 nIdx = 0; nIdx < nCount; nIdx++, pValue++, pNames++ ) { @@ -2310,7 +2310,7 @@ bool SvxShape::setPropertyValueImpl( const OUString&, const SfxItemPropertySimpl aNewPolyPolygon = basegfx::tools::UnoPointSequenceSequenceToB2DPolyPolygon( *(const drawing::PointSequenceSequence*)rValue.getValue()); } - else if( rValue.getValueType() == ::getCppuType(( const drawing::PolyPolygonBezierCoords*)0)) + else if( rValue.getValueType() == cppu::UnoType<drawing::PolyPolygonBezierCoords>::get()) { // get polygpon data from PolyPolygonBezierCoords aNewPolyPolygon = basegfx::tools::UnoPolyPolygonBezierCoordsToB2DPolyPolygon( diff --git a/svx/source/unodraw/unoshcol.cxx b/svx/source/unodraw/unoshcol.cxx index 5d40b57aa26a..6fa01cc9924c 100644 --- a/svx/source/unodraw/unoshcol.cxx +++ b/svx/source/unodraw/unoshcol.cxx @@ -238,7 +238,7 @@ uno::Any SAL_CALL SvxShapeCollection::getByIndex( sal_Int32 Index ) // XElementAccess uno::Type SAL_CALL SvxShapeCollection::getElementType() throw( uno::RuntimeException, std::exception ) { - return ::getCppuType(( const Reference< drawing::XShape >*)0); + return cppu::UnoType<drawing::XShape>::get(); } sal_Bool SAL_CALL SvxShapeCollection::hasElements() throw( uno::RuntimeException, std::exception ) diff --git a/svx/source/unodraw/unottabl.cxx b/svx/source/unodraw/unottabl.cxx index cee2228575d6..57fc0db4e336 100644 --- a/svx/source/unodraw/unottabl.cxx +++ b/svx/source/unodraw/unottabl.cxx @@ -82,7 +82,7 @@ NameOrIndex* SvxUnoTransGradientTable::createItem() const throw() uno::Type SAL_CALL SvxUnoTransGradientTable::getElementType( ) throw( uno::RuntimeException, std::exception ) { - return ::getCppuType((const struct awt::Gradient*)0); + return cppu::UnoType<awt::Gradient>::get(); } /** diff --git a/svx/source/unogallery/unogalitem.cxx b/svx/source/unogallery/unogalitem.cxx index 284a734f7248..1443bba72e97 100644 --- a/svx/source/unogallery/unogalitem.cxx +++ b/svx/source/unogallery/unogalitem.cxx @@ -82,17 +82,17 @@ uno::Any SAL_CALL GalleryItem::queryAggregation( const uno::Type & rType ) { uno::Any aAny; - if( rType == ::getCppuType((const uno::Reference< lang::XServiceInfo >*)0) ) + if( rType == cppu::UnoType<lang::XServiceInfo>::get()) aAny <<= uno::Reference< lang::XServiceInfo >(this); - else if( rType == ::getCppuType((const uno::Reference< lang::XTypeProvider >*)0) ) + else if( rType == cppu::UnoType<lang::XTypeProvider>::get()) aAny <<= uno::Reference< lang::XTypeProvider >(this); - else if( rType == ::getCppuType((const uno::Reference< gallery::XGalleryItem >*)0) ) + else if( rType == cppu::UnoType<gallery::XGalleryItem>::get()) aAny <<= uno::Reference< gallery::XGalleryItem >(this); - else if( rType == ::getCppuType((const uno::Reference< beans::XPropertySet >*)0) ) + else if( rType == cppu::UnoType<beans::XPropertySet>::get()) aAny <<= uno::Reference< beans::XPropertySet >(this); - else if( rType == ::getCppuType((const uno::Reference< beans::XPropertyState >*)0) ) + else if( rType == cppu::UnoType<beans::XPropertyState>::get()) aAny <<= uno::Reference< beans::XPropertyState >(this); - else if( rType == ::getCppuType((const uno::Reference< beans::XMultiPropertySet >*)0) ) + else if( rType == cppu::UnoType<beans::XMultiPropertySet>::get()) aAny <<= uno::Reference< beans::XMultiPropertySet >(this); else aAny <<= OWeakAggObject::queryAggregation( rType ); @@ -168,12 +168,12 @@ uno::Sequence< uno::Type > SAL_CALL GalleryItem::getTypes() uno::Sequence< uno::Type > aTypes( 6 ); uno::Type* pTypes = aTypes.getArray(); - *pTypes++ = ::getCppuType((const uno::Reference< lang::XServiceInfo>*)0); - *pTypes++ = ::getCppuType((const uno::Reference< lang::XTypeProvider>*)0); - *pTypes++ = ::getCppuType((const uno::Reference< gallery::XGalleryItem>*)0); - *pTypes++ = ::getCppuType((const uno::Reference< beans::XPropertySet>*)0); - *pTypes++ = ::getCppuType((const uno::Reference< beans::XPropertyState>*)0); - *pTypes++ = ::getCppuType((const uno::Reference< beans::XMultiPropertySet>*)0); + *pTypes++ = cppu::UnoType<lang::XServiceInfo>::get(); + *pTypes++ = cppu::UnoType<lang::XTypeProvider>::get(); + *pTypes++ = cppu::UnoType<gallery::XGalleryItem>::get(); + *pTypes++ = cppu::UnoType<beans::XPropertySet>::get(); + *pTypes++ = cppu::UnoType<beans::XPropertyState>::get(); + *pTypes++ = cppu::UnoType<beans::XMultiPropertySet>::get(); return aTypes; } @@ -223,7 +223,7 @@ sal_Int8 SAL_CALL GalleryItem::getType() static ::comphelper::PropertyMapEntry const aEntries[] = { - { OUString("GalleryItemType"), UNOGALLERY_GALLERYITEMTYPE, ::getCppuType( (const sal_Int8*)(0)), + { OUString("GalleryItemType"), UNOGALLERY_GALLERYITEMTYPE, cppu::UnoType<sal_Int8>::get(), beans::PropertyAttribute::READONLY, 0 }, { OUString("URL"), UNOGALLERY_URL, ::cppu::UnoType<OUString>::get(), @@ -232,13 +232,13 @@ sal_Int8 SAL_CALL GalleryItem::getType() { OUString("Title"), UNOGALLERY_TITLE, ::cppu::UnoType<OUString>::get(), 0, 0 }, - { OUString("Thumbnail"), UNOGALLERY_THUMBNAIL, ::getCppuType( (const uno::Reference< graphic::XGraphic >*)(0)), + { OUString("Thumbnail"), UNOGALLERY_THUMBNAIL, cppu::UnoType<graphic::XGraphic>::get(), beans::PropertyAttribute::READONLY, 0 }, - { OUString("Graphic"), UNOGALLERY_GRAPHIC, ::getCppuType( (const uno::Reference< graphic::XGraphic >*)(0)), + { OUString("Graphic"), UNOGALLERY_GRAPHIC, cppu::UnoType<graphic::XGraphic>::get(), beans::PropertyAttribute::READONLY, 0 }, - { OUString("Drawing"), UNOGALLERY_DRAWING, ::getCppuType( (const uno::Reference< lang::XComponent >*)(0) ), + { OUString("Drawing"), UNOGALLERY_DRAWING, cppu::UnoType<lang::XComponent>::get(), beans::PropertyAttribute::READONLY, 0 }, { OUString(), 0, css::uno::Type(), 0, 0 } diff --git a/svx/source/unogallery/unogaltheme.cxx b/svx/source/unogallery/unogaltheme.cxx index 9e43d0d0cd93..aa28d12f7b41 100644 --- a/svx/source/unogallery/unogaltheme.cxx +++ b/svx/source/unogallery/unogaltheme.cxx @@ -114,11 +114,11 @@ uno::Sequence< uno::Type > SAL_CALL GalleryTheme::getTypes() uno::Sequence< uno::Type > aTypes( 5 ); uno::Type* pTypes = aTypes.getArray(); - *pTypes++ = ::getCppuType((const uno::Reference< lang::XServiceInfo>*)0); - *pTypes++ = ::getCppuType((const uno::Reference< lang::XTypeProvider>*)0); - *pTypes++ = ::getCppuType((const uno::Reference< container::XElementAccess>*)0); - *pTypes++ = ::getCppuType((const uno::Reference< container::XIndexAccess>*)0); - *pTypes++ = ::getCppuType((const uno::Reference< gallery::XGalleryTheme>*)0); + *pTypes++ = cppu::UnoType<lang::XServiceInfo>::get(); + *pTypes++ = cppu::UnoType<lang::XTypeProvider>::get(); + *pTypes++ = cppu::UnoType<container::XElementAccess>::get(); + *pTypes++ = cppu::UnoType<container::XIndexAccess>::get(); + *pTypes++ = cppu::UnoType<gallery::XGalleryTheme>::get(); return aTypes; } @@ -134,7 +134,7 @@ uno::Sequence< sal_Int8 > SAL_CALL GalleryTheme::getImplementationId() uno::Type SAL_CALL GalleryTheme::getElementType() throw (uno::RuntimeException, std::exception) { - return ::getCppuType( (const uno::Reference< gallery::XGalleryItem >*) 0); + return cppu::UnoType<gallery::XGalleryItem>::get(); } diff --git a/svx/source/unogallery/unogalthemeprovider.cxx b/svx/source/unogallery/unogalthemeprovider.cxx index 1cf1af4967cd..3ccebbb2de73 100644 --- a/svx/source/unogallery/unogalthemeprovider.cxx +++ b/svx/source/unogallery/unogalthemeprovider.cxx @@ -70,12 +70,12 @@ uno::Sequence< uno::Type > SAL_CALL GalleryThemeProvider::getTypes() uno::Sequence< uno::Type > aTypes( 6 ); uno::Type* pTypes = aTypes.getArray(); - *pTypes++ = ::getCppuType((const uno::Reference< lang::XServiceInfo>*)0); - *pTypes++ = ::getCppuType((const uno::Reference< lang::XTypeProvider>*)0); - *pTypes++ = ::getCppuType((const uno::Reference< lang::XInitialization>*)0); - *pTypes++ = ::getCppuType((const uno::Reference< container::XElementAccess>*)0); - *pTypes++ = ::getCppuType((const uno::Reference< container::XNameAccess>*)0); - *pTypes++ = ::getCppuType((const uno::Reference< gallery::XGalleryThemeProvider>*)0); + *pTypes++ = cppu::UnoType<lang::XServiceInfo>::get(); + *pTypes++ = cppu::UnoType<lang::XTypeProvider>::get(); + *pTypes++ = cppu::UnoType<lang::XInitialization>::get(); + *pTypes++ = cppu::UnoType<container::XElementAccess>::get(); + *pTypes++ = cppu::UnoType<container::XNameAccess>::get(); + *pTypes++ = cppu::UnoType<gallery::XGalleryThemeProvider>::get(); return aTypes; } @@ -112,7 +112,7 @@ void SAL_CALL GalleryThemeProvider::initialize( const uno::Sequence< uno::Any >& uno::Type SAL_CALL GalleryThemeProvider::getElementType() throw (uno::RuntimeException, std::exception) { - return ::getCppuType( (const uno::Reference< gallery::XGalleryTheme >*) 0); + return cppu::UnoType<gallery::XGalleryTheme>::get(); } diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx index 9f51875daee5..a5777797e73f 100644 --- a/svx/source/xml/xmleohlp.cxx +++ b/svx/source/xml/xmleohlp.cxx @@ -748,9 +748,9 @@ Type SAL_CALL SvXMLEmbeddedObjectHelper::getElementType() { MutexGuard aGuard( maMutex ); if( EMBEDDEDOBJECTHELPER_MODE_READ == meCreateMode ) - return ::getCppuType((const Reference<XOutputStream>*)0); + return cppu::UnoType<XOutputStream>::get(); else - return ::getCppuType((const Reference<XInputStream>*)0); + return cppu::UnoType<XInputStream>::get(); } sal_Bool SAL_CALL SvXMLEmbeddedObjectHelper::hasElements() diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx index 50251c09b46d..1709271cd721 100644 --- a/svx/source/xml/xmlxtimp.cxx +++ b/svx/source/xml/xmlxtimp.cxx @@ -474,22 +474,22 @@ SvXMLImportContext *SvxXMLXTableImport::CreateContext( sal_uInt16 nPrefix, const } else if ( rLocalName == "marker-table" ) { - if( aType == ::getCppuType((const drawing::PolyPolygonBezierCoords*)0) ) + if( aType == cppu::UnoType<drawing::PolyPolygonBezierCoords>::get()) return new SvxXMLTableImportContext( *this, nPrefix, rLocalName, xAttrList, stice_marker, mrTable, bOOoFormat ); } else if ( rLocalName == "dash-table" ) { - if( aType == ::getCppuType((const drawing::LineDash*)0) ) + if( aType == cppu::UnoType<drawing::LineDash>::get()) return new SvxXMLTableImportContext( *this, nPrefix, rLocalName, xAttrList, stice_dash, mrTable, bOOoFormat ); } else if ( rLocalName == "hatch-table" ) { - if( aType == ::getCppuType((const drawing::Hatch*)0) ) + if( aType == cppu::UnoType<drawing::Hatch>::get()) return new SvxXMLTableImportContext( *this, nPrefix, rLocalName, xAttrList, stice_hatch, mrTable, bOOoFormat ); } else if ( rLocalName == "gradient-table" ) { - if( aType == ::getCppuType((const awt::Gradient*)0)) + if( aType == cppu::UnoType<awt::Gradient>::get()) return new SvxXMLTableImportContext( *this, nPrefix, rLocalName, xAttrList, stice_gradient, mrTable, bOOoFormat ); } else if ( rLocalName == "bitmap-table" ) diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index b9dfb6a3f212..20c60e1387e2 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -1392,7 +1392,7 @@ bool XLineStartItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 if( rVal.hasValue() && rVal.getValue() ) { - if( rVal.getValueType() != ::getCppuType((const com::sun::star::drawing::PolyPolygonBezierCoords*)0) ) + if( rVal.getValueType() != cppu::UnoType<com::sun::star::drawing::PolyPolygonBezierCoords>::get()) return false; com::sun::star::drawing::PolyPolygonBezierCoords* pCoords = (com::sun::star::drawing::PolyPolygonBezierCoords*)rVal.getValue(); @@ -1970,7 +1970,7 @@ bool XLineEndItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 n if( rVal.hasValue() && rVal.getValue() ) { - if( rVal.getValueType() != ::getCppuType((const com::sun::star::drawing::PolyPolygonBezierCoords*)0) ) + if( rVal.getValueType() != cppu::UnoType<com::sun::star::drawing::PolyPolygonBezierCoords>::get()) return false; com::sun::star::drawing::PolyPolygonBezierCoords* pCoords = (com::sun::star::drawing::PolyPolygonBezierCoords*)rVal.getValue(); diff --git a/sw/source/core/uibase/uno/SwXDocumentSettings.cxx b/sw/source/core/uibase/uno/SwXDocumentSettings.cxx index 0a6c16166261..1643633f3262 100644 --- a/sw/source/core/uibase/uno/SwXDocumentSettings.cxx +++ b/sw/source/core/uibase/uno/SwXDocumentSettings.cxx @@ -273,12 +273,12 @@ uno::Sequence< uno::Type > SAL_CALL SwXDocumentSettings::getTypes( ) uno::Type* pBaseTypes = aBaseTypes.getArray(); // from MasterPropertySet - pBaseTypes[0] = ::getCppuType((Reference< XPropertySet >*)0); - pBaseTypes[1] = ::getCppuType((Reference< XPropertyState >*)0); - pBaseTypes[2] = ::getCppuType((Reference< XMultiPropertySet >*)0); + pBaseTypes[0] = cppu::UnoType<XPropertySet>::get(); + pBaseTypes[1] = cppu::UnoType<XPropertyState>::get(); + pBaseTypes[2] = cppu::UnoType<XMultiPropertySet>::get(); - pBaseTypes[3] = ::getCppuType((Reference< XServiceInfo >*)0); - pBaseTypes[4] = ::getCppuType((Reference< XTypeProvider >*)0); + pBaseTypes[3] = cppu::UnoType<XServiceInfo>::get(); + pBaseTypes[4] = cppu::UnoType<XTypeProvider>::get(); return aBaseTypes; } diff --git a/sw/source/core/uibase/uno/unotxdoc.cxx b/sw/source/core/uibase/uno/unotxdoc.cxx index 7b29743200c6..aa38a1ca03ea 100644 --- a/sw/source/core/uibase/uno/unotxdoc.cxx +++ b/sw/source/core/uibase/uno/unotxdoc.cxx @@ -255,7 +255,7 @@ sal_Int64 SAL_CALL SwXTextDocument::getSomething( const Sequence< sal_Int8 >& rI else { GetNumberFormatter(); - Any aNumTunnel = xNumFmtAgg->queryAggregation(::getCppuType((Reference<XUnoTunnel>*)0)); + Any aNumTunnel = xNumFmtAgg->queryAggregation(cppu::UnoType<XUnoTunnel>::get()); Reference<XUnoTunnel> xNumTunnel; aNumTunnel >>= xNumTunnel; if(xNumTunnel.is()) @@ -271,19 +271,19 @@ Any SAL_CALL SwXTextDocument::queryInterface( const uno::Type& rType ) throw(Run if ( !aRet.hasValue() ) aRet = SfxBaseModel::queryInterface(rType); if ( !aRet.hasValue() && - rType == ::getCppuType((Reference<lang::XMultiServiceFactory>*)0)) + rType == cppu::UnoType<lang::XMultiServiceFactory>::get()) { Reference<lang::XMultiServiceFactory> xTmp = this; aRet <<= xTmp; } if ( !aRet.hasValue() - && rType != ::getCppuType((Reference< com::sun::star::document::XDocumentEventBroadcaster>*)0) - && rType != ::getCppuType((Reference< com::sun::star::frame::XController>*)0) - && rType != ::getCppuType((Reference< com::sun::star::frame::XFrame>*)0) - && rType != ::getCppuType((Reference< com::sun::star::script::XInvocation>*)0) - && rType != ::getCppuType((Reference< com::sun::star::beans::XFastPropertySet>*)0) - && rType != ::getCppuType((Reference< com::sun::star::awt::XWindow>*)0)) + && rType != cppu::UnoType<com::sun::star::document::XDocumentEventBroadcaster>::get() + && rType != cppu::UnoType<com::sun::star::frame::XController>::get() + && rType != cppu::UnoType<com::sun::star::frame::XFrame>::get() + && rType != cppu::UnoType<com::sun::star::script::XInvocation>::get() + && rType != cppu::UnoType<com::sun::star::beans::XFastPropertySet>::get() + && rType != cppu::UnoType<com::sun::star::awt::XWindow>::get()) { GetNumberFormatter(); if(xNumFmtAgg.is()) @@ -316,7 +316,7 @@ Sequence< uno::Type > SAL_CALL SwXTextDocument::getTypes() throw(RuntimeExceptio GetNumberFormatter(); if(xNumFmtAgg.is()) { - const uno::Type& rProvType = ::getCppuType((Reference <XTypeProvider>*)0); + const uno::Type& rProvType = cppu::UnoType<XTypeProvider>::get(); Any aNumProv = xNumFmtAgg->queryAggregation(rProvType); Reference<XTypeProvider> xNumProv; if(aNumProv >>= xNumProv) @@ -339,7 +339,7 @@ Sequence< uno::Type > SAL_CALL SwXTextDocument::getTypes() throw(RuntimeExceptio { pBaseTypes[nIndex++] = pNumTypes[nPos]; } - pBaseTypes[nIndex++] = ::getCppuType((Reference<lang::XMultiServiceFactory>*)0); + pBaseTypes[nIndex++] = cppu::UnoType<lang::XMultiServiceFactory>::get(); return aBaseTypes; } @@ -435,7 +435,7 @@ void SwXTextDocument::GetNumberFormatter() } else { - const uno::Type& rTunnelType = ::getCppuType((Reference <XUnoTunnel>*)0); + const uno::Type& rTunnelType = cppu::UnoType<XUnoTunnel>::get(); Any aNumTunnel = xNumFmtAgg->queryAggregation(rTunnelType); SvNumberFormatsSupplierObj* pNumFmt = 0; Reference< XUnoTunnel > xNumTunnel; @@ -1386,7 +1386,7 @@ void SwXTextDocument::Invalidate() bObjectValid = false; if(xNumFmtAgg.is()) { - const uno::Type& rTunnelType = ::getCppuType((Reference <XUnoTunnel>*)0); + const uno::Type& rTunnelType = cppu::UnoType<XUnoTunnel>::get(); Any aNumTunnel = xNumFmtAgg->queryAggregation(rTunnelType); SvNumberFormatsSupplierObj* pNumFmt = 0; Reference< XUnoTunnel > xNumTunnel; @@ -1455,7 +1455,7 @@ void SwXTextDocument::InitNewDoc() if(xNumFmtAgg.is()) { - const uno::Type& rTunnelType = ::getCppuType((Reference <XUnoTunnel>*)0); + const uno::Type& rTunnelType = cppu::UnoType<XUnoTunnel>::get(); Any aNumTunnel = xNumFmtAgg->queryAggregation(rTunnelType); SvNumberFormatsSupplierObj* pNumFmt = 0; Reference< XUnoTunnel > xNumTunnel; @@ -3355,7 +3355,7 @@ Any SwXLinkTargetSupplier::getByName(const OUString& rName) Reference< XNameAccess > xTbls = new SwXLinkNameAccessWrapper( pxDoc->getTextTables(), sToCompare, sSuffix ); Reference< XPropertySet > xRet(xTbls, UNO_QUERY); - aRet.setValue(&xRet, ::getCppuType((Reference<XPropertySet>*)0)); + aRet.setValue(&xRet, cppu::UnoType<XPropertySet>::get()); } else if(sToCompare == sFrames) { @@ -3363,7 +3363,7 @@ Any SwXLinkTargetSupplier::getByName(const OUString& rName) Reference< XNameAccess > xTbls = new SwXLinkNameAccessWrapper( pxDoc->getTextFrames(), sToCompare, sSuffix ); Reference< XPropertySet > xRet(xTbls, UNO_QUERY); - aRet.setValue(&xRet, ::getCppuType((Reference< XPropertySet>*)0)); + aRet.setValue(&xRet, cppu::UnoType<XPropertySet>::get()); } else if(sToCompare == sSections) { @@ -3371,7 +3371,7 @@ Any SwXLinkTargetSupplier::getByName(const OUString& rName) Reference< XNameAccess > xTbls = new SwXLinkNameAccessWrapper( pxDoc->getTextSections(), sToCompare, sSuffix ); Reference< XPropertySet > xRet(xTbls, UNO_QUERY); - aRet.setValue(&xRet, ::getCppuType((Reference< XPropertySet>*)0)); + aRet.setValue(&xRet, cppu::UnoType<XPropertySet>::get()); } else if(sToCompare == sGraphics) { @@ -3379,7 +3379,7 @@ Any SwXLinkTargetSupplier::getByName(const OUString& rName) Reference< XNameAccess > xTbls = new SwXLinkNameAccessWrapper( pxDoc->getGraphicObjects(), sToCompare, sSuffix ); Reference< XPropertySet > xRet(xTbls, UNO_QUERY); - aRet.setValue(&xRet, ::getCppuType((Reference< XPropertySet>*)0)); + aRet.setValue(&xRet, cppu::UnoType<XPropertySet>::get()); } else if(sToCompare == sOLEs) { @@ -3387,7 +3387,7 @@ Any SwXLinkTargetSupplier::getByName(const OUString& rName) Reference< XNameAccess > xTbls = new SwXLinkNameAccessWrapper( pxDoc->getEmbeddedObjects(), sToCompare, sSuffix ); Reference< XPropertySet > xRet(xTbls, UNO_QUERY); - aRet.setValue(&xRet, ::getCppuType((Reference< XPropertySet>*)0)); + aRet.setValue(&xRet, cppu::UnoType<XPropertySet>::get()); } else if(sToCompare == sOutlines) { @@ -3395,7 +3395,7 @@ Any SwXLinkTargetSupplier::getByName(const OUString& rName) Reference< XNameAccess > xTbls = new SwXLinkNameAccessWrapper( *pxDoc, sToCompare, sSuffix ); Reference< XPropertySet > xRet(xTbls, UNO_QUERY); - aRet.setValue(&xRet, ::getCppuType((Reference< XPropertySet>*)0)); + aRet.setValue(&xRet, cppu::UnoType<XPropertySet>::get()); } else if(sToCompare == sBookmarks) { @@ -3403,7 +3403,7 @@ Any SwXLinkTargetSupplier::getByName(const OUString& rName) Reference< XNameAccess > xBkms = new SwXLinkNameAccessWrapper( pxDoc->getBookmarks(), sToCompare, sSuffix ); Reference< XPropertySet > xRet(xBkms, UNO_QUERY); - aRet.setValue(&xRet, ::getCppuType((Reference< XPropertySet>*)0)); + aRet.setValue(&xRet, cppu::UnoType<XPropertySet>::get()); } else throw NoSuchElementException(); @@ -3443,7 +3443,7 @@ sal_Bool SwXLinkTargetSupplier::hasByName(const OUString& rName) uno::Type SwXLinkTargetSupplier::getElementType(void) throw( RuntimeException, std::exception ) { - return ::getCppuType((Reference< XPropertySet>*)0); + return cppu::UnoType<XPropertySet>::get(); } @@ -3526,7 +3526,7 @@ Any SwXLinkNameAccessWrapper::getByName(const OUString& rName) lcl_CreateOutlineString(i, rOutlineNodes, pOutlRule)) { Reference< XPropertySet > xOutline = new SwXOutlineTarget(sParam); - aRet.setValue(&xOutline, ::getCppuType((Reference<XPropertySet>*)0)); + aRet.setValue(&xOutline, cppu::UnoType<XPropertySet>::get()); bFound = true; } } @@ -3627,7 +3627,7 @@ sal_Bool SwXLinkNameAccessWrapper::hasByName(const OUString& rName) uno::Type SwXLinkNameAccessWrapper::getElementType(void) throw( RuntimeException, std::exception ) { - return ::getCppuType((Reference<XPropertySet>*)0); + return cppu::UnoType<XPropertySet>::get(); } sal_Bool SwXLinkNameAccessWrapper::hasElements(void) throw( RuntimeException, std::exception ) @@ -3691,7 +3691,7 @@ static Any lcl_GetDisplayBitmap(const OUString& _sLinkSuffix) const Image& rImage = aEntryImages.GetImage( nImgId ); Bitmap aBitmap( rImage.GetBitmapEx().GetBitmap() ); Reference<awt::XBitmap> xBmp = VCLUnoHelper::CreateBitmap( aBitmap ); - aRet.setValue( &xBmp, ::getCppuType((Reference<awt::XBitmap>*)0) ); + aRet.setValue( &xBmp, cppu::UnoType<awt::XBitmap>::get()); } return aRet; } diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx index 6978bdd97bd8..958f510a7991 100644 --- a/sw/source/core/unocore/unosett.cxx +++ b/sw/source/core/unocore/unosett.cxx @@ -1479,7 +1479,7 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetNumberingRuleByIndex( { awt::FontDescriptor aDesc; SvxUnoFontDescriptor::ConvertFromFont( *pFont, aDesc ); - pData = new PropValData((void*)&aDesc, UNO_NAME_BULLET_FONT, ::getCppuType((const awt::FontDescriptor*)0)); + pData = new PropValData((void*)&aDesc, UNO_NAME_BULLET_FONT, cppu::UnoType<awt::FontDescriptor>::get()); aPropertyValues.push_back(pData); } } diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index be3db68fc954..b547cd080366 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -2576,8 +2576,7 @@ bool SwMSConvertControls::InsertControl( uno::Reference< text::XTextRange > xTxtRg = new SwXTextRange( *pPaM, xDummyTxtRef ); - aTmp.setValue(&xTxtRg,::getCppuType(( - uno::Reference< text::XTextRange >*)0)); + aTmp.setValue(&xTxtRg, cppu::UnoType<text::XTextRange>::get()); xShapePropSet->setPropertyValue("TextRange", aTmp ); // Das Control-Model am Control-Shape setzen diff --git a/vcl/source/window/dndlcon.cxx b/vcl/source/window/dndlcon.cxx index 1f3459c371c4..54b9939a8ed5 100644 --- a/vcl/source/window/dndlcon.cxx +++ b/vcl/source/window/dndlcon.cxx @@ -40,7 +40,7 @@ DNDListenerContainer::~DNDListenerContainer() void SAL_CALL DNDListenerContainer::addDragGestureListener( const Reference< XDragGestureListener >& dgl ) throw(RuntimeException, std::exception) { - rBHelper.addListener( getCppuType( ( const Reference< XDragGestureListener > * ) 0 ), dgl ); + rBHelper.addListener( cppu::UnoType<XDragGestureListener>::get(), dgl ); } // DNDListenerContainer::removeDragGestureListener @@ -48,7 +48,7 @@ void SAL_CALL DNDListenerContainer::addDragGestureListener( const Reference< XDr void SAL_CALL DNDListenerContainer::removeDragGestureListener( const Reference< XDragGestureListener >& dgl ) throw(RuntimeException, std::exception) { - rBHelper.removeListener( getCppuType( ( const Reference< XDragGestureListener > * ) 0 ), dgl ); + rBHelper.removeListener( cppu::UnoType<XDragGestureListener>::get(), dgl ); } // DNDListenerContainer::resetRecognizer @@ -63,7 +63,7 @@ void SAL_CALL DNDListenerContainer::resetRecognizer( ) void SAL_CALL DNDListenerContainer::addDropTargetListener( const Reference< XDropTargetListener >& dtl ) throw(RuntimeException, std::exception) { - rBHelper.addListener( getCppuType( ( const Reference< XDropTargetListener > * ) 0 ), dtl ); + rBHelper.addListener( cppu::UnoType<XDropTargetListener>::get(), dtl ); } // DNDListenerContainer::removeDropTargetListener @@ -71,7 +71,7 @@ void SAL_CALL DNDListenerContainer::addDropTargetListener( const Reference< XDro void SAL_CALL DNDListenerContainer::removeDropTargetListener( const Reference< XDropTargetListener >& dtl ) throw(RuntimeException, std::exception) { - rBHelper.removeListener( getCppuType( ( const Reference< XDropTargetListener > * ) 0 ), dtl ); + rBHelper.removeListener( cppu::UnoType<XDropTargetListener>::get(), dtl ); } // DNDListenerContainer::isActive @@ -115,7 +115,7 @@ sal_uInt32 DNDListenerContainer::fireDropEvent( const Reference< XDropTargetDrop sal_uInt32 nRet = 0; // fire DropTargetDropEvent on all XDropTargetListeners - OInterfaceContainerHelper *pContainer = rBHelper.getContainer( getCppuType( ( Reference < XDropTargetListener > * ) 0) ); + OInterfaceContainerHelper *pContainer = rBHelper.getContainer( cppu::UnoType<XDropTargetListener>::get()); if( pContainer && m_bActive ) { @@ -184,7 +184,7 @@ sal_uInt32 DNDListenerContainer::fireDragExitEvent() sal_uInt32 nRet = 0; // fire DropTargetDropEvent on all XDropTargetListeners - OInterfaceContainerHelper *pContainer = rBHelper.getContainer( getCppuType( ( Reference < XDropTargetListener > * ) 0) ); + OInterfaceContainerHelper *pContainer = rBHelper.getContainer( cppu::UnoType<XDropTargetListener>::get()); if( pContainer && m_bActive ) { @@ -227,7 +227,7 @@ sal_uInt32 DNDListenerContainer::fireDragOverEvent( const Reference< XDropTarget sal_uInt32 nRet = 0; // fire DropTargetDropEvent on all XDropTargetListeners - OInterfaceContainerHelper *pContainer = rBHelper.getContainer( getCppuType( ( Reference < XDropTargetListener > * ) 0) ); + OInterfaceContainerHelper *pContainer = rBHelper.getContainer( cppu::UnoType<XDropTargetListener>::get()); if( pContainer && m_bActive ) { @@ -291,7 +291,7 @@ sal_uInt32 DNDListenerContainer::fireDragEnterEvent( const Reference< XDropTarge sal_uInt32 nRet = 0; // fire DropTargetDropEvent on all XDropTargetListeners - OInterfaceContainerHelper *pContainer = rBHelper.getContainer( getCppuType( ( Reference < XDropTargetListener > * ) 0) ); + OInterfaceContainerHelper *pContainer = rBHelper.getContainer( cppu::UnoType<XDropTargetListener>::get()); if( pContainer && m_bActive ) { @@ -354,7 +354,7 @@ sal_uInt32 DNDListenerContainer::fireDropActionChangedEvent( const Reference< XD sal_uInt32 nRet = 0; // fire DropTargetDropEvent on all XDropTargetListeners - OInterfaceContainerHelper *pContainer = rBHelper.getContainer( getCppuType( ( Reference < XDropTargetListener > * ) 0) ); + OInterfaceContainerHelper *pContainer = rBHelper.getContainer( cppu::UnoType<XDropTargetListener>::get()); if( pContainer && m_bActive ) { @@ -417,7 +417,7 @@ sal_uInt32 DNDListenerContainer::fireDragGestureEvent( sal_Int8 dragAction, sal_ sal_uInt32 nRet = 0; // fire DropTargetDropEvent on all XDropTargetListeners - OInterfaceContainerHelper *pContainer = rBHelper.getContainer( getCppuType( ( Reference < XDragGestureListener > * ) 0) ); + OInterfaceContainerHelper *pContainer = rBHelper.getContainer( cppu::UnoType<XDragGestureListener>::get()); if( pContainer ) { diff --git a/xmloff/source/chart/ColorPropertySet.cxx b/xmloff/source/chart/ColorPropertySet.cxx index c0c05c3aea63..23a3a4a891fa 100644 --- a/xmloff/source/chart/ColorPropertySet.cxx +++ b/xmloff/source/chart/ColorPropertySet.cxx @@ -51,7 +51,7 @@ lcl_ColorPropertySetInfo::lcl_ColorPropertySetInfo( bool bFillColor ) : // note: length of FillColor and LineColor is 9 m_aColorPropName( (bFillColor ? "FillColor" : "LineColor"), 9, RTL_TEXTENCODING_ASCII_US ), m_aColorProp( m_aColorPropName, -1, - ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), 0) + cppu::UnoType<sal_Int32>::get(), 0) {} Sequence< Property > SAL_CALL lcl_ColorPropertySetInfo::getProperties() diff --git a/xmloff/source/chart/PropertyMaps.cxx b/xmloff/source/chart/PropertyMaps.cxx index a95a392705d3..564241479bb5 100644 --- a/xmloff/source/chart/PropertyMaps.cxx +++ b/xmloff/source/chart/PropertyMaps.cxx @@ -94,17 +94,17 @@ const XMLPropertyHandler* XMLChartPropHdlFactory::GetPropertyHandler( sal_Int32 case XML_SCH_TYPE_AXIS_LABEL_POSITION: pHdl = new XMLEnumPropertyHdl( aXMLChartAxisLabelPositionEnumMap, - ::getCppuType((const chart::ChartAxisLabelPosition*)0) ); + cppu::UnoType<chart::ChartAxisLabelPosition>::get()); break; case XML_SCH_TYPE_TICK_MARK_POSITION: pHdl = new XMLEnumPropertyHdl( aXMLChartAxisMarkPositionEnumMap, - ::getCppuType((const chart::ChartAxisMarkPosition*)0) ); + cppu::UnoType<chart::ChartAxisMarkPosition>::get()); break; case XML_SCH_TYPE_AXIS_ARRANGEMENT: pHdl = new XMLEnumPropertyHdl( aXMLChartAxisArrangementEnumMap, - ::getCppuType((const chart::ChartAxisArrangeOrderType*)0) ); + cppu::UnoType<chart::ChartAxisArrangeOrderType>::get()); break; case XML_SCH_TYPE_ERROR_BAR_STYLE: @@ -132,7 +132,7 @@ const XMLPropertyHandler* XMLChartPropHdlFactory::GetPropertyHandler( sal_Int32 break; case XML_SCH_TYPE_DATAROWSOURCE: pHdl = new XMLEnumPropertyHdl( aXMLChartDataRowSourceTypeEnumMap, - ::getCppuType((const chart::ChartDataRowSource*)0) ); + cppu::UnoType<chart::ChartDataRowSource>::get()); break; case XML_SCH_TYPE_TEXT_ORIENTATION: pHdl = new XMLTextOrientationHdl(); diff --git a/xmloff/source/chart/SchXMLEnumConverter.cxx b/xmloff/source/chart/SchXMLEnumConverter.cxx index ec04afdbcb8e..5bf2819b9fe7 100644 --- a/xmloff/source/chart/SchXMLEnumConverter.cxx +++ b/xmloff/source/chart/SchXMLEnumConverter.cxx @@ -44,7 +44,7 @@ class XMLLegendPositionPropertyHdl : public XMLEnumPropertyHdl { public: XMLLegendPositionPropertyHdl() - : XMLEnumPropertyHdl( aXMLLegendPositionEnumMap, ::getCppuType((const chart::ChartLegendPosition*)0) ) {} + : XMLEnumPropertyHdl( aXMLLegendPositionEnumMap, cppu::UnoType<chart::ChartLegendPosition>::get()) {} virtual ~XMLLegendPositionPropertyHdl() {}; }; @@ -65,7 +65,7 @@ class XMLLegendExpansionPropertyHdl : public XMLEnumPropertyHdl { public: XMLLegendExpansionPropertyHdl() - : XMLEnumPropertyHdl( aXMLLegendExpansionEnumMap, ::getCppuType((const chart::ChartLegendExpansion*)0) ) {} + : XMLEnumPropertyHdl( aXMLLegendExpansionEnumMap, cppu::UnoType<chart::ChartLegendExpansion>::get()) {} virtual ~XMLLegendExpansionPropertyHdl() {}; }; diff --git a/xmloff/source/core/SettingsExportHelper.cxx b/xmloff/source/core/SettingsExportHelper.cxx index 64adf5af38c6..66c10ae222ae 100644 --- a/xmloff/source/core/SettingsExportHelper.cxx +++ b/xmloff/source/core/SettingsExportHelper.cxx @@ -142,27 +142,27 @@ void XMLSettingsExportHelper::CallTypeFunction(const uno::Any& rAny, aAny >>= aProps; exportbase64Binary(aProps, rName); } - else if (aType.equals(getCppuType( (uno::Reference<container::XNameContainer> *)0 ) ) || - aType.equals(getCppuType( (uno::Reference<container::XNameAccess> *)0 ) )) + else if (aType.equals(cppu::UnoType<container::XNameContainer>::get()) || + aType.equals(cppu::UnoType<container::XNameAccess>::get())) { uno::Reference< container::XNameAccess> aNamed; aAny >>= aNamed; exportNameAccess(aNamed, rName); } - else if (aType.equals(getCppuType( (uno::Reference<container::XIndexAccess> *)0 ) ) || - aType.equals(getCppuType( (uno::Reference<container::XIndexContainer> *)0 ) ) ) + else if (aType.equals(cppu::UnoType<container::XIndexAccess>::get()) || + aType.equals(cppu::UnoType<container::XIndexContainer>::get()) ) { uno::Reference<container::XIndexAccess> aIndexed; aAny >>= aIndexed; exportIndexAccess(aIndexed, rName); } - else if (aType.equals(getCppuType( (util::DateTime *)0 ) ) ) + else if (aType.equals(cppu::UnoType<util::DateTime>::get()) ) { util::DateTime aDateTime; aAny >>= aDateTime; exportDateTime(aDateTime, rName); } - else if( aType.equals(getCppuType( (uno::Reference<i18n::XForbiddenCharacters> *)0 ) ) ) + else if( aType.equals(cppu::UnoType<i18n::XForbiddenCharacters>::get()) ) { exportForbiddenCharacters( aAny, rName ); } diff --git a/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx b/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx index 6dea02857480..eb9c4f3e68e1 100644 --- a/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx +++ b/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx @@ -136,7 +136,7 @@ void SAL_CALL XMLEmbeddedObjectExportFilter::initialize( for( sal_Int32 nIndex = 0; nIndex < nAnyCount; nIndex++, pAny++ ) { if( pAny->getValueType() == - ::getCppuType((const Reference< XDocumentHandler >*)0)) + cppu::UnoType<XDocumentHandler>::get()) { *pAny >>= xHandler; *pAny >>= xExtHandler; diff --git a/xmloff/source/core/unoatrcn.cxx b/xmloff/source/core/unoatrcn.cxx index 68d43114e472..df29325e0644 100644 --- a/xmloff/source/core/unoatrcn.cxx +++ b/xmloff/source/core/unoatrcn.cxx @@ -53,7 +53,7 @@ SvUnoAttributeContainer::~SvUnoAttributeContainer() uno::Type SAL_CALL SvUnoAttributeContainer::getElementType(void) throw( uno::RuntimeException, std::exception ) { - return ::getCppuType((const xml::AttributeData*)0); + return cppu::UnoType<xml::AttributeData>::get(); } sal_Bool SAL_CALL SvUnoAttributeContainer::hasElements(void) @@ -159,7 +159,7 @@ sal_Bool SAL_CALL SvUnoAttributeContainer::hasByName(const OUString& aName) thro void SAL_CALL SvUnoAttributeContainer::replaceByName(const OUString& aName, const uno::Any& aElement) throw( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { - if( aElement.hasValue() && aElement.getValueType() == ::getCppuType((const xml::AttributeData*)0) ) + if( aElement.hasValue() && aElement.getValueType() == cppu::UnoType<xml::AttributeData>::get()) { sal_uInt16 nAttr = getIndexByName(aName ); if( nAttr == USHRT_MAX ) @@ -201,7 +201,7 @@ void SAL_CALL SvUnoAttributeContainer::replaceByName(const OUString& aName, cons void SAL_CALL SvUnoAttributeContainer::insertByName(const OUString& aName, const uno::Any& aElement) throw( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { - if( !aElement.hasValue() || aElement.getValueType() != ::getCppuType((const xml::AttributeData*)0) ) + if( !aElement.hasValue() || aElement.getValueType() != cppu::UnoType<xml::AttributeData>::get()) throw lang::IllegalArgumentException(); sal_uInt16 nAttr = getIndexByName(aName ); diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx index 4ea112dc3705..e242ed01825a 100644 --- a/xmloff/source/draw/animationimport.cxx +++ b/xmloff/source/draw/animationimport.cxx @@ -1304,7 +1304,7 @@ AnimationsImport::~AnimationsImport() throw () // XInterface Any SAL_CALL AnimationsImport::queryInterface( const Type& aType ) throw (RuntimeException, std::exception) { - if ( aType == ::getCppuType((Reference<XAnimationNodeSupplier> *)0) ) + if ( aType == cppu::UnoType<XAnimationNodeSupplier>::get()) { return makeAny( Reference<XAnimationNodeSupplier>( this ) ); } diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx index ca6834012639..c572e68defbd 100644 --- a/xmloff/source/draw/sdpropls.cxx +++ b/xmloff/source/draw/sdpropls.cxx @@ -876,12 +876,12 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy { case XML_SD_TYPE_STROKE : { - pHdl = new XMLEnumPropertyHdl( aXML_LineStyle_EnumMap, ::getCppuType((const drawing::LineStyle*)0) ); + pHdl = new XMLEnumPropertyHdl( aXML_LineStyle_EnumMap, cppu::UnoType<drawing::LineStyle>::get()); break; } case XML_SD_TYPE_LINEJOIN : { - pHdl = new XMLEnumPropertyHdl( aXML_LineJoint_EnumMap, ::getCppuType((const drawing::LineJoint*)0) ); + pHdl = new XMLEnumPropertyHdl( aXML_LineJoint_EnumMap, cppu::UnoType<drawing::LineJoint>::get()); break; } case XML_SD_TYPE_LINECAP : @@ -891,7 +891,7 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy } case XML_SD_TYPE_FILLSTYLE : { - pHdl = new XMLEnumPropertyHdl( aXML_FillStyle_EnumMap, ::getCppuType((const drawing::FillStyle*)0) ); + pHdl = new XMLEnumPropertyHdl( aXML_FillStyle_EnumMap, cppu::UnoType<drawing::FillStyle>::get()); break; } case XML_SD_TYPE_PRESPAGE_TYPE : @@ -916,7 +916,7 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy } case XML_SD_TYPE_PRESPAGE_SPEED : { - pHdl = new XMLEnumPropertyHdl( aXML_TransSpeed_EnumMap, ::getCppuType((const presentation::AnimationSpeed*)0) ); + pHdl = new XMLEnumPropertyHdl( aXML_TransSpeed_EnumMap, cppu::UnoType<presentation::AnimationSpeed>::get()); break; } case XML_SD_TYPE_PRESPAGE_DURATION : @@ -936,7 +936,7 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy } case XML_SD_TYPE_WRITINGMODE : { - pHdl = new XMLEnumPropertyHdl( aXML_WritingMode_EnumMap, ::getCppuType((const text::WritingMode*)0) ); + pHdl = new XMLEnumPropertyHdl( aXML_WritingMode_EnumMap, cppu::UnoType<text::WritingMode>::get()); break; } case XML_SD_TYPE_PRESPAGE_VISIBILITY : @@ -963,7 +963,7 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy case XML_SD_TYPE_NORMALS_KIND: { - pHdl = new XMLEnumPropertyHdl( aXML_NormalsKind_EnumMap, ::getCppuType((const drawing::NormalsKind*)0) ); + pHdl = new XMLEnumPropertyHdl( aXML_NormalsKind_EnumMap, cppu::UnoType<drawing::NormalsKind>::get()); break; } case XML_SD_TYPE_NORMALS_DIRECTION: @@ -973,22 +973,22 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy } case XML_SD_TYPE_TEX_GENERATION_MODE_X: { - pHdl = new XMLEnumPropertyHdl( aXML_TexGenerationX_EnumMap, ::getCppuType((const drawing::TextureProjectionMode*)0) ); + pHdl = new XMLEnumPropertyHdl( aXML_TexGenerationX_EnumMap, cppu::UnoType<drawing::TextureProjectionMode>::get()); break; } case XML_SD_TYPE_TEX_GENERATION_MODE_Y: { - pHdl = new XMLEnumPropertyHdl( aXML_TexGenerationY_EnumMap, ::getCppuType((const drawing::TextureProjectionMode*)0) ); + pHdl = new XMLEnumPropertyHdl( aXML_TexGenerationY_EnumMap, cppu::UnoType<drawing::TextureProjectionMode>::get()); break; } case XML_SD_TYPE_TEX_KIND: { - pHdl = new XMLEnumPropertyHdl( aXML_TexKind_EnumMap, ::getCppuType((const drawing::TextureKind*)0) ); + pHdl = new XMLEnumPropertyHdl( aXML_TexKind_EnumMap, cppu::UnoType<drawing::TextureKind>::get()); break; } case XML_SD_TYPE_TEX_MODE: { - pHdl = new XMLEnumPropertyHdl( aXML_TexMode_EnumMap, ::getCppuType((const drawing::TextureMode*)0) ); + pHdl = new XMLEnumPropertyHdl( aXML_TexMode_EnumMap, cppu::UnoType<drawing::TextureMode>::get()); break; } case XML_SD_TYPE_NUMBULLET: @@ -1003,7 +1003,7 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy } case XML_SD_TYPE_BITMAP_MODE: { - pHdl = new XMLEnumPropertyHdl( aXML_BitmapMode_EnumMap, getCppuType((const drawing::BitmapMode*)0) ); + pHdl = new XMLEnumPropertyHdl( aXML_BitmapMode_EnumMap, cppu::UnoType<drawing::BitmapMode>::get()); break; } case XML_SD_TYPE_BITMAPREPOFFSETX: @@ -1024,26 +1024,26 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy } case XML_SD_TYPE_BITMAP_REFPOINT: { - pHdl = new XMLEnumPropertyHdl( aXML_RefPoint_EnumMap, getCppuType((const ::com::sun::star::drawing::RectanglePoint*)0) ); + pHdl = new XMLEnumPropertyHdl( aXML_RefPoint_EnumMap, cppu::UnoType<com::sun::star::drawing::RectanglePoint>::get()); break; } case XML_TYPE_TEXT_ANIMATION: - pHdl = new XMLEnumPropertyHdl( pXML_TextAnimation_Enum, ::getCppuType((const com::sun::star::drawing::TextAnimationKind*)0) ); + pHdl = new XMLEnumPropertyHdl( pXML_TextAnimation_Enum, cppu::UnoType<com::sun::star::drawing::TextAnimationKind>::get()); break; case XML_TYPE_TEXT_ANIMATION_BLINKING: - pHdl = new XMLEnumPropertyHdl( pXML_TextAnimation_Blinking_Enum, ::getCppuType((const com::sun::star::drawing::TextAnimationKind*)0) ); + pHdl = new XMLEnumPropertyHdl( pXML_TextAnimation_Blinking_Enum, cppu::UnoType<com::sun::star::drawing::TextAnimationKind>::get()); break; case XML_TYPE_TEXT_ANIMATION_DIRECTION: - pHdl = new XMLEnumPropertyHdl( pXML_TextAnimationDirection_Enum, ::getCppuType((const com::sun::star::drawing::TextAnimationDirection*)0) ); + pHdl = new XMLEnumPropertyHdl( pXML_TextAnimationDirection_Enum, cppu::UnoType<com::sun::star::drawing::TextAnimationDirection>::get()); break; case XML_TYPE_TEXT_ANIMATION_STEPS: pHdl = new XMLTextAnimationStepPropertyHdl; break; case XML_SD_TYPE_TEXT_ALIGN: - pHdl = new XMLEnumPropertyHdl( pXML_TextAlign_Enum, ::getCppuType((const com::sun::star::drawing::TextHorizontalAdjust*)0) ); + pHdl = new XMLEnumPropertyHdl( pXML_TextAlign_Enum, cppu::UnoType<com::sun::star::drawing::TextHorizontalAdjust>::get()); break; case XML_SD_TYPE_VERTICAL_ALIGN: - pHdl = new XMLEnumPropertyHdl( pXML_VerticalAlign_Enum, ::getCppuType((const com::sun::star::drawing::TextVerticalAdjust*)0) ); + pHdl = new XMLEnumPropertyHdl( pXML_VerticalAlign_Enum, cppu::UnoType<com::sun::star::drawing::TextVerticalAdjust>::get()); break; case XML_SD_TYPE_FITTOSIZE: { @@ -1064,10 +1064,10 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy pHdl = new XMLEnumPropertyHdl( pXML_MeasureUnit_Enum, ::cppu::UnoType<sal_Int32>::get() ); break; case XML_SD_TYPE_MEASURE_HALIGN: - pHdl = new XMLEnumPropertyHdl( pXML_Measure_HAlign_Enum, ::getCppuType((const com::sun::star::drawing::MeasureTextHorzPos*)0) ); + pHdl = new XMLEnumPropertyHdl( pXML_Measure_HAlign_Enum, cppu::UnoType<com::sun::star::drawing::MeasureTextHorzPos>::get()); break; case XML_SD_TYPE_MEASURE_VALIGN: - pHdl = new XMLEnumPropertyHdl( pXML_Measure_VAlign_Enum, ::getCppuType((const com::sun::star::drawing::MeasureTextVertPos*)0) ); + pHdl = new XMLEnumPropertyHdl( pXML_Measure_VAlign_Enum, cppu::UnoType<com::sun::star::drawing::MeasureTextVertPos>::get()); break; case XML_SD_TYPE_MEASURE_PLACING: { diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index 611a7113d220..77d87bad09ff 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -2078,7 +2078,7 @@ void SdXMLConnectorShapeContext::StartElement(const uno::Reference< xml::sax::XA if ( bApplySVGD ) { - assert(maPath.getValueType() == ::getCppuType((const drawing::PolyPolygonBezierCoords*)0)); + assert(maPath.getValueType() == cppu::UnoType<drawing::PolyPolygonBezierCoords>::get()); xProps->setPropertyValue("PolyPolygonBezier", maPath); } } diff --git a/xmloff/source/style/prhdlfac.cxx b/xmloff/source/style/prhdlfac.cxx index e211bc60ce74..002c7f43a90a 100644 --- a/xmloff/source/style/prhdlfac.cxx +++ b/xmloff/source/style/prhdlfac.cxx @@ -392,7 +392,7 @@ const XMLPropertyHandler* XMLPropertyHandlerFactory::CreatePropertyHandler( sal_ break; case XML_TYPE_COLOR_MODE: pPropHdl = new XMLEnumPropertyHdl( aXML_ColorMode_EnumMap, - ::getCppuType((const drawing::ColorMode*)0) ); + cppu::UnoType<drawing::ColorMode>::get()); break; case XML_TYPE_DURATION16_MS: pPropHdl = new XMLDurationMS16PropHdl_Impl; @@ -400,7 +400,7 @@ const XMLPropertyHandler* XMLPropertyHandlerFactory::CreatePropertyHandler( sal_ case XML_TYPE_TEXT_HORIZONTAL_ADJUST: pPropHdl = new XMLEnumPropertyHdl( aXML_HorizontalAdjust_Enum, - ::getCppuType((const text::HorizontalAdjust*)0) ); + cppu::UnoType<text::HorizontalAdjust>::get()); break; case XML_TYPE_TEXT_DRAW_ASPECT: pPropHdl = new DrawAspectHdl; diff --git a/xmloff/source/text/XMLAutoTextEventImport.cxx b/xmloff/source/text/XMLAutoTextEventImport.cxx index 8f91521c5a6b..6b6b3fbfcbc8 100644 --- a/xmloff/source/text/XMLAutoTextEventImport.cxx +++ b/xmloff/source/text/XMLAutoTextEventImport.cxx @@ -65,7 +65,7 @@ void XMLAutoTextEventImport::initialize( for( sal_Int32 i = 0; i < nLength; i++ ) { const Type& rType = rArguments[i].getValueType(); - if ( rType == ::getCppuType( (Reference<XEventsSupplier>*)NULL ) ) + if ( rType == cppu::UnoType<XEventsSupplier>::get()) { Reference<XEventsSupplier> xSupplier; rArguments[i] >>= xSupplier; @@ -73,7 +73,7 @@ void XMLAutoTextEventImport::initialize( xEvents = xSupplier->getEvents(); } - else if (rType == ::getCppuType( (Reference<XNameReplace>*)NULL ) ) + else if (rType == cppu::UnoType<XNameReplace>::get()) { rArguments[i] >>= xEvents; DBG_ASSERT(xEvents.is(), "need XEventsSupplier or XNameReplace"); diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index b4ad80d53374..7c91085ffd96 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -377,7 +377,7 @@ BoundFrameSets::BoundFrameSets(const Reference<XInterface> xModel) void FieldParamExporter::Export() { const Type aStringType = ::cppu::UnoType<OUString>::get(); - const Type aBoolType = ::getCppuType((sal_Bool*)0); + const Type aBoolType = cppu::UnoType<sal_Bool>::get(); const Type aSeqType = ::getCppuType((Sequence<OUString>*)0); const Type aIntType = ::cppu::UnoType<sal_Int32>::get(); Sequence<OUString> vParameters(m_xFieldParams->getElementNames()); diff --git a/xmloff/source/text/txtprhdl.cxx b/xmloff/source/text/txtprhdl.cxx index d25091e37bb3..224f35ebffbd 100644 --- a/xmloff/source/text/txtprhdl.cxx +++ b/xmloff/source/text/txtprhdl.cxx @@ -1399,7 +1399,7 @@ const XMLPropertyHandler *XMLTextPropertyHandlerFactory_Impl::GetPropertyHandler //UUUU case XML_SW_TYPE_FILLSTYLE: - pHdl = new XMLEnumPropertyHdl( aXML_FillStyle_EnumMap, ::getCppuType((const FillStyle*)0) ); + pHdl = new XMLEnumPropertyHdl( aXML_FillStyle_EnumMap, cppu::UnoType<FillStyle>::get()); break; case XML_SW_TYPE_FILLBITMAPSIZE: pHdl = new XMLFillBitmapSizePropertyHandler(); @@ -1408,10 +1408,10 @@ const XMLPropertyHandler *XMLTextPropertyHandlerFactory_Impl::GetPropertyHandler pHdl = new XMLBitmapLogicalSizePropertyHandler(); break; case XML_SW_TYPE_BITMAP_REFPOINT: - pHdl = new XMLEnumPropertyHdl( aXML_RefPoint_EnumMap, getCppuType((const RectanglePoint*)0) ); + pHdl = new XMLEnumPropertyHdl( aXML_RefPoint_EnumMap, cppu::UnoType<RectanglePoint>::get()); break; case XML_SW_TYPE_BITMAP_MODE: - pHdl = new XMLEnumPropertyHdl( aXML_BitmapMode_EnumMap, getCppuType((const BitmapMode*)0) ); + pHdl = new XMLEnumPropertyHdl( aXML_BitmapMode_EnumMap, cppu::UnoType<BitmapMode>::get()); break; case XML_SW_TYPE_BITMAPREPOFFSETX: case XML_SW_TYPE_BITMAPREPOFFSETY: diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx index 3098480ee8cd..7d51d95001d3 100644 --- a/xmloff/source/transform/OOo2Oasis.cxx +++ b/xmloff/source/transform/OOo2Oasis.cxx @@ -1866,12 +1866,12 @@ Any OOo2OasisTransformer::queryInterface( const Type& rType ) throw (RuntimeException, std::exception) { Any aRet; - if ( rType == ::getCppuType((Reference<XImporter> *)0) ) + if ( rType == cppu::UnoType<XImporter>::get()) { Reference<XImporter> xThis( this ); aRet <<= xThis; } - else if ( rType == ::getCppuType((Reference<XFilter> *)0) ) + else if ( rType == cppu::UnoType<XFilter>::get()) { Reference<XFilter> xThis( this ); aRet <<= xThis; @@ -2047,8 +2047,8 @@ Sequence< ::com::sun::star::uno::Type > SAL_CALL aTypes.realloc( nIndex + 2 ); ::com::sun::star::uno::Type* pTypes = aTypes.getArray(); - pTypes[nIndex++] = ::getCppuType( static_cast< Reference< XImporter > * >( 0 ) ); - pTypes[nIndex++] = ::getCppuType( static_cast< Reference< XFilter > * >( 0 ) ); + pTypes[nIndex++] = cppu::UnoType<XImporter>::get(); + pTypes[nIndex++] = cppu::UnoType<XFilter>::get(); return aTypes; } diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx index 2433ca4f4ac2..f17501ef148e 100644 --- a/xmloff/source/transform/TransformerBase.cxx +++ b/xmloff/source/transform/TransformerBase.cxx @@ -430,15 +430,15 @@ void SAL_CALL XMLTransformerBase::initialize( const Sequence< Any >& aArguments // uses queryInterface, and the model also has a XPropertySet interface. // document handler - if( ::getCppuType( (const Reference< XDocumentHandler >*) 0 ).isAssignableFrom( pAny->getValueType() ) ) + if( cppu::UnoType<XDocumentHandler>::get().isAssignableFrom( pAny->getValueType() ) ) m_xHandler.set( *pAny, UNO_QUERY ); // property set to transport data across - if( ::getCppuType( (const Reference< XPropertySet >*) 0 ).isAssignableFrom( pAny->getValueType() ) ) + if( cppu::UnoType<XPropertySet>::get().isAssignableFrom( pAny->getValueType() ) ) m_xPropSet.set( *pAny, UNO_QUERY ); // xmodel - if( ::getCppuType( (const Reference< ::com::sun::star::frame::XModel >*) 0 ).isAssignableFrom( pAny->getValueType() ) ) + if( cppu::UnoType<com::sun::star::frame::XModel>::get().isAssignableFrom( pAny->getValueType() ) ) mxModel.set( *pAny, UNO_QUERY ); } |