diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-01 08:41:16 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-01 08:41:16 +0200 |
commit | a55166cc25351f43d502f6b23d75df824c05f01a (patch) | |
tree | 27a7ccda07631ceb08bfb08381ee3623e90e6a7b /svl/source | |
parent | e1f3391a749873875e2e65bf9f36d242702b8006 (diff) |
Replace remaining getCppuType et al with cppu::UnoType
Change-Id: I641a3a1e2cf2c789844940d7231015cb85e3b8bc
Diffstat (limited to 'svl/source')
-rw-r--r-- | svl/source/config/cjkoptions.cxx | 2 | ||||
-rw-r--r-- | svl/source/config/ctloptions.cxx | 2 | ||||
-rw-r--r-- | svl/source/items/globalnameitem.cxx | 2 | ||||
-rw-r--r-- | svl/source/items/ilstitem.cxx | 2 | ||||
-rw-r--r-- | svl/source/numbers/numfmuno.cxx | 28 |
5 files changed, 18 insertions, 18 deletions
diff --git a/svl/source/config/cjkoptions.cxx b/svl/source/config/cjkoptions.cxx index 8510fe0ef745..c396251dbbdc 100644 --- a/svl/source/config/cjkoptions.cxx +++ b/svl/source/config/cjkoptions.cxx @@ -246,7 +246,7 @@ void SvtCJKOptions_Impl::ImplCommit() Any* pValues = aValues.getArray(); sal_Int32 nRealCount = 0; - const Type& rType = ::getBooleanCppuType(); + const Type& rType = cppu::UnoType<bool>::get(); for(int nProp = 0; nProp < nOrgCount; nProp++) { switch(nProp) diff --git a/svl/source/config/ctloptions.cxx b/svl/source/config/ctloptions.cxx index b2e79acc54fe..93e6c53b54ed 100644 --- a/svl/source/config/ctloptions.cxx +++ b/svl/source/config/ctloptions.cxx @@ -150,7 +150,7 @@ void SvtCTLOptions_Impl::ImplCommit() Any* pValues = aValues.getArray(); sal_Int32 nRealCount = 0; - const uno::Type& rType = ::getBooleanCppuType(); + const uno::Type& rType = cppu::UnoType<bool>::get(); for ( int nProp = 0; nProp < nOrgCount; nProp++ ) { diff --git a/svl/source/items/globalnameitem.cxx b/svl/source/items/globalnameitem.cxx index 9a424bf77e79..6e1f5ff8a043 100644 --- a/svl/source/items/globalnameitem.cxx +++ b/svl/source/items/globalnameitem.cxx @@ -75,7 +75,7 @@ bool SfxGlobalNameItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt com::sun::star::uno::Sequence< sal_Int8 > aSeq; com::sun::star::uno::Any aNew; - try { aNew = xConverter->convertTo( rVal, ::getCppuType((const com::sun::star::uno::Sequence < sal_Int8 >*)0) ); } + try { aNew = xConverter->convertTo( rVal, cppu::UnoType<com::sun::star::uno::Sequence < sal_Int8 >>::get() ); } catch (com::sun::star::uno::Exception&) {} aNew >>= aSeq; if ( aSeq.getLength() == 16 ) diff --git a/svl/source/items/ilstitem.cxx b/svl/source/items/ilstitem.cxx index 58eb45916d65..de869ae63416 100644 --- a/svl/source/items/ilstitem.cxx +++ b/svl/source/items/ilstitem.cxx @@ -75,7 +75,7 @@ bool SfxIntegerListItem::PutValue ( const com::sun::star::uno::Any& rVal, sal_u ::com::sun::star::uno::Reference < ::com::sun::star::script::XTypeConverter > xConverter ( ::com::sun::star::script::Converter::create(::comphelper::getProcessComponentContext()) ); ::com::sun::star::uno::Any aNew; - try { aNew = xConverter->convertTo( rVal, ::getCppuType((const ::com::sun::star::uno::Sequence < sal_Int32 >*)0) ); } + try { aNew = xConverter->convertTo( rVal, cppu::UnoType<css::uno::Sequence < sal_Int32 >>::get() ); } catch (::com::sun::star::uno::Exception&) { return true; diff --git a/svl/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx index 678d14d45532..e74572275ed6 100644 --- a/svl/source/numbers/numfmuno.cxx +++ b/svl/source/numbers/numfmuno.cxx @@ -68,10 +68,10 @@ static const SfxItemPropertyMapEntry* lcl_GetNumberFormatPropertyMap() {OUString(PROPERTYNAME_CURRSYM), 0, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, {OUString(PROPERTYNAME_DECIMALS), 0, cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, {OUString(PROPERTYNAME_LEADING), 0, cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, - {OUString(PROPERTYNAME_NEGRED), 0, getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, - {OUString(PROPERTYNAME_STDFORM), 0, getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, - {OUString(PROPERTYNAME_THOUS), 0, getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, - {OUString(PROPERTYNAME_USERDEF), 0, getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, + {OUString(PROPERTYNAME_NEGRED), 0, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, + {OUString(PROPERTYNAME_STDFORM), 0, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, + {OUString(PROPERTYNAME_THOUS), 0, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, + {OUString(PROPERTYNAME_USERDEF), 0, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, {OUString(PROPERTYNAME_CURRABB), 0, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -82,7 +82,7 @@ static const SfxItemPropertyMapEntry* lcl_GetNumberSettingsPropertyMap() { static const SfxItemPropertyMapEntry aNumberSettingsPropertyMap_Impl[] = { - {OUString(PROPERTYNAME_NOZERO), 0, getBooleanCppuType(), beans::PropertyAttribute::BOUND, 0}, + {OUString(PROPERTYNAME_NOZERO), 0, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND, 0}, {OUString(PROPERTYNAME_NULLDATE), 0, cppu::UnoType<util::Date>::get(), beans::PropertyAttribute::BOUND, 0}, {OUString(PROPERTYNAME_STDDEC), 0, cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::BOUND, 0}, {OUString(PROPERTYNAME_TWODIGIT), 0, cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::BOUND, 0}, @@ -744,12 +744,12 @@ uno::Any SAL_CALL SvNumberFormatObj::getPropertyValue( const OUString& aProperty { //! Pass through SvNumberformat Member bStandard? sal_Bool bStandard = ( ( nKey % SV_COUNTRY_LANGUAGE_OFFSET ) == 0 ); - aRet.setValue( &bStandard, getBooleanCppuType() ); + aRet.setValue( &bStandard, cppu::UnoType<bool>::get() ); } else if (aPropertyName == PROPERTYNAME_USERDEF) { sal_Bool bUserDef = ( ( pFormat->GetType() & css::util::NumberFormat::DEFINED ) != 0 ); - aRet.setValue( &bUserDef, getBooleanCppuType() ); + aRet.setValue( &bUserDef, cppu::UnoType<bool>::get() ); } else if (aPropertyName == PROPERTYNAME_DECIMALS) { @@ -764,12 +764,12 @@ uno::Any SAL_CALL SvNumberFormatObj::getPropertyValue( const OUString& aProperty else if (aPropertyName == PROPERTYNAME_NEGRED) { pFormat->GetFormatSpecialInfo( bThousand, bRed, nDecimals, nLeading ); - aRet.setValue( &bRed, getBooleanCppuType() ); + aRet.setValue( &bRed, cppu::UnoType<bool>::get() ); } else if (aPropertyName == PROPERTYNAME_THOUS) { pFormat->GetFormatSpecialInfo( bThousand, bRed, nDecimals, nLeading ); - aRet.setValue( &bThousand, getBooleanCppuType() ); + aRet.setValue( &bThousand, cppu::UnoType<bool>::get() ); } else if (aPropertyName == PROPERTYNAME_CURRSYM) { @@ -878,17 +878,17 @@ uno::Sequence<beans::PropertyValue> SAL_CALL SvNumberFormatObj::getPropertyValue pArray[3].Name = PROPERTYNAME_COMMENT; pArray[3].Value <<= aComment; pArray[4].Name = PROPERTYNAME_STDFORM; - pArray[4].Value.setValue( &bStandard, getBooleanCppuType() ); + pArray[4].Value.setValue( &bStandard, cppu::UnoType<bool>::get() ); pArray[5].Name = PROPERTYNAME_USERDEF; - pArray[5].Value.setValue( &bUserDef, getBooleanCppuType() ); + pArray[5].Value.setValue( &bUserDef, cppu::UnoType<bool>::get() ); pArray[6].Name = PROPERTYNAME_DECIMALS; pArray[6].Value <<= (sal_Int16)( nDecimals ); pArray[7].Name = PROPERTYNAME_LEADING; pArray[7].Value <<= (sal_Int16)( nLeading ); pArray[8].Name = PROPERTYNAME_NEGRED; - pArray[8].Value.setValue( &bRed, getBooleanCppuType() ); + pArray[8].Value.setValue( &bRed, cppu::UnoType<bool>::get() ); pArray[9].Name = PROPERTYNAME_THOUS; - pArray[9].Value.setValue( &bThousand, getBooleanCppuType() ); + pArray[9].Value.setValue( &bThousand, cppu::UnoType<bool>::get() ); pArray[10].Name = PROPERTYNAME_CURRSYM; pArray[10].Value <<= aSymbol; pArray[11].Name = PROPERTYNAME_CURREXT; @@ -1011,7 +1011,7 @@ uno::Any SAL_CALL SvNumberFormatSettingsObj::getPropertyValue( const OUString& a if (aPropertyName == PROPERTYNAME_NOZERO) { sal_Bool bNoZero = pFormatter->GetNoZero(); - aRet.setValue( &bNoZero, getBooleanCppuType() ); + aRet.setValue( &bNoZero, cppu::UnoType<bool>::get() ); } else if (aPropertyName == PROPERTYNAME_NULLDATE) { |