sw/qa/extras/ooxmlexport/ooxmlexport21.cxx | 2 +-
sw/source/writerfilter/ooxml/OOXMLFastContextHandler.cxx | 14 +-------------
2 files changed, 2 insertions(+), 14 deletions(-)
New commits:
commit 7144a9c791ab587b4621c2b35611ba2020baab58
Author: Justin Luth <jl...@mail.com>
AuthorDate: Mon Jul 29 17:01:55 2024 -0400
Commit: Justin Luth <jl...@mail.com>
CommitDate: Sat Aug 17 22:30:50 2024 +0200
tdf#162211 tdf#153909 layoutInCell vml: don't discard layoutInCell
This is just a clean-up patch,
doing for the VML code path what was handled for drawingML
This effectively reverts my patch for tdf#153909
commit ad0266eb84eafa32ccc4e0ddf3c6392860bc9b13,
but it depends on all the changes made for tdf#162211.
Change-Id: I3b5942c406ee73e91cdff1f1f73a2b92e0688474
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171609
Tested-by: Jenkins
Reviewed-by: Justin Luth <jl...@mail.com>
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport21.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport21.cxx
index 062e779386ae..a3a60c2973cf 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport21.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport21.cxx
@@ -658,7 +658,7 @@ DECLARE_OOXMLEXPORT_TEST(testTdf153909_followTextFlow,
"tdf153909_followTextFlow
// given a compat12 VML document with wrap-through blue rect that doesn't
mention allowInCell
// Although MSO's UI reports "layoutInCell" for the rectangle, it isn't
specified or honored
- CPPUNIT_ASSERT_EQUAL(isExported(), getProperty<bool>(getShape(1),
u"IsFollowingTextFlow"_ustr));
+ CPPUNIT_ASSERT(getProperty<bool>(getShape(1),
u"IsFollowingTextFlow"_ustr));
xmlDocUniquePtr pDump = parseLayoutDump();
sal_Int32 nRectBottom
diff --git a/sw/source/writerfilter/ooxml/OOXMLFastContextHandler.cxx
b/sw/source/writerfilter/ooxml/OOXMLFastContextHandler.cxx
index f902f47ecff1..8f6eb4a3bc08 100644
--- a/sw/source/writerfilter/ooxml/OOXMLFastContextHandler.cxx
+++ b/sw/source/writerfilter/ooxml/OOXMLFastContextHandler.cxx
@@ -1827,20 +1827,8 @@ void OOXMLFastContextHandlerShape::sendShape( Token_t
Element )
uno::Reference<beans::XPropertySet> xShapePropSet(xShape, uno::UNO_QUERY);
if (mnTableDepth > 0 && xShapePropSet.is() && mbIsVMLfound) //if we had a
table
{
- bool bForceShapeIntoCell = mbAllowInCell;
- // According to tdf#153909 and GraphicImport's LN_shape handling,
- // through-anchored shapes should not force the shape into the cell
- if (bForceShapeIntoCell)
- {
- text::WrapTextMode nSurround = text::WrapTextMode_NONE;
- xShapePropSet->getPropertyValue(u"Surround"_ustr) >>= nSurround;
- sal_Int32 nHoriRelation = -1;
- xShapePropSet->getPropertyValue(u"HoriOrientRelation"_ustr) >>=
nHoriRelation;
- bForceShapeIntoCell = (nSurround != text::WrapTextMode_THROUGH)
- || (nHoriRelation !=
text::RelOrientation::FRAME);
- }
xShapePropSet->setPropertyValue(dmapper::getPropertyName(dmapper::PROP_FOLLOW_TEXT_FLOW),
- uno::Any(bForceShapeIntoCell));
+ uno::Any(mbAllowInCell));
}
// Notify the dmapper that the shape is ready to use
if ( !bIsPicture )
