[Libreoffice-commits] core.git: slideshow/source starmath/source
Noel (via logerrit)
logerrit at kemper.freedesktop.org
Tue Feb 16 14:00:46 UTC 2021
slideshow/source/engine/eventmultiplexer.cxx | 12 ++++++------
slideshow/source/engine/opengl/TransitionerImpl.cxx | 2 +-
starmath/source/AccessibleSmElement.cxx | 2 +-
starmath/source/AccessibleSmElementsControl.cxx | 2 +-
starmath/source/ElementsDockingWindow.cxx | 2 +-
starmath/source/edit.cxx | 2 +-
starmath/source/view.cxx | 2 +-
7 files changed, 12 insertions(+), 12 deletions(-)
New commits:
commit 5ea8d87dfee68fe3564a58230664d2f2a2852a51
Author: Noel <noel.grandin at collabora.co.uk>
AuthorDate: Tue Feb 16 12:56:38 2021 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue Feb 16 15:00:01 2021 +0100
loplugin:referencecasting in slideshow..starmath
Change-Id: Id9dc0ac27897c8a3650424db65d3a05e2fe418f0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110986
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/slideshow/source/engine/eventmultiplexer.cxx b/slideshow/source/engine/eventmultiplexer.cxx
index 678c44e42e50..2b53073c7bea 100644
--- a/slideshow/source/engine/eventmultiplexer.cxx
+++ b/slideshow/source/engine/eventmultiplexer.cxx
@@ -589,7 +589,7 @@ void EventMultiplexerImpl::clear()
++aIter )
{
if( (*aIter)->getUnoView().is() )
- (*aIter)->getUnoView()->removeMouseListener( mxListener.get() );
+ (*aIter)->getUnoView()->removeMouseListener( mxListener );
}
}
@@ -601,7 +601,7 @@ void EventMultiplexerImpl::clear()
++aIter )
{
if( (*aIter)->getUnoView().is() )
- (*aIter)->getUnoView()->removeMouseMotionListener( mxListener.get() );
+ (*aIter)->getUnoView()->removeMouseMotionListener( mxListener );
}
}
@@ -1160,11 +1160,11 @@ void EventMultiplexer::notifyViewAdded( const UnoViewSharedPtr& rView )
if( mpImpl->isMouseListenerRegistered() )
rUnoView->addMouseListener(
- mpImpl->mxListener.get() );
+ mpImpl->mxListener );
if( !mpImpl->maMouseMoveHandlers.isEmpty() )
rUnoView->addMouseMotionListener(
- mpImpl->mxListener.get() );
+ mpImpl->mxListener );
mpImpl->maViewHandlers.applyAll(
[&rView]( const ViewEventHandlerWeakPtr& pHandler )
@@ -1182,11 +1182,11 @@ void EventMultiplexer::notifyViewRemoved( const UnoViewSharedPtr& rView )
if( mpImpl->isMouseListenerRegistered() )
rUnoView->removeMouseListener(
- mpImpl->mxListener.get() );
+ mpImpl->mxListener );
if( !mpImpl->maMouseMoveHandlers.isEmpty() )
rUnoView->removeMouseMotionListener(
- mpImpl->mxListener.get() );
+ mpImpl->mxListener );
mpImpl->maViewHandlers.applyAll(
[&rView]( const ViewEventHandlerWeakPtr& pHandler )
diff --git a/slideshow/source/engine/opengl/TransitionerImpl.cxx b/slideshow/source/engine/opengl/TransitionerImpl.cxx
index 3565e6ef104e..f206f2015664 100644
--- a/slideshow/source/engine/opengl/TransitionerImpl.cxx
+++ b/slideshow/source/engine/opengl/TransitionerImpl.cxx
@@ -1314,7 +1314,7 @@ public:
if ( !pTransition || !xRes->setTransition(pTransition) )
return uno::Reference< presentation::XTransition >();
- return uno::Reference<presentation::XTransition>(xRes.get());
+ return xRes;
}
};
diff --git a/starmath/source/AccessibleSmElement.cxx b/starmath/source/AccessibleSmElement.cxx
index b995c23818cc..848af8af6b0d 100644
--- a/starmath/source/AccessibleSmElement.cxx
+++ b/starmath/source/AccessibleSmElement.cxx
@@ -137,7 +137,7 @@ uno::Reference<XAccessible> AccessibleSmElement::getAccessibleParent()
OContextEntryGuard aGuard(this);
uno::Reference<XAccessible> xParent;
if (m_pSmElementsControl)
- xParent.set(m_pSmElementsControl->GetAccessible().get());
+ xParent = m_pSmElementsControl->GetAccessible();
return xParent;
}
diff --git a/starmath/source/AccessibleSmElementsControl.cxx b/starmath/source/AccessibleSmElementsControl.cxx
index 15b226931a60..0b82f3f87e5a 100644
--- a/starmath/source/AccessibleSmElementsControl.cxx
+++ b/starmath/source/AccessibleSmElementsControl.cxx
@@ -198,7 +198,7 @@ uno::Reference<XAccessible> AccessibleSmElementsControl::getAccessibleChild(sal_
m_aAccessibleChildren[c] = pChild;
xChild = pChild;
}
- return xChild.get();
+ return xChild;
}
uno::Reference<XAccessible> AccessibleSmElementsControl::getAccessibleParent()
diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx
index 754d819aa3f1..aae6027bbdc4 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -1087,7 +1087,7 @@ css::uno::Reference<css::accessibility::XAccessible> SmElementsControl::CreateAc
m_xAccessible = new AccessibleSmElementsControl(*this);
m_xAccessible->AddAllItems();
}
- return m_xAccessible.get();
+ return m_xAccessible;
}
bool SmElementsControl::itemTrigger(sal_uInt16 nPos)
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index e49945acb840..b6734d6e1aa9 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -1016,7 +1016,7 @@ uno::Reference< XAccessible > SmEditWindow::CreateAccessible()
mxAccessible.set(new SmEditAccessible( this ));
mxAccessible->Init();
}
- return uno::Reference< XAccessible >(mxAccessible.get());
+ return mxAccessible;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 2a69b340e3ef..3d732bbc5b4d 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -612,7 +612,7 @@ uno::Reference< XAccessible > SmGraphicWindow::CreateAccessible()
{
mxAccessible = new SmGraphicAccessible( this );
}
- return mxAccessible.get();
+ return mxAccessible;
}
/**************************************************************************/
More information about the Libreoffice-commits
mailing list