cui/source/tabpages/paragrph.cxx | 1 + sw/qa/extras/ooxmlexport/data/tdf164500_framePrBeforeTable2.docx |binary sw/qa/extras/ooxmlexport/ooxmlexport18.cxx | 5 +++++ sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx | 6 ++++++ 4 files changed, 12 insertions(+)
New commits: commit 999a132e30ca427ab67bbe6c647c5c2724639548 Author: Justin Luth <[email protected]> AuthorDate: Fri Aug 15 11:31:12 2025 -0400 Commit: Xisco Fauli <[email protected]> CommitDate: Mon Aug 25 17:17:52 2025 +0200 tdf#164500 writerfilter: make extra framePr anchor para tiny This reduces the layout impact of 25.8 commit 575094675e7f6fb643e8cac61f06c14d2f79bcd5 I initially just tried to make the paragraph simple (default), but that could still end up being overly large, so force a small size/margins/lineSpacing as well to make this added paragraph as inconspicuous as possible. make CppunitTest_sw_ooxmlexport18 \ CPPUNIT_TEST_NAME=testTdf164500_framePrBeforeTable2 Change-Id: I0c91048d206037b3427c6aa4704d65bb9f677435 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189702 Tested-by: Jenkins Reviewed-by: Justin Luth <[email protected]> (cherry picked from commit 041829c76877599ebf94c9b5bdfa94ec08132d9f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189727 diff --git a/sw/qa/extras/ooxmlexport/data/tdf164500_framePrBeforeTable2.docx b/sw/qa/extras/ooxmlexport/data/tdf164500_framePrBeforeTable2.docx new file mode 100644 index 000000000000..1c5c74985531 Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf164500_framePrBeforeTable2.docx differ diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx index 9b21067e9dc0..a84ad54ac5b4 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx @@ -204,6 +204,11 @@ DECLARE_OOXMLEXPORT_TEST(testTdf164500_framePrBeforeTable, "tdf164500_framePrBef CPPUNIT_ASSERT_EQUAL(sal_Int32(3), xTables->getCount()); } +DECLARE_OOXMLEXPORT_TEST(testTdf164500_framePrBeforeTable2, "tdf164500_framePrBeforeTable2.docx") +{ + CPPUNIT_ASSERT_EQUAL_MESSAGE("Everything should fit on one page", 1, getPages()); +} + DECLARE_OOXMLEXPORT_TEST(testTdf146984_anchorInShape, "tdf146984_anchorInShape.docx") { // This was only one page b/c the page break was missing. diff --git a/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx b/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx index 0765810528ef..b9a664614021 100644 --- a/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx +++ b/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx @@ -2628,8 +2628,14 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap, con uno::UNO_QUERY); xMPS->setAllPropertiesToDefault(); uno::Reference<beans::XPropertySet> xPS(xCursor, uno::UNO_QUERY); + // try to make this additional paragraph inconspicuous xPS->setPropertyValue(u"ParaStyleName"_ustr, uno::Any(u"Standard"_ustr)); + xPS->setPropertyValue(u"CharHeight"_ustr, uno::Any(float(2.0))); + xPS->setPropertyValue(u"ParaTopMargin"_ustr, uno::Any(sal_Int32(0))); + xPS->setPropertyValue(u"ParaBottomMargin"_ustr, uno::Any(sal_Int32(0))); + const style::LineSpacing aSingle(style::LineSpacingMode::PROP, 100); + xPS->setPropertyValue(u"ParaLineSpacing"_ustr, uno::Any(aSingle)); } // If different frame properties are set on this paragraph, keep them. commit 5dde4060cc7ee51481106fbf4567e59353182e79 Author: Justin Luth <[email protected]> AuthorDate: Mon Aug 11 17:08:18 2025 -0400 Commit: Xisco Fauli <[email protected]> CommitDate: Mon Aug 25 17:17:49 2025 +0200 related tdf#167721 cui: allow negative values for firstLine When lcl_SetFontRelativeValue was calling rField.SetFontRelative(FieldUnit::FONT_CJK_ADVANCE), then SvxRelativeField::SetFontRelative would m_xSpinButton->set_range(bNegativeEnabled ? -9999 : 0, 9999) and bNegativeEnabled was false. Change-Id: I3068705c15c11a066301b1105f3959c982f5f824 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189389 Tested-by: Jenkins Reviewed-by: Justin Luth <[email protected]> (cherry picked from commit 6c1b8cf820b41f7a579d5d9e7036a14d22567782) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189421 diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index 212b523d6ebb..c276b3a481d1 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -978,6 +978,7 @@ SvxStdParagraphTabPage::SvxStdParagraphTabPage(weld::Container* pPage, weld::Dia Init_Impl(); m_aFLineIndent.set_min(-9999, FieldUnit::NONE); // is set to 0 on default + m_aFLineIndent.EnableNegativeMode(); m_aFLineIndent.EnableFontRelativeMode(); m_aLeftIndent.EnableFontRelativeMode();
