summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorNoel <noel.grandin@collabora.co.uk>2021-02-15 19:58:15 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2021-02-16 07:52:37 +0100
commit7767ff7b521b7d43a1ea2a4fd19a64bd171da5e0 (patch)
tree55ffa9447129048f87a52d61bbad124051406794 /framework
parent51558d2215a4cf881e357eda7da20688ac61e780 (diff)
loplugin:referencecasting in editeng..framework
Change-Id: Ia3375011ecd0a65afed0f131f477fc1542603fde Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110948 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'framework')
-rw-r--r--framework/qa/cppunit/dispatchtest.cxx3
-rw-r--r--framework/source/fwe/dispatch/interaction.cxx4
-rw-r--r--framework/source/fwe/xml/menudocumenthandler.cxx2
-rw-r--r--framework/source/fwe/xml/statusbardocumenthandler.cxx2
-rw-r--r--framework/source/fwe/xml/toolboxdocumenthandler.cxx2
-rw-r--r--framework/source/services/autorecovery.cxx8
-rw-r--r--framework/source/uielement/resourcemenucontroller.cxx2
-rw-r--r--framework/source/xml/imagesdocumenthandler.cxx2
8 files changed, 12 insertions, 13 deletions
diff --git a/framework/qa/cppunit/dispatchtest.cxx b/framework/qa/cppunit/dispatchtest.cxx
index 0dd6b4cfc33d..5a1b79207046 100644
--- a/framework/qa/cppunit/dispatchtest.cxx
+++ b/framework/qa/cppunit/dispatchtest.cxx
@@ -190,8 +190,7 @@ CPPUNIT_TEST_FIXTURE(DispatchTest, testInterception)
CPPUNIT_ASSERT(xRegistration.is());
rtl::Reference<MyInterceptor> pInterceptor(new MyInterceptor());
- xRegistration->registerDispatchProviderInterceptor(
- uno::Reference<frame::XDispatchProviderInterceptor>(pInterceptor.get()));
+ xRegistration->registerDispatchProviderInterceptor(pInterceptor);
dispatchCommand(mxComponent, ".uno:Bold", {});
CPPUNIT_ASSERT_EQUAL(1, pInterceptor->getExpected());
diff --git a/framework/source/fwe/dispatch/interaction.cxx b/framework/source/fwe/dispatch/interaction.cxx
index 01411804fb8b..86f1b8d60f8b 100644
--- a/framework/source/fwe/dispatch/interaction.cxx
+++ b/framework/source/fwe/dispatch/interaction.cxx
@@ -151,7 +151,7 @@ css::uno::Any SAL_CALL RequestFilterSelect_Impl::getRequest()
css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL RequestFilterSelect_Impl::getContinuations()
{
- return { m_xAbort.get(), m_xFilter.get() };
+ return { m_xAbort, m_xFilter };
}
RequestFilterSelect::RequestFilterSelect( const OUString& sURL )
@@ -181,7 +181,7 @@ OUString RequestFilterSelect::getFilter() const
uno::Reference < task::XInteractionRequest > RequestFilterSelect::GetRequest()
{
- return mxImpl.get();
+ return mxImpl;
}
namespace {
diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx
index dbc6f7a22444..d1fd63bc2b3b 100644
--- a/framework/source/fwe/xml/menudocumenthandler.cxx
+++ b/framework/source/fwe/xml/menudocumenthandler.cxx
@@ -754,7 +754,7 @@ void OWriteMenuDocumentHandler::WriteMenuDocument()
aRootElement = ELEMENT_NS_MENUBAR;
else
aRootElement = ELEMENT_NS_MENUPOPUP;
- m_xWriteDocumentHandler->startElement( aRootElement, pList.get() );
+ m_xWriteDocumentHandler->startElement( aRootElement, pList );
m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
WriteMenu( m_xMenuBarContainer );
diff --git a/framework/source/fwe/xml/statusbardocumenthandler.cxx b/framework/source/fwe/xml/statusbardocumenthandler.cxx
index 94dd1817872f..36cf5da27a48 100644
--- a/framework/source/fwe/xml/statusbardocumenthandler.cxx
+++ b/framework/source/fwe/xml/statusbardocumenthandler.cxx
@@ -511,7 +511,7 @@ void OWriteStatusBarDocumentHandler::WriteStatusBarDocument()
m_aAttributeType,
XMLNS_XLINK );
- m_xWriteDocumentHandler->startElement( ELEMENT_NS_STATUSBAR, pList.get() );
+ m_xWriteDocumentHandler->startElement( ELEMENT_NS_STATUSBAR, pList );
m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
sal_Int32 nItemCount = m_aStatusBarItems->getCount();
diff --git a/framework/source/fwe/xml/toolboxdocumenthandler.cxx b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
index 8d7b9835c3f4..386da1bc7f53 100644
--- a/framework/source/fwe/xml/toolboxdocumenthandler.cxx
+++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
@@ -630,7 +630,7 @@ void OWriteToolBoxDocumentHandler::WriteToolBoxDocument()
m_aAttributeType,
aUIName );
- m_xWriteDocumentHandler->startElement( ELEMENT_NS_TOOLBAR, pList.get() );
+ m_xWriteDocumentHandler->startElement( ELEMENT_NS_TOOLBAR, pList );
m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
sal_Int32 nItemCount = m_rItemAccess->getCount();
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 76594a4ec5f3..bdc46b1d73d4 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -3414,11 +3414,11 @@ void AutoRecovery::implts_openOneDoc(const OUString& sURL ,
}
// introduce model/view/controller to each other
- xController->attachModel( xModel.get() );
- xModel->connectController( xController.get() );
- xTargetFrame->setComponent( xController->getComponentWindow(), xController.get() );
+ xController->attachModel( xModel );
+ xModel->connectController( xController );
+ xTargetFrame->setComponent( xController->getComponentWindow(), xController );
xController->attachFrame( xTargetFrame );
- xModel->setCurrentController( xController.get() );
+ xModel->setCurrentController( xController );
}
rInfo.Document = xModel.get();
diff --git a/framework/source/uielement/resourcemenucontroller.cxx b/framework/source/uielement/resourcemenucontroller.cxx
index 1094874bbcce..c56c91dc35e1 100644
--- a/framework/source/uielement/resourcemenucontroller.cxx
+++ b/framework/source/uielement/resourcemenucontroller.cxx
@@ -282,7 +282,7 @@ void ResourceMenuController::itemActivated( const css::awt::MenuEvent& /*rEvent*
VCLXMenu* pAwtMenu = comphelper::getUnoTunnelImplementation<VCLXMenu>( m_xPopupMenu );
m_xMenuBarManager.set( new framework::MenuBarManager(
m_xContext, m_xFrame, m_xURLTransformer, m_xDispatchProvider, m_aModuleName, pAwtMenu->GetMenu(), false, !m_bContextMenu && !m_bInToolbar ) );
- m_xFrame->addFrameActionListener( m_xMenuBarManager.get() );
+ m_xFrame->addFrameActionListener( m_xMenuBarManager );
}
}
diff --git a/framework/source/xml/imagesdocumenthandler.cxx b/framework/source/xml/imagesdocumenthandler.cxx
index 51352b0296d4..79e95eb87886 100644
--- a/framework/source/xml/imagesdocumenthandler.cxx
+++ b/framework/source/xml/imagesdocumenthandler.cxx
@@ -332,7 +332,7 @@ void OWriteImagesDocumentHandler::WriteImagesDocument()
m_aAttributeType,
XMLNS_XLINK );
- m_xWriteDocumentHandler->startElement( ELEMENT_NS_IMAGESCONTAINER, pList.get() );
+ m_xWriteDocumentHandler->startElement( ELEMENT_NS_IMAGESCONTAINER, pList );
m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
WriteImageList( &m_rImageItemList );