diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-02-26 12:30:57 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-02-26 18:33:28 +0100 |
| commit | 0169227035c5bfb70da615824f5714762b4ba062 (patch) | |
| tree | 00fc85d76c978696e40148084ab9917320a718da /writerfilter/source | |
| parent | 663702cd3e8dc6967d8a6762ae534e06dc7d502b (diff) | |
forcepoint #10 pop empty stack
Change-Id: I96452a86187a6b03251614625445d1b18a5ee218
Reviewed-on: https://gerrit.libreoffice.org/50357
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'writerfilter/source')
| -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 40ca3365232c..93b4d9266db4 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 2ea3c547b10e..efe8a1ef0c1f 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); |