diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2012-08-13 15:04:39 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-08-14 10:39:13 +0200 |
| commit | ed93117447a3217fab0e2425f8761e24423024b5 (patch) | |
| tree | 2e178188bef319d1a1e5594acd5732e9959e35a8 /forms | |
| parent | 9272ce4e6f54bc283bbbe6106f66fd48c4ce8d82 (diff) | |
fdo#53061: Fix for C++11 #define NULL nullptr
Change-Id: Ia1805aab4bec7fef02c96ec4e7a7a0ed9991d3c3
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'forms')
| -rw-r--r-- | forms/source/component/ComboBox.cxx | 2 | ||||
| -rw-r--r-- | forms/source/component/ListBox.cxx | 6 | ||||
| -rw-r--r-- | forms/source/inc/property.hxx | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx index c08054822470..a8a3717bc723 100644 --- a/forms/source/component/ComboBox.cxx +++ b/forms/source/component/ComboBox.cxx @@ -225,7 +225,7 @@ void OComboBoxModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const switch (_nHandle) { case PROPERTY_ID_LISTSOURCETYPE : - DBG_ASSERT(_rValue.getValueType().equals(::getCppuType(reinterpret_cast<ListSourceType*>(NULL))), + DBG_ASSERT(_rValue.getValueType().equals(::getCppuType(static_cast<ListSourceType*>(0))), "OComboBoxModel::setFastPropertyValue_NoBroadcast : invalid type !" ); _rValue >>= m_eListSourceType; break; diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx index 495df87f4346..21a54fd268f6 100644 --- a/forms/source/component/ListBox.cxx +++ b/forms/source/component/ListBox.cxx @@ -302,7 +302,7 @@ namespace frm break; case PROPERTY_ID_LISTSOURCETYPE : - DBG_ASSERT(_rValue.getValueType().equals(::getCppuType(reinterpret_cast<ListSourceType*>(NULL))), + DBG_ASSERT(_rValue.getValueType().equals(::getCppuType(static_cast<ListSourceType*>(0))), "OComboBoxModel::setFastPropertyValue_NoBroadcast : invalid type !" ); _rValue >>= m_eListSourceType; break; @@ -341,7 +341,7 @@ namespace frm throw PropertyVetoException(); case PROPERTY_ID_DEFAULT_SELECT_SEQ : - DBG_ASSERT(_rValue.getValueType().equals(::getCppuType(reinterpret_cast< Sequence<sal_Int16>*>(NULL))), + DBG_ASSERT(_rValue.getValueType().equals(::getCppuType(static_cast< Sequence<sal_Int16>*>(0))), "OListBoxModel::setFastPropertyValue_NoBroadcast : invalid type !" ); _rValue >>= m_aDefaultSelectSeq; @@ -376,7 +376,7 @@ namespace frm switch (_nHandle) { case PROPERTY_ID_BOUNDCOLUMN : - bModified = tryPropertyValue(_rConvertedValue, _rOldValue, _rValue, m_aBoundColumn, ::getCppuType(reinterpret_cast<sal_Int16*>(NULL))); + bModified = tryPropertyValue(_rConvertedValue, _rOldValue, _rValue, m_aBoundColumn, ::getCppuType(static_cast<sal_Int16*>(0))); break; case PROPERTY_ID_LISTSOURCETYPE: diff --git a/forms/source/inc/property.hxx b/forms/source/inc/property.hxx index 81102c609a20..025cc8d7604b 100644 --- a/forms/source/inc/property.hxx +++ b/forms/source/inc/property.hxx @@ -113,7 +113,7 @@ public: //------------------------------------------------------------------------------ #define DECL_PROP_IMPL(varname, type) \ - *pProperties++ = com::sun::star::beans::Property(PROPERTY_##varname, PROPERTY_ID_##varname, ::getCppuType(reinterpret_cast< type* >(NULL)), + *pProperties++ = com::sun::star::beans::Property(PROPERTY_##varname, PROPERTY_ID_##varname, ::getCppuType(static_cast< type* >(0)), //------------------------------------------------------------------------------ #define DECL_BOOL_PROP_IMPL(varname) \ @@ -121,7 +121,7 @@ public: //------------------------------------------------------------------------------ #define DECL_IFACE_PROP_IMPL(varname, type) \ - *pProperties++ = com::sun::star::beans::Property(PROPERTY_##varname, PROPERTY_ID_##varname, ::getCppuType(reinterpret_cast< com::sun::star::uno::Reference< type >* >(NULL)), + *pProperties++ = com::sun::star::beans::Property(PROPERTY_##varname, PROPERTY_ID_##varname, ::getCppuType(static_cast< com::sun::star::uno::Reference< type >* >(0)), //------------------------------------------------------------------------------ #define BEGIN_DESCRIBE_PROPERTIES( count, baseclass ) \ |