diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-05-18 13:31:26 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-05-18 15:50:03 +0100 |
| commit | 775fd7f613ae955d144aa77852ff7ed4eae44897 (patch) | |
| tree | 22fec0856a0870ebc99ea1ada4f41d417c433fbb /sw | |
| parent | 0c0228c4887ac3534cfb6679886f459850a65777 (diff) | |
check for TableBox without StartNode
Change-Id: I77b21c85716083029ab8873094621e0f8eceb48f
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 701ebc7de113..ad8e94d74277 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -3597,18 +3597,22 @@ void DocxAttributeOutput::TableVerticalCell( ww8::WW8TableNodeInfoInner::Pointer else if ( FRMDIR_HORI_LEFT_TOP == m_rExport.TrueFrameDirection( *pFrmFmt ) ) { // Undo the text direction mangling done by the btLr handler in writerfilter::dmapper::DomainMapperTableManager::sprm() - SwPaM aPam(*pTabBox->GetSttNd(), 0); - ++aPam.GetPoint()->nNode; - if (aPam.GetPoint()->nNode.GetNode().IsTxtNode()) + const SwStartNode* pSttNd = pTabBox->GetSttNd(); + if (pSttNd) { - const SwTxtNode& rTxtNode = static_cast<const SwTxtNode&>(aPam.GetPoint()->nNode.GetNode()); - if( const SwAttrSet* pAttrSet = rTxtNode.GetpSwAttrSet()) + SwPaM aPam(*pSttNd, 0); + ++aPam.GetPoint()->nNode; + if (aPam.GetPoint()->nNode.GetNode().IsTxtNode()) { - const SvxCharRotateItem& rCharRotate = pAttrSet->GetCharRotate(); - if (rCharRotate.GetValue() == 900) + const SwTxtNode& rTxtNode = static_cast<const SwTxtNode&>(aPam.GetPoint()->nNode.GetNode()); + if( const SwAttrSet* pAttrSet = rTxtNode.GetpSwAttrSet()) { - m_pSerializer->singleElementNS( XML_w, XML_textDirection, FSNS( XML_w, XML_val ), "btLr", FSEND ); - m_bBtLr = true; + const SvxCharRotateItem& rCharRotate = pAttrSet->GetCharRotate(); + if (rCharRotate.GetValue() == 900) + { + m_pSerializer->singleElementNS( XML_w, XML_textDirection, FSNS( XML_w, XML_val ), "btLr", FSEND ); + m_bBtLr = true; + } } } } |