diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-01 08:40:47 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-01 08:40:47 +0200 |
| commit | bbe29239614459c899c0f5764290af336802873c (patch) | |
| tree | 92f230ac84c4ee145e385e67d5043e894e97b74d /scripting | |
| parent | 4f5b03433db779dfd779bb1a221338dd89b420e6 (diff) | |
Replace remaining getCppuType et al with cppu::UnoType
Change-Id: I936ae26f8d5d7cdd32c15e937b7cae6668b6192c
Diffstat (limited to 'scripting')
| -rw-r--r-- | scripting/source/basprov/basmethnode.cxx | 4 | ||||
| -rw-r--r-- | scripting/source/basprov/basscript.cxx | 4 | ||||
| -rw-r--r-- | scripting/source/vbaevents/eventhelper.cxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/scripting/source/basprov/basmethnode.cxx b/scripting/source/basprov/basmethnode.cxx index a3a29897e49b..51ff569c1da7 100644 --- a/scripting/source/basprov/basmethnode.cxx +++ b/scripting/source/basprov/basmethnode.cxx @@ -91,8 +91,8 @@ namespace basprov } } - registerProperty( BASPROV_PROPERTY_URI, BASPROV_PROPERTY_ID_URI, BASPROV_DEFAULT_ATTRIBS(), &m_sURI, ::getCppuType( &m_sURI ) ); - registerProperty( BASPROV_PROPERTY_EDITABLE, BASPROV_PROPERTY_ID_EDITABLE, BASPROV_DEFAULT_ATTRIBS(), &m_bEditable, ::getCppuType( &m_bEditable ) ); + registerProperty( BASPROV_PROPERTY_URI, BASPROV_PROPERTY_ID_URI, BASPROV_DEFAULT_ATTRIBS(), &m_sURI, cppu::UnoType<decltype(m_sURI)>::get() ); + registerProperty( BASPROV_PROPERTY_EDITABLE, BASPROV_PROPERTY_ID_EDITABLE, BASPROV_DEFAULT_ATTRIBS(), &m_bEditable, cppu::UnoType<decltype(m_bEditable)>::get() ); } diff --git a/scripting/source/basprov/basscript.cxx b/scripting/source/basprov/basscript.cxx index 3f4196e5fd5f..afd4a307aa42 100644 --- a/scripting/source/basprov/basscript.cxx +++ b/scripting/source/basprov/basscript.cxx @@ -67,7 +67,7 @@ namespace basprov ,m_documentBasicManager( NULL ) ,m_xDocumentScriptContext() { - registerProperty( BASSCRIPT_PROPERTY_CALLER, BASSCRIPT_PROPERTY_ID_CALLER, BASSCRIPT_DEFAULT_ATTRIBS(), &m_caller, ::getCppuType( &m_caller ) ); + registerProperty( BASSCRIPT_PROPERTY_CALLER, BASSCRIPT_PROPERTY_ID_CALLER, BASSCRIPT_DEFAULT_ATTRIBS(), &m_caller, cppu::UnoType<decltype(m_caller)>::get() ); } @@ -81,7 +81,7 @@ namespace basprov ,m_xDocumentScriptContext( documentScriptContext ) { StartListening( *m_documentBasicManager ); - registerProperty( BASSCRIPT_PROPERTY_CALLER, BASSCRIPT_PROPERTY_ID_CALLER, BASSCRIPT_DEFAULT_ATTRIBS(), &m_caller, ::getCppuType( &m_caller ) ); + registerProperty( BASSCRIPT_PROPERTY_CALLER, BASSCRIPT_PROPERTY_ID_CALLER, BASSCRIPT_DEFAULT_ATTRIBS(), &m_caller, cppu::UnoType<decltype(m_caller)>::get() ); } diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx index 6f8cb735854b..15224d50b84e 100644 --- a/scripting/source/vbaevents/eventhelper.cxx +++ b/scripting/source/vbaevents/eventhelper.cxx @@ -662,7 +662,7 @@ EventListener::EventListener( const Reference< XComponentContext >& rxContext ) OPropertyContainer(GetBroadcastHelper()), m_xContext( rxContext ), m_bDocClosed(false), mpShell( 0 ) { registerProperty( EVENTLSTNR_PROPERTY_MODEL, EVENTLSTNR_PROPERTY_ID_MODEL, - beans::PropertyAttribute::TRANSIENT, &m_xModel, ::getCppuType( &m_xModel ) ); + beans::PropertyAttribute::TRANSIENT, &m_xModel, cppu::UnoType<decltype(m_xModel)>::get() ); msProject = "Standard"; } |