summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
authorNoel <noel.grandin@collabora.co.uk>2021-02-12 15:34:27 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2021-02-15 08:37:59 +0100
commit881d8470eb9ede52690dbd75c02f72c6ee422261 (patch)
tree991318034ecf2849e2fd531c9b7c421e4249daec /sw/source
parent0ae0b7ff575b4148f9c06abd3bac78d0881ec817 (diff)
loplugin:referencecasting in sw
Change-Id: Ie923fc8baaa26938378407f6e5f3c50b2cea7cca Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110815 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/core/access/acccontext.cxx2
-rw-r--r--sw/source/core/access/accmap.cxx6
-rw-r--r--sw/source/core/fields/docufld.cxx2
-rw-r--r--sw/source/core/ole/ndole.cxx6
-rw-r--r--sw/source/core/unocore/unofield.cxx2
-rw-r--r--sw/source/core/unocore/unotbl.cxx6
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.cxx6
-rw-r--r--sw/source/filter/xml/XMLRedlineImportHelper.cxx2
-rw-r--r--sw/source/filter/xml/xmlexp.cxx4
-rw-r--r--sw/source/filter/xml/xmlfmt.cxx4
-rw-r--r--sw/source/filter/xml/xmlimp.cxx5
-rw-r--r--sw/source/filter/xml/xmlitem.cxx2
-rw-r--r--sw/source/filter/xml/xmltbli.cxx2
-rw-r--r--sw/source/ui/dbui/dbtablepreviewdialog.cxx2
-rw-r--r--sw/source/ui/vba/vbadocument.cxx2
-rw-r--r--sw/source/uibase/app/docshdrw.cxx2
-rw-r--r--sw/source/uibase/dbui/dbmgr.cxx8
-rw-r--r--sw/source/uibase/docvw/srcedtw.cxx4
18 files changed, 33 insertions, 34 deletions
diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx
index e36b89a890b0..225b21424a85 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -1023,7 +1023,7 @@ void SwAccessibleContext::DisposeShape( const SdrObject *pObj,
AccessibleEventObject aEvent;
aEvent.EventId = AccessibleEventId::CHILD;
- uno::Reference< XAccessible > xAcc( xAccImpl.get() );
+ uno::Reference< XAccessible > xAcc( xAccImpl );
aEvent.OldValue <<= xAcc;
FireAccessibleEvent( aEvent );
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 38cf49e532c0..ae1e6e29b06c 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -2714,7 +2714,7 @@ void SwAccessibleMap::InvalidateCursorPosition( const SwFrame *pFrame )
{
AccessibleEventObject aEvent;
aEvent.EventId = AccessibleEventId::CHILD;
- aEvent.NewValue <<= uno::Reference< XAccessible>(xParentAccImpl.get());
+ aEvent.NewValue <<= uno::Reference< XAccessible>(xParentAccImpl);
xParentAccImplRoot->FireAccessibleEvent( aEvent );
}
}
@@ -2807,7 +2807,7 @@ void SwAccessibleMap::SetCursorContext(
const ::rtl::Reference < SwAccessibleContext >& rCursorContext )
{
osl::MutexGuard aGuard( maMutex );
- uno::Reference < XAccessible > xAcc( rCursorContext.get() );
+ uno::Reference < XAccessible > xAcc( rCursorContext );
mxCursorContext = xAcc;
}
@@ -3175,7 +3175,7 @@ bool SwAccessibleMap::ReplaceChild (
rShapeTypeHandler.CreateAccessibleObject (
aShapeInfo, mpShapeMap->GetInfo() ));
- uno::Reference < XAccessible > xAcc( pReplacement.get() );
+ uno::Reference < XAccessible > xAcc( pReplacement );
if( xAcc.is() )
{
pReplacement->Init();
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index a5472dd27776..9297cebb11be 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -1865,7 +1865,7 @@ bool SwPostItField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
else
m_xTextObject->SetString( m_sText );
- uno::Reference < text::XText > xText( m_xTextObject.get() );
+ uno::Reference < text::XText > xText( m_xTextObject );
rAny <<= xText;
break;
}
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index 3fb56edbd3ad..b098b089c1d2 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/sw/source/core/ole/ndole.cxx
@@ -782,7 +782,7 @@ SwOLEObj::SwOLEObj( const svt::EmbeddedObjectRef& xObj ) :
if ( xObj.is() )
{
m_xListener = new SwOLEListener_Impl( this );
- xObj->addStateChangeListener( m_xListener.get() );
+ xObj->addStateChangeListener( m_xListener );
}
}
@@ -809,7 +809,7 @@ SwOLEObj::~SwOLEObj() COVERITY_NOEXCEPT_FALSE
if( m_xListener )
{
if ( m_xOLERef.is() )
- m_xOLERef->removeStateChangeListener( m_xListener.get() );
+ m_xOLERef->removeStateChangeListener( m_xListener );
m_xListener->dispose();
m_xListener.clear();
}
@@ -948,7 +948,7 @@ uno::Reference < embed::XEmbeddedObject > const & SwOLEObj::GetOleRef()
m_xOLERef.Assign( xObj, m_xOLERef.GetViewAspect() );
m_xOLERef.AssignToContainer( &p->GetEmbeddedObjectContainer(), m_aName );
m_xListener = new SwOLEListener_Impl( this );
- xObj->addStateChangeListener( m_xListener.get() );
+ xObj->addStateChangeListener( m_xListener );
}
const_cast<SwOLENode*>(m_pOLENode)->CheckFileLink_Impl(); // for this notification nonconst access is required
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx
index e4e0ea629d15..5de1c6bdf11f 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -2428,7 +2428,7 @@ uno::Any SAL_CALL SwXTextField::getPropertyValue(const OUString& rPropertyName)
= new SwTextAPIObject( std::make_unique<SwTextAPIEditSource>(m_pImpl->m_pDoc) );
}
- uno::Reference<text::XText> xText(m_pImpl->m_xTextObject.get());
+ uno::Reference<text::XText> xText(m_pImpl->m_xTextObject);
aRet <<= xText;
break;
}
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index 60c65acabac0..6392d16cd786 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -2248,7 +2248,7 @@ uno::Reference<table::XCellRange> GetRangeByName(
UnoActionRemoveContext aRemoveContext(rCursor);
rCursor.MakeBoxSels();
// pUnoCursor will be provided and will not be deleted
- return SwXCellRange::CreateXCellRange(pUnoCursor, *pFormat, rDesc).get();
+ return SwXCellRange::CreateXCellRange(pUnoCursor, *pFormat, rDesc);
}
} // namespace
@@ -3108,7 +3108,7 @@ void SwXTextTable::Impl::Notify(const SfxHint& rHint)
}
else
{
- lcl_SendChartEvent(xThis.get(), m_Listeners);
+ lcl_SendChartEvent(xThis, m_Listeners);
}
}
}
@@ -3851,7 +3851,7 @@ void SwXCellRange::Impl::Notify( const SfxHint& rHint )
if (xThis.is())
{ // fdo#72695: if UNO object is already dead, don't revive it with event
if(m_pFrameFormat)
- lcl_SendChartEvent(xThis.get(), m_ChartListeners);
+ lcl_SendChartEvent(xThis, m_ChartListeners);
else
m_ChartListeners.disposeAndClear(lang::EventObject(xThis));
}
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index ddc26f1a3be4..c915b01b0e6a 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1122,7 +1122,7 @@ void DocxAttributeOutput::WriteCollectedParagraphProperties()
{
if ( m_rExport.SdrExporter().getFlyAttrList().is() )
{
- rtl::Reference<FastAttributeList> xAttrList( m_rExport.SdrExporter().getFlyAttrList().get() );
+ rtl::Reference<FastAttributeList> xAttrList( m_rExport.SdrExporter().getFlyAttrList() );
m_rExport.SdrExporter().getFlyAttrList().clear();
m_pSerializer->singleElementNS( XML_w, XML_framePr, xAttrList );
@@ -2635,7 +2635,7 @@ void lclProcessRecursiveGrabBag(sal_Int32 aElementId, const css::uno::Sequence<c
pAttributes->add(*aSubElementId, aValue.getStr());
}
- pSerializer->startElement(aElementId, pAttributes.get());
+ pSerializer->startElement(aElementId, pAttributes);
for (const auto& rElement : rElements)
{
@@ -2665,7 +2665,7 @@ void DocxAttributeOutput::WriteCollectedRunProperties()
if ( m_pColorAttrList.is() )
{
- rtl::Reference<FastAttributeList> xAttrList( m_pColorAttrList.get() );
+ rtl::Reference<FastAttributeList> xAttrList( m_pColorAttrList );
m_pSerializer->singleElementNS( XML_w, XML_color, xAttrList );
}
diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
index 34cf4ac4b6d0..d368b812a199 100644
--- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx
+++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
@@ -477,7 +477,7 @@ Reference<XTextCursor> XMLRedlineImportHelper::CreateRedlineTextSection(
// create (UNO-) cursor
SwPosition aPos(*pRedlineNode);
SwXTextCursor *const pXCursor =
- new SwXTextCursor(*pDoc, pXText.get(), CursorType::Redline, aPos);
+ new SwXTextCursor(*pDoc, pXText, CursorType::Redline, aPos);
pXCursor->GetCursor().Move(fnMoveForward, GoInNode);
// cast to avoid ambiguity
xReturn = static_cast<text::XWordCursor*>(pXCursor);
diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx
index 99e95e9a5381..2c646dc0268e 100644
--- a/sw/source/filter/xml/xmlexp.cxx
+++ b/sw/source/filter/xml/xmlexp.cxx
@@ -232,7 +232,7 @@ ErrCode SwXMLExport::exportDoc( enum XMLTokenEnum eClass )
if (!GetGraphicStorageHandler().is())
{
xGraphicStorageHandler = SvXMLGraphicHelper::Create(SvXMLGraphicHelperMode::Write, GetImageFilterName());
- SetGraphicStorageHandler(xGraphicStorageHandler.get());
+ SetGraphicStorageHandler(xGraphicStorageHandler);
}
rtl::Reference<SvXMLEmbeddedObjectHelper> xEmbeddedResolver;
@@ -244,7 +244,7 @@ ErrCode SwXMLExport::exportDoc( enum XMLTokenEnum eClass )
xEmbeddedResolver = SvXMLEmbeddedObjectHelper::Create(
*pPersist,
SvXMLEmbeddedObjectHelperMode::Write );
- SetEmbeddedResolver( Reference<XEmbeddedObjectResolver>( xEmbeddedResolver.get() ) );
+ SetEmbeddedResolver( xEmbeddedResolver );
}
}
diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx
index 5a409a429525..b1d5c7f8a019 100644
--- a/sw/source/filter/xml/xmlfmt.cxx
+++ b/sw/source/filter/xml/xmlfmt.cxx
@@ -363,7 +363,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > SwXMLTextStyleContext_
pConditions = std::make_unique<SwXMLConditions_Impl>();
pConditions->push_back( xCond );
}
- return xCond.get();
+ return xCond;
}
return XMLTextStyleContext::createFastChildContext( nElement, xAttrList );
@@ -596,7 +596,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > SwXMLItemSetStyleConte
pTextStyle = new SwXMLTextStyleContext_Impl( GetSwImport(), XmlStyleFamily::TEXT_PARAGRAPH, rStyles );
rtl::Reference<sax_fastparser::FastAttributeList> xTmpAttrList = new sax_fastparser::FastAttributeList(nullptr);
xTmpAttrList->add(XML_ELEMENT(STYLE, XML_NAME), GetName().toUtf8() );
- pTextStyle->startFastElement( nElement, xTmpAttrList.get() );
+ pTextStyle->startFastElement( nElement, xTmpAttrList );
rStyles.AddStyle( *pTextStyle );
}
return pTextStyle->createFastChildContext( nElement, xAttrList );
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 584a8e5d9176..226b08f22384 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -610,7 +610,7 @@ void SwXMLImport::startDocument()
if (!GetGraphicStorageHandler().is())
{
m_xGraphicStorageHandler = SvXMLGraphicHelper::Create(SvXMLGraphicHelperMode::Read);
- SetGraphicStorageHandler(m_xGraphicStorageHandler.get());
+ SetGraphicStorageHandler(m_xGraphicStorageHandler);
}
if( !GetEmbeddedResolver().is() )
@@ -621,8 +621,7 @@ void SwXMLImport::startDocument()
m_xEmbeddedResolver = SvXMLEmbeddedObjectHelper::Create(
*pPersist,
SvXMLEmbeddedObjectHelperMode::Read );
- Reference< document::XEmbeddedObjectResolver > xEmbeddedResolver( m_xEmbeddedResolver.get() );
- SetEmbeddedResolver( xEmbeddedResolver );
+ SetEmbeddedResolver( m_xEmbeddedResolver );
}
}
}
diff --git a/sw/source/filter/xml/xmlitem.cxx b/sw/source/filter/xml/xmlitem.cxx
index 899c0b6bb1ad..e97eb5f6922d 100644
--- a/sw/source/filter/xml/xmlitem.cxx
+++ b/sw/source/filter/xml/xmlitem.cxx
@@ -60,7 +60,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > SwXMLItemSetContext::c
if( pEntry && 0 != (pEntry->nMemberId & MID_SW_FLAG_ELEMENT_ITEM_IMPORT) )
{
- return createFastChildContext( nElement, xAttrList, *pEntry ).get();
+ return createFastChildContext( nElement, xAttrList, *pEntry );
}
else
XMLOFF_WARN_UNKNOWN_ELEMENT("sw", nElement);
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index 5a40c3c8d281..bded70ce03dd 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -1291,7 +1291,7 @@ css::uno::Reference<css::xml::sax::XFastContextHandler> SwXMLTableContext::creat
if( IsValid() )
{
m_xDDESource.set(new SwXMLDDETableContext_Impl( GetSwImport() ));
- return m_xDDESource.get();
+ return m_xDDESource;
}
break;
}
diff --git a/sw/source/ui/dbui/dbtablepreviewdialog.cxx b/sw/source/ui/dbui/dbtablepreviewdialog.cxx
index 3bbfa989f7f7..d716aefbb689 100644
--- a/sw/source/ui/dbui/dbtablepreviewdialog.cxx
+++ b/sw/source/ui/dbui/dbtablepreviewdialog.cxx
@@ -91,7 +91,7 @@ SwDBTablePreviewDialog::SwDBTablePreviewDialog(weld::Window* pParent, uno::Seque
if (xFrame.is())
{
m_xFrameListener.set(new DBTablePreviewFrame(xFrame));
- xFrame->addEventListener(m_xFrameListener.get());
+ xFrame->addEventListener(m_xFrameListener);
util::URL aURL;
aURL.Complete = ".component:DB/DataSourceBrowser";
diff --git a/sw/source/ui/vba/vbadocument.cxx b/sw/source/ui/vba/vbadocument.cxx
index 4e305cc100e5..c7340095b44a 100644
--- a/sw/source/ui/vba/vbadocument.cxx
+++ b/sw/source/ui/vba/vbadocument.cxx
@@ -410,7 +410,7 @@ void SAL_CALL SwVbaDocument::setConsecutiveHyphensLimit( ::sal_Int32 _consecutiv
uno::Reference< ooo::vba::word::XMailMerge > SAL_CALL SwVbaDocument::getMailMerge()
{
- return uno::Reference< ooo::vba::word::XMailMerge >(SwVbaMailMerge::get(mxParent, mxContext).get());
+ return SwVbaMailMerge::get(mxParent, mxContext);
}
void SAL_CALL SwVbaDocument::Protect( ::sal_Int32 /*Type*/, const uno::Any& /*NOReset*/, const uno::Any& /*Password*/, const uno::Any& /*UseIRM*/, const uno::Any& /*EnforceStyleLock*/ )
diff --git a/sw/source/uibase/app/docshdrw.cxx b/sw/source/uibase/app/docshdrw.cxx
index e9a8b2e3160d..f767191fbd10 100644
--- a/sw/source/uibase/app/docshdrw.cxx
+++ b/sw/source/uibase/app/docshdrw.cxx
@@ -70,7 +70,7 @@ void InitDrawModelAndDocShell(SwDocShell* pSwDocShell, SwDrawModel* pSwDrawDocum
// docshell and then to the drawdocument
xColorList = XColorList::GetStdColorList();
pSwDocShell->PutItem(SvxColorListItem(xColorList, SID_COLOR_TABLE));
- pSwDrawDocument->SetPropertyList(xColorList.get());
+ pSwDrawDocument->SetPropertyList(xColorList);
}
}
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index fb6706b0ba82..b7805d8b5707 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -487,7 +487,7 @@ bool SwDBManager::Merge( const SwMergeDescriptor& rMergeDesc )
{
uno::Reference<lang::XComponent> xComponent(m_DataSourceParams.back()->xConnection, uno::UNO_QUERY);
if(xComponent.is())
- xComponent->addEventListener(m_pImpl->m_xDisposeListener.get());
+ xComponent->addEventListener(m_pImpl->m_xDisposeListener);
}
catch(const uno::Exception&)
{
@@ -2342,7 +2342,7 @@ uno::Reference< sdbc::XConnection> const & SwDBManager::RegisterConnection(OUStr
{
uno::Reference<lang::XComponent> xComponent(pFound->xConnection, uno::UNO_QUERY);
if(xComponent.is())
- xComponent->addEventListener(m_pImpl->m_xDisposeListener.get());
+ xComponent->addEventListener(m_pImpl->m_xDisposeListener);
}
catch(const uno::Exception&)
{
@@ -2456,7 +2456,7 @@ SwDSParam* SwDBManager::FindDSData(const SwDBData& rData, bool bCreate)
{
uno::Reference<lang::XComponent> xComponent(pFound->xConnection, uno::UNO_QUERY);
if(xComponent.is())
- xComponent->addEventListener(m_pImpl->m_xDisposeListener.get());
+ xComponent->addEventListener(m_pImpl->m_xDisposeListener);
}
catch(const uno::Exception&)
{
@@ -2494,7 +2494,7 @@ SwDSParam* SwDBManager::FindDSConnection(const OUString& rDataSource, bool bCre
{
uno::Reference<lang::XComponent> xComponent(pFound->xConnection, uno::UNO_QUERY);
if(xComponent.is())
- xComponent->addEventListener(m_pImpl->m_xDisposeListener.get());
+ xComponent->addEventListener(m_pImpl->m_xDisposeListener);
}
catch(const uno::Exception&)
{
diff --git a/sw/source/uibase/docvw/srcedtw.cxx b/sw/source/uibase/docvw/srcedtw.cxx
index 33f7a33435d1..042dcc727eaa 100644
--- a/sw/source/uibase/docvw/srcedtw.cxx
+++ b/sw/source/uibase/docvw/srcedtw.cxx
@@ -263,7 +263,7 @@ SwSrcEditWindow::SwSrcEditWindow( vcl::Window* pParent, SwSrcView* pParentView )
css::uno::Sequence< OUString > s(2);
s[0] = "FontHeight";
s[1] = "FontName";
- n->addPropertiesChangeListener(s, m_xListener.get());
+ n->addPropertiesChangeListener(s, m_xListener);
}
SwSrcEditWindow::~SwSrcEditWindow()
@@ -279,7 +279,7 @@ void SwSrcEditWindow::dispose()
n = m_xNotifier;
}
if (n.is()) {
- n->removePropertiesChangeListener(m_xListener.get());
+ n->removePropertiesChangeListener(m_xListener);
}
m_aSyntaxIdle.Stop();
if ( m_pOutWin )