diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-01 08:43:09 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-01 08:43:09 +0200 |
commit | 63d4636da8c0bb890016baf22702d944d72c6fd1 (patch) | |
tree | 69027ad5e86a7cb0cbc7fe076abb4346c739e7a8 /unotools | |
parent | 15bdb0ae87fb7514d224657ce74e92bdad8f9c00 (diff) |
Replace remaining getCppuType et al with cppu::UnoType
Change-Id: I6b0974024e61e02639106d4ca3abcdcdb8e6fa87
Diffstat (limited to 'unotools')
-rw-r--r-- | unotools/source/config/configitem.cxx | 2 | ||||
-rw-r--r-- | unotools/source/config/eventcfg.cxx | 2 | ||||
-rw-r--r-- | unotools/source/config/fltrcfg.cxx | 4 | ||||
-rw-r--r-- | unotools/source/config/lingucfg.cxx | 2 | ||||
-rw-r--r-- | unotools/source/config/misccfg.cxx | 2 | ||||
-rw-r--r-- | unotools/source/config/saveopt.cxx | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/unotools/source/config/configitem.cxx b/unotools/source/config/configitem.cxx index 46489d7214d9..f445565d0bfb 100644 --- a/unotools/source/config/configitem.cxx +++ b/unotools/source/config/configitem.cxx @@ -298,7 +298,7 @@ void ConfigItem::impl_unpackLocalizedProperties( const Sequence< OUString > for( nSourceCounter=0; nSourceCounter<nSourceSize; ++nSourceCounter ) { // If item a special localized one ... split it and insert his parts to output lists ... - if( lInValues[nSourceCounter].getValueType() == ::getCppuType( (const Sequence< PropertyValue >*)NULL ) ) + if( lInValues[nSourceCounter].getValueType() == cppu::UnoType<Sequence<PropertyValue>>::get() ) { lInValues[nSourceCounter] >>= lProperties; nPropertiesSize = lProperties.getLength(); diff --git a/unotools/source/config/eventcfg.cxx b/unotools/source/config/eventcfg.cxx index cb46c6dc3a09..e5b0d4de1f9c 100644 --- a/unotools/source/config/eventcfg.cxx +++ b/unotools/source/config/eventcfg.cxx @@ -290,7 +290,7 @@ bool SAL_CALL GlobalEventConfig_Impl::hasByName( const OUString& aName ) throw ( Type SAL_CALL GlobalEventConfig_Impl::getElementType( ) throw (RuntimeException) { //DF definitely not sure about this?? - return ::getCppuType((const Sequence<beans::PropertyValue>*)0); + return cppu::UnoType<Sequence<beans::PropertyValue>>::get(); } bool SAL_CALL GlobalEventConfig_Impl::hasElements( ) throw (RuntimeException) diff --git a/unotools/source/config/fltrcfg.cxx b/unotools/source/config/fltrcfg.cxx index da64f94323a4..34b0fef9b663 100644 --- a/unotools/source/config/fltrcfg.cxx +++ b/unotools/source/config/fltrcfg.cxx @@ -101,7 +101,7 @@ void SvtAppFilterOptions_Impl::ImplCommit() Sequence<Any> aValues(aNames.getLength()); Any* pValues = aValues.getArray(); - const Type& rType = ::getBooleanCppuType(); + const Type& rType = cppu::UnoType<bool>::get(); pValues[0].setValue(&bLoadVBA, rType); pValues[1].setValue(&bSaveVBA, rType); @@ -386,7 +386,7 @@ void SvtFilterOptions::ImplCommit() Sequence<Any> aValues(aNames.getLength()); Any* pValues = aValues.getArray(); - const Type& rType = ::getBooleanCppuType(); + const Type& rType = cppu::UnoType<bool>::get(); for(int nProp = 0; nProp < aNames.getLength(); nProp++) { sal_uLong nFlag = lcl_GetFlag(nProp); diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx index e86c8dd002ac..0849409c54e4 100644 --- a/unotools/source/config/lingucfg.cxx +++ b/unotools/source/config/lingucfg.cxx @@ -672,7 +672,7 @@ bool SvtLinguConfigItem::SaveOptions( const uno::Sequence< OUString > &rProperyN osl::MutexGuard aGuard(theSvtLinguConfigItemMutex::get()); bool bRet = false; - const uno::Type &rBOOL = ::getBooleanCppuType(); + const uno::Type &rBOOL = cppu::UnoType<bool>::get(); const uno::Type &rINT16 = cppu::UnoType<sal_Int16>::get(); const uno::Type &rINT32 = cppu::UnoType<sal_Int32>::get(); diff --git a/unotools/source/config/misccfg.cxx b/unotools/source/config/misccfg.cxx index bb6f1d51fdc0..f2b7e428f231 100644 --- a/unotools/source/config/misccfg.cxx +++ b/unotools/source/config/misccfg.cxx @@ -161,7 +161,7 @@ void SfxMiscCfg::ImplCommit() Sequence<Any> aValues(rNames.getLength()); Any* pValues = aValues.getArray(); - const Type& rType = ::getBooleanCppuType(); + const Type& rType = cppu::UnoType<bool>::get(); for(int nProp = 0; nProp < rNames.getLength(); nProp++) { switch(nProp) diff --git a/unotools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx index 47a190fb44e9..f0b4a32b1141 100644 --- a/unotools/source/config/saveopt.cxx +++ b/unotools/source/config/saveopt.cxx @@ -791,7 +791,7 @@ void SvtLoadOptions_Impl::ImplCommit() Sequence< OUString > aNames(1); aNames[0] = cUserDefinedSettings; Sequence< Any > aValues( 1 ); - aValues[0].setValue(&bLoadUserDefinedSettings, ::getBooleanCppuType()); + aValues[0].setValue(&bLoadUserDefinedSettings, cppu::UnoType<bool>::get()); PutProperties( aNames, aValues ); } |