diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-02-26 12:30:57 +0000 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-03-06 16:36:06 +0100 |
| commit | b0de5d677638772028f48059c2ad54bd327dfaf4 (patch) | |
| tree | e919062e709a8a67177082b786ce23ddab8cbc7b /writerfilter | |
| parent | 91000db4d97c75f58bbca0f79fca1944934ee995 (diff) | |
forcepoint #10 pop empty stack
Reviewed-on: https://gerrit.libreoffice.org/50359
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit befd67bcd0607bf2f0116a5418f3c7278e471631)
Change-Id: I96452a86187a6b03251614625445d1b18a5ee218
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapperTableManager.cxx | 6 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/TableManager.cxx | 2 | ||||
| -rw-r--r-- | writerfilter/source/rtftok/rtfdispatchvalue.cxx | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx index 1c1a3c10fcde..f5d2a8112ee9 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx @@ -463,6 +463,12 @@ void DomainMapperTableManager::startLevel( ) void DomainMapperTableManager::endLevel( ) { + if (m_aTableGrid.empty()) + { + SAL_WARN("writerfilter.dmapper", "Table stack is empty"); + return; + } + m_aTableGrid.pop_back( ); m_aGridSpans.pop_back( ); diff --git a/writerfilter/source/dmapper/TableManager.cxx b/writerfilter/source/dmapper/TableManager.cxx index c14ec25b0d28..238258ffe15a 100644 --- a/writerfilter/source/dmapper/TableManager.cxx +++ b/writerfilter/source/dmapper/TableManager.cxx @@ -251,8 +251,6 @@ void TableManager::endParagraphGroup() if (mnTableDepth > 0) { - TableData::Pointer_t pTableData = mTableDataStack.top(); - if (isRowEnd()) { endOfRowAction(); diff --git a/writerfilter/source/rtftok/rtfdispatchvalue.cxx b/writerfilter/source/rtftok/rtfdispatchvalue.cxx index 1c0ec1bd8401..11235aaf06f3 100644 --- a/writerfilter/source/rtftok/rtfdispatchvalue.cxx +++ b/writerfilter/source/rtftok/rtfdispatchvalue.cxx @@ -198,7 +198,7 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) } if (nSprm > 0) { - LanguageTag aTag((LanguageType)nParam); + LanguageTag aTag((LanguageType(static_cast<sal_uInt16>(nParam)))); auto pValue = std::make_shared<RTFValue>(aTag.getBcp47()); putNestedAttribute(m_aStates.top().aCharacterSprms, NS_ooxml::LN_EG_RPrBase_lang, nSprm, pValue); // Language is a character property, but we should store it at a paragraph level as well for fields. |