diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-01 08:38:29 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-01 08:38:29 +0200 |
commit | cc7ae7776402ed967463cdf8f515d5236edffbad (patch) | |
tree | ea256348e44bde04f0f920785d42681c58f22803 /dbaccess/source/ui/uno | |
parent | 28c8a529510133466f2b361020678cb3a479d78b (diff) |
Replace remaining getCppuType et al with cppu::UnoType
Change-Id: I2d1b59cf13c3944b24ad54dc63e20b83a9c8a015
Diffstat (limited to 'dbaccess/source/ui/uno')
-rw-r--r-- | dbaccess/source/ui/uno/ColumnModel.cxx | 12 | ||||
-rw-r--r-- | dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx | 4 | ||||
-rw-r--r-- | dbaccess/source/ui/uno/composerdialogs.cxx | 4 | ||||
-rw-r--r-- | dbaccess/source/ui/uno/unosqlmessage.cxx | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/dbaccess/source/ui/uno/ColumnModel.cxx b/dbaccess/source/ui/uno/ColumnModel.cxx index 685ab1d1eb3a..ce72c992b1f5 100644 --- a/dbaccess/source/ui/uno/ColumnModel.cxx +++ b/dbaccess/source/ui/uno/ColumnModel.cxx @@ -83,22 +83,22 @@ OColumnControlModel::~OColumnControlModel() void OColumnControlModel::registerProperties() { registerProperty( PROPERTY_ACTIVE_CONNECTION, PROPERTY_ID_ACTIVE_CONNECTION, PropertyAttribute::TRANSIENT | PropertyAttribute::BOUND, - &m_xConnection, ::getCppuType( &m_xConnection ) ); + &m_xConnection, cppu::UnoType<decltype(m_xConnection)>::get() ); Any a; a <<= m_xColumn; registerProperty( PROPERTY_COLUMN, PROPERTY_ID_COLUMN, PropertyAttribute::TRANSIENT | PropertyAttribute::BOUND, - &m_xColumn, ::getCppuType( &m_xColumn ) ); + &m_xColumn, cppu::UnoType<decltype(m_xColumn)>::get() ); registerMayBeVoidProperty( PROPERTY_TABSTOP, PROPERTY_ID_TABSTOP, PropertyAttribute::BOUND | PropertyAttribute::MAYBEVOID, &m_aTabStop, ::cppu::UnoType<sal_Int16>::get() ); registerProperty( PROPERTY_DEFAULTCONTROL, PROPERTY_ID_DEFAULTCONTROL, PropertyAttribute::BOUND, - &m_sDefaultControl, ::getCppuType( &m_sDefaultControl ) ); + &m_sDefaultControl, cppu::UnoType<decltype(m_sDefaultControl)>::get() ); registerProperty( PROPERTY_ENABLED, PROPERTY_ID_ENABLED, PropertyAttribute::BOUND, - &m_bEnable, ::getCppuType( &m_bEnable ) ); + &m_bEnable, cppu::UnoType<decltype(m_bEnable)>::get() ); registerProperty( PROPERTY_BORDER, PROPERTY_ID_BORDER, PropertyAttribute::BOUND, - &m_nBorder, ::getCppuType( &m_nBorder ) ); + &m_nBorder, cppu::UnoType<decltype(m_nBorder)>::get() ); registerProperty( PROPERTY_EDIT_WIDTH, PROPERTY_ID_EDIT_WIDTH, PropertyAttribute::BOUND, - &m_nWidth, ::getCppuType( &m_nWidth ) ); + &m_nWidth, cppu::UnoType<decltype(m_nWidth)>::get() ); } // XCloneable diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx index a6db1563e1d3..15dcaa292158 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx @@ -50,10 +50,10 @@ ODBTypeWizDialogSetup::ODBTypeWizDialogSetup(const Reference< XComponentContext ,m_bStartTableWizard(false) { registerProperty(OUString("OpenDatabase"), 3, PropertyAttribute::TRANSIENT, - &m_bOpenDatabase, getBooleanCppuType()); + &m_bOpenDatabase, cppu::UnoType<bool>::get()); registerProperty(OUString("StartTableWizard"), 4, PropertyAttribute::TRANSIENT, - &m_bStartTableWizard, getBooleanCppuType()); + &m_bStartTableWizard, cppu::UnoType<bool>::get()); } Sequence<sal_Int8> SAL_CALL ODBTypeWizDialogSetup::getImplementationId( ) throw(RuntimeException, std::exception) diff --git a/dbaccess/source/ui/uno/composerdialogs.cxx b/dbaccess/source/ui/uno/composerdialogs.cxx index 7cf58cdec9d8..7404f5b4d5d3 100644 --- a/dbaccess/source/ui/uno/composerdialogs.cxx +++ b/dbaccess/source/ui/uno/composerdialogs.cxx @@ -59,9 +59,9 @@ namespace dbaui { registerProperty( PROPERTY_QUERYCOMPOSER, PROPERTY_ID_QUERYCOMPOSER, PropertyAttribute::TRANSIENT, - &m_xComposer, ::getCppuType( &m_xComposer ) ); + &m_xComposer, cppu::UnoType<decltype(m_xComposer)>::get() ); registerProperty( PROPERTY_ROWSET, PROPERTY_ID_ROWSET, PropertyAttribute::TRANSIENT, - &m_xRowSet, ::getCppuType( &m_xRowSet ) ); + &m_xRowSet, cppu::UnoType<decltype(m_xRowSet)>::get() ); } ComposerDialog::~ComposerDialog() diff --git a/dbaccess/source/ui/uno/unosqlmessage.cxx b/dbaccess/source/ui/uno/unosqlmessage.cxx index a0d66837630c..df635164f7fe 100644 --- a/dbaccess/source/ui/uno/unosqlmessage.cxx +++ b/dbaccess/source/ui/uno/unosqlmessage.cxx @@ -50,7 +50,7 @@ OSQLMessageDialog::OSQLMessageDialog(const Reference< XComponentContext >& _rxOR registerMayBeVoidProperty(PROPERTY_SQLEXCEPTION, PROPERTY_ID_SQLEXCEPTION, PropertyAttribute::TRANSIENT | PropertyAttribute::MAYBEVOID, &m_aException, ::cppu::UnoType<SQLException>::get()); registerProperty( PROPERTY_HELP_URL, PROPERTY_ID_HELP_URL, PropertyAttribute::TRANSIENT, - &m_sHelpURL, ::getCppuType( &m_sHelpURL ) ); + &m_sHelpURL, cppu::UnoType<decltype(m_sHelpURL)>::get() ); } Sequence<sal_Int8> SAL_CALL OSQLMessageDialog::getImplementationId( ) throw(RuntimeException, std::exception) |