tdf#89307: Removed SvRef::operator T*()

Conditional statements are using SvRef::Is() method.
Changed static_cast<T*>(svRef<T>) occurances to svRef.get().
Added operator == and != to SvRef.

SbxObject::Execute is using SbxVariableRef internally.
SbxObject::FindQualified is using SbxVariableRef internally.

Change-Id: I45b553e35d8fca9bf71163e6eefc60802a066395
Reviewed-on: https://gerrit.libreoffice.org/29621
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

14 files changed, 57 insertions, 57 deletions

diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx
index b5364d2b7c0d..ec2f70b29ebc 100644
--- a/sw/source/core/crsr/bookmrk.cxx
+++ b/sw/source/core/crsr/bookmrk.cxx
@@ -253,7 +253,7 @@ namespace sw { namespace mark
     void DdeBookmark::DeregisterFromDoc(SwDoc* const pDoc)
     {
         if(m_aRefObj.Is())
-            pDoc->getIDocumentLinksAdministration().GetLinkManager().RemoveServer(m_aRefObj);
+            pDoc->getIDocumentLinksAdministration().GetLinkManager().RemoveServer(m_aRefObj.get());
     }
 
     DdeBookmark::~DdeBookmark()
diff --git a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx
index 0949aa77d582..1255eccc5433 100644
--- a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx
+++ b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx
@@ -75,7 +75,7 @@ namespace
                     tools::SvRef<sfx2::SvBaseLink> xLink = pLnk;
 
                     OUString sFName;
-                    sfx2::LinkManager::GetDisplayNames( xLink, nullptr, &sFName );
+                    sfx2::LinkManager::GetDisplayNames( xLink.get(), nullptr, &sFName );
 
                     INetURLObject aURL( sFName );
                     if( INetProtocol::File == aURL.GetProtocol() ||
@@ -417,7 +417,7 @@ bool DocumentLinksAdministrationManager::EmbedAllLinks()
 
             // if one forgot to remove itself
             if( xLink.Is() )
-                rLnkMgr.Remove( xLink );
+                rLnkMgr.Remove( xLink.get() );
 
             bRet = true;
         }
diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx
index cae15e316a47..c46e1ea633aa 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -243,7 +243,7 @@ SwSection::~SwSection()
 
         if (CONTENT_SECTION != m_Data.GetType())
         {
-            pDoc->getIDocumentLinksAdministration().GetLinkManager().Remove( m_RefLink );
+            pDoc->getIDocumentLinksAdministration().GetLinkManager().Remove( m_RefLink.get() );
         }
 
         if (m_RefObj.Is())
@@ -559,7 +559,7 @@ OUString SwSection::GetLinkFileName() const
                 OUString sFilter;
                 if (m_RefLink->GetLinkManager() &&
                     sfx2::LinkManager::GetDisplayNames(
-                        m_RefLink, nullptr, &sTmp, &sRange, &sFilter ))
+                        m_RefLink.get(), nullptr, &sTmp, &sRange, &sFilter ))
                 {
                     sTmp += OUStringLiteral1(sfx2::cTokenSeparator) + sFilter
                         + OUStringLiteral1(sfx2::cTokenSeparator) + sRange;
@@ -1509,7 +1509,7 @@ void SwSection::CreateLink( LinkCreateType eCreateType )
     }
     else
     {
-        pFormat->GetDoc()->getIDocumentLinksAdministration().GetLinkManager().Remove( m_RefLink );
+        pFormat->GetDoc()->getIDocumentLinksAdministration().GetLinkManager().Remove( m_RefLink.get() );
     }
 
     SwIntrnlSectRefLink *const pLnk =
@@ -1574,7 +1574,7 @@ void SwSection::BreakLink()
         OSL_ENSURE(pFormat, "SwSection::BreakLink: no format?");
         if (pFormat)
         {
-            pFormat->GetDoc()->getIDocumentLinksAdministration().GetLinkManager().Remove( m_RefLink );
+            pFormat->GetDoc()->getIDocumentLinksAdministration().GetLinkManager().Remove( m_RefLink.get() );
         }
         m_RefLink.Clear();
     }
diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx
index 69493290342d..413b904e6f77 100644
--- a/sw/source/core/fields/ddefld.cxx
+++ b/sw/source/core/fields/ddefld.cxx
@@ -243,7 +243,7 @@ SwDDEFieldType::SwDDEFieldType(const OUString& rName,
 SwDDEFieldType::~SwDDEFieldType()
 {
     if( pDoc && !pDoc->IsInDtor() )
-        pDoc->getIDocumentLinksAdministration().GetLinkManager().Remove( refLink );
+        pDoc->getIDocumentLinksAdministration().GetLinkManager().Remove( refLink.get() );
     refLink->Disconnect();
 }
 
@@ -286,14 +286,14 @@ void SwDDEFieldType::SetDoc( SwDoc* pNewDoc )
     if( pDoc && refLink.Is() )
     {
         OSL_ENSURE( !nRefCnt, "How do we get the references?" );
-        pDoc->getIDocumentLinksAdministration().GetLinkManager().Remove( refLink );
+        pDoc->getIDocumentLinksAdministration().GetLinkManager().Remove( refLink.get() );
     }
 
     pDoc = pNewDoc;
     if( pDoc && nRefCnt )
     {
         refLink->SetVisible( pDoc->getIDocumentLinksAdministration().IsVisibleLinks() );
-        pDoc->getIDocumentLinksAdministration().GetLinkManager().InsertDDELink( refLink );
+        pDoc->getIDocumentLinksAdministration().GetLinkManager().InsertDDELink( refLink.get() );
     }
 }
 
@@ -302,14 +302,14 @@ void SwDDEFieldType::RefCntChgd()
     if( nRefCnt )
     {
         refLink->SetVisible( pDoc->getIDocumentLinksAdministration().IsVisibleLinks() );
-        pDoc->getIDocumentLinksAdministration().GetLinkManager().InsertDDELink( refLink );
+        pDoc->getIDocumentLinksAdministration().GetLinkManager().InsertDDELink( refLink.get() );
         if( pDoc->getIDocumentLayoutAccess().GetCurrentViewShell() )
             UpdateNow();
     }
     else
     {
         Disconnect();
-        pDoc->getIDocumentLinksAdministration().GetLinkManager().Remove( refLink );
+        pDoc->getIDocumentLinksAdministration().GetLinkManager().Remove( refLink.get() );
     }
 }
 
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index a5575c2172a4..36e1e37ba2d4 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -180,7 +180,7 @@ bool SwGrfNode::ReRead(
         }
         else // no name anymore, so remove link
         {
-            GetDoc()->getIDocumentLinksAdministration().GetLinkManager().Remove( refLink );
+            GetDoc()->getIDocumentLinksAdministration().GetLinkManager().Remove( refLink.get() );
             refLink.Clear();
         }
 
@@ -301,7 +301,7 @@ SwGrfNode::~SwGrfNode()
     if( refLink.Is() )
     {
         OSL_ENSURE( !bInSwapIn, "DTOR: I am still in SwapIn" );
-        pDoc->getIDocumentLinksAdministration().GetLinkManager().Remove( refLink );
+        pDoc->getIDocumentLinksAdministration().GetLinkManager().Remove( refLink.get() );
         refLink->Disconnect();
     }
     else
@@ -522,7 +522,7 @@ bool SwGrfNode::SwapIn( bool bWaitForData )
 
     bool bRet = false;
     bInSwapIn = true;
