diff options
author | Julien Nabet <serval2412@yahoo.fr> | 2014-05-10 00:14:44 +0200 |
---|---|---|
committer | Julien Nabet <serval2412@yahoo.fr> | 2014-05-10 06:19:42 +0200 |
commit | 5ec7a589bed7991ffe8ad9a2f544a6699d159765 (patch) | |
tree | f9020375a29477fe7e4d22970a4040c36abadbdf /filter | |
parent | 83a88b942134314e86ac612d0ef70a8e4919e4af (diff) |
Prefer cppu::UnoType<T>::get() to ::getCppuType((T*)0) part8
Change-Id: Ie16923d17541e84e0d7424fffe37caf410786abf
Diffstat (limited to 'filter')
-rw-r--r-- | filter/source/graphicfilter/icgm/actimpr.cxx | 6 | ||||
-rw-r--r-- | filter/source/msfilter/msocximex.cxx | 2 | ||||
-rw-r--r-- | filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/filter/source/graphicfilter/icgm/actimpr.cxx b/filter/source/graphicfilter/icgm/actimpr.cxx index 43ff94099cec..8db2cc36cda1 100644 --- a/filter/source/graphicfilter/icgm/actimpr.cxx +++ b/filter/source/graphicfilter/icgm/actimpr.cxx @@ -481,7 +481,7 @@ void CGMImpressOutAct::DrawEllipse( FloatPoint& rCenter, FloatPoint& rSize, doub if ( ImplCreateShape( "com.sun.star.drawing.EllipseShape" ) ) { drawing::CircleKind eCircleKind = drawing::CircleKind_FULL; - uno::Any aAny( &eCircleKind, ::getCppuType((const drawing::CircleKind*)0) ); + uno::Any aAny( &eCircleKind, ::cppu::UnoType<drawing::CircleKind>::get() ); maXPropSet->setPropertyValue( "CircleKind", aAny ); long nXSize = (long)( rSize.X * 2.0 ); // strange behaviour with a awt::Size of 0 @@ -540,11 +540,11 @@ void CGMImpressOutAct::DrawEllipticalArc( FloatPoint& rCenter, FloatPoint& rSize if ( (long)fStartAngle == (long)fEndAngle ) { eCircleKind = drawing::CircleKind_FULL; - aAny.setValue( &eCircleKind, ::getCppuType((const drawing::CircleKind*)0) ); + aAny.setValue( &eCircleKind, ::cppu::UnoType<drawing::CircleKind>::get() ); } else { - aAny.setValue( &eCircleKind, ::getCppuType((const drawing::CircleKind*)0) ); + aAny.setValue( &eCircleKind, ::cppu::UnoType<drawing::CircleKind>::get() ); maXPropSet->setPropertyValue( "CircleKind", aAny ); aAny <<= (sal_Int32)( (long)( fStartAngle * 100 ) ); maXPropSet->setPropertyValue( "CircleStartAngle", aAny ); diff --git a/filter/source/msfilter/msocximex.cxx b/filter/source/msfilter/msocximex.cxx index 5706df0b8562..fbb419d415a5 100644 --- a/filter/source/msfilter/msocximex.cxx +++ b/filter/source/msfilter/msocximex.cxx @@ -126,7 +126,7 @@ const uno::Reference< container::XIndexContainer >& uno::Reference< beans::XPropertySet > xFormPropSet( xCreate, uno::UNO_QUERY ); - uno::Any aTmp(&sName,getCppuType((OUString *)0)); + uno::Any aTmp(&sName,cppu::UnoType<OUString>::get()); xFormPropSet->setPropertyValue( "Name", aTmp ); uno::Reference< form::XForm > xForm( xCreate, uno::UNO_QUERY ); diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx index ced9df142994..7703264eab13 100644 --- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx +++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx @@ -96,7 +96,7 @@ bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< ::com::sun::star::be // create an XProperty set to configure the exporter for pretty printing PropertyMapEntry aImportInfoMap[] = { - { OUString("BaseURI"), 0, ::getCppuType((const OUString*)0), PropertyAttribute::MAYBEVOID, 0}, + { OUString("BaseURI"), 0, ::cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -256,7 +256,7 @@ bool SAL_CALL XmlFilterAdaptor::exportImpl( const Sequence< ::com::sun::star::be { { OUString("UsePrettyPrinting"), 0, ::getCppuType((const sal_Bool*)0), PropertyAttribute::MAYBEVOID, 0}, { OUString("ExportTextNumberElement"), 0, ::getCppuType((const sal_Bool*)0), PropertyAttribute::MAYBEVOID, 0}, - { OUString("BaseURI"), 0, ::getCppuType((const OUString*)0), PropertyAttribute::MAYBEVOID, 0}, + { OUString("BaseURI"), 0, ::cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; |