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 /vbahelper | |
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 'vbahelper')
-rw-r--r-- | vbahelper/source/msforms/vbacontrol.cxx | 4 | ||||
-rw-r--r-- | vbahelper/source/msforms/vbalistbox.cxx | 2 | ||||
-rw-r--r-- | vbahelper/source/msforms/vbalistcontrolhelper.cxx | 2 | ||||
-rw-r--r-- | vbahelper/source/msforms/vbauserform.cxx | 2 | ||||
-rw-r--r-- | vbahelper/source/vbahelper/vbashape.cxx | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/vbahelper/source/msforms/vbacontrol.cxx b/vbahelper/source/msforms/vbacontrol.cxx index 0521d4826d0b..d0b6e6020a2f 100644 --- a/vbahelper/source/msforms/vbacontrol.cxx +++ b/vbahelper/source/msforms/vbacontrol.cxx @@ -539,7 +539,7 @@ void SAL_CALL ScVbaControl::fireEvent( const script::ScriptEvent& rEvt ) evt.ScriptCode = xNameQuery->getCodeNameForObject( xIf ); // handle if we passed in our own arguments if ( !rEvt.Arguments.getLength() ) - evt.Arguments[ 0 ] = uno::makeAny( aEvt ); + evt.Arguments[ 0 ] <<= aEvt; xScriptListener->firing( evt ); } else @@ -553,7 +553,7 @@ void SAL_CALL ScVbaControl::fireEvent( const script::ScriptEvent& rEvt ) evt.Source = xThisControl; aEvt.Source = xControl; evt.ScriptCode = m_sLibraryAndCodeName; - evt.Arguments[ 0 ] = uno::makeAny( aEvt ); + evt.Arguments[ 0 ] <<= aEvt; xScriptListener->firing( evt ); } } diff --git a/vbahelper/source/msforms/vbalistbox.cxx b/vbahelper/source/msforms/vbalistbox.cxx index 3e94440f5a1a..afd4958e2aa6 100644 --- a/vbahelper/source/msforms/vbalistbox.cxx +++ b/vbahelper/source/msforms/vbalistbox.cxx @@ -65,7 +65,7 @@ ScVbaListBox::getValue() throw uno::RuntimeException( "Attribute use invalid." ); uno::Any aRet; if ( sSelection.getLength() ) - aRet = uno::makeAny( sItems[ sSelection[ 0 ] ] ); + aRet <<= sItems[ sSelection[ 0 ] ]; return aRet; } diff --git a/vbahelper/source/msforms/vbalistcontrolhelper.cxx b/vbahelper/source/msforms/vbalistcontrolhelper.cxx index a0a9c73b3964..7ca7c4f87bcb 100644 --- a/vbahelper/source/msforms/vbalistcontrolhelper.cxx +++ b/vbahelper/source/msforms/vbalistcontrolhelper.cxx @@ -75,7 +75,7 @@ uno::Any ListPropListener::getValueEvent() sReturnArray[ i ].realloc( 10 ); sReturnArray[ i ][ 0 ] = sList[ i ]; } - aRet = uno::makeAny( sReturnArray ); + aRet <<= sReturnArray; } return aRet; } diff --git a/vbahelper/source/msforms/vbauserform.cxx b/vbahelper/source/msforms/vbauserform.cxx index 7ff527ac8353..111ff8c7f614 100644 --- a/vbahelper/source/msforms/vbauserform.cxx +++ b/vbahelper/source/msforms/vbauserform.cxx @@ -266,7 +266,7 @@ ScVbaUserForm::getValue( const OUString& aPropertyName ) ScVbaControl* pControl = dynamic_cast< ScVbaControl* >( xVBAControl.get() ); if (pControl && !m_sLibName.isEmpty()) pControl->setLibraryAndCodeName( m_sLibName.concat( "." ).concat( getName() ) ); - aResult = uno::makeAny( xVBAControl ); + aResult <<= xVBAControl; } } diff --git a/vbahelper/source/vbahelper/vbashape.cxx b/vbahelper/source/vbahelper/vbashape.cxx index 7b73d2f11b3b..4fb239bac73a 100644 --- a/vbahelper/source/vbahelper/vbashape.cxx +++ b/vbahelper/source/vbahelper/vbashape.cxx @@ -350,7 +350,7 @@ ScVbaShape::TextFrame() { uno::Reference< uno::XComponentContext > xContext = comphelper::getProcessComponentContext(); uno::Sequence< uno::Any > aArgs(2); - aArgs[0] = uno::makeAny( getParent() ); + aArgs[0] <<= getParent(); aArgs[1] <<= m_xShape; uno::Reference< uno::XInterface > xTextFrame = xContext->getServiceManager()->createInstanceWithArgumentsAndContext( "ooo.vba.excel.TextFrame" , aArgs, xContext ); return uno::makeAny( xTextFrame ); @@ -687,7 +687,7 @@ ScVbaShape::WrapFormat() { uno::Reference< uno::XComponentContext > xContext = comphelper::getProcessComponentContext(); uno::Sequence< uno::Any > aArgs(2); - aArgs[0] = uno::makeAny( getParent() ); + aArgs[0] <<= getParent(); aArgs[1] <<= m_xShape; uno::Reference< uno::XInterface > xWrapFormat = xContext->getServiceManager()->createInstanceWithArgumentsAndContext( "ooo.vba.word.WrapFormat" , aArgs, xContext ); return uno::makeAny( xWrapFormat ); |