writerfilter/source/dmapper/DomainMapper.cxx | 2 --
1 file changed, 2 deletions(-)
New commits:
commit e8d97f2af7e58e7c0068c813eede2fb4ea75a3ab
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Thu Jan 18 20:57:52 2024 +0600
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Wed Jan 24 13:52:00 2024 +0100
Related: tdf#159259 Drop obsolete exclusion of framePr inside sdt
Commit 73bd937420b9a99e1e35950e3f9dcbcfd874876d (n#780853 fix DOCX
import of w:sdtContent in table cell, 2012-09-25) had introduced a
restriction, where a framePr was ignored, when inside an sdt. It
was required to allow table import, which broke otherwise.
Since then, the situation has obviously changed; the test case for
the change, added in commit 7ea71eb8a28c4b41949299ff7d4b391486c90eea
(n#780853 testcase, 2012-09-25) passes after removal of the check.
This check disallows importing sdt in frame. This makes the bugdoc
of tdf#159259 to import the sdt in frame. The Lorem Ipsum paragraph
is still enclosed into the sdt - to be fixed in a follow-up.
Change-Id: I60fbb2dd6f753682217d86e4f8d315f1883c6e83
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162258
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
(cherry picked from commit 4d0f2d5ec9f7f988a1493916ae35bac1986c95a8)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162384
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
Tested-by: Xisco Fauli <xiscofa...@libreoffice.org>
(cherry picked from commit 883aa0695524d171c9009c87b4f32488b134629f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162467
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index e4e66672fab9..6813736dc4c5 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -2408,8 +2408,6 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const
PropertyMapPtr& rContext )
}
break;
case NS_ooxml::LN_CT_PPrBase_framePr:
- // Avoid frames if we're inside a structured document tag, would just
cause outer tables fail to create.
- if (!m_pImpl->GetSdt())
{
PropertyMapPtr pContext =
m_pImpl->GetTopContextOfType(CONTEXT_PARAGRAPH);
if( pContext )
