diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-24 11:22:18 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-28 10:17:47 +0000 |
| commit | 198c41c4fe8be4ce8a6ddab43ae0c5f17a4889ac (patch) | |
| tree | 041d55126e9770b81f68fadfaaa69e82313786b3 /svx/source/form | |
| parent | d3981b3e8c021ee03a2ca7103a73e56cca18df81 (diff) | |
new loplugin unoany
Change-Id: I5d6c4a67cb2a09e7cd5bd620c6b262d188701b89
Reviewed-on: https://gerrit.libreoffice.org/34714
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx/source/form')
| -rw-r--r-- | svx/source/form/fmshimp.cxx | 10 | ||||
| -rw-r--r-- | svx/source/form/fmvwimp.cxx | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 892b3e2aef4f..c8ba3be334e8 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -3367,7 +3367,7 @@ void FmXFormShell::CreateExternalView() // columns props are a dispatch argument pDispatchArgs->Name = "ColumnProperties"; // TODO : fmurl.* - pDispatchArgs->Value = makeAny(aColumnProps); + pDispatchArgs->Value <<= aColumnProps; ++pDispatchArgs; DBG_ASSERT(nDispatchArgs == (pDispatchArgs - aDispatchArgs.getConstArray()), "FmXFormShell::CreateExternalView : forgot to adjust nDispatchArgs ?"); @@ -3407,7 +3407,7 @@ void FmXFormShell::CreateExternalView() // content type pListBoxDescription->Name = FM_PROP_LISTSOURCETYPE; ListSourceType eType = ListSourceType_VALUELIST; - pListBoxDescription->Value = makeAny(eType); + pListBoxDescription->Value <<= eType; ++pListBoxDescription; // list source @@ -3415,7 +3415,7 @@ void FmXFormShell::CreateExternalView() DBG_ASSERT(aCurrentListSource != aRadioListSources.end(), "FmXFormShell::CreateExternalView : inconsistent radio descriptions !"); pListBoxDescription->Name = FM_PROP_LISTSOURCE; - pListBoxDescription->Value = makeAny((*aCurrentListSource).second); + pListBoxDescription->Value <<= (*aCurrentListSource).second; ++pListBoxDescription; // value list @@ -3423,7 +3423,7 @@ void FmXFormShell::CreateExternalView() DBG_ASSERT(aCurrentValueList != aRadioValueLists.end(), "FmXFormShell::CreateExternalView : inconsistent radio descriptions !"); pListBoxDescription->Name = FM_PROP_STRINGITEMLIST; - pListBoxDescription->Value = makeAny(((*aCurrentValueList).second)); + pListBoxDescription->Value <<= (*aCurrentValueList).second; ++pListBoxDescription; DBG_ASSERT(nListBoxDescription == (pListBoxDescription - aListBoxDescription.getConstArray()), @@ -3454,7 +3454,7 @@ void FmXFormShell::CreateExternalView() // the pDispatchArgs->Name = "ColumnProperties"; // TODO : fmurl.* - pDispatchArgs->Value = makeAny(aListBoxDescription); + pDispatchArgs->Value <<= aListBoxDescription; ++pDispatchArgs; DBG_ASSERT(nDispatchArgs == (pDispatchArgs - aDispatchArgs.getConstArray()), "FmXFormShell::CreateExternalView : forgot to adjust nDispatchArgs ?"); diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index a0f10465b8c7..8d8f7200d6f8 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -1556,7 +1556,7 @@ bool FmXFormView::createControlLabelPair( OutputDevice& _rOutDev, sal_Int32 _nXO if ( _rxField.is() ) { nDataType = ::comphelper::getINT32(_rxField->getPropertyValue(FM_PROP_FIELDTYPE)); - aFieldName = Any(_rxField->getPropertyValue(FM_PROP_NAME)); + aFieldName = _rxField->getPropertyValue(FM_PROP_NAME); aFieldName >>= sFieldName; } |