From c047451f8a7d2878a2b8be39817105c3d362af0e Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 1 Apr 2015 08:38:49 +0200 Subject: Replace remaining getCppuType et al with cppu::UnoType Change-Id: I13a85e13b22559a9f1571ef5771b26d70a5cd4fb --- editeng/source/items/frmitems.cxx | 6 +++--- editeng/source/items/paraitem.cxx | 2 +- editeng/source/misc/acorrcfg.cxx | 4 ++-- editeng/source/uno/unofield.cxx | 14 +++++++------- editeng/source/uno/unonrule.cxx | 2 +- editeng/source/uno/unotext.cxx | 2 +- editeng/source/uno/unotext2.cxx | 2 +- editeng/source/xml/xmltxtexp.cxx | 2 +- 8 files changed, 17 insertions(+), 17 deletions(-) (limited to 'editeng') 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>::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>::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>::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::get() ); break; } default: ;//prevent warning diff --git a/editeng/source/misc/acorrcfg.cxx b/editeng/source/misc/acorrcfg.cxx index 49cc34b8d639..3971ce8d8e74 100644 --- a/editeng/source/misc/acorrcfg.cxx +++ b/editeng/source/misc/acorrcfg.cxx @@ -243,7 +243,7 @@ void SvxBaseAutoCorrCfg::ImplCommit() Sequence aValues(aNames.getLength()); Any* pValues = aValues.getArray(); - const Type& rType = ::getBooleanCppuType(); + const Type& rType = cppu::UnoType::get(); sal_Bool bVal; const long nFlags = rParent.pAutoCorrect->GetFlags(); for(int nProp = 0; nProp < aNames.getLength(); nProp++) @@ -552,7 +552,7 @@ void SvxSwAutoCorrCfg::ImplCommit() Sequence aValues(aNames.getLength()); Any* pValues = aValues.getArray(); - const Type& rType = ::getBooleanCppuType(); + const Type& rType = cppu::UnoType::get(); sal_Bool bVal; SvxSwAutoFmtFlags& rSwFlags = rParent.pAutoCorrect->GetSwFlags(); for(int nProp = 0; nProp < aNames.getLength(); nProp++) diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx index 48042ebf8f54..c115d1193b24 100644 --- a/editeng/source/uno/unofield.cxx +++ b/editeng/source/uno/unofield.cxx @@ -38,7 +38,7 @@ using namespace ::cppu; using namespace ::com::sun::star; #define QUERYINT( xint ) \ - if( rType == ::getCppuType((const uno::Reference< xint >*)0) ) \ + if( rType == cppu::UnoType::get() ) \ aAny <<= uno::Reference< xint >(this) @@ -71,8 +71,8 @@ const SfxItemPropertySet* ImplGetFieldItemPropertySet( sal_Int32 mnId ) static const SfxItemPropertyMapEntry aExDateTimeFieldPropertyMap_Impl[] = { { OUString(UNO_TC_PROP_DATE_TIME), WID_DATE, ::cppu::UnoType::get(), 0, 0 }, - { OUString(UNO_TC_PROP_IS_FIXED), WID_BOOL1, ::getBooleanCppuType(), 0, 0 }, - { OUString(UNO_TC_PROP_IS_DATE), WID_BOOL2, ::getBooleanCppuType(), 0, 0 }, + { OUString(UNO_TC_PROP_IS_FIXED), WID_BOOL1, cppu::UnoType::get(), 0, 0 }, + { OUString(UNO_TC_PROP_IS_DATE), WID_BOOL2, cppu::UnoType::get(), 0, 0 }, { OUString(UNO_TC_PROP_NUMFORMAT), WID_INT32, ::cppu::UnoType::get(), 0, 0 }, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -80,7 +80,7 @@ const SfxItemPropertySet* ImplGetFieldItemPropertySet( sal_Int32 mnId ) static const SfxItemPropertyMapEntry aDateTimeFieldPropertyMap_Impl[] = { - { OUString(UNO_TC_PROP_IS_DATE), WID_BOOL2, ::getBooleanCppuType(), 0, 0 }, + { OUString(UNO_TC_PROP_IS_DATE), WID_BOOL2, cppu::UnoType::get(), 0, 0 }, { OUString(), 0, css::uno::Type(), 0, 0 } }; static const SfxItemPropertySet aDateTimeFieldPropertySet_Impl(aDateTimeFieldPropertyMap_Impl); @@ -104,7 +104,7 @@ const SfxItemPropertySet* ImplGetFieldItemPropertySet( sal_Int32 mnId ) static const SfxItemPropertyMapEntry aExtFileFieldPropertyMap_Impl[] = { - { OUString(UNO_TC_PROP_IS_FIXED), WID_BOOL1, ::getBooleanCppuType(), 0, 0 }, + { OUString(UNO_TC_PROP_IS_FIXED), WID_BOOL1, cppu::UnoType::get(), 0, 0 }, { OUString(UNO_TC_PROP_FILE_FORMAT), WID_INT16, ::cppu::UnoType::get(), 0, 0 }, { OUString(UNO_TC_PROP_CURRENT_PRESENTATION), WID_STRING1, ::cppu::UnoType::get(), 0, 0 }, { OUString(), 0, css::uno::Type(), 0, 0 } @@ -113,11 +113,11 @@ const SfxItemPropertySet* ImplGetFieldItemPropertySet( sal_Int32 mnId ) static const SfxItemPropertyMapEntry aAuthorFieldPropertyMap_Impl[] = { - { OUString(UNO_TC_PROP_IS_FIXED), WID_BOOL1, ::getBooleanCppuType(), 0, 0 }, + { OUString(UNO_TC_PROP_IS_FIXED), WID_BOOL1, cppu::UnoType::get(), 0, 0 }, { OUString(UNO_TC_PROP_CURRENT_PRESENTATION), WID_STRING1,::cppu::UnoType::get(), 0, 0 }, { OUString(UNO_TC_PROP_AUTHOR_CONTENT), WID_STRING2,::cppu::UnoType::get(), 0, 0 }, { OUString(UNO_TC_PROP_AUTHOR_FORMAT), WID_INT16, ::cppu::UnoType::get(), 0, 0 }, - { OUString(UNO_TC_PROP_AUTHOR_FULLNAME), WID_BOOL2, ::getBooleanCppuType(), 0, 0 }, + { OUString(UNO_TC_PROP_AUTHOR_FULLNAME), WID_BOOL2, cppu::UnoType::get(), 0, 0 }, { OUString(), 0, css::uno::Type(), 0, 0 } }; static const SfxItemPropertySet aAuthorFieldPropertySet_Impl(aAuthorFieldPropertyMap_Impl); diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx index 34e47d5c6645..bc13c0858b79 100644 --- a/editeng/source/uno/unonrule.cxx +++ b/editeng/source/uno/unonrule.cxx @@ -130,7 +130,7 @@ Any SAL_CALL SvxUnoNumberingRules::getByIndex( sal_Int32 Index ) Type SAL_CALL SvxUnoNumberingRules::getElementType() throw( RuntimeException, std::exception ) { - return ::getCppuType(( const Sequence< beans::PropertyValue >*)0); + return cppu::UnoType>::get(); } sal_Bool SAL_CALL SvxUnoNumberingRules::hasElements() throw( RuntimeException, std::exception ) diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx index 0a94a73194c0..db0bfceb222f 100644 --- a/editeng/source/uno/unotext.cxx +++ b/editeng/source/uno/unotext.cxx @@ -69,7 +69,7 @@ ESelection toESelection(const text::TextRangeSelection& rSel) } #define QUERYINT( xint ) \ - if( rType == ::getCppuType((const uno::Reference< xint >*)0) ) \ + if( rType == cppu::UnoType::get() ) \ return uno::makeAny(uno::Reference< xint >(this)) const SvxItemPropertySet* ImplGetSvxUnoOutlinerTextCursorSvxPropertySet() diff --git a/editeng/source/uno/unotext2.cxx b/editeng/source/uno/unotext2.cxx index 4b51b8560a88..e57cf87f399e 100644 --- a/editeng/source/uno/unotext2.cxx +++ b/editeng/source/uno/unotext2.cxx @@ -33,7 +33,7 @@ using namespace ::cppu; using namespace ::com::sun::star; #define QUERYINT( xint ) \ - if( rType == ::getCppuType((const uno::Reference< xint >*)0) ) \ + if( rType == cppu::UnoType::get() ) \ return uno::makeAny(uno::Reference< xint >(this)) diff --git a/editeng/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx index 49196c4ba86c..9ec93aef19f5 100644 --- a/editeng/source/xml/xmltxtexp.cxx +++ b/editeng/source/xml/xmltxtexp.cxx @@ -382,7 +382,7 @@ SvxXMLTextExportComponent::SvxXMLTextExportComponent( SVX_UNOEDIT_FONT_PROPERTIES, // SVX_UNOEDIT_OUTLINER_PROPERTIES, {OUString(UNO_NAME_NUMBERING_RULES), EE_PARA_NUMBULLET, cppu::UnoType::get(), 0, 0 }, - {OUString(UNO_NAME_NUMBERING), EE_PARA_BULLETSTATE,::getBooleanCppuType(), 0, 0 }, + {OUString(UNO_NAME_NUMBERING), EE_PARA_BULLETSTATE,cppu::UnoType::get(), 0, 0 }, {OUString(UNO_NAME_NUMBERING_LEVEL), EE_PARA_OUTLLEVEL, ::cppu::UnoType::get(), 0, 0 }, SVX_UNOEDIT_PARA_PROPERTIES, { OUString(), 0, css::uno::Type(), 0, 0 } -- cgit