sw/inc/docfac.hxx | 2
sw/source/core/unocore/unotext.cxx | 3 -
sw/source/filter/basflt/docfact.cxx | 10 +--
sw/source/uibase/app/docsh.cxx | 6 +-
sw/source/uibase/app/docshini.cxx | 2
sw/source/uibase/dochdl/swdtflvr.cxx | 98 ++++++++++++++++-------------------
6 files changed, 57 insertions(+), 64 deletions(-)
New commits:
commit c26807a9e9ba653712e293a7b34e25686f4bb43d
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Sep 30 10:51:20 2020 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Sep 30 17:13:39 2020 +0200
SwDocFac::GetDoc can return a reference
and remove discovered redundant null checks
Change-Id: I200fd0ad61b307c78a354b7a6929b70045fee488
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103690
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/inc/docfac.hxx b/sw/inc/docfac.hxx
index 01bf092f2ee8..60e6a2ab1626 100644
--- a/sw/inc/docfac.hxx
+++ b/sw/inc/docfac.hxx
@@ -33,7 +33,7 @@ public:
~SwDocFac() COVERITY_NOEXCEPT_FALSE;
/// Document is created after calling Read(...).
- SwDoc* GetDoc();
+ SwDoc& GetDoc();
};
#endif
diff --git a/sw/source/core/unocore/unotext.cxx
b/sw/source/core/unocore/unotext.cxx
index 614afccfd459..3b38b63871c4 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -131,7 +131,8 @@ const SwDoc * SwXText::GetDoc() const
{
return m_pImpl->m_pDoc;
}
- SwDoc * SwXText::GetDoc()
+
+SwDoc * SwXText::GetDoc()
{
return m_pImpl->m_pDoc;
}
diff --git a/sw/source/filter/basflt/docfact.cxx
b/sw/source/filter/basflt/docfact.cxx
index f2302eb92cbd..731f29913b0f 100644
--- a/sw/source/filter/basflt/docfact.cxx
+++ b/sw/source/filter/basflt/docfact.cxx
@@ -26,19 +26,15 @@ SwDocFac::SwDocFac( SwDoc *pDc )
{
}
-
SwDocFac::~SwDocFac() COVERITY_NOEXCEPT_FALSE
{
}
-
-SwDoc *SwDocFac::GetDoc()
+SwDoc& SwDocFac::GetDoc()
{
- if( !mxDoc.is() )
- {
+ if(!mxDoc.is())
mxDoc = new SwDoc;
- }
- return mxDoc.get();
+ return *mxDoc;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index 9846c1748e1f..d918df4b3a37 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -222,7 +222,7 @@ bool SwDocShell::ConvertFrom( SfxMedium& rMedium )
SW_MOD()->SetEmbeddedLoadSave(
SfxObjectCreateMode::EMBEDDED == GetCreateMode() );
-
pRdr->GetDoc()->getIDocumentSettingAccess().set(DocumentSettingId::HTML_MODE,
dynamic_cast< const SwWebDocShell *>( this ) != nullptr);
+
pRdr->GetDoc().getIDocumentSettingAccess().set(DocumentSettingId::HTML_MODE,
dynamic_cast< const SwWebDocShell *>( this ) != nullptr);
// Restore the pool default if reading a saved document.
m_xDoc->RemoveAllFormatLanguageDependencies();
@@ -230,10 +230,10 @@ bool SwDocShell::ConvertFrom( SfxMedium& rMedium )
ErrCode nErr = pRdr->Read( *pRead );
// Maybe put away one old Doc
- if (m_xDoc.get() != pRdr->GetDoc())
+ if (m_xDoc.get() != &pRdr->GetDoc())
{
RemoveLink();
- m_xDoc = pRdr->GetDoc();
+ m_xDoc = &pRdr->GetDoc();
AddLink();
diff --git a/sw/source/uibase/app/docshini.cxx
b/sw/source/uibase/app/docshini.cxx
index ec1f31610a71..0cfea4721e42 100644
--- a/sw/source/uibase/app/docshini.cxx
+++ b/sw/source/uibase/app/docshini.cxx
@@ -393,7 +393,7 @@ void SwDocShell::AddLink()
if (!m_xDoc)
{
SwDocFac aFactory;
- m_xDoc = aFactory.GetDoc();
+ m_xDoc = &aFactory.GetDoc();
m_xDoc->getIDocumentSettingAccess().set(DocumentSettingId::HTML_MODE,
dynamic_cast< const SwWebDocShell *>( this ) != nullptr );
}
m_xDoc->SetDocShell( this ); // set the DocShell-Pointer for Doc
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx
b/sw/source/uibase/dochdl/swdtflvr.cxx
index fee2723e13de..44127a51f6f4 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -304,15 +304,11 @@ SwTransferable::~SwTransferable()
m_eBufferType = TransferBufferType::NONE;
}
-static SwDoc * lcl_GetDoc(SwDocFac & rDocFac)
+static SwDoc& lcl_GetDoc(SwDocFac & rDocFac)
{
- SwDoc *const pDoc = rDocFac.GetDoc();
- OSL_ENSURE( pDoc, "Document not found" );
- if (pDoc)
- {
- pDoc->SetClipBoard( true );
- }
- return pDoc;
+ SwDoc& rDoc = rDocFac.GetDoc();
+ rDoc.SetClipBoard( true );
+ return rDoc;
}
void SwTransferable::ObjectReleased()
@@ -348,7 +344,7 @@ uno::Reference < embed::XEmbeddedObject >
SwTransferable::FindOLEObj( sal_Int64&
uno::Reference < embed::XEmbeddedObject > xObj;
if( m_pClpDocFac )
{
- SwIterator<SwContentNode,SwFormatColl> aIter(
*m_pClpDocFac->GetDoc()->GetDfltGrfFormatColl() );
+ SwIterator<SwContentNode,SwFormatColl> aIter(
*m_pClpDocFac->GetDoc().GetDfltGrfFormatColl() );
for( SwContentNode* pNd = aIter.First(); pNd; pNd = aIter.Next() )
if( SwNodeType::Ole == pNd->GetNodeType() )
{
@@ -364,7 +360,7 @@ const Graphic* SwTransferable::FindOLEReplacementGraphic()
const
{
if( m_pClpDocFac )
{
- SwIterator<SwContentNode,SwFormatColl> aIter(
*m_pClpDocFac->GetDoc()->GetDfltGrfFormatColl() );
+ SwIterator<SwContentNode,SwFormatColl> aIter(
*m_pClpDocFac->GetDoc().GetDfltGrfFormatColl() );
for( SwContentNode* pNd = aIter.First(); pNd; pNd = aIter.Next() )
if( SwNodeType::Ole == pNd->GetNodeType() )
{
@@ -429,15 +425,15 @@ sal_Bool SAL_CALL SwTransferable::isComplex()
// Copy into a new Doc so we don't mess with the existing one.
//FIXME: We *should* be able to avoid this and improve the performance.
m_pClpDocFac.reset(new SwDocFac);
- SwDoc* const pTmpDoc = lcl_GetDoc(*m_pClpDocFac);
+ SwDoc& rTmpDoc = lcl_GetDoc(*m_pClpDocFac);
- pTmpDoc->getIDocumentFieldsAccess()
+ rTmpDoc.getIDocumentFieldsAccess()
.LockExpFields(); // never update fields - leave text as it is
- lclOverWriteDoc(*m_pWrtShell, *pTmpDoc);
+ lclOverWriteDoc(*m_pWrtShell, rTmpDoc);
sal_Int32 nTextLength = 0;
const SwNode* pEndOfContent =
&m_pWrtShell->GetDoc()->GetNodes().GetEndOfContent();
- SwNodes& aNodes = pTmpDoc->GetNodes();
+ SwNodes& aNodes = rTmpDoc.GetNodes();
for( sal_uLong nIndex = 0; nIndex < aNodes.Count(); ++nIndex)
{
SwNode& rNd = *aNodes[nIndex];
@@ -504,16 +500,16 @@ bool SwTransferable::GetData( const DataFlavor& rFlavor,
const OUString& rDestDo
}
m_pClpDocFac.reset(new SwDocFac);
- SwDoc *const pTmpDoc = lcl_GetDoc(*m_pClpDocFac);
+ SwDoc& rTmpDoc = lcl_GetDoc(*m_pClpDocFac);
- pTmpDoc->getIDocumentFieldsAccess().LockExpFields(); // never
update fields - leave text as it is
- lclOverWriteDoc(*m_pWrtShell, *pTmpDoc);
+ rTmpDoc.getIDocumentFieldsAccess().LockExpFields(); // never
update fields - leave text as it is
+ lclOverWriteDoc(*m_pWrtShell, rTmpDoc);
// in CORE a new one was created (OLE-objects copied!)
- m_aDocShellRef = pTmpDoc->GetTmpDocShell();
+ m_aDocShellRef = rTmpDoc.GetTmpDocShell();
if( m_aDocShellRef.Is() )
SwTransferable::InitOle( m_aDocShellRef );
- pTmpDoc->SetTmpDocShell( nullptr );
+ rTmpDoc.SetTmpDocShell( nullptr );
if( nSelectionType & SelectionType::Text && !m_pWrtShell->HasMark() )
{
@@ -589,35 +585,35 @@ bool SwTransferable::GetData( const DataFlavor& rFlavor,
const OUString& rDestDo
case SotClipboardFormatId::DRAWING:
{
- SwDoc *const pDoc = lcl_GetDoc(*m_pClpDocFac);
- bOK = SetObject(
pDoc->getIDocumentDrawModelAccess().GetDrawModel(),
+ SwDoc& rDoc = lcl_GetDoc(*m_pClpDocFac);
+ bOK = SetObject(
rDoc.getIDocumentDrawModelAccess().GetDrawModel(),
SWTRANSFER_OBJECTTYPE_DRAWMODEL, rFlavor );
}
break;
case SotClipboardFormatId::STRING:
{
- SwDoc *const pDoc = lcl_GetDoc(*m_pClpDocFac);
- bOK = SetObject( pDoc, SWTRANSFER_OBJECTTYPE_STRING, rFlavor );
+ SwDoc& rDoc = lcl_GetDoc(*m_pClpDocFac);
+ bOK = SetObject( &rDoc, SWTRANSFER_OBJECTTYPE_STRING, rFlavor );
}
break;
case SotClipboardFormatId::RTF:
{
- SwDoc *const pDoc = lcl_GetDoc(*m_pClpDocFac);
- bOK = SetObject( pDoc, SWTRANSFER_OBJECTTYPE_RTF, rFlavor );
+ SwDoc& rDoc = lcl_GetDoc(*m_pClpDocFac);
+ bOK = SetObject( &rDoc, SWTRANSFER_OBJECTTYPE_RTF, rFlavor );
}
break;
case SotClipboardFormatId::RICHTEXT:
{
- SwDoc *const pDoc = lcl_GetDoc(*m_pClpDocFac);
- bOK = SetObject( pDoc, SWTRANSFER_OBJECTTYPE_RICHTEXT, rFlavor );
+ SwDoc& rDoc = lcl_GetDoc(*m_pClpDocFac);
+ bOK = SetObject( &rDoc, SWTRANSFER_OBJECTTYPE_RICHTEXT, rFlavor );
}
break;
case SotClipboardFormatId::HTML:
{
- SwDoc *const pDoc = lcl_GetDoc(*m_pClpDocFac);
- bOK = SetObject( pDoc, SWTRANSFER_OBJECTTYPE_HTML, rFlavor );
+ SwDoc& rDoc = lcl_GetDoc(*m_pClpDocFac);
+ bOK = SetObject( &rDoc, SWTRANSFER_OBJECTTYPE_HTML, rFlavor );
}
break;
@@ -660,8 +656,8 @@ bool SwTransferable::GetData( const DataFlavor& rFlavor,
const OUString& rDestDo
case SotClipboardFormatId::EMBED_SOURCE:
if( !m_aDocShellRef.Is() )
{
- SwDoc *const pDoc = lcl_GetDoc(*m_pClpDocFac);
- SwDocShell* pNewDocSh = new SwDocShell( pDoc,
+ SwDoc& rDoc = lcl_GetDoc(*m_pClpDocFac);
+ SwDocShell* pNewDocSh = new SwDocShell( &rDoc,
SfxObjectCreateMode::EMBEDDED );
m_aDocShellRef = pNewDocSh;
m_aDocShellRef->DoInitNew();
@@ -895,8 +891,8 @@ int SwTransferable::PrepareForCopy( bool bIsCut )
m_pOrigGraphic = m_pClpBitmap.get();
m_pClpDocFac.reset(new SwDocFac);
- SwDoc *const pDoc = lcl_GetDoc(*m_pClpDocFac);
- m_pWrtShell->Copy( pDoc );
+ SwDoc& rDoc = lcl_GetDoc(*m_pClpDocFac);
+ m_pWrtShell->Copy( &rDoc );
#if HAVE_FEATURE_DESKTOP
if (m_pOrigGraphic && !m_pOrigGraphic->GetBitmapEx().IsEmpty())
@@ -921,10 +917,10 @@ int SwTransferable::PrepareForCopy( bool bIsCut )
else if ( nSelection == SelectionType::Ole )
{
m_pClpDocFac.reset(new SwDocFac);
- SwDoc *const pDoc = lcl_GetDoc(*m_pClpDocFac);
- m_aDocShellRef = new SwDocShell( pDoc, SfxObjectCreateMode::EMBEDDED);
+ SwDoc& rDoc = lcl_GetDoc(*m_pClpDocFac);
+ m_aDocShellRef = new SwDocShell( &rDoc, SfxObjectCreateMode::EMBEDDED);
m_aDocShellRef->DoInitNew();
- m_pWrtShell->Copy( pDoc );
+ m_pWrtShell->Copy(&rDoc);
AddFormat( SotClipboardFormatId::EMBED_SOURCE );
@@ -973,13 +969,13 @@ int SwTransferable::PrepareForCopy( bool bIsCut )
if( m_pWrtShell->IsAddMode() &&
m_pWrtShell->SwCursorShell::HasSelection() )
m_pWrtShell->CreateCursor();
- SwDoc *const pTmpDoc = lcl_GetDoc(*m_pClpDocFac);
+ SwDoc& rTmpDoc = lcl_GetDoc(*m_pClpDocFac);
- pTmpDoc->getIDocumentFieldsAccess().LockExpFields(); // Never
update fields - leave text as is
- lclOverWriteDoc(*m_pWrtShell, *pTmpDoc);
+ rTmpDoc.getIDocumentFieldsAccess().LockExpFields(); // Never
update fields - leave text as is
+ lclOverWriteDoc(*m_pWrtShell, rTmpDoc);
{
- IDocumentMarkAccess* const pMarkAccess =
pTmpDoc->getIDocumentMarkAccess();
+ IDocumentMarkAccess* const pMarkAccess =
rTmpDoc.getIDocumentMarkAccess();
std::vector< ::sw::mark::IMark* > vDdeMarks;
// find all DDE-Bookmarks
for(IDocumentMarkAccess::const_iterator_t ppMark =
pMarkAccess->getAllMarksBegin();
@@ -995,10 +991,10 @@ int SwTransferable::PrepareForCopy( bool bIsCut )
}
// a new one was created in CORE (OLE objects copied!)
- m_aDocShellRef = pTmpDoc->GetTmpDocShell();
+ m_aDocShellRef = rTmpDoc.GetTmpDocShell();
if( m_aDocShellRef.Is() )
SwTransferable::InitOle( m_aDocShellRef );
- pTmpDoc->SetTmpDocShell( nullptr );
+ rTmpDoc.SetTmpDocShell( nullptr );
if( m_pWrtShell->IsObjSelected() )
m_eBufferType = TransferBufferType::Drawing;
@@ -1150,8 +1146,8 @@ void SwTransferable::CalculateAndCopy()
OUString aStr( m_pWrtShell->Calculate() );
m_pClpDocFac.reset(new SwDocFac);
- SwDoc *const pDoc = lcl_GetDoc(*m_pClpDocFac);
- m_pWrtShell->Copy(pDoc, & aStr);
+ SwDoc& rDoc = lcl_GetDoc(*m_pClpDocFac);
+ m_pWrtShell->Copy(&rDoc, & aStr);
m_eBufferType = TransferBufferType::Document;
AddFormat( SotClipboardFormatId::STRING );
@@ -1165,22 +1161,22 @@ bool SwTransferable::CopyGlossary( SwTextBlocks&
rGlossary, const OUString& rStr
SwWait aWait( *m_pWrtShell->GetView().GetDocShell(), true );
m_pClpDocFac.reset(new SwDocFac);
- SwDoc *const pCDoc = lcl_GetDoc(*m_pClpDocFac);
+ SwDoc& rCDoc = lcl_GetDoc(*m_pClpDocFac);
- SwNodes& rNds = pCDoc->GetNodes();
+ SwNodes& rNds = rCDoc.GetNodes();
SwNodeIndex aNodeIdx( *rNds.GetEndOfContent().StartOfSectionNode() );
SwContentNode* pCNd = rNds.GoNext( &aNodeIdx ); // go to 1st ContentNode
SwPaM aPam( *pCNd );
- pCDoc->getIDocumentFieldsAccess().LockExpFields(); // never update
fields - leave text as it is
+ rCDoc.getIDocumentFieldsAccess().LockExpFields(); // never update fields
- leave text as it is
- pCDoc->InsertGlossary( rGlossary, rStr, aPam );
+ rCDoc.InsertGlossary( rGlossary, rStr, aPam );
// a new one was created in CORE (OLE-Objects copied!)
- m_aDocShellRef = pCDoc->GetTmpDocShell();
+ m_aDocShellRef = rCDoc.GetTmpDocShell();
if( m_aDocShellRef.Is() )
SwTransferable::InitOle( m_aDocShellRef );
- pCDoc->SetTmpDocShell( nullptr );
+ rCDoc.SetTmpDocShell( nullptr );
m_eBufferType = TransferBufferType::Document;
@@ -3755,7 +3751,7 @@ bool SwTransferable::PrivatePaste(SwWrtShell& rShell,
SwPasteContext* pContext,
bool bRet = true;
// m_pWrtShell is nullptr when the source document is closed already.
if (!m_pWrtShell || lcl_checkClassification(m_pWrtShell->GetDoc(),
rShell.GetDoc()))
- bRet = rShell.Paste(m_pClpDocFac->GetDoc(), ePasteTable ==
PasteTableType::PASTE_TABLE);
+ bRet = rShell.Paste(&m_pClpDocFac->GetDoc(), ePasteTable ==
PasteTableType::PASTE_TABLE);
if( bKillPaMs )
rShell.KillPams();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
