diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-01 08:38:49 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-01 08:38:49 +0200 |
commit | c047451f8a7d2878a2b8be39817105c3d362af0e (patch) | |
tree | cf7b669b546baa9435853ce0e70d1c243cc51791 /editeng/source/items | |
parent | 59a051d27d81114ca188c47db23a97c482fdfec6 (diff) |
Replace remaining getCppuType et al with cppu::UnoType
Change-Id: I13a85e13b22559a9f1571ef5771b26d70a5cd4fb
Diffstat (limited to 'editeng/source/items')
-rw-r--r-- | editeng/source/items/frmitems.cxx | 6 | ||||
-rw-r--r-- | editeng/source/items/paraitem.cxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index 6c2368d745e4..3fe61eb639a3 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -2035,7 +2035,7 @@ bool SvxBoxItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) ( script::Converter::create(::comphelper::getProcessComponentContext()) ); uno::Sequence < uno::Any > aSeq; uno::Any aNew; - try { aNew = xConverter->convertTo( rVal, ::getCppuType((const uno::Sequence < uno::Any >*)0) ); } + try { aNew = xConverter->convertTo( rVal, cppu::UnoType<uno::Sequence < uno::Any >>::get() ); } catch (const uno::Exception&) {} aNew >>= aSeq; @@ -2834,7 +2834,7 @@ bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) uno::Reference < script::XTypeConverter > xConverter( script::Converter::create(::comphelper::getProcessComponentContext()) ); uno::Any aNew; uno::Sequence < uno::Any > aSeq; - try { aNew = xConverter->convertTo( rVal, ::getCppuType((const uno::Sequence < uno::Any >*)0) ); } + try { aNew = xConverter->convertTo( rVal, cppu::UnoType<uno::Sequence < uno::Any >>::get() ); } catch (const uno::Exception&) {} if ((aNew >>= aSeq) && @@ -2867,7 +2867,7 @@ bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) else return false; } - else if (rVal.getValueType() == ::getCppuType((const ::com::sun::star::uno::Sequence < sal_Int16 >*)0) ) + else if (rVal.getValueType() == cppu::UnoType<css::uno::Sequence < sal_Int16 >>::get() ) { // serialization for basic macro recording ::com::sun::star::uno::Sequence < sal_Int16 > aSeq; diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx index 3537700d8613..2f9ed1619b57 100644 --- a/editeng/source/items/paraitem.cxx +++ b/editeng/source/items/paraitem.cxx @@ -363,7 +363,7 @@ bool SvxAdjustItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const case MID_EXPAND_SINGLE : { sal_Bool bValue = bOneBlock; - rVal.setValue( &bValue, ::getCppuBooleanType() ); + rVal.setValue( &bValue, cppu::UnoType<bool>::get() ); break; } default: ;//prevent warning |