vcl/qa/cppunit/pdfexport/pdfexport2.cxx | 50 +++----------------------------- vcl/qt5/QtInstanceBuilder.cxx | 1 2 files changed, 6 insertions(+), 45 deletions(-)
New commits: commit 2f5ef88542c7df98d545b618a792fe677206908f Author: Michael Weghorn <[email protected]> AuthorDate: Wed Feb 25 00:40:35 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Wed Feb 25 09:03:48 2026 +0100 tdf#130857 qt weld: Support "Label Field Selection" dialog This means that native Qt widgets are used for that dialog now when using the qt5 or qt6 VCL plugin and starting LO with environment variable SAL_VCL_QT_USE_WELDED_WIDGETS=1 set. The dialog can be triggered like this: * start Writer * "Form" -> "Text Box" * click and drag mouse in the document to insert the text box * double-click on the inserted text box to open the properties dialog * in the "General" tab, click on the button with the "..." label Change-Id: I3998b2292ac0570bacc1b3e94ddd99aa511a6518 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200277 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx index a247c1128ecc..6e5a63fb9548 100644 --- a/vcl/qt5/QtInstanceBuilder.cxx +++ b/vcl/qt5/QtInstanceBuilder.cxx @@ -199,6 +199,7 @@ constexpr auto SUPPORTED_UI_FILES = frozen::make_unordered_set<std::u16string_vi u"modules/smath/ui/savedefaultsdialog.ui", u"modules/smath/ui/smathsettings.ui", u"modules/smath/ui/spacingdialog.ui", + u"modules/spropctrlr/ui/labelselectiondialog.ui", u"modules/spropctrlr/ui/taborder.ui", u"modules/swriter/ui/addentrydialog.ui", u"modules/swriter/ui/assignfieldsdialog.ui", commit 9451ea41915976fc36496e1d631d047f614a8068 Author: Xisco Fauli <[email protected]> AuthorDate: Tue Feb 24 14:16:55 2026 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Wed Feb 25 09:03:42 2026 +0100 CppunitTest_vcl_pdfexport2: simplify test Change-Id: I93755554d7b664a0255d85e037de989497a44cfe Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200208 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> diff --git a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx index dd983147efd9..c1611a143b8a 100644 --- a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx +++ b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx @@ -32,7 +32,6 @@ #include <unotools/tempfile.hxx> #include <vcl/filter/pdfdocument.hxx> #include <tools/zcodec.hxx> -#include <tools/XmlWalker.hxx> #include <vcl/graphicfilter.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <unotools/streamwrap.hxx> @@ -75,6 +74,8 @@ void PdfExportTest2::registerNamespaces(xmlXPathContextPtr& pXmlXpathCtx) xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST("rdf"), BAD_CAST("http://www.w3.org/1999/02/22-rdf-syntax-ns#";)); xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST("dc"), BAD_CAST("http://purl.org/dc/elements/1.1/";)); + xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST("pdfuaid"), + BAD_CAST("http://www.aiim.org/pdfua/ns/id/";)); } CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf160705) @@ -1491,51 +1492,10 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest2, testPdfUaMetadata) CPPUNIT_ASSERT(pStreamObject); auto& rStream = pStreamObject->GetMemory(); rStream.Seek(0); + xmlDocUniquePtr pXmlDoc = parseXmlStream(&rStream); + CPPUNIT_ASSERT(pXmlDoc); - // Search for the PDF/UA marker in the metadata - - tools::XmlWalker aWalker; - CPPUNIT_ASSERT(aWalker.open(&rStream)); - CPPUNIT_ASSERT_EQUAL(std::string_view("xmpmeta"), aWalker.name()); - - bool bPdfUaMarkerFound = false; - OString aPdfUaPart; - - aWalker.children(); - while (aWalker.isValid()) - { - if (aWalker.name() == "RDF" - && aWalker.namespaceHref() == "http://www.w3.org/1999/02/22-rdf-syntax-ns#";) - { - aWalker.children(); - while (aWalker.isValid()) - { - if (aWalker.name() == "Description" - && aWalker.namespaceHref() == "http://www.w3.org/1999/02/22-rdf-syntax-ns#";) - { - aWalker.children(); - while (aWalker.isValid()) - { - if (aWalker.name() == "part" - && aWalker.namespaceHref() == "http://www.aiim.org/pdfua/ns/id/";) - { - aPdfUaPart = aWalker.content(); - bPdfUaMarkerFound = true; - } - aWalker.next(); - } - aWalker.parent(); - } - aWalker.next(); - } - aWalker.parent(); - } - aWalker.next(); - } - aWalker.parent(); - - CPPUNIT_ASSERT(bPdfUaMarkerFound); - CPPUNIT_ASSERT_EQUAL("1"_ostr, aPdfUaPart); + assertXPathContent(pXmlDoc, "/x:xmpmeta/rdf:RDF/rdf:Description[1]/pdfuaid:part", u"1"); } CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf139736)
