chart2/inc/ChartModel.hxx | 3 chart2/source/controller/main/ChartController_Tools.cxx | 6 chart2/source/model/main/ChartModel.cxx | 2 cui/source/options/appearance.cxx | 4 cui/source/options/appearance.hxx | 1 distro-configs/Jenkins/macosx_clang_dbgutil | 1 distro-configs/Jenkins/windows_msc_dbgutil_32 | 1 distro-configs/Jenkins/windows_msc_dbgutil_64 | 1 download.lst | 12 external/nss/nss_macosx.patch | 29 + external/poppler/poppler-config.patch.1 | 221 ++----------- offapi/com/sun/star/text/TextGraphicObject.idl | 5 officecfg/registry/schema/org/openoffice/Office/Common.xcs | 2 oox/source/export/vmlexport.cxx | 13 sd/source/ui/view/drviews7.cxx | 3 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 15 sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx | 25 + solenv/sanitizers/ui/modules/swriter.suppr | 1 svl/qa/unit/svl.cxx | 4 svx/source/svdraw/svdpage.cxx | 4 sw/inc/hintids.hxx | 2 sw/inc/unoprnms.hxx | 1 sw/qa/core/text/frmform.cxx | 9 sw/qa/extras/ooxmlexport/data/tdf162527_hidden_image.docx |binary sw/qa/extras/ooxmlexport/data/tdf169802_hidden_shape.docx |binary sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 3 sw/qa/extras/ooxmlexport/ooxmlexport10.cxx | 21 - sw/qa/extras/ooxmlexport/ooxmlexport11.cxx | 21 - sw/qa/extras/ooxmlexport/ooxmlexport12.cxx | 18 - sw/qa/extras/ooxmlexport/ooxmlexport13.cxx | 46 +- sw/qa/extras/ooxmlexport/ooxmlexport14.cxx | 18 - sw/qa/extras/ooxmlexport/ooxmlexport15.cxx | 24 - sw/qa/extras/ooxmlexport/ooxmlexport16.cxx | 33 - sw/qa/extras/ooxmlexport/ooxmlexport17.cxx | 8 sw/qa/extras/ooxmlexport/ooxmlexport18.cxx | 12 sw/qa/extras/ooxmlexport/ooxmlexport2.cxx | 3 sw/qa/extras/ooxmlexport/ooxmlexport20.cxx | 33 - sw/qa/extras/ooxmlexport/ooxmlexport21.cxx | 15 sw/qa/extras/ooxmlexport/ooxmlexport23.cxx | 9 sw/qa/extras/ooxmlexport/ooxmlexport24.cxx | 9 sw/qa/extras/ooxmlexport/ooxmlexport25.cxx | 5 sw/qa/extras/ooxmlexport/ooxmlexport26.cxx | 12 sw/qa/extras/ooxmlexport/ooxmlexport4.cxx | 15 sw/qa/extras/ooxmlexport/ooxmlexport5.cxx | 6 sw/qa/extras/ooxmlexport/ooxmlexport7.cxx | 9 sw/qa/extras/ooxmlexport/ooxmlexport8.cxx | 3 sw/source/core/bastyp/init.cxx | 2 sw/source/core/layout/anchoredobject.cxx | 5 sw/source/core/layout/fly.cxx | 8 sw/source/core/layout/tabfrm.cxx | 9 sw/source/core/unocore/unoframe.cxx | 19 + sw/source/core/unocore/unomap1.cxx | 1 sw/source/filter/html/css1atr.cxx | 2 sw/source/filter/html/htmlatr.cxx | 2 sw/source/filter/ww8/docxattributeoutput.cxx | 2 sw/source/filter/ww8/docxexport.cxx | 5 sw/source/filter/ww8/docxexport.hxx | 2 sw/source/filter/ww8/rtfexport.hxx | 2 sw/source/filter/ww8/wrtw8sty.cxx | 1 sw/source/filter/ww8/wrtww8.hxx | 4 sw/source/writerfilter/dmapper/GraphicImport.cxx | 3 sw/uiconfig/swriter/ui/outlinenumberingpage.ui | 5 sw/uiconfig/swriter/ui/outlinepositionpage.ui | 5 63 files changed, 247 insertions(+), 518 deletions(-)
New commits: commit bb0621f4564ab96e152e7b9dc8e6c1696266e413 Author: Mike Kaganski <[email protected]> AuthorDate: Wed Jan 14 08:49:32 2026 +0100 Commit: Andras Timar <[email protected]> CommitDate: Thu Jan 15 10:14:08 2026 +0100 tdf#170337: find the correct master containing the anchored objects Was this way since commit f66ac0bacb9a57228dfd3b24b347b985376b63df (INTEGRATION: CWS swqbugfixes09 (1.67.38); FILE MERGED, 2004-11-16). Change-Id: I7feeeb2d77849ef626b6ed7ce6385c10cae02c6e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197240 Tested-by: Jenkins Reviewed-by: Mike Kaganski <[email protected]> Signed-off-by: Xisco Fauli <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197251 diff --git a/sw/qa/core/text/frmform.cxx b/sw/qa/core/text/frmform.cxx index b73497f42b33..3ad8ab305ad1 100644 --- a/sw/qa/core/text/frmform.cxx +++ b/sw/qa/core/text/frmform.cxx @@ -148,6 +148,15 @@ CPPUNIT_TEST_FIXTURE(Test, testFloattableBadFlyPos) CPPUNIT_ASSERT(pPage4); CPPUNIT_ASSERT(pPage4->GetSortedObjs()); CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), pPage4->GetSortedObjs()->size()); + + // tdf#170337: Make sure that page 4's toplevel table has the correct height (it was 517, not + // taking inner floating table height into account): + auto pBody = pPage4->FindBodyCont(); + CPPUNIT_ASSERT(pBody); + auto pTable = pBody->GetLower(); + CPPUNIT_ASSERT(pTable); + CPPUNIT_ASSERT(pTable->IsTabFrame()); + CPPUNIT_ASSERT_EQUAL(tools::Long(3658), pTable->getFrameArea().Height()); } CPPUNIT_TEST_FIXTURE(Test, testFullPageShapeWrap) diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx index 68a6f688b8c5..eb7d49360c8f 100644 --- a/sw/source/core/layout/tabfrm.cxx +++ b/sw/source/core/layout/tabfrm.cxx @@ -4800,7 +4800,7 @@ static tools::Long CalcHeightWithFlys_Impl(const SwFrame* pTmp, const SwFrame* p bool bIsFollow( false ); if ( pTmp->IsTextFrame() && static_cast<const SwTextFrame*>(pTmp)->IsFollow() ) { - const SwFrame* pMaster; + const SwTextFrame* pMaster; // #i46450# Master does not necessarily have // to exist if this function is called from JoinFrame() -> // Cut() -> Shrink() @@ -4814,6 +4814,11 @@ static tools::Long CalcHeightWithFlys_Impl(const SwFrame* pTmp, const SwFrame* p if ( pMaster ) { + while (pMaster->IsFollow()) + { + pMaster = pMaster->FindMaster(); + assert(pMaster); + } pObjs = pMaster->GetDrawObjs(); bIsFollow = true; } commit b7c4c1e24d979684d0ce1bdb56bca96d0ed093fa Author: Mike Kaganski <[email protected]> AuthorDate: Wed Jan 14 07:09:06 2026 +0100 Commit: Andras Timar <[email protected]> CommitDate: Thu Jan 15 10:14:08 2026 +0100 pMaster is already the object we need - avoid finding it again Change-Id: I1d719631053a8335c49cc55e4c98e602732e1117 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197231 Tested-by: Jenkins Reviewed-by: Mike Kaganski <[email protected]> Signed-off-by: Xisco Fauli <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197250 diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx index bf525e7c313c..68a6f688b8c5 100644 --- a/sw/source/core/layout/tabfrm.cxx +++ b/sw/source/core/layout/tabfrm.cxx @@ -4814,7 +4814,7 @@ static tools::Long CalcHeightWithFlys_Impl(const SwFrame* pTmp, const SwFrame* p if ( pMaster ) { - pObjs = static_cast<const SwTextFrame*>(pTmp)->FindMaster()->GetDrawObjs(); + pObjs = pMaster->GetDrawObjs(); bIsFollow = true; } } commit 68b935771dc32f71abb65979b80bbfaabf5f4b5b Author: Andreas Heinisch <[email protected]> AuthorDate: Mon Dec 22 09:41:13 2025 +0100 Commit: Andras Timar <[email protected]> CommitDate: Thu Jan 15 10:14:08 2026 +0100 tdf#112628 - Impress: disable header and footer in master view Change-Id: Ic3eae2ad1ee204044ec36c83f0541f6ce83d950d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196067 Tested-by: Jenkins Reviewed-by: Andreas Heinisch <[email protected]> (cherry picked from commit 7ccfa4ea6f8c7215fb065b62f08c7e6cbe553997) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196191 Reviewed-by: Xisco Fauli <[email protected]> diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index 7c591d45ed67..44009a6ee9f3 100644 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -868,6 +868,9 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) rSet.Put(SfxBoolItem(SID_PAGEMODE, false)); rSet.Put(SfxBoolItem(SID_MASTERPAGE, true)); + // tdf#112628 - disable header and footer in master view + rSet.DisableItem(SID_HEADER_AND_FOOTER); + // tdf#139269 - disable menu entries to paste text into read only areas of master views const OutlinerView* pOlView = mpDrawView->GetTextEditOutlinerView(); if (pOlView && pOlView->IsReadOnly()) commit 1e56da9636da203e0cb2a1d3a40c324ae7dd93a9 Author: Noel Grandin <[email protected]> AuthorDate: Wed Jan 14 11:07:21 2026 +0200 Commit: Andras Timar <[email protected]> CommitDate: Thu Jan 15 10:14:07 2026 +0100 officeotron: fillcolor is not valid for framePr because of some generic code adding attributes to the flyAttrList, we end with: <w:pPr> ... <w:framePr fillcolor="#FF00FF"/> inside word/header1.xml, which is not valid. Unfortunately, the code structure here does not allow an elegant solution, we need a new virtual method to be able to get at the flyAttrList and clear it, to prevent attributes leaking into elements they are not meant for. Change-Id: I2bfd6b1afd78e722a29d79cf853a4678b7d0dea4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197248 Tested-by: Jenkins Reviewed-by: Michael Stahl <[email protected]> (cherry picked from commit f748949b6ffe6e8ef2a7fd27c70669efe8ac3818) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197297 Reviewed-by: Xisco Fauli <[email protected]> diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx index 1e1057be6661..dd7e7b2e6ae8 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx @@ -667,9 +667,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf77219_backgroundShape, "tdf77219_backgroundShape DECLARE_OOXMLEXPORT_TEST(testTdf126533_axialAngle, "tdf126533_axialAngle.docx") { - //FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); - // axial gradient is purple foreground/lime background in the middle (top-left to bottom-right) uno::Reference<beans::XPropertySet> xPageStyle(getStyles(u"PageStyles"_ustr)->getByName(u"Standard"_ustr), uno::UNO_QUERY); @@ -685,8 +682,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf126533_axialAngle, "tdf126533_axialAngle.docx") DECLARE_OOXMLEXPORT_TEST(testTdf126533_axialAngle2, "tdf126533_axialAngle2.docx") { - //FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); // axial gradient is purple foreground/lime background in the middle (top-right to bottom-left) uno::Reference<beans::XPropertySet> xPageStyle(getStyles(u"PageStyles"_ustr)->getByName(u"Standard"_ustr), uno::UNO_QUERY); diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx index 00d9a1005d8f..7a0b872ebcc1 100644 --- a/sw/source/filter/ww8/docxexport.cxx +++ b/sw/source/filter/ww8/docxexport.cxx @@ -740,6 +740,11 @@ void DocxExport::PrepareNewPageDesc( const SfxItemSet* pSet, } +void DocxExport::ClearFlyAttrList() +{ + SdrExporter().getFlyAttrList().clear(); +} + void DocxExport::InitStyles() { m_pStyles.reset(new MSWordStyles( *this, /*bListStyles =*/ true )); diff --git a/sw/source/filter/ww8/docxexport.hxx b/sw/source/filter/ww8/docxexport.hxx index ac5700d77867..a51285b6dab7 100644 --- a/sw/source/filter/ww8/docxexport.hxx +++ b/sw/source/filter/ww8/docxexport.hxx @@ -240,6 +240,8 @@ protected: const SwPageDesc* pNewPgDesc, bool bExtraPageBreak = false) override; + virtual void ClearFlyAttrList() override; + private: /// Setup pStyles and write styles.xml void InitStyles(); diff --git a/sw/source/filter/ww8/rtfexport.hxx b/sw/source/filter/ww8/rtfexport.hxx index 6b285dbab485..2187a789993a 100644 --- a/sw/source/filter/ww8/rtfexport.hxx +++ b/sw/source/filter/ww8/rtfexport.hxx @@ -147,6 +147,8 @@ protected: void AppendSection(const SwPageDesc* pPageDesc, const SwSectionFormat* pFormat, sal_uLong nLnNum) override; + void ClearFlyAttrList() override {} + public: /// Pass the pDocument, pCurrentPam and pOriginalPam to the base class. RtfExport(RtfExportFilter* pFilter, SwDoc& rDocument, std::shared_ptr<SwUnoCursor>& pCurrentPam, diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index aa25d5945962..2986f84f432f 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -1867,6 +1867,7 @@ void MSWordExportBase::SectionProperties( const WW8_SepInfo& rSepInfo, WW8_PdAtt } AttrOutput().OutputStyleItemSet( pPdFormat->GetAttrSet(), false ); + ClearFlyAttrList(); // so they do not leak into other elements if (titlePage) { diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index 6aa9cacac1ea..5aa6c208235b 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -926,6 +926,8 @@ protected: virtual bool IsDummyFloattableAnchor(SwNode& /*rNode*/) const { return false; } + virtual void ClearFlyAttrList() = 0; + public: MSWordExportBase(SwDoc& rDocument, std::shared_ptr<SwUnoCursor> & pCurrentPam, SwPaM* pOriginalPam); virtual ~MSWordExportBase(); @@ -1225,6 +1227,8 @@ protected: virtual void AppendSection( const SwPageDesc *pPageDesc, const SwSectionFormat* pFormat, sal_uLong nLnNum ) override; + virtual void ClearFlyAttrList() override {} + private: WW8Export(const WW8Export&) = delete; WW8Export& operator=(const WW8Export&) = delete; commit d7f8d56d399092edcfb7224b2f6b89fc526c5a91 Author: Caolán McNamara <[email protected]> AuthorDate: Wed Jan 14 19:12:48 2026 +0000 Commit: Andras Timar <[email protected]> CommitDate: Thu Jan 15 10:14:07 2026 +0100 add a11y name to preview widget Change-Id: Ic04f7bac3e4eb62c7735d6e8e7bd611de915f240 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197295 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> (cherry picked from commit 62a3e245ff9f10b9824cf9dca644894c34c83adb) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197301 Reviewed-by: Xisco Fauli <[email protected]> diff --git a/sw/uiconfig/swriter/ui/outlinepositionpage.ui b/sw/uiconfig/swriter/ui/outlinepositionpage.ui index cfd8a8deb35e..15a534838ceb 100644 --- a/sw/uiconfig/swriter/ui/outlinepositionpage.ui +++ b/sw/uiconfig/swriter/ui/outlinepositionpage.ui @@ -516,6 +516,11 @@ numbering and text:</property> <property name="height_request">130</property> <property name="visible">True</property> <property name="can_focus">False</property> + <child internal-child="accessible"> + <object class="AtkObject" id="preview-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="outlinepositionpage|preview-atkobject">Preview</property> + </object> + </child> </object> <packing> <property name="left_attach">0</property> commit 0b6c71ee84da699e621448b7dd134dc4a56cf5ff Author: Aron Budea <[email protected]> AuthorDate: Mon Jan 12 15:04:20 2026 +1030 Commit: Andras Timar <[email protected]> CommitDate: Thu Jan 15 10:14:07 2026 +0100 tdf#162527 tdf#169802 hidden image/shape in DOCX should be invisible ...and remain invisible after save. After 0b9e4f6085d147c43a86d107303eea9b86e7f34c shapes did get hidden, but in case of wrap-around shapes text still flowed around their supposed placement. Hidden images were simply shown before and after. Add a new Visible property to SwXTextGraphicObject, and let it set SwFlyDrawObj's Visible member as SdrObject. Import and export wp:docPr's hidden attribute in OOXML based on these properties. To avoid showing their area, let SwAnchoredObject::GetObjRectWithSpaces() return an empty rectangle (during opening this is only called from SwTextFly's IsAnyObj(...) and InitAnchoredObjList(), though). Note that Writer lacks support of changing visibility of images and shapes. This change adds minimal support for hiding them and roundtripping the setting in DOCX, but doesn't add ODF or UI support. Change-Id: I6e9d062628006a7128e380d1af06508625aa3d06 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197056 Tested-by: Jenkins Reviewed-by: Aron Budea <[email protected]> (cherry picked from commit c1f7ea0db134d63c54b581f11e843ebd5bb83b54) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197286 Reviewed-by: Mike Kaganski <[email protected]> diff --git a/offapi/com/sun/star/text/TextGraphicObject.idl b/offapi/com/sun/star/text/TextGraphicObject.idl index 423a41778992..7a425f70ea27 100644 --- a/offapi/com/sun/star/text/TextGraphicObject.idl +++ b/offapi/com/sun/star/text/TextGraphicObject.idl @@ -123,6 +123,11 @@ published service TextGraphicObject */ [optional, property] com::sun::star::graphic::XGraphic Graphic; + /** if this is `FALSE`, the graphic is not visible. + + @since LibreOffice 26.2 + */ + [ optional, property ] boolean Visible; }; diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx index 39676270559c..423dafdcea08 100644 --- a/sw/inc/hintids.hxx +++ b/sw/inc/hintids.hxx @@ -411,8 +411,8 @@ inline constexpr TypedWhichId<SwGammaGrf> RES_GRFATR_GAMMA(RES_GRFATR_BEGIN + 8) inline constexpr TypedWhichId<SwInvertGrf> RES_GRFATR_INVERT(RES_GRFATR_BEGIN + 9); inline constexpr TypedWhichId<SwTransparencyGrf> RES_GRFATR_TRANSPARENCY(RES_GRFATR_BEGIN + 10); inline constexpr TypedWhichId<SwDrawModeGrf> RES_GRFATR_DRAWMODE(RES_GRFATR_BEGIN + 11); +inline constexpr TypedWhichId<SfxBoolItem> RES_GRFATR_VISIBLE(RES_GRFATR_BEGIN + 12); -inline constexpr TypedWhichId<SfxBoolItem> RES_GRFATR_DUMMY4(RES_GRFATR_BEGIN + 12); inline constexpr TypedWhichId<SfxBoolItem> RES_GRFATR_DUMMY5(RES_GRFATR_BEGIN + 13); inline constexpr sal_uInt16 RES_GRFATR_END(RES_GRFATR_BEGIN + 14); diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx index 27981e05db01..e4b865b3f6de 100644 --- a/sw/inc/unoprnms.hxx +++ b/sw/inc/unoprnms.hxx @@ -601,6 +601,7 @@ inline constexpr OUString UNO_NAME_ADJUST_BLUE = u"AdjustBlue"_ustr; inline constexpr OUString UNO_NAME_GAMMA = u"Gamma"_ustr; inline constexpr OUString UNO_NAME_GRAPHIC_IS_INVERTED = u"GraphicIsInverted"_ustr; inline constexpr OUString UNO_NAME_TRANSPARENCY = u"Transparency"_ustr; +inline constexpr OUString UNO_NAME_VISIBLE = u"Visible"_ustr; inline constexpr OUString UNO_NAME_REDLINE_AUTHOR = u"RedlineAuthor"_ustr; inline constexpr OUString UNO_NAME_REDLINE_DATE_TIME = u"RedlineDateTime"_ustr; inline constexpr OUString UNO_NAME_REDLINE_MOVED_ID = u"RedlineMovedID"_ustr; diff --git a/sw/qa/extras/ooxmlexport/data/tdf162527_hidden_image.docx b/sw/qa/extras/ooxmlexport/data/tdf162527_hidden_image.docx new file mode 100644 index 000000000000..5196bd67d772 Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf162527_hidden_image.docx differ diff --git a/sw/qa/extras/ooxmlexport/data/tdf169802_hidden_shape.docx b/sw/qa/extras/ooxmlexport/data/tdf169802_hidden_shape.docx new file mode 100644 index 000000000000..b72fab170a69 Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf169802_hidden_shape.docx differ diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx index bf8776fc6c41..43c16d0c912d 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx @@ -724,6 +724,34 @@ DECLARE_OOXMLEXPORT_TEST(testTdf156484, "tdf156484.docx") CPPUNIT_ASSERT_MESSAGE("Third shape should not be printable.", !getProperty<bool>(xShape, u"Printable"_ustr)); } +CPPUNIT_TEST_FIXTURE(Test, testTdf162527_hidden_image) +{ + createSwDoc("tdf162527_hidden_image.docx"); + save(TestFilter::DOCX); + + xmlDocUniquePtr pXmlDoc = parseExport(u"word/document.xml"_ustr); + CPPUNIT_ASSERT(pXmlDoc); + // Without the fix this element would have no 'hidden' attribute + assertXPath(pXmlDoc, "/w:document/w:body/w:p/w:r/w:drawing/wp:anchor/wp:docPr", "hidden", + u"1"); + + auto xShape(getShape(1)); + CPPUNIT_ASSERT_MESSAGE("Shape should not be visible.", + !getProperty<bool>(xShape, u"Visible"_ustr)); +} + +CPPUNIT_TEST_FIXTURE(Test, testTdf169802_hidden_shape) +{ + createSwDoc("tdf169802_hidden_shape.docx"); + xmlDocUniquePtr pDump = parseLayoutDump(); + // Just to check that the layout has sane content + int nTextNodes = countXPathNodes(pDump, "//*[contains(@type, 'PortionType::Text')]"); + CPPUNIT_ASSERT_MESSAGE("Layout must contain text nodes", 0 < nTextNodes); + // Layout mustn't contain fly portion, without the fix it would contain several + int nFlyNodes = countXPathNodes(pDump, "//*[contains(@type, 'PortionType::Fly')]"); + CPPUNIT_ASSERT_EQUAL_MESSAGE("No fly portion nodes must exist in the layout", 0, nFlyNodes); +} + DECLARE_OOXMLEXPORT_TEST(testTdf124594, "tdf124594.docx") { xmlDocUniquePtr pDump = parseLayoutDump(); diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx index bfc29059a774..cb2471ca3683 100644 --- a/sw/source/core/bastyp/init.cxx +++ b/sw/source/core/bastyp/init.cxx @@ -454,9 +454,9 @@ std::unique_ptr<ItemInfoPackage> createItemInfoPackageSwAttributes() { RES_GRFATR_INVERT, new SwInvertGrf, 0, SFX_ITEMINFOFLAG_NONE }, { RES_GRFATR_TRANSPARENCY, new SwTransparencyGrf, 0, SFX_ITEMINFOFLAG_NONE }, { RES_GRFATR_DRAWMODE, new SwDrawModeGrf, 0, SFX_ITEMINFOFLAG_NONE }, + { RES_GRFATR_VISIBLE, new SfxBoolItem(RES_GRFATR_VISIBLE, true), 0, SFX_ITEMINFOFLAG_NONE }, // GraphicAttr - Dummies - { RES_GRFATR_DUMMY4, new SfxBoolItem( RES_GRFATR_DUMMY4 ), 0, SFX_ITEMINFOFLAG_NONE }, { RES_GRFATR_DUMMY5, new SfxBoolItem( RES_GRFATR_DUMMY5 ), 0, SFX_ITEMINFOFLAG_NONE }, { RES_BOXATR_FORMAT, new SwTableBoxNumFormat, 0, SFX_ITEMINFOFLAG_NONE }, { RES_BOXATR_FORMULA, new SwTableBoxFormula( OUString() ), 0, SFX_ITEMINFOFLAG_NONE }, diff --git a/sw/source/core/layout/anchoredobject.cxx b/sw/source/core/layout/anchoredobject.cxx index c8c418fa310f..39429e8b209f 100644 --- a/sw/source/core/layout/anchoredobject.cxx +++ b/sw/source/core/layout/anchoredobject.cxx @@ -564,6 +564,11 @@ bool SwAnchoredObject::HasClearedEnvironment() const */ const SwRect& SwAnchoredObject::GetObjRectWithSpaces() const { + static const SwRect aEmptyRect; + // invisible objects have no area + if (!GetDrawObj()->IsVisible()) + return aEmptyRect; + if ( mbObjRectWithSpacesValid && maLastObjRect != GetObjRect() ) { diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx index e1c2a35e8a24..380df804bac8 100644 --- a/sw/source/core/layout/fly.cxx +++ b/sw/source/core/layout/fly.cxx @@ -1487,6 +1487,14 @@ void SwFlyFrame::Format( vcl::RenderContext* /*pRenderContext*/, const SwBorderA { OSL_ENSURE( pAttrs, "FlyFrame::Format, pAttrs is 0." ); + if (GetDrawObj() && !GetDrawObj()->IsVisible()) + { + SwFrameAreaDefinition::FrameAreaWriteAccess aFrm(*this); + aFrm.setSwRect(SwRect()); + setFrameAreaSizeValid(true); + return; + } + ColLock(); if ( !isFrameAreaSizeValid() ) diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index b87dcd7f29f2..4ea5dbcb08c6 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -1411,7 +1411,14 @@ void SwXFrame::setPropertyValue(const OUString& rPropertyName, const ::uno::Any& throw beans::PropertyVetoException("Property is read-only: " + rPropertyName, getXWeak() ); SwDoc& rDoc = pFormat->GetDoc(); - if ( ((m_eType == FLYCNTTYPE_GRF) && isGRFATR(pEntry->nWID)) || + if (m_eType == FLYCNTTYPE_GRF && RES_GRFATR_VISIBLE == pEntry->nWID) + { + bool bVisible = true; + aValue >>= bVisible; + SdrObject* pObject = GetOrCreateSdrObject(static_cast<SwFlyFrameFormat&>(*pFormat)); + pObject->SetVisible(bVisible); + } + else if ( ((m_eType == FLYCNTTYPE_GRF) && isGRFATR(pEntry->nWID)) || (FN_PARAM_CONTOUR_PP == pEntry->nWID) || (FN_UNO_IS_AUTOMATIC_CONTOUR == pEntry->nWID) || (FN_UNO_IS_PIXEL_CONTOUR == pEntry->nWID) ) @@ -1962,7 +1969,12 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName) } else if(pFormat) { - if( ((m_eType == FLYCNTTYPE_GRF) || (m_eType == FLYCNTTYPE_OLE)) && + if (m_eType == FLYCNTTYPE_GRF && RES_GRFATR_VISIBLE == pEntry->nWID) + { + SdrObject* pObject = GetOrCreateSdrObject(static_cast<SwFlyFrameFormat&>(*pFormat)); + aAny <<= pObject->IsVisible(); + } + else if( ((m_eType == FLYCNTTYPE_GRF) || (m_eType == FLYCNTTYPE_OLE)) && (isGRFATR(pEntry->nWID) || pEntry->nWID == FN_PARAM_CONTOUR_PP || pEntry->nWID == FN_UNO_IS_AUTOMATIC_CONTOUR || @@ -3046,6 +3058,9 @@ void SwXFrame::attachToRange(uno::Reference<text::XTextRange> const& xTextRange, { setPropertyValue(UNO_NAME_DESCRIPTION, *pDescription); } + if (const uno::Any* pVisible = m_pProps->GetProperty(RES_GRFATR_VISIBLE, 0)) + setPropertyValue(UNO_NAME_VISIBLE, *pVisible); + // For grabbag if (const uno::Any* pFrameIntropgrabbagItem = m_pProps->GetProperty(RES_FRMATR_GRABBAG, 0)) diff --git a/sw/source/core/unocore/unomap1.cxx b/sw/source/core/unocore/unomap1.cxx index b04688f57240..db0e32baaa34 100644 --- a/sw/source/core/unocore/unomap1.cxx +++ b/sw/source/core/unocore/unomap1.cxx @@ -851,6 +851,7 @@ std::span<const SfxItemPropertyMapEntry> SwUnoPropertyMapProvider::GetGraphicPro { UNO_NAME_GAMMA, RES_GRFATR_GAMMA, cppu::UnoType<double>::get(), 0, 0}, { UNO_NAME_GRAPHIC_IS_INVERTED, RES_GRFATR_INVERT, cppu::UnoType<bool>::get(), 0, 0}, { UNO_NAME_TRANSPARENCY, RES_GRFATR_TRANSPARENCY, cppu::UnoType<sal_Int16>::get(), 0, 0}, + { UNO_NAME_VISIBLE, RES_GRFATR_VISIBLE, cppu::UnoType<bool>::get(), 0, 0 }, { UNO_NAME_GRAPHIC_COLOR_MODE, RES_GRFATR_DRAWMODE, cppu::UnoType<css::drawing::ColorMode>::get(), 0, 0}, // added FillProperties for SW, same as FILL_PROPERTIES in svx diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index fa4f4fec235e..892584bd0820 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -3562,7 +3562,7 @@ SwAttrFnTab const aCSS1AttrFnTab = { /* RES_GRFATR_TRANSPARENCY */ nullptr, /* RES_GRFATR_DRWAMODE */ nullptr, /* RES_GRFATR_DUMMY3 */ nullptr, -/* RES_GRFATR_DUMMY4 */ nullptr, +/* RES_GRFATR_VISIBLE */ nullptr, /* RES_GRFATR_DUMMY5 */ nullptr, /* RES_BOXATR_FORMAT */ nullptr, diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index 1fc954052c1e..2fc92408e46a 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -3430,7 +3430,7 @@ const SwAttrFnTab aHTMLAttrFnTab = { /* RES_GRFATR_TRANSPARENCY */ nullptr, /* RES_GRFATR_DRWAMODE */ nullptr, /* RES_GRFATR_DUMMY3 */ nullptr, -/* RES_GRFATR_DUMMY4 */ nullptr, +/* RES_GRFATR_VISIBLE */ nullptr, /* RES_GRFATR_DUMMY5 */ nullptr, /* RES_BOXATR_FORMAT */ nullptr, diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index e76d08bb35d7..e0c2256744e4 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -5518,6 +5518,8 @@ void DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode* pGrfNode, const Size OUString const title(pGrfNode ? pGrfNode->GetTitle() : pOLEFrameFormat->GetObjTitle()); auto const docPrattrList(CreateDocPrAttrList( GetExport(), pFrameFormat->GetName().toString(), title, descr)); + if (pSdrObj && !pSdrObj->IsVisible()) + docPrattrList->add(XML_hidden, "1"); m_pSerializer->startElementNS( XML_wp, XML_docPr, docPrattrList ); OUString sURL, sRelId; diff --git a/sw/source/writerfilter/dmapper/GraphicImport.cxx b/sw/source/writerfilter/dmapper/GraphicImport.cxx index 891f287741d0..b24f5dd7f2de 100644 --- a/sw/source/writerfilter/dmapper/GraphicImport.cxx +++ b/sw/source/writerfilter/dmapper/GraphicImport.cxx @@ -1812,6 +1812,9 @@ rtl::Reference<SwXTextGraphicObject> GraphicImport::createGraphicObject(uno::Ref xGraphicObject->setPropertyValue(getPropertyName(PROP_DECORATIVE), uno::Any(m_bDecorative)); if (m_rGraphicImportType == IMPORT_AS_DETECTED_ANCHOR) { + if (m_bHidden) + xGraphicObject->setPropertyValue(u"Visible"_ustr, uno::Any(false)); + if (m_nHoriRelation == text::RelOrientation::FRAME && (m_nHoriOrient == text::HoriOrientation::LEFT || m_nHoriOrient == text::HoriOrientation::RIGHT commit 2d2052f9109e6c62e528e73b214d462ca24d5200 Author: Xisco Fauli <[email protected]> AuthorDate: Mon Jan 12 14:23:52 2026 +0100 Commit: Andras Timar <[email protected]> CommitDate: Thu Jan 15 10:14:07 2026 +0100 crashreporting: fix crash in SvxAppearanceTabPage::SvxAppearanceTabPage Seen in https://crashreport.libreoffice.org/stats/crash_details/ed1c2ca4-f71b-441a-8bf6-48fd965bdb77 Get "Automatic" string using CuiResId instead Change-Id: Ib973e0139685c4e270a084fb9e878db8c14aace2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197111 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins (cherry picked from commit 7acfec5a8ad8534d4177750aa5b110b16b53378c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197176 Reviewed-by: Christian Lohmaier <[email protected]> diff --git a/cui/source/options/appearance.cxx b/cui/source/options/appearance.cxx index 33f7b65be2b1..f57493300fad 100644 --- a/cui/source/options/appearance.cxx +++ b/cui/source/options/appearance.cxx @@ -119,7 +119,6 @@ SvxAppearanceTabPage::SvxAppearanceTabPage(weld::Container* pPage, , m_xNotebookbarIconSize(m_xBuilder->weld_combo_box(u"notebookbariconsdropdown"_ustr)) , m_xSizeGrid(m_xBuilder->weld_widget(u"grdIconSize"_ustr)) , m_xCustomizationFrame(m_xBuilder->weld_widget(u"items"_ustr)) - , m_sAutoStr(m_xIconsDropDown->get_text(0)) , m_xVerticalToolbars(m_xBuilder->weld_radio_button(u"rbVertical"_ustr)) , m_xHorizontalToolbars(m_xBuilder->weld_radio_button(u"rbHorizontal"_ustr)) { @@ -558,7 +557,8 @@ void SvxAppearanceTabPage::InitIcons() const vcl::IconThemeInfo& autoIconTheme = vcl::IconThemeInfo::FindIconThemeById(mInstalledIconThemes, autoThemeId); - OUString entryForAuto = m_sAutoStr + " (" + autoIconTheme.GetDisplayName() + ")"; + OUString sAutoStr(CuiResId(RID_COLOR_SCHEME_LIBREOFFICE_AUTOMATIC)); + OUString entryForAuto = sAutoStr + " (" + autoIconTheme.GetDisplayName() + ")"; m_xIconsDropDown->append(u"auto"_ustr, entryForAuto); // index 0 means choose style automatically diff --git a/cui/source/options/appearance.hxx b/cui/source/options/appearance.hxx index 761685418a94..3bf65e905517 100644 --- a/cui/source/options/appearance.hxx +++ b/cui/source/options/appearance.hxx @@ -44,7 +44,6 @@ private: std::unique_ptr<weld::ComboBox> m_xNotebookbarIconSize; std::unique_ptr<weld::Widget> m_xSizeGrid; std::unique_ptr<weld::Widget> m_xCustomizationFrame; - OUString m_sAutoStr; std::unique_ptr<weld::RadioButton> m_xVerticalToolbars; std::unique_ptr<weld::RadioButton> m_xHorizontalToolbars; commit a6468d2d4223df6880839ef9834e4018ff643d5e Author: Xisco Fauli <[email protected]> AuthorDate: Wed Jan 7 14:06:55 2026 +0100 Commit: Andras Timar <[email protected]> CommitDate: Thu Jan 15 10:14:07 2026 +0100 poppler: upgrade to 26.01.0 Adapt external/poppler/poppler-config.patch.1 after commit 808094b11c07b1895bc9a1d03e338584045e6087 Author: Albert Astals Cid <[email protected]> Date: Fri Dec 5 01:59:41 2025 +0100 cmakedefine -> cmakedefine01 Downloaded from https://poppler.freedesktop.org/poppler-26.01.0.tar.xz Change-Id: I8cf88d535e6fbd85fa0761fa23ac790c01711e01 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196684 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> (cherry picked from commit b307d254a88a87fe59f9c041346657790c75ac16) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196883 Reviewed-by: Christian Lohmaier <[email protected]> diff --git a/download.lst b/download.lst index 5c3357c650e5..54587bb52103 100644 --- a/download.lst +++ b/download.lst @@ -667,8 +667,8 @@ LIBTIFF_TARBALL := tiff-4.7.1.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts -POPPLER_SHA256SUM := c18b40eb36b1a0c5b86e29ca054bf0770304583da4f2cdd42fe86eca6a20de48 -POPPLER_TARBALL := poppler-25.12.0.tar.xz +POPPLER_SHA256SUM := 1cb944a4b88847f5fb6551683bc799db59f04990f5d8be07aba2acbf38601089 +POPPLER_TARBALL := poppler-26.01.0.tar.xz POPPLER_DATA_SHA256SUM := c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74 POPPLER_DATA_TARBALL := poppler-data-0.4.12.tar.gz # three static lines diff --git a/external/poppler/poppler-config.patch.1 b/external/poppler/poppler-config.patch.1 index 78f1c4fe2f72..edf04d4af2ef 100644 --- a/external/poppler/poppler-config.patch.1 +++ b/external/poppler/poppler-config.patch.1 @@ -2,7 +2,7 @@ note: to get the 3rd one, use -DENABLE_CPP=on -(cd workdir/UnpackedTarball/poppler && cmake -DENABLE_DCTDECODER=libjpeg -DHAVE_CAIRO=off -DENABLE_LIBOPENJPEG=none -DENABLE_LCMS=off -DENABLE_LIBCURL=off -DENABLE_ZLIB_UNCOMPRESS=off -DENABLE_NSS3=off -DENABLE_GPGME=off -DENABLE_PGP_SIGNATURES=off -DENABLE_LIBPNG=off -DENABLE_LIBTIFF=off -DENABLE_BOOST=off -DENABLE_UTILS=off -DENABLE_CPP=off -DENABLE_GLIB=off -DENABLE_GOBJECT_INTROSPECTION=off -DENABLE_GTK_DOC=off -DENABLE_QT5=off -DENABLE_QT6=off +(cd workdir/UnpackedTarball/poppler && cmake -DENABLE_DCTDECODER=libjpeg -DHAVE_CAIRO=off -DENABLE_LIBOPENJPEG=none -DENABLE_LCMS=off -DENABLE_LIBCURL=off -DENABLE_ZLIB_UNCOMPRESS=off -DENABLE_NSS3=off -DENABLE_GPGME=off -DENABLE_PGP_SIGNATURES=off -DENABLE_LIBPNG=off -DENABLE_LIBTIFF=off -DENABLE_BOOST=off -DENABLE_UTILS=off -DENABLE_CPP=off -DENABLE_GLIB=off -DENABLE_GOBJECT_INTROSPECTION=off -DENABLE_GTK_DOC=off -DENABLE_QT5=off -DENABLE_QT6=off) manually disabled these because cmake failed to do it: HAVE_CAIRO @@ -13,41 +13,41 @@ new file mode 100644 index 0fbd336a..451213f8 100644 --- /dev/null +++ b/config.h -@@ -0,0 +1,232 @@ +@@ -0,0 +1,170 @@ +/* config.h. Generated from config.h.cmake by cmake. */ + +/* Build against libcurl. */ -+/* #undef ENABLE_LIBCURL */ ++#define ENABLE_LIBCURL 0 + +/* Use libjpeg instead of builtin jpeg decoder. */ +#define ENABLE_LIBJPEG 1 + +/* Use libopenjpeg instead of builtin jpeg2000 decoder. */ -+/* #undef ENABLE_LIBOPENJPEG */ ++#define ENABLE_LIBOPENJPEG 0 + +/* Build against libtiff. */ -+/* #undef ENABLE_LIBTIFF */ ++#define ENABLE_LIBTIFF 0 + +/* Build against libpng. */ -+/* #define ENABLE_LIBPNG 1 */ ++#define ENABLE_LIBPNG 0 + +/* Do not hardcode the library location */ -+/* #undef ENABLE_RELOCATABLE */ ++#define ENABLE_RELOCATABLE 0 + +/* Use zlib instead of builtin zlib decoder to uncompress flate streams. */ -+/* #undef ENABLE_ZLIB_UNCOMPRESS */ ++#define ENABLE_ZLIB_UNCOMPRESS 0 + +/* Build against libnss3 for digital signature validation */ -+/* #undef ENABLE_NSS3 */ ++#define ENABLE_NSS3 0 + +/* Build against libgpgme for digital signature validation */ -+/* #undef ENABLE_GPGME */ ++#define ENABLE_GPGME 0 + +/* Enable pgp signatures in GPG backend by default */ -+/* #undef ENABLE_PGP_SIGNATURES */ ++#define ENABLE_PGP_SIGNATURES 0 + +/* Signatures enabled */ -+/* #undef ENABLE_SIGNATURES */ ++#define ENABLE_SIGNATURES 0 + +/* Default signature backend */ +#define DEFAULT_SIGNATURE_BACKEND "None" @@ -59,33 +59,16 @@ index 0fbd336a..451213f8 100644 +#define HAVE_DCT_DECODER 1 + +/* Do we have any JPX decoder?. */ -+/* #undef HAVE_JPX_DECODER */ -+ -+#if !defined(_WIN32) -+/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'. -+ */ -+#define HAVE_DIRENT_H 1 -+#endif -+ -+#if !defined(_WIN32) -+/* Define to 1 if you have the <dlfcn.h> header file. */ -+#define HAVE_DLFCN_H 1 -+#endif -+ -+/* Define to 1 if you have the <fcntl.h> header file. */ -+#define HAVE_FCNTL_H 1 ++#define HAVE_JPX_DECODER 0 + +/* Define to 1 if you have the `fseek64' function. */ -+/* #undef HAVE_FSEEK64 */ ++#define HAVE_FSEEK64 0 + +#if !defined(_WIN32) +/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ +#define HAVE_FSEEKO 1 +#endif + -+/* Define to 1 if you have the `ftell64' function. */ -+/* #undef HAVE_FTELL64 */ -+ +#if !defined(__APPLE__) && !defined(_WIN32) +/* Define to 1 if you have the `pread64' function. */ +#define HAVE_PREAD64 1 @@ -97,11 +80,6 @@ index 0fbd336a..451213f8 100644 +#endif + +#if !defined(_WIN32) -+/* Defines if gettimeofday is available on your system */ -+#define HAVE_GETTIMEOFDAY 1 -+#endif -+ -+#if !defined(_WIN32) +/* Defines if gmtime_r is available on your system */ +#define HAVE_GMTIME_R 1 +#endif @@ -111,64 +89,27 @@ index 0fbd336a..451213f8 100644 +#define HAVE_TIMEGM 1 +#endif + -+/* Define to 1 if you have the `z' library (-lz). */ -+/* #undef HAVE_LIBZ */ -+ +#if !defined(_WIN32) +/* Defines if localtime_r is available on your system */ +#define HAVE_LOCALTIME_R 1 +#endif + +#if !defined(_WIN32) -+/* Define to 1 if you have the `mkstemp' function. */ -+#define HAVE_MKSTEMP 1 -+#endif -+ -+#if !defined(_WIN32) +/* Defines if strtok_r is available on your system */ +#define HAVE_STRTOK_R 1 +#endif + -+/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */ -+/* #undef HAVE_NDIR_H */ -+ +#if !defined(_WIN32) +/* Define to 1 if you have the `popen' function. */ +#define HAVE_POPEN 1 +#endif + -+#if !defined(__APPLE__) && !defined(_WIN32) -+/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'. -+ */ -+#define HAVE_SYS_DIR_H 1 -+#endif -+ -+#if !defined(__APPLE__) && !defined(_WIN32) -+/* Define to 1 if you have the <sys/mman.h> header file. */ -+#define HAVE_SYS_MMAN_H 1 -+#endif -+ -+/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'. -+ */ -+/* #undef HAVE_SYS_NDIR_H */ -+ -+/* Define to 1 if you have the <sys/stat.h> header file. */ -+#define HAVE_SYS_STAT_H 1 -+ -+#if !defined(_WIN32) -+/* Define to 1 if you have the <unistd.h> header file. */ -+#define HAVE_UNISTD_H 1 -+#endif -+ +/* Define to 1 if you have a big endian machine */ -+/* #undef WORDS_BIGENDIAN */ ++#define WORDS_BIGENDIAN 0 + +/* Define as const if the declaration of iconv() needs const. */ +#define ICONV_CONST + -+/* Generate OPI comments in PS output. */ -+#define OPI_SUPPORT 1 -+ +/* Name of package */ +#define PACKAGE "poppler" + @@ -179,7 +120,7 @@ index 0fbd336a..451213f8 100644 +#define PACKAGE_NAME "poppler" + +/* Define to the full name and version of this package. */ -+#define PACKAGE_STRING "poppler 25.12.0" ++#define PACKAGE_STRING "poppler 26.01.0" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "poppler" @@ -188,25 +129,22 @@ index 0fbd336a..451213f8 100644 +#define PACKAGE_URL "" + +/* Define to the version of this package. */ -+#define PACKAGE_VERSION "25.12.0" ++#define PACKAGE_VERSION "26.01.0" + +/* Poppler data dir */ +#define POPPLER_DATADIR "/usr/local/share/poppler" + +/* Support for curl based doc builder is compiled in. */ -+/* #undef POPPLER_HAS_CURL_SUPPORT */ -+ -+/* Enable word list support. */ -+#define TEXTOUT_WORD_LIST 1 ++#define POPPLER_HAS_CURL_SUPPORT 0 + +/* Defines if use cms */ -+/* #undef USE_CMS */ ++#define USE_CMS 0 + +/* Use single precision arithmetic in the Splash backend */ -+/* #undef USE_FLOAT */ ++#define USE_FLOAT 0 + +/* Version number of package */ -+#define VERSION "25.12.0" ++#define VERSION "26.01.0" + +#if defined(__APPLE__) +#elif defined (_WIN32) @@ -221,7 +159,7 @@ index 0fbd336a..451213f8 100644 +#endif + +/* OpenJPEG with the OPJ_DPARAMETERS_IGNORE_PCLR_CMAP_CDEF_FLAG flag */ -+/* #undef WITH_OPENJPEG_IGNORE_PCLR_CMAP_CDEF_FLAG */ ++#define WITH_OPENJPEG_IGNORE_PCLR_CMAP_CDEF_FLAG 0 + +/* MS defined snprintf as deprecated but then added it in Visual Studio 2015. */ +#if defined(_MSC_VER) && _MSC_VER < 1900 @@ -239,7 +177,7 @@ index 0fbd336a..451213f8 100644 +#endif + +/* Number of bits in a file offset, on hosts where this is settable. */ -+/* #undef _FILE_OFFSET_BITS */ ++#define _FILE_OFFSET_BITS 0 + +/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */ +/* TODO This is wrong, port if needed #undef _LARGEFILE_SOURCE */ @@ -251,7 +189,7 @@ new file mode 100644 index 0fbd336a..451213f8 100644 --- /dev/null +++ b/poppler/poppler-config.h -@@ -0,0 +1,156 @@ +@@ -0,0 +1,91 @@ +//================================================= -*- mode: c++ -*- ==== +// +// poppler-config.h @@ -273,7 +211,7 @@ index 0fbd336a..451213f8 100644 +// Copyright (C) 2017 Adrian Johnson <[email protected]> +// Copyright (C) 2018 Adam Reichold <[email protected]> +// Copyright (C) 2018 Stefan Brüns <[email protected]> -+// Copyright (C) 2020 Albert Astals Cid <[email protected]> ++// Copyright (C) 2020, 2025 Albert Astals Cid <[email protected]> +// +// To see a description of the changes please see the Changelog file that +// came with your tarball or type make ChangeLog if you are building from git @@ -283,101 +221,39 @@ index 0fbd336a..451213f8 100644 +#ifndef POPPLER_CONFIG_H +#define POPPLER_CONFIG_H + -+// We duplicate some of the config.h #define's here since they are -+// used in some of the header files we install. The #ifndef/#endif -+// around #undef look odd, but it's to silence warnings about -+// redefining those symbols. -+ +/* Defines the poppler version. */ -+#ifndef POPPLER_VERSION -+#define POPPLER_VERSION "25.12.0" -+#endif ++#define POPPLER_VERSION "26.01.0" + +/* Use single precision arithmetic in the Splash backend */ -+#ifndef USE_FLOAT -+/* #undef USE_FLOAT */ -+#endif -+ -+/* Include support for OPI comments. */ -+#ifndef OPI_SUPPORT -+#define OPI_SUPPORT 1 -+#endif -+ -+/* Enable word list support. */ -+#ifndef TEXTOUT_WORD_LIST -+#define TEXTOUT_WORD_LIST 1 -+#endif ++#define USE_FLOAT 0 + +/* Support for curl is compiled in. */ -+#ifndef POPPLER_HAS_CURL_SUPPORT -+/* #undef POPPLER_HAS_CURL_SUPPORT */ -+#endif ++#define POPPLER_HAS_CURL_SUPPORT 0 + +/* Use libjpeg instead of builtin jpeg decoder. */ -+#ifndef ENABLE_LIBJPEG +#define ENABLE_LIBJPEG 1 -+#endif + +/* Build against libtiff. */ -+#ifndef ENABLE_LIBTIFF -+/* #undef ENABLE_LIBTIFF */ -+#endif ++#define ENABLE_LIBTIFF 0 + +/* Build against libpng. */ -+#ifndef ENABLE_LIBPNG -+/* #define ENABLE_LIBPNG 1 */ -+#endif -+ -+/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'. -+ */ -+#ifndef HAVE_DIRENT_H -+#if !defined(_WIN32) -+#define HAVE_DIRENT_H 1 -+#endif -+#endif -+ -+/* Defines if gettimeofday is available on your system */ -+#ifndef HAVE_GETTIMEOFDAY -+#if !defined(_WIN32) -+#define HAVE_GETTIMEOFDAY 1 -+#endif -+#endif -+ -+/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */ -+#ifndef HAVE_NDIR_H -+/* #undef HAVE_NDIR_H */ -+#endif ++#define ENABLE_LIBPNG 0 + -+/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'. -+ */ -+#ifndef HAVE_SYS_DIR_H -+#if !defined(__APPLE__) && !defined(_WIN32) -+#define HAVE_SYS_DIR_H 1 -+#endif -+#endif -+ -+/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'. -+ */ -+#ifndef HAVE_SYS_NDIR_H -+/* #undef HAVE_SYS_NDIR_H */ -+#endif ++/* Use zlib instead of builtin zlib decoder to uncompress flate streams. */ ++#define ENABLE_ZLIB_UNCOMPRESS 0 + +/* Defines if use cms */ -+#ifndef USE_CMS -+/* #undef USE_CMS */ -+#endif ++#define USE_CMS 0 + +/* Use header-only classes from Boost in the Splash backend */ -+#ifndef USE_BOOST_HEADERS -+/* #undef USE_BOOST_HEADERS */ -+#endif ++#define USE_BOOST_HEADERS 0 + +//------------------------------------------------------------------------ +// version +//------------------------------------------------------------------------ + +// copyright notice -+#define popplerCopyright "Copyright 2005-2025 The Poppler Developers - http://poppler.freedesktop.org"; ++#define popplerCopyright "Copyright 2005-2026 The Poppler Developers - http://poppler.freedesktop.org"; +#define xpdfCopyright "Copyright 1996-2011, 2022 Glyph & Cog, LLC" + +//------------------------------------------------------------------------ @@ -385,26 +261,23 @@ index 0fbd336a..451213f8 100644 +//------------------------------------------------------------------------ + +#if defined(_WIN32) && !defined(_MSC_VER) -+#include <windef.h> ++# include <windef.h> +#else -+#define CDECL ++# define CDECL +#endif + +//------------------------------------------------------------------------ +// Compiler +//------------------------------------------------------------------------ + -+#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4) -+#include <cstdio> // __MINGW_PRINTF_FORMAT is defined in the mingw stdio.h -+#ifdef __MINGW_PRINTF_FORMAT -+#define GCC_PRINTF_FORMAT(fmt_index, va_index) \ -+ __attribute__((__format__(__MINGW_PRINTF_FORMAT, fmt_index, va_index))) -+#else -+#define GCC_PRINTF_FORMAT(fmt_index, va_index) \ -+ __attribute__((__format__(__printf__, fmt_index, va_index))) -+#endif ++#ifdef __GNUC__ ++# ifdef __MINGW32__ ++# define GCC_PRINTF_FORMAT(fmt_index, va_index) __attribute__((__format__(gnu_printf, fmt_index, va_index))) ++# else ++# define GCC_PRINTF_FORMAT(fmt_index, va_index) __attribute__((__format__(printf, fmt_index, va_index))) ++# endif +#else -+#define GCC_PRINTF_FORMAT(fmt_index, va_index) ++# define GCC_PRINTF_FORMAT(fmt_index, va_index) +#endif + +#endif /* POPPLER_CONFIG_H */ @@ -437,9 +310,9 @@ index 0fbd336a..451213f8 100644 + +#include "poppler-global.h" + -+#define POPPLER_VERSION "25.12.0" -+#define POPPLER_VERSION_MAJOR 25 -+#define POPPLER_VERSION_MINOR 12 ++#define POPPLER_VERSION "26.01.0" ++#define POPPLER_VERSION_MAJOR 26 ++#define POPPLER_VERSION_MINOR 01 +#define POPPLER_VERSION_MICRO 0 + +namespace poppler diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx index a3b34db15464..6b9184809803 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx @@ -231,7 +231,10 @@ static void writeJpeg_( OutputBuffer& o_rOutputBuf, Stream* str ) #else str = ((DCTStream *)str)->getRawStream(); #endif -#if POPPLER_CHECK_VERSION(25, 2, 0) +#if POPPLER_CHECK_VERSION(26, 1, 0) + if (!str->rewind()) + return; +#elif POPPLER_CHECK_VERSION(25, 2, 0) if (!str->reset()) return; #else @@ -272,7 +275,10 @@ static void writePbm_(OutputBuffer& o_rOutputBuf, Stream* str, int width, int he o_rOutputBuf.resize(header_size); // initialize stream -#if POPPLER_CHECK_VERSION(25, 2, 0) +#if POPPLER_CHECK_VERSION(26, 1, 0) + if (!str->rewind()) + return; +#elif POPPLER_CHECK_VERSION(25, 2, 0) if (!str->reset()) return; #else @@ -334,7 +340,10 @@ static void writePpm_( OutputBuffer& o_rOutputBuf, width, colorMap->getNumPixelComps(), colorMap->getBits())); -#if POPPLER_CHECK_VERSION(25, 2, 0) +#if POPPLER_CHECK_VERSION(26, 1, 0) + if (!imgStr->rewind()) + return; +#elif POPPLER_CHECK_VERSION(25, 2, 0) if (!imgStr->reset()) return; #else diff --git a/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx b/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx index e21d9192f563..6e9784d4aa6b 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx +++ b/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx @@ -214,7 +214,10 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf, int nLineSize = (width + 7)/8; aScanlines.reserve( nLineSize * height + height ); -#if POPPLER_CHECK_VERSION(25, 2, 0) +#if POPPLER_CHECK_VERSION(26, 1, 0) + if (!str->rewind()) + return; +#elif POPPLER_CHECK_VERSION(25, 2, 0) if (!str->reset()) return; #else @@ -257,7 +260,10 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf, width, colorMap->getNumPixelComps(), colorMap->getBits())); -#if POPPLER_CHECK_VERSION(25, 2, 0) +#if POPPLER_CHECK_VERSION(26, 1, 0) + if (!imgStr->rewind()) + return; +#elif POPPLER_CHECK_VERSION(25, 2, 0) if (!imgStr->reset()) return; #else @@ -299,7 +305,10 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf, maskColorMap->getNumPixelComps(), maskColorMap->getBits())); -#if POPPLER_CHECK_VERSION(25, 2, 0) +#if POPPLER_CHECK_VERSION(26, 1, 0) + if (!imgStrMask->rewind()) + return; +#elif POPPLER_CHECK_VERSION(25, 2, 0) if (!imgStrMask->reset()) return; #else @@ -353,7 +362,10 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf, width, colorMap->getNumPixelComps(), colorMap->getBits())); -#if POPPLER_CHECK_VERSION(25, 2, 0) +#if POPPLER_CHECK_VERSION(26, 1, 0) + if (!imgStr->rewind()) + return; +#elif POPPLER_CHECK_VERSION(25, 2, 0) if (!imgStr->reset()) return; #else @@ -392,7 +404,10 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf, std::unique_ptr<ImageStream> imgStrMask( new ImageStream(maskStr, maskWidth, 1, 1)); -#if POPPLER_CHECK_VERSION(25, 2, 0) +#if POPPLER_CHECK_VERSION(26, 1, 0) + if (!imgStrMask->rewind()) + return; +#elif POPPLER_CHECK_VERSION(25, 2, 0) if (!imgStrMask->reset()) return; #else commit 9460326bb51b65b09a8f48f6fe124ddb7e920bba Author: Xisco Fauli <[email protected]> AuthorDate: Thu Dec 11 10:22:14 2025 +0100 Commit: Andras Timar <[email protected]> CommitDate: Thu Jan 15 10:14:07 2026 +0100 nss: upgrade to 3.119.1 Downloaded from https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_119_1_RTM/src/nss-3_119_1-with-nspr-4.38.2.tar.gz Change-Id: I281e1a7f7bb212e1e721deba6238f3bcc17795e3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195436 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins (cherry picked from commit a40ea776fe34d01682b4716d609e5b61d70226ae) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195912 Reviewed-by: Christian Lohmaier <[email protected]> diff --git a/download.lst b/download.lst index 6bc551dbaaa5..5c3357c650e5 100644 --- a/download.lst +++ b/download.lst @@ -591,8 +591,8 @@ MYTHES_TARBALL := mythes-1.2.5.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts -NSS_SHA256SUM := 8f12f61ef814662bf991a289bc6724d078cd79f135e09e260adbc35dfa9acaf3 -NSS_TARBALL := nss-3.119-with-nspr-4.38.2.tar.gz +NSS_SHA256SUM := 1e86aacdce66c3bdd38bb011e617a3c93013ed6f802102365a589d6f686efe4b +NSS_TARBALL := nss-3.119.1-with-nspr-4.38.2.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts diff --git a/external/nss/nss_macosx.patch b/external/nss/nss_macosx.patch index eaa025f1c205..e553cfda7042 100644 --- a/external/nss/nss_macosx.patch +++ b/external/nss/nss_macosx.patch @@ -23,33 +23,38 @@ diff -ru a/nspr/configure b/nspr/configure diff -ru a/nss/coreconf/Darwin.mk b/nss/coreconf/Darwin.mk --- a/a/nss/coreconf/Darwin.mk 2014-09-29 16:50:22.992304799 +0100 +++ b/b/nss/coreconf/Darwin.mk 2014-09-29 16:51:59.214931953 +0100 -@@ -19,34 +19,39 @@ - endif +@@ -20,35 +20,37 @@ - ifeq (x86_64,$(CPU_ARCH)) + ifeq (,$(filter-out i%86,$(CPU_ARCH))) + ifdef USE_64 +ifeq (,$(findstring -arch ,$(CC))) CC += -arch x86_64 CCC += -arch x86_64 +endif override CPU_ARCH = x86_64 - else ifeq (i386,$(CPU_ARCH)) + else OS_REL_CFLAGS = -Di386 +ifeq (,$(findstring -arch ,$(CC))) CC += -arch i386 CCC += -arch i386 +endif override CPU_ARCH = x86 - else ifeq (,$(filter-out aarch64 arm,$(CPU_ARCH))) - CC += -arch arm64 - CCC += -arch arm64 - override CPU_ARCH = aarch64 - else ifeq (powerpc,$(CPU_ARCH)) + endif +-else ifeq (,$(filter-out aarch64 arm,$(CPU_ARCH))) +-CC += -arch arm64 +-CCC += -arch arm64 +-override CPU_ARCH = aarch64 +-else ifeq (powerpc,$(CPU_ARCH)) -OS_REL_CFLAGS = -Dppc -CC += -arch ppc -CCC += -arch ppc - override CPU_ARCH = ppc +-override CPU_ARCH = ppc else - $(error Unknown CPU architecture) +- $(error Unknown CPU architecture) ++ifeq (arm,$(CPU_ARCH)) ++# Nothing set for arm currently. ++else ++endif endif ifneq (,$(MACOS_SDK_DIR)) @@ -67,7 +72,7 @@ diff -ru a/nss/coreconf/Darwin.mk b/nss/coreconf/Darwin.mk # GCC <= 3 DARWIN_SDK_FRAMEWORKS = -F$(MACOS_SDK_DIR)/System/Library/Frameworks ifneq (,$(shell find $(MACOS_SDK_DIR)/Library/Frameworks -maxdepth 0)) -@@ -108,7 +113,7 @@ +@@ -111,7 +113,7 @@ # May override this with different compatibility and current version numbers. DARWIN_DYLIB_VERSIONS = -compatibility_version 1 -current_version 1 # May override this with -bundle to create a loadable module. commit 051edd1db89f915344b05685108daf586c8286a5 Author: Xisco Fauli <[email protected]> AuthorDate: Wed Dec 17 20:15:37 2025 +0100 Commit: Andras Timar <[email protected]> CommitDate: Thu Jan 15 10:14:07 2026 +0100 lzma: upgrade to 5.8.2 Downloaded from https://github.com/tukaani-project/xz/releases/download/v5.8.2/xz-5.8.2.tar.gz Change-Id: Ia7550b49244cf0f3cc5fd4975eeba5595055ec24 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195806 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins (cherry picked from commit 54f676d8c1f46c8861a4784036f96c58ca3dd49b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195824 Reviewed-by: Christian Lohmaier <[email protected]> diff --git a/download.lst b/download.lst index 51438ce814f1..6bc551dbaaa5 100644 --- a/download.lst +++ b/download.lst @@ -550,8 +550,8 @@ LXML_TARBALL := lxml-6.0.2.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts -LZMA_SHA256SUM := bdbc23fbf9098843357e71e49685724fda2c320c29cb1b25fd90505f14bb0b3d -LZMA_TARBALL := xz-5.8.1.tar.gz +LZMA_SHA256SUM := ce09c50a5962786b83e5da389c90dd2c15ecd0980a258dd01f70f9e7ce58a8f1 +LZMA_TARBALL := xz-5.8.2.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts commit 0ea3d26067cd88a44fd00360ec2d280047b1d7ec Author: Xisco Fauli <[email protected]> AuthorDate: Mon Jan 12 11:28:55 2026 +0100 Commit: Andras Timar <[email protected]> CommitDate: Thu Jan 15 10:14:07 2026 +0100 crashreporting: fix crash in impl_createReferenceSizeProvider() Seen in https://crashreport.libreoffice.org/stats/crash_details/deb8f144-001b-4f79-9a7b-c0e8dd7d8c55 Most likely after commit 76d296f7600bddf0b52fe2bd5522594551f10218 Author: Noel Grandin <[email protected]> Date: Thu Apr 10 20:02:01 2025 +0200 fold ChartModelHelper functions into ChartModel Change-Id: I959b1210254e741ac9dca492f2e70d86e86f3929 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197083 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> (cherry picked from commit 76ef93a709bde90518b3809f35926aa284082ded) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197129 Reviewed-by: Adolfo Jayme Barrientos <[email protected]> diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx index 428cfe7e297e..88f208e70bec 100644 --- a/chart2/inc/ChartModel.hxx +++ b/chart2/inc/ChartModel.hxx @@ -60,6 +60,9 @@ typedef struct _xmlTextWriter* xmlTextWriterPtr; +#define DEFAULT_PAGE_WIDTH 16000 +#define DEFAULT_PAGE_HEIGHT 9000 + namespace com::sun::star::awt { class XRequestCallback; } namespace com::sun::star::chart2::data { class XDataProvider; } namespace com::sun::star::document { class XFilter; } diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx index ea2c17978fda..9a77a6860210 100644 --- a/chart2/source/controller/main/ChartController_Tools.cxx +++ b/chart2/source/controller/main/ChartController_Tools.cxx @@ -212,9 +212,9 @@ css::uno::Reference<css::beans::XPropertySet> getSelectedGraphObject(ChartContro ReferenceSizeProvider ChartController::impl_createReferenceSizeProvider() { - awt::Size aPageSize( getChartModel()->getPageSize() ); - - return ReferenceSizeProvider(aPageSize, getChartModel()); + rtl::Reference<::chart::ChartModel> xChartModel = getChartModel(); + awt::Size aPageSize = xChartModel.is() ? xChartModel->getPageSize() : awt::Size(DEFAULT_PAGE_WIDTH, DEFAULT_PAGE_HEIGHT ); + return ReferenceSizeProvider(aPageSize, xChartModel); } void ChartController::impl_adaptDataSeriesAutoResize() diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index 96fe84cc99dc..409132b48e5c 100644 --- a/chart2/source/model/main/ChartModel.cxx +++ b/chart2/source/model/main/ChartModel.cxx @@ -1435,7 +1435,7 @@ rtl::Reference< ChartType > ChartModel::getChartTypeOfSeries( const rtl::Referen // static awt::Size ChartModel::getDefaultPageSize() { - return awt::Size( 16000, 9000 ); + return awt::Size( DEFAULT_PAGE_WIDTH, DEFAULT_PAGE_HEIGHT ); } awt::Size ChartModel::getPageSize() commit a1d8cb634ad646cb213141fc6549e8477a249ed0 Author: Aron Budea <[email protected]> AuthorDate: Wed Jan 14 21:49:45 2026 +1030 Commit: Andras Timar <[email protected]> CommitDate: Thu Jan 15 10:14:07 2026 +0100 tdf#170325 update default TwoDigitYear to 1950 2030 is almost here, so start of range still interpeted as 1900s should be pushed back. Change-Id: I76d7171a9947860d8353241aae1f2a97e9da5c69 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197261 Tested-by: Jenkins Reviewed-by: Aron Budea <[email protected]> (cherry picked from commit 211cbca48cc3d2c912663224c650f4ee3431f7e5) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197292 Reviewed-by: Adolfo Jayme Barrientos <[email protected]> diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index b652621254f2..3085ed094145 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -3598,7 +3598,7 @@ two-digit-year date formats.</desc> <label>First two-digit year</label> </info> - <value>1930</value> + <value>1950</value> </prop> </group> <group oor:name="Filter"> diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx index 54878e9451e3..4b482e0c1d9b 100644 --- a/svl/qa/unit/svl.cxx +++ b/svl/qa/unit/svl.cxx @@ -1239,7 +1239,7 @@ void Test::testIsNumberFormatSpecific() std::vector<FormatInputOutput> aIO = { { "005-12-14", true, "0005-12-14", 0 }, { "5-12-14", true, "2005-12-14", 0 }, - { "32-12-14", true, "1932-12-14", 0 } + { "52-12-14", true, "1952-12-14", 0 } }; checkSpecificNumberFormats( aFormatter, aIO, "[en-US] date"); @@ -1253,7 +1253,7 @@ void Test::testIsNumberFormatSpecific() std::vector<FormatInputOutput> aIO = { { "005-12-14", true, "0005-12-14", 0 }, { "5-12-14", true, "2005-12-14", 0 }, - { "32-12-14", true, "1932-12-14", 0 } + { "52-12-14", true, "1952-12-14", 0 } }; checkSpecificNumberFormats( aFormatter, aIO, "[de-DE] date"); commit 05a6bb05dec5db0779ab3ed6de5b46bd9c81d24b Author: Caolán McNamara <[email protected]> AuthorDate: Tue Jan 13 16:34:39 2026 +0000 Commit: Andras Timar <[email protected]> CommitDate: Thu Jan 15 10:14:07 2026 +0100 add a11y name to preview widget Change-Id: Id8753aad512081a4158b356b4ff852cae53c750f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197205 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Jenkins (cherry picked from commit ba0b4a88235660e1cebb06faf260fe492f328c9d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197296 Reviewed-by: Xisco Fauli <[email protected]> diff --git a/solenv/sanitizers/ui/modules/swriter.suppr b/solenv/sanitizers/ui/modules/swriter.suppr index 5d5667d72d31..88bfb3ab577f 100644 --- a/solenv/sanitizers/ui/modules/swriter.suppr +++ b/solenv/sanitizers/ui/modules/swriter.suppr @@ -57,7 +57,6 @@ sw/uiconfig/swriter/ui/opttablepage.ui://GtkLabel[@id='label12'] orphan-label sw/uiconfig/swriter/ui/opttablepage.ui://GtkLabel[@id='label13'] orphan-label sw/uiconfig/swriter/ui/opttablepage.ui://GtkLabel[@id='label4'] orphan-label sw/uiconfig/swriter/ui/opttablepage.ui://GtkLabel[@id='label14'] orphan-label -sw/uiconfig/swriter/ui/outlinenumberingpage.ui://GtkDrawingArea[@id='preview'] no-labelled-by sw/uiconfig/swriter/ui/pbmenubutton.ui://GtkMenuButton[@id='menubutton'] button-no-label sw/uiconfig/swriter/ui/poseditbox.ui://GtkEntry[@id='entry'] no-labelled-by sw/uiconfig/swriter/ui/mailmerge.ui://GtkLabel[@id='fieldlabel'] orphan-label diff --git a/sw/uiconfig/swriter/ui/outlinenumberingpage.ui b/sw/uiconfig/swriter/ui/outlinenumberingpage.ui index 86d78e2c1356..ead9a9382664 100644 --- a/sw/uiconfig/swriter/ui/outlinenumberingpage.ui +++ b/sw/uiconfig/swriter/ui/outlinenumberingpage.ui @@ -114,6 +114,11 @@ <property name="height-request">260</property> <property name="visible">True</property> <property name="can-focus">False</property> + <child internal-child="accessible"> + <object class="AtkObject" id="preview-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="outlinenumberingpage|preview-atkobject">Preview</property> + </object> + </child> </object> <packing> <property name="expand">True</property> commit 22fa83fa61384d3a6f035446ed1e930299c7d3d7 Author: Caolán McNamara <[email protected]> AuthorDate: Tue Jan 13 21:15:14 2026 +0000 Commit: Andras Timar <[email protected]> CommitDate: Thu Jan 15 10:14:07 2026 +0100 Don't null-deref if pView is not present And default to COL_WHITE as view background if not present. Related: tdf#168710 Change-Id: I184fb018d16ac83381b689093e751167bad2c2fb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197222 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> (cherry picked from commit 1772c60c7a8b31edd1baebf60b0b589dc6d865df) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197254 Reviewed-by: Xisco Fauli <[email protected]> diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index 7f4c0674d351..69fc85d9adb0 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -1800,7 +1800,7 @@ SfxStyleSheet* SdrPage::GetTextStyleSheetForObject( SdrObject* pObj ) const // #i75566# GetBackgroundColor -> GetPageBackgroundColor and bScreenDisplay hint value Color SdrPage::GetPageBackgroundColor( SdrPageView const * pView, bool bScreenDisplay ) const { - Color aColor; + Color aColor(COL_WHITE); if(bScreenDisplay && (!pView || pView->GetApplicationDocumentColor() == COL_AUTO)) { @@ -1812,7 +1812,7 @@ Color SdrPage::GetPageBackgroundColor( SdrPageView const * pView, bool bScreenDi aColor = aColorConfig.GetColorValue( svtools::DOCCOLOR ).nColor; } } - else + else if (pView) { aColor = pView->GetApplicationDocumentColor(); } commit 6818e0700daf4818e70628ed84893900e4fe5b00 Author: Noel Grandin <[email protected]> AuthorDate: Mon Jan 12 21:02:56 2026 +0200 Commit: Andras Timar <[email protected]> CommitDate: Thu Jan 15 10:14:06 2026 +0100 officeotron says that o:spt needs to be numeric Change-Id: I9d2f995d7cdc2feae547b61e60f75ed608277386 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197137 Reviewed-by: Michael Stahl <[email protected]> Tested-by: Jenkins (cherry picked from commit ad70c58224084f8f390cd01713f8fd03962680d0) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197218 Reviewed-by: Xisco Fauli <[email protected]> diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx index 5800219fa47a..0613426e6fe5 100644 --- a/oox/source/export/vmlexport.cxx +++ b/oox/source/export/vmlexport.cxx @@ -1260,12 +1260,21 @@ sal_uInt32 VMLExport::GenerateShapeId() OString VMLExport::GetVMLShapeTypeDefinition( std::string_view sShapeID, const bool bIsPictureFrame ) { + // officeotron says that o:spt needs to be numeric + sal_Int32 nSptId = 0; + std::string_view sRest; + if (o3tl::starts_with(sShapeID, "ole_rId", &sRest)) + nSptId = o3tl::toInt32(sRest); + else + nSptId = o3tl::toInt32(sShapeID); + SAL_WARN_IF(nSptId == 0, "oox", "o:spt needs to be numeric, but we have " << sShapeID); + assert(nSptId != 0); OString sShapeType; if ( !bIsPictureFrame ) // We don't have a shape definition for host control in presetShapeDefinitions.xml // So use a definition copied from DOCX file created with MSO sShapeType = OString::Concat("<v:shapetype id=\"_x0000_t") + sShapeID + - "\" coordsize=\"21600,21600\" o:spt=\"" + sShapeID + + "\" coordsize=\"21600,21600\" o:spt=\"" + OString::number(nSptId) + "\" path=\"m,l,21600l21600,21600l21600,xe\"> " "<v:stroke joinstyle=\"miter\"/> " "<v:path shadowok=\"f\" o:extrusionok=\"f\" strokeok=\"f\" fillok=\"f\" o:connecttype=\"rect\"/> " @@ -1275,7 +1284,7 @@ OString VMLExport::GetVMLShapeTypeDefinition( // We don't have a shape definition for picture frame in presetShapeDefinitions.xml // So use a definition copied from DOCX file created with MSO sShapeType = OString::Concat("<v:shapetype id=\"_x0000_t") + sShapeID + - "\" coordsize=\"21600,21600\" o:spt=\"" + sShapeID + + "\" coordsize=\"21600,21600\" o:spt=\"" + OString::number(nSptId) + "\" o:preferrelative=\"t\" path=\"m@4@5l@4@11@9@11@9@5xe\" filled=\"f\" stroked=\"f\"> " "<v:stroke joinstyle=\"miter\"/> " "<v:formulas> " diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 019ba34c476b..bdcf851d157d 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -44,9 +44,6 @@ CPPUNIT_TEST_FIXTURE(Test, testfdo81381) { createSwDoc("fdo81381.docx"); - // FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/document.xml"_ustr); assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:r[1]/w:object[1]/o:OLEObject[1]", "DrawAspect", u"Icon"); diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx index 51532b3cb6d8..6238bfd89e69 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx @@ -45,9 +45,6 @@ public: DECLARE_OOXMLEXPORT_TEST(testWPGtextboxes, "testWPGtextboxes.docx") { - // FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); - CPPUNIT_ASSERT_EQUAL(2, getShapes()); auto MyShape = getShape(1); @@ -169,9 +166,6 @@ CPPUNIT_TEST_FIXTURE(Test, testFloattableNestedCellStartDOCXExport) DECLARE_OOXMLEXPORT_TEST(testWpgOnly, "wpg-only.docx") { - // FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); - uno::Reference<drawing::XShape> xShape = getShape(1); // Check position, it was nearly 0. This is a shape, so use getPosition(), not a property. CPPUNIT_ASSERT_EQUAL(oox::drawingml::convertEmuToHmm(548005), xShape->getPosition().X); @@ -679,9 +673,6 @@ DECLARE_OOXMLEXPORT_TEST(testLargeTwips, "large-twips.docx" ) DECLARE_OOXMLEXPORT_TEST(testNegativeCellMarginTwips, "negative-cell-margin-twips.docx") { - // FIXME: validation error in OOXML export: Errors: 4 - skipValidation(); - // Slightly related to cp#1000043, the twips value was negative, which wrapped around somewhere, // while MSO seems to ignore that as well. xmlDocUniquePtr pXmlDoc = parseLayoutDump(); @@ -691,9 +682,6 @@ DECLARE_OOXMLEXPORT_TEST(testNegativeCellMarginTwips, "negative-cell-margin-twip DECLARE_OOXMLEXPORT_TEST(testFdo38414, "fdo38414.docx") { - // FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - // The cells in the last (4th) column were merged properly and so the result didn't have the same height. // (Since w:gridBefore is worked around by faking another cell in the row, so column count is thus 5 // instead of 4, therefore compare height of cells 4 and 5 rather than 3 and 4.) @@ -761,9 +749,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf134606) { createSwDoc("tdf134606.docx"); - // FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); - save(TestFilter::DOCX); // The problem was that the importer lost the nested table structure with w:gridBefore xmlDocUniquePtr pXmlDoc = parseExport(u"word/document.xml"_ustr); @@ -795,9 +780,6 @@ DECLARE_OOXMLEXPORT_TEST(testChartSize, "chart-size.docx") DECLARE_OOXMLEXPORT_TEST(testInlineGroupshape, "inline-groupshape.docx") { - // FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); - // Inline groupshape was in the background, so it was hidden sometimes by other shapes. CPPUNIT_ASSERT_EQUAL(true, getProperty<bool>(getShape(1), u"Opaque"_ustr)); } @@ -827,9 +809,6 @@ DECLARE_OOXMLEXPORT_TEST(testCaption, "caption.docx") DECLARE_OOXMLEXPORT_TEST(testGroupshapeTrackedchanges, "groupshape-trackedchanges.docx") { - // FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); - uno::Reference<drawing::XShapes> xGroup(getShape(1), uno::UNO_QUERY); uno::Reference<drawing::XShape> xShape(xGroup->getByIndex(0), uno::UNO_QUERY); // Shape text was completely missing, ensure inserted text is available. diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx index 4f23f1127db9..869fdb02eca1 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx @@ -89,9 +89,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf116436_rowFill) { createSwDoc("tdf116436_rowFill.odt"); - // FIXME: validation error in OOXML export: Errors: 8 - skipValidation(); - saveAndReload(TestFilter::DOCX); CPPUNIT_ASSERT_EQUAL(1, getPages()); uno::Reference<text::XTextTablesSupplier> xTextTablesSupplier(mxComponent, uno::UNO_QUERY); @@ -363,9 +360,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf117988, "tdf117988.docx") DECLARE_OOXMLEXPORT_TEST(testTdf94801, "tdf94801.docx") { - // FIXME: validation error in OOXML export: Errors: 81 - skipValidation(); - // This was a 2-page document with unwanted line breaking in table cells, because // the table was narrower, than defined (< 1/100 mm loss during twip to 1/100 mm conversion) CPPUNIT_ASSERT_EQUAL(1, getPages()); @@ -539,9 +533,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf114703, "tdf114703.docx") DECLARE_OOXMLEXPORT_TEST(testTdf113258, "tdf113258.docx") { - // FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); - uno::Reference<text::XTextRange> xShape(getShape(1), uno::UNO_QUERY); // This was 494, i.e. automatic spacing resulted in non-zero paragraph top // margin for the first paragraph in a shape. @@ -551,9 +542,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf113258, "tdf113258.docx") DECLARE_OOXMLEXPORT_TEST(testTdf113258_noBeforeAutospacing, "tdf113258_noBeforeAutospacing.docx") { - // FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); - uno::Reference<text::XTextRange> xShape(getShape(1), uno::UNO_QUERY); // This was 0, i.e. disabled automatic spacing still resulted in zero paragraph // top margin for the first paragraph in a shape. @@ -618,9 +606,6 @@ CPPUNIT_TEST_FIXTURE(Test, testPageBreak_after) { createSwDoc("pageBreak_after.odt"); - // FIXME: validation error in OOXML export: Errors: 4 - skipValidation(); - saveAndReload(TestFilter::DOCX); // The problem was that the page breakAfter put the empty page BEFORE the table xmlDocUniquePtr pDump = parseLayoutDump(); @@ -790,9 +775,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf116801, "tdf116801.docx") DECLARE_OOXMLEXPORT_TEST(testTdf107969, "tdf107969.docx") { - // FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - // A VML object in a footnote's tracked changes caused write past end of document.xml at export to docx. // After that, importing after export failed with // SAXParseException: '[word/document.xml line 2]: Extra content at the end of the document', Stream 'word/document.xml'. @@ -805,9 +787,6 @@ DECLARE_OOXMLEXPORT_TEST(testOpenDocumentAsReadOnly, "open-as-read-only.docx") DECLARE_OOXMLEXPORT_TEST(testNoDefault, "noDefault.docx") { - // FIXME: validation error in OOXML export: Errors: 7 - skipValidation(); - uno::Reference<text::XTextTablesSupplier> xTextTablesSupplier(mxComponent, uno::UNO_QUERY); uno::Reference<container::XIndexAccess> xTables(xTextTablesSupplier->getTextTables(), uno::UNO_QUERY); uno::Reference<text::XTextTable> xTable(xTables->getByIndex(0), uno::UNO_QUERY); diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx index e9a9ca2cacfe..9d6490d1e118 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx @@ -730,9 +730,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTd112202) createSwDoc("090716_Studentische_Arbeit_VWS.docx"); verify(); - // FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); - saveAndReload(TestFilter::DOCX); verify(/*bIsExport*/ true); } @@ -997,9 +994,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf99631) { createSwDoc("tdf99631.docx"); - // FIXME: validation error in OOXML export: Errors: 4 - skipValidation(); - save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/document.xml"_ustr); @@ -1029,9 +1023,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf122563) { createSwDoc("tdf122563.docx"); - // FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/document.xml"_ustr); @@ -1064,9 +1055,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf94628) DECLARE_OOXMLEXPORT_TEST(testTdf122594, "tdf122594.docx") { - // FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - // test import/export of ActiveTable (visible sheet) of embedded XLSX OLE objects uno::Reference<text::XTextEmbeddedObjectsSupplier> xEmbeddedObjectsSupplier(mxComponent, uno::UNO_QUERY); @@ -1374,9 +1362,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf157011) // check tracked table column insertions and deletions with empty cells createSwDoc("tdf157011_ins_del_empty_cols.docx"); - // FIXME: validation error in OOXML export: Errors: 11 - skipValidation(); - save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/document.xml"_ustr); @@ -1492,9 +1477,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf149708) { createSwDoc("tdf149708.docx"); - // FIXME: validation error in OOXML export: Errors: 14 - skipValidation(); - save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/document.xml"_ustr); // keep tracked insertion of a list item diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx index 6b61b86c6bfa..bf8776fc6c41 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx @@ -57,9 +57,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf125778_lostPageBreakTOX, "tdf125778_lostPageBrea DECLARE_OOXMLEXPORT_TEST(testTdf126994_lostPageBreak, "tdf126994_lostPageBreak.docx") { - // FIXME: validation error in OOXML export: Errors: 3 - skipValidation(); - CPPUNIT_ASSERT_EQUAL_MESSAGE( "Number of Pages", 3, getPages() ); } @@ -175,9 +172,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf121659_loseColumnBrNextToShape) DECLARE_OOXMLEXPORT_TEST(testTdf95848, "tdf95848.docx") { - // FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); - OUString listId; OUString listStyle; { @@ -704,9 +698,6 @@ CPPUNIT_TEST_FIXTURE(Test, testFrameSizeExport) DECLARE_OOXMLEXPORT_TEST(testTdf119201, "tdf119201.docx") { - // FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); - // Visibility of shapes wasn't imported/exported, for now base printable property on that, too auto xShape(getShape(1)); CPPUNIT_ASSERT_MESSAGE("First shape should be visible.", getProperty<bool>(xShape, u"Visible"_ustr)); @@ -848,9 +839,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf123460) createSwDoc("tdf123460.docx"); verify(); - // FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - saveAndReload(TestFilter::DOCX); verify(/*bIsExport*/ true); } @@ -859,9 +847,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf146140) { createSwDoc("tdf123460.docx"); - // FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - save(TestFilter::DOCX); CPPUNIT_ASSERT_EQUAL(1, getPages()); xmlDocUniquePtr pXmlDoc = parseExport(u"word/document.xml"_ustr); @@ -1390,9 +1375,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf128304) { createSwDoc("tdf128304.odt"); - // FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - saveAndReload(TestFilter::DOCX); CPPUNIT_ASSERT_EQUAL(4, getShapes()); CPPUNIT_ASSERT_EQUAL(1, getPages()); diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx index 3e6431b89a12..c98890de9841 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx @@ -85,9 +85,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf135595_HFtableWrap) { createSwDoc("tdf135595_HFtableWrap.odt"); - // FIXME: validation error in OOXML export: Errors: 5 - skipValidation(); - saveAndReload(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseLayoutDump(); sal_Int32 nRowHeight = getXPath(pXmlDoc, "//page[1]/header/tab/row/infos/bounds", "height").toInt32(); @@ -110,9 +107,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf135595_HFtableWrap) DECLARE_OOXMLEXPORT_TEST(testTdf135943_shapeWithText_L0c15, "tdf135943_shapeWithText_LayoutInCell0_compat15.docx") { - // FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); - // With compat15, layoutinCell ought to be ignored/forced to true. // HOWEVER, currently only the shape is correctly placed, while its text is un-synced separately. // So to prevent this ugly mess, just leave everything together in the historical (wrong) spot. @@ -135,9 +129,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf135943_shapeWithText_L0c15, DECLARE_OOXMLEXPORT_TEST(testTdf135595_HFtableWrap_c12, "tdf135595_HFtableWrap_c12.docx") { - // FIXME: validation error in OOXML export: Errors: 10 - skipValidation(); - xmlDocUniquePtr pXmlDoc = parseLayoutDump(); // tdf#104596: ignore wrap exception apparently does not apply if it is not "layout in table cell". // Should be only one page. Row height should be two lines at 722, not wrapped to three lines at 998. @@ -205,9 +196,6 @@ CPPUNIT_TEST_FIXTURE(Test, Tdf133065) { createSwDoc("tdf133065.odt"); - // FIXME: validation error in OOXML export: Errors: 14 - skipValidation(); - save(TestFilter::DOCX); CPPUNIT_ASSERT_EQUAL(7, getShapes()); CPPUNIT_ASSERT_EQUAL(3, getPages()); @@ -599,9 +587,6 @@ CPPUNIT_TEST_FIXTURE(Test, Tdf133035) { createSwDoc("tdf133035.docx"); - // FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - save(TestFilter::DOCX); auto pxml = parseExport(u"word/document.xml"_ustr); CPPUNIT_ASSERT(pxml); @@ -691,9 +676,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf129522_removeShadowStyle) DECLARE_OOXMLEXPORT_TEST(testTdf130167_spilloverHeaderShape, "testTdf130167_spilloverHeader.docx") { - // FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); - uno::Reference<text::XTextGraphicObjectsSupplier> xTextGraphicObjectsSupplier(mxComponent, uno::UNO_QUERY); uno::Reference<container::XIndexAccess> xNameAccess( xTextGraphicObjectsSupplier->getGraphicObjects(), uno::UNO_QUERY); diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx index 1db5d94ef6af..aa92610d3f92 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx @@ -41,9 +41,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf131540) { createSwDoc("tdf131540.odt"); - //FIXME: validation error in OOXML export: Errors: 4 - skipValidation(); - saveAndReload(TestFilter::DOCX); CPPUNIT_ASSERT_EQUAL(2, getShapes()); CPPUNIT_ASSERT_EQUAL(1, getPages()); @@ -837,9 +834,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf135655) { createSwDoc("tdf135655.odt"); - //FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - save(TestFilter::DOCX); const xmlDocUniquePtr pExpDoc = parseExport(u"word/document.xml"_ustr); const OUString sXFillColVal = getXPath(pExpDoc, "/w:document/w:body/w:p/w:r/w:object/v:shape", "fillcolor"); @@ -947,9 +941,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf138345_numberingHighlight) DECLARE_OOXMLEXPORT_TEST(testTdf134063, "tdf134063.docx") { - //FIXME: validation error in OOXML export: Errors: 8 - skipValidation(); - CPPUNIT_ASSERT_EQUAL(2, getPages()); xmlDocUniquePtr pDump = parseLayoutDump(); @@ -962,9 +953,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf134063, "tdf134063.docx") DECLARE_OOXMLEXPORT_TEST(TestTdf135653, "tdf135653.docx") { - //FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - uno::Reference<beans::XPropertySet> xOLEProps(getShape(1), uno::UNO_QUERY_THROW); drawing::FillStyle nFillStyle = static_cast<drawing::FillStyle>(-1); xOLEProps->getPropertyValue(u"FillStyle"_ustr) >>= nFillStyle; @@ -982,9 +970,6 @@ DECLARE_OOXMLEXPORT_TEST(TestTdf135653, "tdf135653.docx") DECLARE_OOXMLEXPORT_TEST(testTdf135665, "tdf135665.docx") { - //FIXME: validation error in OOXML export: Errors: 4 - skipValidation(); - uno::Reference<beans::XPropertySet> xOLEProps1(getShape(1), uno::UNO_QUERY_THROW); uno::Reference<beans::XPropertySet> xOLEProps2(getShape(2), uno::UNO_QUERY_THROW); bool bSurroundContour1 = false; @@ -1060,9 +1045,6 @@ CPPUNIT_TEST_FIXTURE(Test, testRelativeAnchorHeightFromBottomMarginHasFooter) DECLARE_OOXMLEXPORT_TEST(TestTdf132483, "tdf132483.docx") { - //FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - uno::Reference<beans::XPropertySet> xOLEProps(getShape(1), uno::UNO_QUERY_THROW); sal_Int16 nVRelPos = -1; sal_Int16 nHRelPos = -1; @@ -1111,9 +1093,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf135667) { createSwDoc("tdf135667.odt"); - //FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - save(TestFilter::DOCX); xmlDocUniquePtr pXmlDocument = parseExport(u"word/document.xml"_ustr); @@ -1156,9 +1135,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf137295) DECLARE_OOXMLEXPORT_TEST(testTdf135660, "tdf135660.docx") { - //FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - CPPUNIT_ASSERT_EQUAL(1, getShapes()); const uno::Reference<drawing::XShape> xShape = getShape(1); const uno::Reference<beans::XPropertySet> xOLEProps(xShape, uno::UNO_QUERY_THROW); diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx index 3e5169d4588c..4de1842e917c 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx @@ -115,9 +115,6 @@ CPPUNIT_TEST_FIXTURE(Test, testFrameWrapTextMode) { createSwDoc("tdf143432_Frame_WrapTextMode.odt"); - //FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - save(TestFilter::DOCX); CPPUNIT_ASSERT_EQUAL(2, getShapes()); CPPUNIT_ASSERT_EQUAL(1, getPages()); @@ -151,9 +148,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf134219ContourWrap_glow_rotate) // actual 4177; top: expected 1522 actual 2457; bottom: expected 1296, actual 4179 verify(); - //FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); - saveAndReload(TestFilter::DOCX); verify(); } @@ -220,9 +214,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf151384Hyperlink, "151384Hyperlink.odt") DECLARE_OOXMLEXPORT_TEST(testTdf66039, "tdf66039.docx") { - //FIXME: validation error in OOXML export: Errors: 4 - skipValidation(); - // This bugdoc has a groupshape (WPG) with a table inside its each member shape. // Before there was no table after import at all. From now, there must be 2 tables. uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent, uno::UNO_QUERY); @@ -497,9 +488,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf148671) DECLARE_OOXMLEXPORT_TEST(testTdf140668, "tdf140668.docx") { - //FIXME: validation error in OOXML export: Errors: 3 - skipValidation(); - // Don't crash when document is opened CPPUNIT_ASSERT_EQUAL(1, getPages()); } @@ -512,18 +500,12 @@ DECLARE_OOXMLEXPORT_TEST(testTdf149649, "tdf149649.docx") DECLARE_OOXMLEXPORT_TEST(testTdf138771, "tdf138771.docx") { - //FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); - // Don't crash when document is imported CPPUNIT_ASSERT_EQUAL(1, getPages()); } DECLARE_OOXMLEXPORT_TEST(testTdf168017, "tdf168017.docx") { - //FIXME: validation error in OOXML export: Errors: 20 - skipValidation(); - // Don't crash when document is imported } @@ -537,9 +519,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf134619_numberingProps) { createSwDoc("tdf134619_numberingProps.doc"); - //FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - saveAndReload(TestFilter::DOCX); // Get the third paragraph's numbering style's 1st level's bullet size uno::Reference<text::XTextRange> xParagraph = getParagraph(3); @@ -728,9 +707,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf139580) { createSwDoc("tdf139580.odt"); - //FIXME: validation error in OOXML export: Errors: 21 - skipValidation(); - saveAndReload(TestFilter::DOCX); // Without the fix in place, this test would have crashed at export time CPPUNIT_ASSERT_EQUAL(2, getShapes()); @@ -891,9 +867,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf153874, "image_through_shape.docx") DECLARE_OOXMLEXPORT_TEST(testTextBoxZOrder, "testTextBoxZOrder.docx") { - //FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); - // Collect the z-order values of the textboxes std::vector<sal_uInt64> ShapeZorders; std::vector<sal_uInt64> FrameZorders; @@ -1139,9 +1112,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf152153) { createSwDoc("embedded_images.odt"); - //FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - saveAndReload(TestFilter::DOCX); uno::Reference<packages::zip::XZipFileAccess2> xNameAccess @@ -1164,9 +1134,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf152152) { createSwDoc("artistic_effects.docx"); - //FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - saveAndReload(TestFilter::DOCX); uno::Reference<packages::zip::XZipFileAccess2> xNameAccess diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx index ca5f5d35c0fe..28ed1b321bad 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx @@ -216,9 +216,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf135906) DECLARE_OOXMLEXPORT_TEST(testTdf146802, "tdf146802.docx") { - // FIXME: validation error in OOXML export: Errors: 7 - skipValidation(); - // There is a group shape with text box inside having an embedded VML formula, // check if something missing. CPPUNIT_ASSERT_EQUAL_MESSAGE("Where is the formula?", 2, getShapes()); @@ -1059,9 +1056,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf147978enhancedPathABVW) DECLARE_OOXMLEXPORT_TEST(testTdf148132, "tdf148132.docx") { - // FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); - { uno::Reference<text::XTextRange> xParagraph = getParagraph(1); auto xLevels = getProperty< uno::Reference<container::XIndexAccess> >(xParagraph, u"NumberingRules"_ustr); @@ -1091,8 +1085,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf148132, "tdf148132.docx") DECLARE_OOXMLEXPORT_TEST(testTdf154481, "tdf154481.docx") { - // FIXME: validation error in OOXML export: Errors: 16 - skipValidation(); CPPUNIT_ASSERT_EQUAL_MESSAGE("Missing pages!", 7, getPages()); } diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx index 415000327e77..bce66556cbef 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx @@ -123,9 +123,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf147646, "tdf147646_mergedCellNumbering.docx") DECLARE_OOXMLEXPORT_TEST(testTdf153526_commentInNumbering, "tdf153526_commentInNumbering.docx") { - //FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); - // an exception was prematurely ending finishParagraph, losing numbering and CRs // so before the patch, this was 6. CPPUNIT_ASSERT_EQUAL(13, getParagraphs()); @@ -170,9 +167,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf154478) { createSwDoc("tdf154478.docx"); - //FIXME: validation error in OOXML export: Errors: 4 - skipValidation(); - save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/comments.xml"_ustr); @@ -777,9 +771,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf126477) { createSwDoc("embedded_chart.odt"); - //FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - saveAndReload(TestFilter::DOCX); uno::Reference<text::XTextEmbeddedObjectsSupplier> xTEOSupplier(mxComponent, uno::UNO_QUERY); @@ -863,9 +854,6 @@ CPPUNIT_TEST_FIXTURE(Test, testExportingUnknownStyleInRedline) // This must not fail assertions createSwDoc("UnknownStyleInRedline.docx"); - //FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); - saveAndReload(TestFilter::DOCX); // Check that the original unknown style name "UnknownStyle" is roundtripped // (maybe this is wrong, because Word does not do this). diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx index b9cb46325755..3dab83d08831 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx @@ -527,9 +527,6 @@ CPPUNIT_TEST_FIXTURE(Test, testFdo51550) { createSwDoc("fdo51550.odt"); - // FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - saveAndReload(TestFilter::DOCX); CPPUNIT_ASSERT_EQUAL(1, getShapes()); CPPUNIT_ASSERT_EQUAL(1, getPages()); diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport20.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport20.cxx index 7e326d7151a6..f77f9aa65a4e 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport20.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport20.cxx @@ -37,9 +37,6 @@ CPPUNIT_TEST_FIXTURE(Test, testfdo79969_xlsb) { createSwDoc("fdo79969_xlsb.docx"); - //FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - save(TestFilter::DOCX); // This UT for DOCX embedded with binary excel work sheet. xmlDocUniquePtr pXmlDoc = parseExport(u"[Content_Types].xml"_ustr); @@ -179,9 +176,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf138612) { createSwDoc("tdf138612.docx"); - //FIXME: validation error in OOXML export: Errors: 6 - skipValidation(); - save(TestFilter::DOCX); xmlDocUniquePtr pXmlDocument = parseExport(u"word/document.xml"_ustr); @@ -350,9 +344,6 @@ CPPUNIT_TEST_FIXTURE(Test, testfdo79969_xlsm) { createSwDoc("fdo79969_xlsm.docx"); - //FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - save(TestFilter::DOCX); // This UT for DOCX embedded with excel work sheet. xmlDocUniquePtr pXmlDoc = parseExport(u"[Content_Types].xml"_ustr); @@ -377,9 +368,6 @@ CPPUNIT_TEST_FIXTURE(Test, testfdo80522) { createSwDoc("fdo80522.docx"); - //FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - saveAndReload(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"[Content_Types].xml"_ustr); @@ -403,9 +391,6 @@ CPPUNIT_TEST_FIXTURE(Test, testfdo80523_pptm) { createSwDoc("fdo80523_pptm.docx"); - //FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - saveAndReload(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"[Content_Types].xml"_ustr); @@ -429,9 +414,6 @@ CPPUNIT_TEST_FIXTURE(Test, testfdo80523_sldm) { createSwDoc("fdo80523_sldm.docx"); - //FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - saveAndReload(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"[Content_Types].xml"_ustr); @@ -455,9 +437,6 @@ CPPUNIT_TEST_FIXTURE(Test, testfdo80898) { createSwDoc("fdo80898.docx"); - //FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - save(TestFilter::DOCX); // This UT for DOCX embedded with binary excel work sheet. xmlDocUniquePtr pXmlDoc = parseExport(u"[Content_Types].xml"_ustr); @@ -481,9 +460,6 @@ CPPUNIT_TEST_FIXTURE(Test, testOleIconDrawAspect) { createSwDoc("tdf131537.odt"); - //FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/document.xml"_ustr); assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r/w:object/o:OLEObject", "DrawAspect", @@ -590,9 +566,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf148035) { createSwDoc("tdf148035.docx"); - //FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); - save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/document.xml"_ustr); @@ -613,9 +586,6 @@ CPPUNIT_TEST_FIXTURE(Test, testfdo83048) { createSwDoc("fdo83048.docx"); - //FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); - save(TestFilter::DOCX); // Issue was wrong SDT properties were getting exported for Date SDT xmlDocUniquePtr pXmlDoc = parseExport(u"word/footer2.xml"_ustr); @@ -857,9 +827,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf146491) { createSwDoc("tdf146491.odt"); - //FIXME: validation error in OOXML export: Errors: 93 - skipValidation(); - saveAndReload(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/document.xml"_ustr); // This was 12 - a page style was unnecessarily created for every section. diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport21.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport21.cxx index 681e32251952..d51b5b2456b2 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport21.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport21.cxx @@ -69,9 +69,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf161631) DECLARE_OOXMLEXPORT_TEST(testTdf158597, "tdf158597.docx") { - // FIXME: validation error in OOXML export: Errors: 8 - skipValidation(); - // test with 2 properties: font size, italic (toggle) { uno::Reference<text::XTextRange> xParagraph(getParagraph(1)); @@ -566,9 +563,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf160077_layoutInCell, "tdf160077_layoutInCell.doc DECLARE_OOXMLEXPORT_TEST(testTdf160077_layoutInCellB, "tdf160077_layoutInCellB.docx") { - // FIXME: validation error in OOXML export: Errors: 317 - skipValidation(); - // given an in-table, group-shape vertically aligned -1.35 cm (above) the top page margin // (which is actually forced to layoutInCell, so that turns into 1.35cm above the cell margin) @@ -689,9 +683,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf160077_layoutInCellD, "tdf160077_layoutInCellD.d DECLARE_OOXMLEXPORT_TEST(testTdf153909_followTextFlow, "tdf153909_followTextFlow.docx") { - // FIXME: validation error in OOXML export: Errors: 11 - skipValidation(); - // 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 @@ -928,9 +919,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf131098_imageFill, "tdf131098_imageFill.docx") DECLARE_OOXMLEXPORT_TEST(testTdf154369, "tdf154369.docx") { - // FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - //Unit test for bug fix in tdf#154369 // Docx file contains ordered list formatted with Heading 1 style, font color set as Accent 1 from theme xmlDocUniquePtr pXmlDoc = parseLayoutDump(); @@ -1287,9 +1275,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf164065) { createSwDoc("tdf164065.docx"); - // FIXME: validation error in OOXML export: Errors: 4 - skipValidation(); - save(TestFilter::DOCX); CPPUNIT_ASSERT_EQUAL(1, getShapes()); diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport23.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport23.cxx index e7b725f8a88c..8846486c58e8 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport23.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport23.cxx @@ -136,9 +136,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf128245) DECLARE_OOXMLEXPORT_TEST(testTdf124367, "tdf124367.docx") { - // FIXME: validation error in OOXML export: Errors: 5 - skipValidation(); - uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent, uno::UNO_QUERY); uno::Reference<container::XIndexAccess> xTables(xTablesSupplier->getTextTables(), uno::UNO_QUERY); @@ -400,9 +397,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf123757) { createSwDoc("tdf123757.docx"); - // FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); - save(TestFilter::DOCX); xmlDocUniquePtr pXml = parseExport(u"word/document.xml"_ustr); CPPUNIT_ASSERT(pXml); @@ -815,9 +809,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf131539) { createSwDoc("tdf131539.odt"); - // FIXME: validation error in OOXML export: Errors: 4 - skipValidation(); - save(TestFilter::DOCX); CPPUNIT_ASSERT_EQUAL(2, getShapes()); CPPUNIT_ASSERT_EQUAL(1, getPages()); diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport24.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport24.cxx index 82aa7a352080..271c98396d19 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport24.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport24.cxx @@ -262,9 +262,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf55427_footnote2endnote) createSwDoc("tdf55427_footnote2endnote.odt"); verify(); - // FIXME: validation error in OOXML export: Errors: 6 - skipValidation(); - saveAndReload(TestFilter::DOCX); verify(/*bIsExport*/ true); } @@ -288,9 +285,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf104150, "tdf104150.docx") DECLARE_OOXMLEXPORT_TEST(testTdf103976, "tdf103976.docx") { - // FIXME: validation error in OOXML export: Errors: 8 - skipValidation(); - uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent, uno::UNO_QUERY); uno::Reference<container::XIndexAccess> xTables(xTablesSupplier->getTextTables(), uno::UNO_QUERY); @@ -479,9 +473,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf107618) { createSwDoc("tdf107618.doc"); - // FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - -e ... etc. - the rest is truncated
