diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-05-30 15:14:03 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-05-30 15:14:03 +0200 |
commit | 8fec9e7e4ca97e14551a737583226f89b0c6eecd (patch) | |
tree | 97b0c9e68fd2c3ad75f9b7d52a76a134522b8350 /extensions | |
parent | e630df7853a62225cd77fc4262689ef5607d2907 (diff) |
Some clean up of uses of css::uno::Any::setValue
Change-Id: I04e8aef35a6083b61d775c8eb3f96757da2b31bd
Diffstat (limited to 'extensions')
-rw-r--r-- | extensions/source/bibliography/bibload.cxx | 4 | ||||
-rw-r--r-- | extensions/source/bibliography/datman.cxx | 7 | ||||
-rw-r--r-- | extensions/source/bibliography/framectr.cxx | 6 | ||||
-rw-r--r-- | extensions/source/bibliography/general.cxx | 2 |
4 files changed, 8 insertions, 11 deletions
diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx index ce394a16d289..fb36a2f31bda 100644 --- a/extensions/source/bibliography/bibload.cxx +++ b/extensions/source/bibliography/bibload.cxx @@ -480,7 +480,7 @@ Any BibliographyLoader::getByName(const OUString& rName) throw pValues[nEntry].Name = sColName; pValues[nEntry].Value <<= lcl_AddProperty(xColumns, pMapping, sColName); } - aRet.setValue(&aPropSequ, cppu::UnoType<Sequence<PropertyValue>>::get()); + aRet <<= aPropSequ; break; } @@ -641,7 +641,7 @@ Any BibliographyLoader::getPropertyValue(const OUString& rPropertyName) pArray[i].Name = pConfig->GetDefColumnName(aInternalMapping[i]); pArray[i].Value <<= (sal_Int16) i; } - aRet.setValue(&aSeq, cppu::UnoType<Sequence<PropertyValue>>::get()); + aRet <<= aSeq; } else throw UnknownPropertyException(); diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index 0ec1fe2daa9f..d9ff7c9d0022 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -1325,8 +1325,7 @@ Reference< awt::XControlModel > BibDataManager::loadControlModel( //uno::Reference< beans::XPropertySet > xPropSet(xControl, UNO_QUERY); aAny <<= (sal_Int16)1; xPropSet->setPropertyValue("BoundColumn", aAny); - ListSourceType eSet = ListSourceType_VALUELIST; - aAny.setValue( &eSet, ::cppu::UnoType<ListSourceType>::get() ); + aAny <<= ListSourceType_VALUELIST; xPropSet->setPropertyValue("ListSourceType", aAny); uno::Sequence<OUString> aListSource(TYPE_COUNT); @@ -1334,7 +1333,7 @@ Reference< awt::XControlModel > BibDataManager::loadControlModel( //pListSourceArr[0] = "select TypeName, TypeIndex from TypeNms"; for(sal_Int32 i = 0; i < TYPE_COUNT; ++i) pListSourceArr[i] = OUString::number(i); - aAny.setValue(&aListSource, cppu::UnoType<uno::Sequence<OUString>>::get()); + aAny <<= aListSource; xPropSet->setPropertyValue("ListSource", aAny); @@ -1365,7 +1364,7 @@ Reference< awt::XControlModel > BibDataManager::loadControlModel( // empty string if an invalid value no values is set pValuesArr[TYPE_COUNT].clear(); - aAny.setValue(&aValues, cppu::UnoType<uno::Sequence<OUString>>::get()); + aAny <<= aValues; xPropSet->setPropertyValue("StringItemList", aAny); diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx index 7e448f8ff887..df541538dee4 100644 --- a/extensions/source/bibliography/framectr.cxx +++ b/extensions/source/bibliography/framectr.cxx @@ -664,8 +664,7 @@ void BibFrameController_Impl::addStatusListener( aEvent.IsEnabled = true; aEvent.FeatureDescriptor=pDatMan->getQueryField(); - uno::Sequence<OUString> aStringSeq=pDatMan->getQueryFields(); - aEvent.State.setValue(&aStringSeq,cppu::UnoType<uno::Sequence<OUString>>::get()); + aEvent.State <<= pDatMan->getQueryFields(); } else if ( aURL.Path == "Bib/source") @@ -673,8 +672,7 @@ void BibFrameController_Impl::addStatusListener( aEvent.IsEnabled = true; aEvent.FeatureDescriptor=pDatMan->getActiveDataTable(); - uno::Sequence<OUString> aStringSeq=pDatMan->getDataSources(); - aEvent.State.setValue(&aStringSeq,cppu::UnoType<uno::Sequence<OUString>>::get()); + aEvent.State <<= pDatMan->getDataSources(); } else if( aURL.Path == "Bib/sdbsource" || aURL.Path == "Bib/Mapping" || diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx index 14c256ab0c46..7758e4f0e305 100644 --- a/extensions/source/bibliography/general.cxx +++ b/extensions/source/bibliography/general.cxx @@ -150,7 +150,7 @@ void BibPosListener::cursorMoved(const lang::EventObject& /*aEvent*/) throw( uno uno::Sequence<sal_Int16> aSelSeq(1); sal_Int16* pArr = aSelSeq.getArray(); pArr[0] = TYPE_COUNT; - aSel.setValue(&aSelSeq, cppu::UnoType<Sequence<sal_Int16>>::get()); + aSel <<= aSelSeq; xPropSet->setPropertyValue("SelectedItems", aSel); } } |