diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-10-04 15:57:04 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-10-04 22:18:19 +0200 |
| commit | 60ef0a2ff7fad0d94f4cc5020df3aee14568a82c (patch) | |
| tree | 2a6e227f67cb2ce6013dfaa4fb66edc93cdc7a65 | |
| parent | 8bb5b028b975b9a92d053a784f7940cc6c4fe97f (diff) | |
ofz#17992 null deref
presumably since...
commit f9aac900ada3d507526eeeed5b51fc7a10ab4cae
Date: Wed Oct 2 14:57:16 2019 +0200
tdf#81100 DOCX import: repeat header according to table style
Change-Id: I4f093606a15909c8e29b18dfb792abd938a80c5b
Reviewed-on: https://gerrit.libreoffice.org/80234
Reviewed-by: László Németh <nemeth@numbertext.org>
Tested-by: Jenkins
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx index 859c8c4415c5..be87c2c3785f 100644 --- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx @@ -439,10 +439,13 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo m_aTableProperties->dumpXml(); TagLogger::getInstance().endElement(); #endif - // apply tblHeader setting of the table style - PropertyMapPtr pHeaderStyleProps = pTableStyle->GetProperties(CNF_FIRST_ROW); - if ( pHeaderStyleProps->getProperty(PROP_HEADER_ROW_COUNT) ) - m_aTableProperties->Insert(PROP_HEADER_ROW_COUNT, uno::makeAny( sal_Int32(1)), false); + if (pTableStyle) + { + // apply tblHeader setting of the table style + PropertyMapPtr pHeaderStyleProps = pTableStyle->GetProperties(CNF_FIRST_ROW); + if ( pHeaderStyleProps->getProperty(PROP_HEADER_ROW_COUNT) ) + m_aTableProperties->Insert(PROP_HEADER_ROW_COUNT, uno::makeAny( sal_Int32(1)), false); + } } } |