mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace remaining getCppuType et al with cppu::UnoType

Browse Source 
Change-Id: I6b0974024e61e02639106d4ca3abcdcdb8e6fa87
This commit is contained in:
Stephan Bergmann
2015-04-01 08:43:09 +02:00
parent 15bdb0ae87
commit 63d4636da8
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
unotools/source/config/configitem.cxx
View File

@@ -298,7 +298,7 @@ void ConfigItem::impl_unpackLocalizedProperties( const Sequence< OUString >
for( nSourceCounter=0; nSourceCounter<nSourceSize; ++nSourceCounter ) for( nSourceCounter=0; nSourceCounter<nSourceSize; ++nSourceCounter )
{ {
// If item a special localized one ... split it and insert his parts to output lists ... // 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; lInValues[nSourceCounter] >>= lProperties;
nPropertiesSize = lProperties.getLength(); nPropertiesSize = lProperties.getLength();

2
unotools/source/config/eventcfg.cxx
View File

@@ -290,7 +290,7 @@ bool SAL_CALL GlobalEventConfig_Impl::hasByName( const OUString& aName ) throw (
Type SAL_CALL GlobalEventConfig_Impl::getElementType( ) throw (RuntimeException) Type SAL_CALL GlobalEventConfig_Impl::getElementType( ) throw (RuntimeException)
{ {
//DF definitely not sure about this?? //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) bool SAL_CALL GlobalEventConfig_Impl::hasElements( ) throw (RuntimeException)

4
unotools/source/config/fltrcfg.cxx
View File

@@ -101,7 +101,7 @@ void SvtAppFilterOptions_Impl::ImplCommit()
Sequence<Any> aValues(aNames.getLength()); Sequence<Any> aValues(aNames.getLength());
Any* pValues = aValues.getArray(); Any* pValues = aValues.getArray();
const Type& rType = ::getBooleanCppuType(); const Type& rType = cppu::UnoType<bool>::get();
pValues[0].setValue(&bLoadVBA, rType); pValues[0].setValue(&bLoadVBA, rType);
pValues[1].setValue(&bSaveVBA, rType); pValues[1].setValue(&bSaveVBA, rType);
@@ -386,7 +386,7 @@ void SvtFilterOptions::ImplCommit()
Sequence<Any> aValues(aNames.getLength()); Sequence<Any> aValues(aNames.getLength());
Any* pValues = aValues.getArray(); Any* pValues = aValues.getArray();
const Type& rType = ::getBooleanCppuType(); const Type& rType = cppu::UnoType<bool>::get();
for(int nProp = 0; nProp < aNames.getLength(); nProp++) for(int nProp = 0; nProp < aNames.getLength(); nProp++)
{ {
sal_uLong nFlag = lcl_GetFlag(nProp); sal_uLong nFlag = lcl_GetFlag(nProp);

2
unotools/source/config/lingucfg.cxx
View File

@@ -672,7 +672,7 @@ bool SvtLinguConfigItem::SaveOptions( const uno::Sequence< OUString > &rProperyN
osl::MutexGuard aGuard(theSvtLinguConfigItemMutex::get()); osl::MutexGuard aGuard(theSvtLinguConfigItemMutex::get());
bool bRet = false; 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 &rINT16 = cppu::UnoType<sal_Int16>::get();
const uno::Type &rINT32 = cppu::UnoType<sal_Int32>::get(); const uno::Type &rINT32 = cppu::UnoType<sal_Int32>::get();

2
unotools/source/config/misccfg.cxx
View File

@@ -161,7 +161,7 @@ void SfxMiscCfg::ImplCommit()
Sequence<Any> aValues(rNames.getLength()); Sequence<Any> aValues(rNames.getLength());
Any* pValues = aValues.getArray(); Any* pValues = aValues.getArray();
const Type& rType = ::getBooleanCppuType(); const Type& rType = cppu::UnoType<bool>::get();
for(int nProp = 0; nProp < rNames.getLength(); nProp++) for(int nProp = 0; nProp < rNames.getLength(); nProp++)
{ {
switch(nProp) switch(nProp)

2
unotools/source/config/saveopt.cxx
View File

@@ -791,7 +791,7 @@ void SvtLoadOptions_Impl::ImplCommit()
Sequence< OUString > aNames(1); Sequence< OUString > aNames(1);
aNames[0] = cUserDefinedSettings; aNames[0] = cUserDefinedSettings;
Sequence< Any > aValues( 1 ); Sequence< Any > aValues( 1 );
aValues[0].setValue(&bLoadUserDefinedSettings, ::getBooleanCppuType()); aValues[0].setValue(&bLoadUserDefinedSettings, cppu::UnoType<bool>::get());
PutProperties( aNames, aValues ); PutProperties( aNames, aValues );
} }