summaryrefslogtreecommitdiff
path: root/UnoControls
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-04-01 08:35:13 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-04-01 08:35:13 +0200
commitd246f474223f22b5aabd9732312f923255f111c3 (patch)
tree32c999b6b4decd49439bc3db726d83fccafbf907 /UnoControls
parentbb9003c7f8f8dbe30fef041473dadcac37075df2 (diff)
Replace remaining getCppuType et al with cppu::UnoType
Change-Id: I61a85caf1587291eaa6b999050a52c92d9e416e3
Diffstat (limited to 'UnoControls')
-rw-r--r--UnoControls/source/base/multiplexer.cxx2
-rw-r--r--UnoControls/source/controls/framecontrol.cxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/UnoControls/source/base/multiplexer.cxx b/UnoControls/source/base/multiplexer.cxx
index 8157e66e554a..e6ddac31c4d5 100644
--- a/UnoControls/source/base/multiplexer.cxx
+++ b/UnoControls/source/base/multiplexer.cxx
@@ -35,7 +35,7 @@ namespace unocontrols{
#define MULTIPLEX( INTERFACE, METHOD, EVENTTYP, EVENT ) \
\
/* First get all interfaces from container with right type.*/ \
- OInterfaceContainerHelper* pContainer = m_aListenerHolder.getContainer( ::getCppuType((const Reference< INTERFACE >*)0) ); \
+ OInterfaceContainerHelper* pContainer = m_aListenerHolder.getContainer( cppu::UnoType<INTERFACE>::get() ); \
/* Do the follow only, if elements in container exist.*/ \
if( pContainer != NULL ) \
{ \
diff --git a/UnoControls/source/controls/framecontrol.cxx b/UnoControls/source/controls/framecontrol.cxx
index 2fae2ca2071e..da8fd36e274f 100644
--- a/UnoControls/source/controls/framecontrol.cxx
+++ b/UnoControls/source/controls/framecontrol.cxx
@@ -501,7 +501,7 @@ const Sequence< Property > FrameControl::impl_getStaticPropertyDescriptor()
{
Property( PROPERTYNAME_COMPONENTURL, PROPERTYHANDLE_COMPONENTURL, cppu::UnoType<OUString>::get(), PropertyAttribute::BOUND | PropertyAttribute::CONSTRAINED ),
Property( PROPERTYNAME_FRAME, PROPERTYHANDLE_FRAME, cppu::UnoType<XFrame>::get(), PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT ),
- Property( PROPERTYNAME_LOADERARGUMENTS, PROPERTYHANDLE_LOADERARGUMENTS, ::getCppuType((const Sequence< PropertyValue >*)0), PropertyAttribute::BOUND | PropertyAttribute::CONSTRAINED )
+ Property( PROPERTYNAME_LOADERARGUMENTS, PROPERTYHANDLE_LOADERARGUMENTS, cppu::UnoType<Sequence<PropertyValue>>::get(), PropertyAttribute::BOUND | PropertyAttribute::CONSTRAINED )
};
static const Sequence< Property > seqPropertys( pPropertys, PROPERTY_COUNT );