diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-09-15 16:53:43 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-09-16 08:52:47 +0000 |
| commit | 6da201e1cb5fc1cb9d0f3c27270f98fd2eb03eef (patch) | |
| tree | 3b444b41cf110b211118cfc6618afaebbb4fde16 /writerfilter | |
| parent | 62123bf21c4c56cc3fd6b941f10deecd3c9fe5c9 (diff) | |
Resolves: fdo#66496 don't crash on loading specific .docx
Change-Id: I4db5dfeb0ce1494039a051f552ce3f69b2b5dae3
(cherry picked from commit 48a679cbc5775a7a033dfe494c2a0a513aba9b1f)
Reviewed-on: https://gerrit.libreoffice.org/11459
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapperTableManager.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx index 121ea21a537a..22c7a62afeb9 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx @@ -515,7 +515,7 @@ void DomainMapperTableManager::endLevel( ) oCurrentWidth.reset(m_aCellWidths.back()->back()); m_aCellWidths.pop_back( ); // And push it back to the right level. - if (oCurrentWidth) + if (oCurrentWidth && !m_aCellWidths.empty() && !m_aCellWidths.back()->empty()) m_aCellWidths.back()->push_back(*oCurrentWidth); m_nCell.pop_back( ); |