diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-10-02 11:35:04 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-10-02 20:40:44 +0200 |
| commit | 7c70a59cd02a5b6111a9c39c74c8b6cd1585c4c2 (patch) | |
| tree | f343040e275f0b6b3470afd32a6f34a433cb2c8d /sw/source/filter/ww8/wrtww8gr.cxx | |
| parent | d7d3c11357efb65bd9721e6fedae2486162d1a71 (diff) | |
MSWordExportBase never passed a null SwDoc*
and drop redundant nullptr checks
Change-Id: I42b86461ad276089454b35a51651c5aa1e1280ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103850
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/filter/ww8/wrtww8gr.cxx')
| -rw-r--r-- | sw/source/filter/ww8/wrtww8gr.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx index 3645b519619e..e0600d4cb33d 100644 --- a/sw/source/filter/ww8/wrtww8gr.cxx +++ b/sw/source/filter/ww8/wrtww8gr.cxx @@ -131,10 +131,10 @@ bool WW8Export::TestOleNeedsGraphic(const SwAttrSet& rSet, tools::SvRef<SotStora if ( pOLENd ) nAspect = pOLENd->GetAspect(); SdrOle2Obj *pRet = SvxMSDffManager::CreateSdrOLEFromStorage( - *m_pDoc->getIDocumentDrawModelAccess().GetOrCreateDrawModel(), + *m_rDoc.getIDocumentDrawModelAccess().GetOrCreateDrawModel(), rStorageName, xObjStg, - m_pDoc->GetDocStorage(), + m_rDoc.GetDocStorage(), aGraph, aRect, tools::Rectangle(), @@ -150,7 +150,7 @@ bool WW8Export::TestOleNeedsGraphic(const SwAttrSet& rSet, tools::SvRef<SotStora if ( xObj.is() ) { std::unique_ptr<SvStream> pGraphicStream; - comphelper::EmbeddedObjectContainer aCnt( m_pDoc->GetDocStorage() ); + comphelper::EmbeddedObjectContainer aCnt( m_rDoc.GetDocStorage() ); try { uno::Reference< embed::XEmbedPersist > xPersist( @@ -319,7 +319,7 @@ void WW8Export::OutputOLENode( const SwOLENode& rOLENode ) void WW8Export::OutputLinkedOLE( const OUString& rOleId ) { - uno::Reference< embed::XStorage > xDocStg = m_pDoc->GetDocStorage(); + uno::Reference< embed::XStorage > xDocStg = m_rDoc.GetDocStorage(); uno::Reference< embed::XStorage > xOleStg = xDocStg->openStorageElement( "OLELinks", embed::ElementModes::READ ); tools::SvRef<SotStorage> xObjSrc = SotStorage::OpenOLEStorage( xOleStg, rOleId, StreamMode::READ ); @@ -405,7 +405,7 @@ void WW8Export::OutGrf(const ww8::Frame &rFrame) { const SwTextNode* pTextNd = static_cast<const SwTextNode*>(m_pOutFormatNode); SwPosition aPos(*pTextNd); - bVert = m_pDoc->IsInVerticalText(aPos); + bVert = m_rDoc.IsInVerticalText(aPos); } if (!bVert) { |