diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2022-05-04 10:00:26 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2022-05-04 11:58:23 +0200 |
| commit | 6b6df07d2fe6346bc5a6b32912abcb7694853e2a (patch) | |
| tree | 383fff0a4224a84ff2560d3e2ed2deb4f244bfa5 /framework/source/fwi/uielement | |
| parent | f04375e1cfaadb12b2c42c8f0fbb0c05b223e092 (diff) | |
Just use Any ctor instead of makeAny in framework
Change-Id: I9f4990cf58cc794408dd70cd7fbfb2a8effa138c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133806
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'framework/source/fwi/uielement')
| -rw-r--r-- | framework/source/fwi/uielement/constitemcontainer.cxx | 6 | ||||
| -rw-r--r-- | framework/source/fwi/uielement/itemcontainer.cxx | 2 | ||||
| -rw-r--r-- | framework/source/fwi/uielement/rootitemcontainer.cxx | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/framework/source/fwi/uielement/constitemcontainer.cxx b/framework/source/fwi/uielement/constitemcontainer.cxx index 9dee39a6e76d..f9840d52ec3b 100644 --- a/framework/source/fwi/uielement/constitemcontainer.cxx +++ b/framework/source/fwi/uielement/constitemcontainer.cxx @@ -187,7 +187,7 @@ Any SAL_CALL ConstItemContainer::getByIndex( sal_Int32 Index ) { if ( sal_Int32( m_aItemVector.size()) <= Index ) throw IndexOutOfBoundsException( OUString(), static_cast<OWeakObject *>(this) ); - return makeAny( m_aItemVector[Index] ); + return Any( m_aItemVector[Index] ); } // XPropertySet @@ -207,7 +207,7 @@ void SAL_CALL ConstItemContainer::setPropertyValue( const OUString&, const Any& Any SAL_CALL ConstItemContainer::getPropertyValue( const OUString& PropertyName ) { if ( PropertyName == PROPNAME_UINAME ) - return makeAny( m_aUIName ); + return Any( m_aUIName ); throw UnknownPropertyException(PropertyName); } @@ -239,7 +239,7 @@ void SAL_CALL ConstItemContainer::setFastPropertyValue( sal_Int32, const css::un Any SAL_CALL ConstItemContainer::getFastPropertyValue( sal_Int32 nHandle ) { if ( nHandle == PROPHANDLE_UINAME ) - return makeAny( m_aUIName ); + return Any( m_aUIName ); throw UnknownPropertyException(OUString::number(nHandle)); } diff --git a/framework/source/fwi/uielement/itemcontainer.cxx b/framework/source/fwi/uielement/itemcontainer.cxx index 8cee8440ee41..389bbaeaaf9d 100644 --- a/framework/source/fwi/uielement/itemcontainer.cxx +++ b/framework/source/fwi/uielement/itemcontainer.cxx @@ -160,7 +160,7 @@ Any SAL_CALL ItemContainer::getByIndex( sal_Int32 Index ) if ( sal_Int32( m_aItemVector.size()) <= Index ) throw IndexOutOfBoundsException( OUString(), static_cast<OWeakObject *>(this) ); - return makeAny( m_aItemVector[Index] ); + return Any( m_aItemVector[Index] ); } // XIndexContainer diff --git a/framework/source/fwi/uielement/rootitemcontainer.cxx b/framework/source/fwi/uielement/rootitemcontainer.cxx index a91742cb598e..50ecd0d53bde 100644 --- a/framework/source/fwi/uielement/rootitemcontainer.cxx +++ b/framework/source/fwi/uielement/rootitemcontainer.cxx @@ -170,7 +170,7 @@ Any SAL_CALL RootItemContainer::getByIndex( sal_Int32 Index ) if ( sal_Int32( m_aItemVector.size()) <= Index ) throw IndexOutOfBoundsException( OUString(), static_cast<OWeakObject *>(this) ); - return makeAny( m_aItemVector[Index] ); + return Any( m_aItemVector[Index] ); } // XIndexContainer @@ -239,7 +239,7 @@ sal_Bool SAL_CALL RootItemContainer::convertFastPropertyValue( Any& aConve { case PROPHANDLE_UINAME: bReturn = PropHelper::willPropertyBeChanged( - css::uno::makeAny(m_aUIName), + css::uno::Any(m_aUIName), aValue, aOldValue, aConvertedValue); |