-    SwBaseLink* pLink = static_cast<SwBaseLink*>(static_cast<sfx2::SvBaseLink*>(refLink));
+    SwBaseLink* pLink = static_cast<SwBaseLink*>( refLink.get() );
 
     if( pLink )
     {
@@ -632,14 +632,14 @@ bool SwGrfNode::GetFileFilterNms( OUString* pFileNm, OUString* pFilterNm ) const
         sal_uInt16 nType = refLink->GetObjType();
         if( OBJECT_CLIENT_GRF == nType )
             bRet = sfx2::LinkManager::GetDisplayNames(
-                    refLink, nullptr, pFileNm, nullptr, pFilterNm );
+                    refLink.get(), nullptr, pFileNm, nullptr, pFilterNm );
         else if( OBJECT_CLIENT_DDE == nType && pFileNm && pFilterNm )
         {
             OUString sApp;
             OUString sTopic;
             OUString sItem;
             if( sfx2::LinkManager::GetDisplayNames(
-                    refLink, &sApp, &sTopic, &sItem ) )
+                    refLink.get(), &sApp, &sTopic, &sItem ) )
             {
                 *pFileNm = sApp + OUStringLiteral1(sfx2::cTokenSeparator)
                          + sTopic + OUStringLiteral1(sfx2::cTokenSeparator)
@@ -661,7 +661,7 @@ bool SwGrfNode::SavePersistentData()
     if( refLink.Is() )
     {
         OSL_ENSURE( !bInSwapIn, "SavePersistentData: I am still in SwapIn" );
-        GetDoc()->getIDocumentLinksAdministration().GetLinkManager().Remove( refLink );
+        GetDoc()->getIDocumentLinksAdministration().GetLinkManager().Remove( refLink.get() );
         return true;
     }
 
@@ -690,7 +690,7 @@ bool SwGrfNode::RestorePersistentData()
     {
         IDocumentLinksAdministration& rIDLA = getIDocumentLinksAdministration();
         refLink->SetVisible( rIDLA.IsVisibleLinks() );
-        rIDLA.GetLinkManager().InsertDDELink( refLink );
+        rIDLA.GetLinkManager().InsertDDELink( refLink.get() );
         if( getIDocumentLayoutAccess().GetCurrentLayout() )
             refLink->Update();
     }
@@ -712,7 +712,7 @@ void SwGrfNode::InsertLink( const OUString& rGrfName, const OUString& rFltName )
             sApp = rGrfName.getToken( 0, sfx2::cTokenSeparator, nTmp );
             sTopic = rGrfName.getToken( 0, sfx2::cTokenSeparator, nTmp );
             sItem = rGrfName.copy( nTmp );
-            rIDLA.GetLinkManager().InsertDDELink( refLink,
+            rIDLA.GetLinkManager().InsertDDELink( refLink.get(),
                                             sApp, sTopic, sItem );
         }
         else
@@ -739,12 +739,12 @@ void SwGrfNode::ReleaseLink()
 
         {
             bInSwapIn = true;
-            SwBaseLink* pLink = static_cast<SwBaseLink*>(static_cast<sfx2::SvBaseLink*>(refLink));
+            SwBaseLink* pLink = static_cast<SwBaseLink*>( refLink.get() );
             pLink->SwapIn( true, true );
             bInSwapIn = false;
         }
 
-        getIDocumentLinksAdministration().GetLinkManager().Remove( refLink );
+        getIDocumentLinksAdministration().GetLinkManager().Remove( refLink.get() );
         refLink.Clear();
         maGrfObj.SetLink();
 
@@ -937,11 +937,11 @@ SwContentNode* SwGrfNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const
 
     OUString sFile, sFilter;
     if( IsLinkedFile() )
-        sfx2::LinkManager::GetDisplayNames( refLink, nullptr, &sFile, nullptr, &sFilter );
+        sfx2::LinkManager::GetDisplayNames( refLink.get(), nullptr, &sFile, nullptr, &sFilter );
     else if( IsLinkedDDE() )
     {
         OUString sTmp1, sTmp2;
-        sfx2::LinkManager::GetDisplayNames( refLink, &sTmp1, &sTmp2, &sFilter );
+        sfx2::LinkManager::GetDisplayNames( refLink.get(), &sTmp1, &sTmp2, &sFilter );
         sfx2::MakeLnkName( sFile, &sTmp1, sTmp2, sFilter );
         sFilter = "DDE";
     }
@@ -1097,7 +1097,7 @@ void SwGrfNode::TriggerAsyncRetrieveInputStream()
         mpThreadConsumer.reset( new SwAsyncRetrieveInputStreamThreadConsumer( *this ) );
 
         OUString sGrfNm;
-        sfx2::LinkManager::GetDisplayNames( refLink, nullptr, &sGrfNm );
+        sfx2::LinkManager::GetDisplayNames( refLink.get(), nullptr, &sGrfNm );
         OUString sReferer;
         SfxObjectShell * sh = GetDoc()->GetPersist();
         if (sh != nullptr && sh->HasName())
@@ -1152,7 +1152,7 @@ bool SwGrfNode::IsAsyncRetrieveInputStreamPossible() const
     if ( IsLinkedFile() )
     {
         OUString sGrfNm;
-        sfx2::LinkManager::GetDisplayNames( refLink, nullptr, &sGrfNm );
+        sfx2::LinkManager::GetDisplayNames( refLink.get(), nullptr, &sGrfNm );
         if ( !sGrfNm.startsWith( "vnd.sun.star.pkg:" ) )
         {
             bRet = true;
diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx
index 929c0f32cc97..35cd05255983 100644
--- a/sw/source/filter/basflt/shellio.cxx
+++ b/sw/source/filter/basflt/shellio.cxx
@@ -864,7 +864,7 @@ sal_uLong SwWriter::Write( WriterRef& rxWriter, const OUString* pRealFileName )
     sal_uLong nError = 0;
     if( pMedium )
         nError = rxWriter->Write( *pPam, *pMedium, pRealFileName );
-    else if( pStg )
+    else if( pStg.Is() )
         nError = rxWriter->Write( *pPam, *pStg, pRealFileName );
     else if( pStrm )
         nError = rxWriter->Write( *pPam, *pStrm, pRealFileName );
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx
index 75ee64c144ae..6f00814e47b5 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -332,7 +332,7 @@ void WW8Export::OutputLinkedOLE( const OUString& rOleId )
     {
         tools::SvRef<SotStorage> xOleDst = xObjStg->OpenSotStorage( rOleId );
         if ( xOleDst.Is() )
-            xObjSrc->CopyTo( xOleDst );
+            xObjSrc->CopyTo( xOleDst.get() );
 
         if ( !xOleDst->GetError( ) )
         {
diff --git a/sw/source/filter/ww8/ww8glsy.cxx b/sw/source/filter/ww8/ww8glsy.cxx
index 35e01924d294..f25d66e4e956 100644
--- a/sw/source/filter/ww8/ww8glsy.cxx
+++ b/sw/source/filter/ww8/ww8glsy.cxx
@@ -222,7 +222,7 @@ bool WW8Glossary::Load( SwTextBlocks &rBlocks, bool bSaveRelFile )
                 aPamo.GetPoint()->nContent.Assign(aIdx.GetNode().GetContentNode(),
                     0);
                 std::unique_ptr<SwWW8ImplReader> xRdr(new SwWW8ImplReader(
-                    pGlossary->m_nVersion, xStg, &rStrm, *pD, rBlocks.GetBaseURL(),
+                    pGlossary->m_nVersion, xStg.get(), &rStrm, *pD, rBlocks.GetBaseURL(),
                     true, false, *aPamo.GetPoint()));
                 xRdr->LoadDoc(this);
                 bRet = MakeEntries(pD, rBlocks, bSaveRelFile, aStrings, aData);
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 40b610fbb046..0d67089799ca 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -4902,7 +4902,7 @@ void SwWW8ImplReader::ReadGlobalTemplateSettings( const OUString& sCreatedFrom,
         if (xTableStream.Is() && SVSTREAM_OK == xTableStream->GetError())
         {
             xTableStream->SetEndian(SvStreamEndian::LITTLE);
-            WW8Customizations aGblCustomisations( xTableStream, aWwFib );
+            WW8Customizations aGblCustomisations( xTableStream.get(), aWwFib );
             aGblCustomisations.Import( m_pDocShell );
         }
     }
@@ -6168,7 +6168,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportDOC(const OUString &rURL
 sal_uLong WW8Reader::OpenMainStream( tools::SvRef<SotStorageStream>& rRef, sal_uInt16& rBuffSize )
 {
     sal_uLong nRet = ERR_SWG_READ_ERROR;
-    OSL_ENSURE( pStg, "Where is my Storage?" );
+    OSL_ENSURE( pStg.get(), "Where is my Storage?" );
     rRef = pStg->OpenSotStream( "WordDocument", StreamMode::READ | StreamMode::SHARE_DENYALL);
 
     if( rRef.Is() )
@@ -6215,7 +6215,7 @@ sal_uLong WW8Reader::Read(SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, co
         else if ( sFltName=="CWW7" )
             nVersion = 7;
 
-        if( pStg )
+        if( pStg.Is() )
         {
             nRet = OpenMainStream( refStrm, nOldBuffSize );
             pIn = &refStrm;
@@ -6229,7 +6229,7 @@ sal_uLong WW8Reader::Read(SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, co
 
     if( !nRet )
     {
-        std::unique_ptr<SwWW8ImplReader> pRdr(new SwWW8ImplReader(nVersion, pStg, pIn, rDoc,
+        std::unique_ptr<SwWW8ImplReader> pRdr(new SwWW8ImplReader(nVersion, pStg.get(), pIn, rDoc,
             rBaseURL, bNew, bSkipImages, *rPaM.GetPoint()));
         if (bNew)
         {
@@ -6283,7 +6283,7 @@ bool WW8Reader::ReadGlossaries(SwTextBlocks& rBlocks, bool bSaveRelFiles) const
     tools::SvRef<SotStorageStream> refStrm;
     if (!pThis->OpenMainStream(refStrm, nOldBuffSize))
     {
-        WW8Glossary aGloss( refStrm, 8, pStg );
+        WW8Glossary aGloss( refStrm, 8, pStg.get() );
         bRet = aGloss.Load( rBlocks, bSaveRelFiles );
     }
     return bRet;
diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx
index 7f88b578b634..b48c94af0516 100644
--- a/sw/source/filter/ww8/ww8par4.cxx
+++ b/sw/source/filter/ww8/ww8par4.cxx
@@ -84,7 +84,7 @@ static bool SwWw8ReadScaling(long& rX, long& rY, tools::SvRef<SotStorage>& rSrc1
 
     tools::SvRef<SotStorageStream> xSrc3 = rSrc1->OpenSotStream( "\3PIC",
         StreamMode::STD_READ );
-    SotStorageStream* pS = xSrc3;
+    SotStorageStream* pS = xSrc3.get();
     pS->SetEndian( SvStreamEndian::LITTLE );
     pS->Seek( STREAM_SEEK_TO_END );
 
@@ -129,7 +129,7 @@ static bool SwWw6ReadMetaStream(GDIMetaFile& rWMF, OLE_MFP* pMfp,
 {
     tools::SvRef<SotStorageStream> xSrc2 = rSrc1->OpenSotStream( "\3META",
         StreamMode::STD_READ );
-    SotStorageStream* pSt = xSrc2;
+    SotStorageStream* pSt = xSrc2.get();
     pSt->SetEndian( SvStreamEndian::LITTLE );
     size_t const nRead = pSt->ReadBytes(pMfp, sizeof(*pMfp));
                                 // read mini-placable-header
@@ -182,7 +182,7 @@ static bool SwWw6ReadMacPICTStream(Graphic& rGraph, tools::SvRef<SotStorage>& rS
 {
     // 03-META-stream does not exist. Maybe a 03-PICT?
     tools::SvRef<SotStorageStream> xSrc4 = rSrc1->OpenSotStream("\3PICT");
-    SotStorageStream* pStp = xSrc4;
+    SotStorageStream* pStp = xSrc4.get();
     pStp->SetEndian( SvStreamEndian::LITTLE );
     sal_uInt8 aTestA[10];        // Does the 01Ole-stream even exist?
     size_t const nReadTst = pStp->ReadBytes(aTestA, sizeof(aTestA));
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 94167640764a..503f83ef11b4 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -641,7 +641,7 @@ sal_uInt16 SwWW8ImplReader::End_Field()
 
                                 if ( xObjDst.Is() )
                                 {
-                                    xSrc1->CopyTo( xObjDst );
+                                    xSrc1->CopyTo( xObjDst.get() );
 
                                     if ( !xObjDst->GetError() )
                                         xObjDst->Commit();
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 52421db6dc87..cf34f85c11a1 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -3986,7 +3986,7 @@ void SwEntryBrowseBox::PaintCell(OutputDevice& rDev,
 
 ::svt::CellController* SwEntryBrowseBox::GetController(long /*nRow*/, sal_uInt16 nCol)
 {
-    return nCol < ITEM_CASE ? m_xController : m_xCheckController;
+    return nCol < ITEM_CASE ? m_xController.get() : m_xCheckController.get();
 }
 
 bool SwEntryBrowseBox::SaveModified()
@@ -4000,12 +4000,12 @@ bool SwEntryBrowseBox::SaveModified()
     ::svt::CellController* pController = nullptr;
     if(nCol < ITEM_CASE)
     {
-        pController = m_xController;
+        pController = m_xController.get();
         sNew = static_cast< ::svt::EditCellController*>(pController)->GetEditImplementation()->GetText( LINEEND_LF );
     }
     else
     {
-        pController = m_xCheckController;
+        pController = m_xCheckController.get();
         bVal = static_cast< ::svt::CheckBoxCellController*>(pController)->GetCheckBox().IsChecked();
     }
     AutoMarkEntry* pEntry = (nRow >= m_Entries.size()) ? new AutoMarkEntry
@@ -4040,13 +4040,13 @@ void SwEntryBrowseBox::InitController(
     if(nCol < ITEM_CASE)
     {
         rController = m_xController;
-        ::svt::CellController* pController = m_xController;
+        ::svt::CellController* pController = m_xController.get();
         static_cast< ::svt::EditCellController*>(pController)->GetEditImplementation()->SetText( rText );
     }
     else
     {
         rController = m_xCheckController;
-        ::svt::CellController* pController = m_xCheckController;
+        ::svt::CellController* pController = m_xCheckController.get();
         static_cast< ::svt::CheckBoxCellController*>(pController)->GetCheckBox().Check(
                                                             rText == m_sYes );
      }
@@ -4109,9 +4109,9 @@ void SwEntryBrowseBox::WriteEntries(SvStream& rOutStr)
     const sal_uInt16 nCol = GetCurColumnId();
     ::svt::CellController* pController;
     if(nCol < ITEM_CASE)
-        pController = m_xController;
+        pController = m_xController.get();
     else
-        pController = m_xCheckController;
+        pController = m_xCheckController.get();
     if(pController ->IsModified())
         GoToColumnId(nCol + (nCol < ITEM_CASE ? 1 : -1 ));
 
@@ -4145,9 +4145,9 @@ bool SwEntryBrowseBox::IsModified()const
     const sal_uInt16 nCol = GetCurColumnId();
     ::svt::CellController* pController;
     if(nCol < ITEM_CASE)
-        pController = m_xController;
+        pController = m_xController.get();
     else
-        pController = m_xCheckController;
+        pController = m_xCheckController.get();
     return pController->IsModified();
 }
 
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 781ca39149ca..2bf4ed906eb8 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -1027,7 +1027,7 @@ static SfxObjectShell* lcl_CreateWorkingDocument(
     if( pWrtShell ) *pWrtShell = pWorkWrtShell;
     if( pDoc )      *pDoc      = pWorkDoc;
 
-    return xWorkObjectShell;
+    return xWorkObjectShell.get();
 }
 
 uno::Reference< mail::XMailMessage > lcl_CreateMailFromDoc(
@@ -1240,7 +1240,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
             *pSourceShell, bMT_SHELL ? pSourceWindow : nullptr,
             nullptr, &pTargetView, &pTargetShell, &pTargetDoc );
         if (nMaxDumpDocs)
-            lcl_SaveDebugDoc( xTargetDocShell, "MergeDoc" );
+            lcl_SaveDebugDoc( xTargetDocShell.get(), "MergeDoc" );
     }
     else if( pTargetView )
     {
@@ -1444,7 +1444,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
                 targetDocPageCount += pWorkShell->GetPageCnt();
 
                 if ( (nMaxDumpDocs < 0) || (nDocNo <= nMaxDumpDocs) )
-                    lcl_SaveDebugDoc( xTargetDocShell, "MergeDoc" );
+                    lcl_SaveDebugDoc( xTargetDocShell.get(), "MergeDoc" );
 
                 if (bMT_SHELL)
                 {
@@ -1577,7 +1577,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
             }
             if( !lcl_SaveDoc( &aTempFileURL, pStoreToFilter,
                     pStoreToFilterOptions, &rMergeDescriptor.aSaveToFilterData,
-                    bIsPDFexport, xTargetDocShell, *pTargetShell ) )
+                    bIsPDFexport, xTargetDocShell.get(), *pTargetShell ) )
             {
                 m_aMergeStatus = MergeStatus::ERROR;
             }
@@ -1595,7 +1595,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
     if( !IsMergeError() && bMT_SHELL )
         // leave docshell available for caller (e.g. MM wizard)
         rMergeDescriptor.pMailMergeConfigItem->SetTargetView( pTargetView );
-    else if( xTargetDocShell )
+    else if( xTargetDocShell.Is() )
         xTargetDocShell->DoClose();
 
     rescheduleGui();
@@ -2865,7 +2865,7 @@ void SwDBManager::ExecuteFormLetter( SwWrtShell& rSh,
         // SfxObjectShellRef is ok, since there should be no control over the document lifetime here
         SfxObjectShellRef xDocShell = rSh.GetView().GetViewFrame()->GetObjectShell();
 
-        EMIT_SW_EVENT(MAIL_MERGE, xDocShell);
+        EMIT_SW_EVENT(MAIL_MERGE, xDocShell.get());
 
         // prepare mail merge descriptor
         SwMergeDescriptor aMergeDesc( pImpl->pMergeDialog->GetMergeType(), rSh, aDescriptor );
@@ -2879,7 +2879,7 @@ void SwDBManager::ExecuteFormLetter( SwWrtShell& rSh,
 
         Merge( aMergeDesc );
 
-        EMIT_SW_EVENT(MAIL_MERGE_END, xDocShell);
+        EMIT_SW_EVENT(MAIL_MERGE_END, xDocShell.get());
 
         // reset the cursor inside
         xResSet = nullptr;
diff --git a/sw/source/uibase/uno/unomailmerge.cxx b/sw/source/uibase/uno/unomailmerge.cxx
index aa667ef23aad..f081461d0366 100644
--- a/sw/source/uibase/uno/unomailmerge.cxx
+++ b/sw/source/uibase/uno/unomailmerge.cxx
@@ -599,7 +599,7 @@ uno::Any SAL_CALL SwXMailMerge::execute(
         aCurSelection = aTranslated;
     }
 
-    SfxViewFrame*   pFrame = SfxViewFrame::GetFirst( xCurDocSh, false);
+    SfxViewFrame*   pFrame = SfxViewFrame::GetFirst( xCurDocSh.get(), false);
     SwView *pView = pFrame ? dynamic_cast<SwView*>( pFrame->GetViewShell()  ) : nullptr;
     if (!pView)
         throw RuntimeException();
@@ -803,9 +803,9 @@ uno::Any SAL_CALL SwXMailMerge::execute(
     OSL_ENSURE( !pOldSrc || pOldSrc == this, "Ooops... different event source already set." );
     pMgr->SetMailMergeEvtSrc( this );   // launch events for listeners
 
-    SfxGetpApp()->NotifyEvent(SfxEventHint(SW_EVENT_MAIL_MERGE, SwDocShell::GetEventName(STR_SW_EVENT_MAIL_MERGE), xCurDocSh));
+    SfxGetpApp()->NotifyEvent(SfxEventHint(SW_EVENT_MAIL_MERGE, SwDocShell::GetEventName(STR_SW_EVENT_MAIL_MERGE), xCurDocSh.get()));
     bool bSucc = pMgr->Merge( aMergeDesc );
-    SfxGetpApp()->NotifyEvent(SfxEventHint(SW_EVENT_MAIL_MERGE_END, SwDocShell::GetEventName(STR_SW_EVENT_MAIL_MERGE_END), xCurDocSh));
+    SfxGetpApp()->NotifyEvent(SfxEventHint(SW_EVENT_MAIL_MERGE_END, SwDocShell::GetEventName(STR_SW_EVENT_MAIL_MERGE_END), xCurDocSh.get()));
 
     pMgr->SetMailMergeEvtSrc( pOldSrc );