diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-03-31 14:05:47 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-03-31 20:08:53 +0200 |
| commit | 41b72adab4da7ad793e60a6959e48a8dd42dbde4 (patch) | |
| tree | 9172fe062ea42a615eaac7b535475aa5b980fd10 | |
| parent | 17757784c02a28ca2c3f70c64ae29f2c61c58249 (diff) | |
sw: no need to handle a null SwDoc in SwDrawModel ctor
Change-Id: I9ac596ade8b42979ee3fc944af878c702a7e223b
| -rw-r--r-- | sw/source/core/draw/drawdoc.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/core/draw/drawdoc.cxx b/sw/source/core/draw/drawdoc.cxx index 0c7cc1b697a0..6c7a0b1cc228 100644 --- a/sw/source/core/draw/drawdoc.cxx +++ b/sw/source/core/draw/drawdoc.cxx @@ -59,10 +59,10 @@ SwDrawModel::SwDrawModel(SwDoc *const pDoc) // use common InitDrawModelAndDocShell which will set the associations as needed, // including SvxColorTableItem with WhichID SID_COLOR_TABLE - InitDrawModelAndDocShell(m_pDoc ? m_pDoc->GetDocShell() : 0, this); + InitDrawModelAndDocShell(m_pDoc->GetDocShell(), this); // copy all the default values to the SdrModel - SfxItemPool* pSdrPool = pDoc->GetAttrPool().GetSecondaryPool(); + SfxItemPool* pSdrPool = m_pDoc->GetAttrPool().GetSecondaryPool(); if( pSdrPool ) { const sal_uInt16 aWhichRanges[] = @@ -72,7 +72,7 @@ SwDrawModel::SwDrawModel(SwDoc *const pDoc) 0 }; - SfxItemPool& rDocPool = pDoc->GetAttrPool(); + SfxItemPool& rDocPool = m_pDoc->GetAttrPool(); sal_uInt16 nEdtWhich, nSlotId; const SfxPoolItem* pItem; for( const sal_uInt16* pRangeArr = aWhichRanges; @@ -92,10 +92,10 @@ SwDrawModel::SwDrawModel(SwDoc *const pDoc) } } - SetForbiddenCharsTable( pDoc->GetDocumentSettingManager().getForbiddenCharacterTable() ); + SetForbiddenCharsTable(m_pDoc->GetDocumentSettingManager().getForbiddenCharacterTable()); // Implementation for asian compression SetCharCompressType( static_cast<sal_uInt16>( - pDoc->GetDocumentSettingManager().getCharacterCompressionType())); + m_pDoc->GetDocumentSettingManager().getCharacterCompressionType())); } // Destructor |