external/libtommath/ExternalProject_libtommath.mk | 2 +- unoxml/qa/unit/domtest.cxx | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-)
New commits: commit eddb716f0084c7c7e541698cc57df20d171bb7c8 Author: Thorsten Behrens <[email protected]> AuthorDate: Tue Jan 21 17:26:59 2025 +0100 Commit: Thorsten Behrens <[email protected]> CommitDate: Tue Jan 21 17:26:59 2025 +0100 libtommath: fix -Werror breakage for bn_s_mp_rand_platform.c: ../8.1/include/shared\minwindef.h(218): error C2220: warning treated as error - no 'object' file generated ../8.1/include/shared\minwindef.h(218): warning C4255: 'FARPROC': no function prototype given: converting '()' to '(void)' ../8.1/include/shared\minwindef.h(219): warning C4255: 'NEARPROC': no function prototype given: converting '()' to '(void)' ../8.1/include/shared\minwindef.h(220): warning C4255: 'PROC': no function prototype given: converting '()' to '(void)' Change-Id: I5bbc0127acd722fd8244ab60b12296d7be23507d diff --git a/external/libtommath/ExternalProject_libtommath.mk b/external/libtommath/ExternalProject_libtommath.mk index f534e62a126d..fec480245a80 100644 --- a/external/libtommath/ExternalProject_libtommath.mk +++ b/external/libtommath/ExternalProject_libtommath.mk @@ -18,7 +18,7 @@ $(eval $(call gb_ExternalProject_use_nmake,libtommath,build)) ifeq ($(COM),MSC) $(call gb_ExternalProject_get_state_target,libtommath,build): $(call gb_ExternalProject_run,build,\ - nmake -nologo -f makefile.msvc \ + nmake -nologo -f makefile.msvc CFLAGS="/Ox /WX:NO" \ ) else $(call gb_ExternalProject_get_state_target,libtommath,build) : commit 024b3a21759bf26c268b539021f46bbd3f29179a Author: Caolán McNamara <[email protected]> AuthorDate: Thu Jan 4 17:00:06 2024 +0000 Commit: Thorsten Behrens <[email protected]> CommitDate: Tue Jan 21 17:26:26 2025 +0100 std::size/SAL_N_ELEMENTS also counts the null terminator which libxml2 2.12 will fail on with error: 'Extra content at the end of the document' Change-Id: I9d5da9fdd826cce8462ede8c510eaea7281b760f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161627 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> (cherry picked from commit cbb17a548b5cc6a99b6ed7735479bb4f2bc40f26) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161643 Reviewed-by: Xisco Fauli <[email protected]> diff --git a/unoxml/qa/unit/domtest.cxx b/unoxml/qa/unit/domtest.cxx index 35f41974acd7..26a8514bdbda 100644 --- a/unoxml/qa/unit/domtest.cxx +++ b/unoxml/qa/unit/domtest.cxx @@ -200,10 +200,10 @@ struct BasicTest : public test::BootstrapFixture mxErrHandler.set( new ErrorHandler() ); uno::Reference<XDocumentBuilder> xDB( getMultiServiceFactory()->createInstance("com.sun.star.xml.dom.DocumentBuilder"), uno::UNO_QUERY_THROW ); mxDomBuilder.set( xDB ); - mxValidInStream.set( new SequenceInputStream(css::uno::Sequence<sal_Int8>(reinterpret_cast<sal_Int8 const *>(validTestFile), SAL_N_ELEMENTS(validTestFile))) ); - mxWarningInStream.set( new SequenceInputStream(css::uno::Sequence<sal_Int8>(reinterpret_cast<sal_Int8 const *>(warningTestFile), SAL_N_ELEMENTS(warningTestFile))) ); - mxErrorInStream.set( new SequenceInputStream(css::uno::Sequence<sal_Int8>(reinterpret_cast<sal_Int8 const *>(errorTestFile), SAL_N_ELEMENTS(errorTestFile))) ); - mxFatalInStream.set( new SequenceInputStream(css::uno::Sequence<sal_Int8>(reinterpret_cast<sal_Int8 const *>(fatalTestFile), SAL_N_ELEMENTS(fatalTestFile))) ); + mxValidInStream.set( new SequenceInputStream(css::uno::Sequence<sal_Int8>(reinterpret_cast<sal_Int8 const *>(validTestFile), SAL_N_ELEMENTS(validTestFile)-1)) ); + mxWarningInStream.set( new SequenceInputStream(css::uno::Sequence<sal_Int8>(reinterpret_cast<sal_Int8 const *>(warningTestFile), SAL_N_ELEMENTS(warningTestFile)-1)) ); + mxErrorInStream.set( new SequenceInputStream(css::uno::Sequence<sal_Int8>(reinterpret_cast<sal_Int8 const *>(errorTestFile), SAL_N_ELEMENTS(errorTestFile)-1)) ); + mxFatalInStream.set( new SequenceInputStream(css::uno::Sequence<sal_Int8>(reinterpret_cast<sal_Int8 const *>(fatalTestFile), SAL_N_ELEMENTS(fatalTestFile)-1)) ); mxDomBuilder->setErrorHandler(mxErrHandler.get()); } @@ -274,7 +274,7 @@ struct SerializerTest : public test::BootstrapFixture mxErrHandler.set( new ErrorHandler() ); uno::Reference<XDocumentBuilder> xDB( getMultiServiceFactory()->createInstance("com.sun.star.xml.dom.DocumentBuilder"), uno::UNO_QUERY_THROW ); mxDomBuilder.set( xDB ); - mxInStream.set( new SequenceInputStream(css::uno::Sequence<sal_Int8>(reinterpret_cast<sal_Int8 const *>(validTestFile), SAL_N_ELEMENTS(validTestFile))) ); + mxInStream.set( new SequenceInputStream(css::uno::Sequence<sal_Int8>(reinterpret_cast<sal_Int8 const *>(validTestFile), SAL_N_ELEMENTS(validTestFile)-1)) ); mxDomBuilder->setErrorHandler(mxErrHandler.get()); mxHandler.set( new DocumentHandler ); mxTokHandler.set( new TokenHandler );
