From efd7c456fffc77a6bb2e85d3d89f98ccd4a0faba Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sun, 28 Sep 2014 16:47:13 +0100 Subject: Related: fdo#73608 don't crash on missing table styles (cherry picked from commit 5fd7382651d64f77e8ad1d9a5c053f52f3641f9f) Conflicts: writerfilter/source/dmapper/DomainMapperTableHandler.cxx Change-Id: I340b43b7afc4c5c4d6dc8e4ed182279240306540 Resolves: fdo#73608 bail out on loop in style sheet hierarchy Change-Id: I03975d1ce8eaceceb4d5c263eb11c1521bcd57eb (cherry picked from commit be18133e84120625734a09380594ee89b23c4322) Reviewed-on: https://gerrit.libreoffice.org/11680 Reviewed-by: Andras Timar Tested-by: Andras Timar --- sw/qa/core/data/ooxml/pass/fdo73608-1.docx | Bin 0 -> 11066 bytes sw/qa/core/data/ooxml/pass/fdo73608-2.docx | Bin 0 -> 11064 bytes .../source/dmapper/DomainMapperTableHandler.cxx | 16 +++++++++++++++- 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 sw/qa/core/data/ooxml/pass/fdo73608-1.docx create mode 100644 sw/qa/core/data/ooxml/pass/fdo73608-2.docx diff --git a/sw/qa/core/data/ooxml/pass/fdo73608-1.docx b/sw/qa/core/data/ooxml/pass/fdo73608-1.docx new file mode 100644 index 000000000000..d3cc84a6edb9 Binary files /dev/null and b/sw/qa/core/data/ooxml/pass/fdo73608-1.docx differ diff --git a/sw/qa/core/data/ooxml/pass/fdo73608-2.docx b/sw/qa/core/data/ooxml/pass/fdo73608-2.docx new file mode 100644 index 000000000000..f5588782cd22 Binary files /dev/null and b/sw/qa/core/data/ooxml/pass/fdo73608-2.docx differ diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx index 7b8d9cd9a42d..b4002d7fd795 100644 --- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx @@ -116,9 +116,17 @@ void DomainMapperTableHandler::startTable(unsigned int nRows, PropertyMapPtr lcl_SearchParentStyleSheetAndMergeProperties(const StyleSheetEntryPtr pStyleSheet, StyleSheetTablePtr pStyleSheetTable) { PropertyMapPtr pRet; + + if (!pStyleSheet) + return pRet; + if(!pStyleSheet->sBaseStyleIdentifier.isEmpty()) { const StyleSheetEntryPtr pParentStyleSheet = pStyleSheetTable->FindStyleSheetByISTD( pStyleSheet->sBaseStyleIdentifier ); + //a loop in the style hierarchy, bail out + if (pParentStyleSheet == pStyleSheet) + return pRet; + pRet = lcl_SearchParentStyleSheetAndMergeProperties( pParentStyleSheet, pStyleSheetTable ); } else @@ -126,7 +134,10 @@ PropertyMapPtr lcl_SearchParentStyleSheetAndMergeProperties(const StyleSheetEntr pRet.reset( new PropertyMap ); } - pRet->InsertProps(pStyleSheet->pProperties); + if (pRet) + { + pRet->InsertProps(pStyleSheet->pProperties); + } return pRet; } @@ -291,6 +302,9 @@ namespace bool lcl_extractTableBorderProperty(PropertyMapPtr pTableProperties, const PropertyIds nId, TableInfo& rInfo, table::BorderLine2& rLine) { + if (!pTableProperties) + return false; + PropertyMap::iterator aTblBorderIter = pTableProperties->find(nId); if( aTblBorderIter != pTableProperties->end() ) { -- cgit v1.2.3