diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2014-05-11 10:09:04 +0200 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2014-05-11 10:16:42 +0200 |
| commit | bd596286207adf06936939a3ef8018efc1055591 (patch) | |
| tree | dc8e079155868ffbc5d023f04620c83f402dc6c2 /dbaccess/source/ui | |
| parent | be44f0e91b6061f6bbe6b4da2f264eed70fb6542 (diff) | |
Prefer cppu::UnoType<T>::get() to ::getCppuType((T*)0) part10
Change-Id: I67acda35fa127547dcea0cd18c9dc16db7c00294
Diffstat (limited to 'dbaccess/source/ui')
| -rw-r--r-- | dbaccess/source/ui/browser/exsrcbrw.cxx | 4 | ||||
| -rw-r--r-- | dbaccess/source/ui/uno/ColumnModel.cxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/uno/unosqlmessage.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/dbaccess/source/ui/browser/exsrcbrw.cxx b/dbaccess/source/ui/browser/exsrcbrw.cxx index e7bf020c8d06..1dbfcdb84b78 100644 --- a/dbaccess/source/ui/browser/exsrcbrw.cxx +++ b/dbaccess/source/ui/browser/exsrcbrw.cxx @@ -143,14 +143,14 @@ void SAL_CALL SbaExternalSourceBrowser::dispatch(const ::com::sun::star::util::U { if ( pArguments->Name == "ColumnType" ) { - bool bCorrectType = pArguments->Value.getValueType().equals(::getCppuType((const OUString*)0)); + bool bCorrectType = pArguments->Value.getValueType().equals(::cppu::UnoType<OUString>::get()0)); OSL_ENSURE(bCorrectType, "invalid type for argument \"ColumnType\" !"); if (bCorrectType) sControlType = ::comphelper::getString(pArguments->Value); } else if ( pArguments->Name == "ColumnPosition" ) { - bool bCorrectType = pArguments->Value.getValueType().equals(::getCppuType((const sal_Int16*)0)); + bool bCorrectType = pArguments->Value.getValueType().equals(::cppu::UnoType<sal_Int16>::get()0)); OSL_ENSURE(bCorrectType, "invalid type for argument \"ColumnPosition\" !"); if (bCorrectType) nControlPos = ::comphelper::getINT16(pArguments->Value); diff --git a/dbaccess/source/ui/uno/ColumnModel.cxx b/dbaccess/source/ui/uno/ColumnModel.cxx index 11c48483a8e7..685ab1d1eb3a 100644 --- a/dbaccess/source/ui/uno/ColumnModel.cxx +++ b/dbaccess/source/ui/uno/ColumnModel.cxx @@ -90,7 +90,7 @@ void OColumnControlModel::registerProperties() &m_xColumn, ::getCppuType( &m_xColumn ) ); registerMayBeVoidProperty( PROPERTY_TABSTOP, PROPERTY_ID_TABSTOP, PropertyAttribute::BOUND | PropertyAttribute::MAYBEVOID, - &m_aTabStop, ::getCppuType( static_cast<sal_Int16*>(NULL) ) ); + &m_aTabStop, ::cppu::UnoType<sal_Int16>::get() ); registerProperty( PROPERTY_DEFAULTCONTROL, PROPERTY_ID_DEFAULTCONTROL, PropertyAttribute::BOUND, &m_sDefaultControl, ::getCppuType( &m_sDefaultControl ) ); registerProperty( PROPERTY_ENABLED, PROPERTY_ID_ENABLED, PropertyAttribute::BOUND, diff --git a/dbaccess/source/ui/uno/unosqlmessage.cxx b/dbaccess/source/ui/uno/unosqlmessage.cxx index f13270ee7e73..9235528c52a4 100644 --- a/dbaccess/source/ui/uno/unosqlmessage.cxx +++ b/dbaccess/source/ui/uno/unosqlmessage.cxx @@ -48,7 +48,7 @@ OSQLMessageDialog::OSQLMessageDialog(const Reference< XComponentContext >& _rxOR :OSQLMessageDialogBase(_rxORB) { registerMayBeVoidProperty(PROPERTY_SQLEXCEPTION, PROPERTY_ID_SQLEXCEPTION, PropertyAttribute::TRANSIENT | PropertyAttribute::MAYBEVOID, - &m_aException, ::getCppuType(static_cast<SQLException*>(NULL))); + &m_aException, ::cppu::UnoType<SQLException>::get()); registerProperty( PROPERTY_HELP_URL, PROPERTY_ID_HELP_URL, PropertyAttribute::TRANSIENT, &m_sHelpURL, ::getCppuType( &m_sHelpURL ) ); } |