diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2014-05-20 23:29:28 +0200 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2014-05-20 23:29:53 +0200 |
| commit | 227af32d8c6d5e3649c83fcdb274298bc7faa294 (patch) | |
| tree | 8490a6c94094d1fbf5a190a911070c3142d3cca7 /svx | |
| parent | 0f836296ea3cdc10326ad54983b634168285b8e2 (diff) | |
Prefer cppu::UnoType<T>::get() to ::getCppuType((T*)0) part18
Change-Id: Ibf958dbfbf7cdbe6ad31d390138be8d4d468c225
Diffstat (limited to 'svx')
30 files changed, 363 insertions, 363 deletions
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(); |