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 /oox | |
| parent | 3191d7d1302dbde2445b9f300b3eb853120ede65 (diff) | |
Prefer cppu::UnoType<T>::get() to ::getCppuType((T*)0) part20
Change-Id: If87cdfb2c605254f6d69baa4ca5aec09091caa68
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/export/ColorPropertySet.cxx | 2 | ||||
| -rw-r--r-- | oox/source/export/drawingml.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/oox/source/export/ColorPropertySet.cxx b/oox/source/export/ColorPropertySet.cxx index d3fe84806507..3ff4f28c7aaa 100644 --- a/oox/source/export/ColorPropertySet.cxx +++ b/oox/source/export/ColorPropertySet.cxx @@ -56,7 +56,7 @@ lcl_ColorPropertySetInfo::lcl_ColorPropertySetInfo( bool bFillColor ) : // note: length of FillColor and LineColor is 9 m_aColorPropName( (bFillColor ? "FillColor" : "LineColor"), 9, RTL_TEXTENCODING_ASCII_US ), m_aColorProp( m_aColorPropName, -1, - ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), 0) + cppu::UnoType<sal_Int32>::get(), 0) {} Sequence< Property > SAL_CALL lcl_ColorPropertySetInfo::getProperties() diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index b5369c3357b2..6703669e3c95 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -1489,7 +1489,7 @@ void DrawingML::WriteParagraphNumbering( Reference< XPropertySet > rXPropSet, sa DBG(fprintf (stderr, "graphic url: %s\n", OUStringToOString( aGraphicURL, RTL_TEXTENCODING_UTF8 ).getStr())); } else if ( aPropName == "GraphicSize" ) { - if ( pPropValue[ i ].Value.getValueType() == ::getCppuType( (awt::Size*)0) ) + if ( pPropValue[ i ].Value.getValueType() == cppu::UnoType<awt::Size>::get()) { // don't cast awt::Size to Size as on 64-bits they are not the same. ::com::sun::star::awt::Size aSize; |