sw/qa/extras/odfexport/odfexport.cxx | 4 ++-- writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx | 1 - 2 files changed, 2 insertions(+), 3 deletions(-)
New commits: commit 7cdbe504ff3b59d3aec1b1e86caf7f24223dce72 Author: Stephan Bergmann <[email protected]> AuthorDate: Thu Apr 13 18:45:13 2023 +0200 Commit: Stephan Bergmann <[email protected]> CommitDate: Fri Apr 14 08:11:44 2023 +0200 Fix what looks like copy/paste typos ...introduced in 398275ba9f4d65bebcc78864e70eee6212a84397 "tdf#115483 svl xmloff sc sw: verify all ODF 1.2 protection-key hashes". (Found with an experimental Clang build supporting __attribute__((warn_unused)) on individual ctors rather than just whole class types, and the corresponding css::uno::Reference ctor marked accordingly to report xSect2 and xSect3 as unused.) Change-Id: Ie0eb38e0011b2b457f640ade67c6e615731f165f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150368 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/sw/qa/extras/odfexport/odfexport.cxx b/sw/qa/extras/odfexport/odfexport.cxx index c909e8feaff5..50a3bbec5f76 100644 --- a/sw/qa/extras/odfexport/odfexport.cxx +++ b/sw/qa/extras/odfexport/odfexport.cxx @@ -1190,10 +1190,10 @@ CPPUNIT_TEST_FIXTURE(Test, testProtectionKey) uno::Sequence<sal_Int8> const key1(getProperty<uno::Sequence<sal_Int8>>(xSect1, "ProtectionKey")); CPPUNIT_ASSERT(SvPasswordHelper::CompareHashPassword(key1, password)); uno::Reference<beans::XPropertySet> xSect2(xSections->getByIndex(2), uno::UNO_QUERY); - uno::Sequence<sal_Int8> const key2(getProperty<uno::Sequence<sal_Int8>>(xSect1, "ProtectionKey")); + uno::Sequence<sal_Int8> const key2(getProperty<uno::Sequence<sal_Int8>>(xSect2, "ProtectionKey")); CPPUNIT_ASSERT(SvPasswordHelper::CompareHashPassword(key2, password)); uno::Reference<beans::XPropertySet> xSect3(xSections->getByIndex(3), uno::UNO_QUERY); - uno::Sequence<sal_Int8> const key3(getProperty<uno::Sequence<sal_Int8>>(xSect1, "ProtectionKey")); + uno::Sequence<sal_Int8> const key3(getProperty<uno::Sequence<sal_Int8>>(xSect3, "ProtectionKey")); CPPUNIT_ASSERT(SvPasswordHelper::CompareHashPassword(key3, password)); // we can't assume that the user entered the password; check that we commit 83617ef36a6e962d0f90a413950032781bba1cf9 Author: Stephan Bergmann <[email protected]> AuthorDate: Thu Apr 13 16:32:02 2023 +0200 Commit: Stephan Bergmann <[email protected]> CommitDate: Fri Apr 14 08:11:32 2023 +0200 -Werror,-Wunused-variable Unused ever since it got introduced in 0101c7918bb735d796bc1bc0d1705f995e41ee98 "Add simple unit test for recent fix to take layoutInCell into consideration". (Found with an experimental Clang build supporting __attribute__((warn_unused)) on individual ctors rather than just whole class types, and the corresponding css::uno::Reference ctor marked accordingly.) Change-Id: Ibba11e910433769a72a7c1e8e1419d07cb8968a9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150360 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx b/writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx index ecd8b3cf4e9f..32239798983e 100644 --- a/writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx +++ b/writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx @@ -357,7 +357,6 @@ CPPUNIT_TEST_FIXTURE(Test, testLayoutInCellOfHraphics) uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(mxComponent, uno::UNO_QUERY); uno::Reference<drawing::XDrawPage> xDrawPage = xDrawPageSupplier->getDrawPage(); uno::Reference<beans::XPropertySet> xShape(xDrawPage->getByIndex(1), uno::UNO_QUERY); - uno::Reference<container::XNamed> xNamedShape(xShape, uno::UNO_QUERY); bool bFollowingTextFlow = false; CPPUNIT_ASSERT(xShape->getPropertyValue("IsFollowingTextFlow") >>= bFollowingTextFlow); CPPUNIT_ASSERT(bFollowingTextFlow);
