Kaydet (Commit) b0de5d67 authored tarafından Caolán McNamara's avatar Caolán McNamara Kaydeden (comit) Andras Timar

forcepoint #10 pop empty stack

Reviewed-on: https://gerrit.libreoffice.org/50359Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
(cherry picked from commit befd67bc)

Change-Id: I96452a86187a6b03251614625445d1b18a5ee218
üst 91000db4
This diff is collapsed.
......@@ -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( );
......
......@@ -251,8 +251,6 @@ void TableManager::endParagraphGroup()
if (mnTableDepth > 0)
{
TableData::Pointer_t pTableData = mTableDataStack.top();
if (isRowEnd())
{
endOfRowAction();
......
......@@ -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.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment