diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-02-26 12:30:57 +0000 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2018-02-27 17:55:04 +0100 |
| commit | efadc8becb2376e54839a7823560811063fb2f48 (patch) | |
| tree | e87e9f416111fb057e20a8b02e7ad1df095279a4 /writerfilter | |
| parent | e4d0e964b5be550c88c8c6693beca483c2ca1a1b (diff) | |
forcepoint #10 pop empty stack
Change-Id: I96452a86187a6b03251614625445d1b18a5ee218
Reviewed-on: https://gerrit.libreoffice.org/50358
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapperTableManager.cxx | 6 | ||||
| -rw-r--r-- | writerfilter/source/rtftok/rtfdispatchvalue.cxx | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx index aba8a2fd4adc..b101ec64dc0c 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx @@ -453,6 +453,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/rtftok/rtfdispatchvalue.cxx b/writerfilter/source/rtftok/rtfdispatchvalue.cxx index 416f35204f19..7079962c69d1 100644 --- a/writerfilter/source/rtftok/rtfdispatchvalue.cxx +++ b/writerfilter/source/rtftok/rtfdispatchvalue.cxx @@ -213,7 +213,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); |