diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-01 12:48:44 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-01 12:48:44 +0200 |
| commit | 2fc4a8c8113b1bf78258845ed06662a07996a6af (patch) | |
| tree | db055018db2d6190438b451444f337215a76917f /sfx2 | |
| parent | 7ea8046c741c8b7b608f26e312cc5f1056752c09 (diff) | |
Add support for cppu::UnoType<void>
Change-Id: I88259ffaffc73979c240721d2db166c79d3085f1
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/control/sfxstatuslistener.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/sidebar/Theme.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/statbar/stbitem.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/toolbox/tbxitem.cxx | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/sfx2/source/control/sfxstatuslistener.cxx b/sfx2/source/control/sfxstatuslistener.cxx index 56b9aecdc6a5..cc75699e6c2a 100644 --- a/sfx2/source/control/sfxstatuslistener.cxx +++ b/sfx2/source/control/sfxstatuslistener.cxx @@ -170,7 +170,7 @@ throw( RuntimeException, std::exception ) eState = SfxItemState::DEFAULT; ::com::sun::star::uno::Type pType = rEvent.State.getValueType(); - if ( pType == ::cppu::UnoType< ::cppu::UnoVoidType >::get() ) + if ( pType == ::cppu::UnoType<void>::get() ) { pItem = new SfxVoidItem( m_nSlotID ); eState = SfxItemState::UNKNOWN; diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx index 6b55a7b13b92..03dd0c1946ac 100644 --- a/sfx2/source/sidebar/Theme.cxx +++ b/sfx2/source/sidebar/Theme.cxx @@ -831,7 +831,7 @@ css::uno::Type Theme::GetCppuType (const PropertyType eType) return cppu::UnoType<sal_uInt32>::get(); case PT_Paint: - return cppu::UnoType<cppu::UnoVoidType>::get(); + return cppu::UnoType<void>::get(); case PT_Integer: return cppu::UnoType<sal_Int32>::get(); @@ -844,7 +844,7 @@ css::uno::Type Theme::GetCppuType (const PropertyType eType) case PT_Invalid: default: - return cppu::UnoType<cppu::UnoVoidType>::get(); + return cppu::UnoType<void>::get(); } } diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx index bd3a3969eac4..da1f7e269818 100644 --- a/sfx2/source/statbar/stbitem.cxx +++ b/sfx2/source/statbar/stbitem.cxx @@ -257,7 +257,7 @@ throw ( ::com::sun::star::uno::RuntimeException, std::exception ) eState = SfxItemState::DEFAULT; uno::Type pType = rEvent.State.getValueType(); - if ( pType == cppu::UnoType<cppu::UnoVoidType>::get() ) + if ( pType == cppu::UnoType<void>::get() ) { pItem = new SfxVoidItem( nSlotID ); eState = SfxItemState::UNKNOWN; diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index a16c0bbf4674..0643e78aae18 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -515,7 +515,7 @@ throw ( ::com::sun::star::uno::RuntimeException, std::exception ) eState = SfxItemState::DEFAULT; ::com::sun::star::uno::Type pType = rEvent.State.getValueType(); - if ( pType == cppu::UnoType<cppu::UnoVoidType>::get() ) + if ( pType == cppu::UnoType<void>::get() ) { pItem = new SfxVoidItem( nSlotId ); eState = SfxItemState::UNKNOWN; @@ -1069,7 +1069,7 @@ throw ( ::com::sun::star::uno::RuntimeException, std::exception ) eState = SfxItemState::DEFAULT; ::com::sun::star::uno::Type pType = rEvent.State.getValueType(); - if ( pType == cppu::UnoType<cppu::UnoVoidType>::get() ) + if ( pType == cppu::UnoType<void>::get() ) { pItem = new SfxVoidItem( nSlotId ); eState = SfxItemState::UNKNOWN; |