summaryrefslogtreecommitdiff
path: root/embeddedobj/source/msole
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-07-19 14:05:10 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-07-19 21:49:20 +0200
commit5043421fdc527d18d18121ec5fe2d4e009c8191a (patch)
treea93584cd705b362d254e509d556a2a9432ee88e5 /embeddedobj/source/msole
parent0f0adc34889ff68da584cea97a9de649174b0333 (diff)
loplugin:referencecasting in embeddedobj
Change-Id: I11a80e540b2a7da8d8037ba45e176d5c4d85374c Reviewed-on: https://gerrit.libreoffice.org/75951 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'embeddedobj/source/msole')
-rw-r--r--embeddedobj/source/msole/oleembed.cxx15
-rw-r--r--embeddedobj/source/msole/olemisc.cxx10
2 files changed, 10 insertions, 15 deletions
diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx
index 6dd539bd7a8e..5cf159dfdf17 100644
--- a/embeddedobj/source/msole/oleembed.cxx
+++ b/embeddedobj/source/msole/oleembed.cxx
@@ -129,15 +129,14 @@ void OleEmbeddedObject::MoveListeners()
m_pInterfaceContainer->getContainer( cppu::UnoType<embed::XStateChangeListener>::get());
if ( pStateChangeContainer != nullptr )
{
- uno::Reference< embed::XStateChangeBroadcaster > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY );
- if ( xWrappedObject.is() )
+ if ( m_xWrappedObject.is() )
{
::cppu::OInterfaceIteratorHelper pIterator( *pStateChangeContainer );
while ( pIterator.hasMoreElements() )
{
try
{
- xWrappedObject->addStateChangeListener( static_cast<embed::XStateChangeListener*>(pIterator.next()) );
+ m_xWrappedObject->addStateChangeListener( static_cast<embed::XStateChangeListener*>(pIterator.next()) );
}
catch( const uno::RuntimeException& )
{
@@ -154,15 +153,14 @@ void OleEmbeddedObject::MoveListeners()
m_pInterfaceContainer->getContainer( cppu::UnoType<document::XEventListener>::get());
if ( pEventContainer != nullptr )
{
- uno::Reference< document::XEventBroadcaster > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY );
- if ( xWrappedObject.is() )
+ if ( m_xWrappedObject.is() )
{
::cppu::OInterfaceIteratorHelper pIterator( *pEventContainer );
while ( pIterator.hasMoreElements() )
{
try
{
- xWrappedObject->addEventListener( static_cast<document::XEventListener*>(pIterator.next()) );
+ m_xWrappedObject->addEventListener( static_cast<document::XEventListener*>(pIterator.next()) );
}
catch( const uno::RuntimeException& )
{
@@ -179,15 +177,14 @@ void OleEmbeddedObject::MoveListeners()
m_pInterfaceContainer->getContainer( cppu::UnoType<util::XCloseListener>::get());
if ( pCloseContainer != nullptr )
{
- uno::Reference< util::XCloseBroadcaster > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY );
- if ( xWrappedObject.is() )
+ if ( m_xWrappedObject.is() )
{
::cppu::OInterfaceIteratorHelper pIterator( *pCloseContainer );
while ( pIterator.hasMoreElements() )
{
try
{
- xWrappedObject->addCloseListener( static_cast<util::XCloseListener*>(pIterator.next()) );
+ m_xWrappedObject->addCloseListener( static_cast<util::XCloseListener*>(pIterator.next()) );
}
catch( const uno::RuntimeException& )
{
diff --git a/embeddedobj/source/msole/olemisc.cxx b/embeddedobj/source/msole/olemisc.cxx
index 9a22ec9982cb..66572c40be4d 100644
--- a/embeddedobj/source/msole/olemisc.cxx
+++ b/embeddedobj/source/msole/olemisc.cxx
@@ -392,11 +392,10 @@ uno::Reference< util::XCloseable > SAL_CALL OleEmbeddedObject::getComponent()
void SAL_CALL OleEmbeddedObject::addStateChangeListener( const uno::Reference< embed::XStateChangeListener >& xListener )
{
// begin wrapping related part ====================
- uno::Reference< embed::XStateChangeBroadcaster > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY );
- if ( xWrappedObject.is() )
+ if ( m_xWrappedObject.is() )
{
// the object was converted to OOo embedded object, the current implementation is now only a wrapper
- xWrappedObject->addStateChangeListener( xListener );
+ m_xWrappedObject->addStateChangeListener( xListener );
return;
}
// end wrapping related part ====================
@@ -417,11 +416,10 @@ void SAL_CALL OleEmbeddedObject::removeStateChangeListener(
const uno::Reference< embed::XStateChangeListener >& xListener )
{
// begin wrapping related part ====================
- uno::Reference< embed::XStateChangeBroadcaster > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY );
- if ( xWrappedObject.is() )
+ if ( m_xWrappedObject.is() )
{
// the object was converted to OOo embedded object, the current implementation is now only a wrapper
- xWrappedObject->removeStateChangeListener( xListener );
+ m_xWrappedObject->removeStateChangeListener( xListener );
return;
}
// end wrapping related part ====================