diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2014-05-23 22:11:27 +0200 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2014-05-23 22:11:52 +0200 |
| commit | ac76cc7e605b1bc9c0ff8e24d0b9995a8247074e (patch) | |
| tree | 797df8cc9387fa70a0c09e574f49714ce4dc6710 /starmath | |
| parent | 3191d7d1302dbde2445b9f300b3eb853120ede65 (diff) | |
Prefer cppu::UnoType<T>::get() to ::getCppuType((T*)0) part20
Change-Id: If87cdfb2c605254f6d69baa4ca5aec09091caa68
Diffstat (limited to 'starmath')
| -rw-r--r-- | starmath/source/mathmlimport.cxx | 2 | ||||
| -rw-r--r-- | starmath/source/unomodel.cxx | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx index 5e1f74357e15..0ea7bc2ee384 100644 --- a/starmath/source/mathmlimport.cxx +++ b/starmath/source/mathmlimport.cxx @@ -136,7 +136,7 @@ sal_uLong SmXMLImportWrapper::Import(SfxMedium &rMedium) comphelper::PropertyMapEntry aInfoMap[] = { { OUString("PrivateData"), 0, - ::getCppuType( (Reference<XInterface> *)0 ), + cppu::UnoType<XInterface>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("BaseURI"), 0, ::cppu::UnoType<OUString>::get(), diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx index 995914816343..26ac82511b99 100644 --- a/starmath/source/unomodel.cxx +++ b/starmath/source/unomodel.cxx @@ -235,12 +235,12 @@ static PropertySetInfo * lcl_createModelPropertyInfo () { { OUString("Alignment") , HANDLE_ALIGNMENT , ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0 }, { OUString("BaseFontHeight") , HANDLE_BASE_FONT_HEIGHT , ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0 }, - { OUString("BasicLibraries") , HANDLE_BASIC_LIBRARIES , ::getCppuType((const uno::Reference< script::XLibraryContainer > *)0), PropertyAttribute::READONLY, 0 }, + { OUString("BasicLibraries") , HANDLE_BASIC_LIBRARIES , cppu::UnoType<script::XLibraryContainer>::get(), PropertyAttribute::READONLY, 0 }, { OUString("BottomMargin") , HANDLE_BOTTOM_MARGIN , ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, DIS_BOTTOMSPACE }, { OUString("CustomFontNameFixed") , HANDLE_CUSTOM_FONT_NAME_FIXED , ::cppu::UnoType<OUString>::get(), PROPERTY_NONE, FNT_FIXED }, { OUString("CustomFontNameSans") , HANDLE_CUSTOM_FONT_NAME_SANS , ::cppu::UnoType<OUString>::get(), PROPERTY_NONE, FNT_SANS }, { OUString("CustomFontNameSerif") , HANDLE_CUSTOM_FONT_NAME_SERIF , ::cppu::UnoType<OUString>::get(), PROPERTY_NONE, FNT_SERIF }, - { OUString("DialogLibraries") , HANDLE_DIALOG_LIBRARIES , ::getCppuType((const uno::Reference< script::XLibraryContainer > *)0), PropertyAttribute::READONLY, 0 }, + { OUString("DialogLibraries") , HANDLE_DIALOG_LIBRARIES , cppu::UnoType<script::XLibraryContainer>::get(), PropertyAttribute::READONLY, 0 }, { OUString("FontFixedIsBold") , HANDLE_CUSTOM_FONT_FIXED_WEIGHT , ::getBooleanCppuType(), PROPERTY_NONE, FNT_FIXED }, { OUString("FontFixedIsItalic") , HANDLE_CUSTOM_FONT_FIXED_POSTURE , ::getBooleanCppuType(), PROPERTY_NONE, FNT_FIXED }, { OUString("FontFunctionsIsBold") , HANDLE_FONT_FUNCTIONS_WEIGHT , ::getBooleanCppuType(), PROPERTY_NONE, FNT_FUNCTION }, @@ -355,10 +355,10 @@ uno::Sequence< uno::Type > SAL_CALL SmModel::getTypes( ) throw(uno::RuntimeExce sal_Int32 nLen = aTypes.getLength(); aTypes.realloc(nLen + 4); uno::Type* pTypes = aTypes.getArray(); - pTypes[nLen++] = ::getCppuType((Reference<XServiceInfo>*)0); - pTypes[nLen++] = ::getCppuType((Reference<XPropertySet>*)0); - pTypes[nLen++] = ::getCppuType((Reference<XMultiPropertySet>*)0); - pTypes[nLen++] = ::getCppuType((Reference<XRenderable>*)0); + pTypes[nLen++] = cppu::UnoType<XServiceInfo>::get(); + pTypes[nLen++] = cppu::UnoType<XPropertySet>::get(); + pTypes[nLen++] = cppu::UnoType<XMultiPropertySet>::get(); + pTypes[nLen++] = cppu::UnoType<XRenderable>::get(); return aTypes; } |