dev/null |binary oox/source/drawingml/fillproperties.cxx | 5 ++++- sw/qa/extras/ooxmlexport/ooxmlexport6.cxx | 10 ---------- 3 files changed, 4 insertions(+), 11 deletions(-)
New commits: commit be39a3d8c1bf9b134839a90e52ccabb2101421f4 Author: Justin Luth <jl...@mail.com> AuthorDate: Thu Jul 28 16:45:41 2022 -0400 Commit: Justin Luth <jl...@mail.com> CommitDate: Fri Jul 29 00:08:54 2022 +0200 Revert "tdf#141652 partial revert "Reset ShapeProperty priority..." This reverts 7.4 commit 18cc1240565e697859dd7d17058f91d5e01df929. Someone backported it to 7.3 as well. Change-Id: Ie04595e11dd9d2e15fa940b8ada71714bd434f6a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137581 Tested-by: Jenkins Reviewed-by: Justin Luth <jl...@mail.com> diff --git a/oox/source/drawingml/fillproperties.cxx b/oox/source/drawingml/fillproperties.cxx index f7dc16bf231b..fef43b0ca238 100644 --- a/oox/source/drawingml/fillproperties.cxx +++ b/oox/source/drawingml/fillproperties.cxx @@ -811,7 +811,10 @@ void FillProperties::pushToPropMap( ShapePropertyMap& rPropMap, if(bIsCustomShape && bHasCropValues && bNeedCrop) { xGraphic = lclCropGraphic(xGraphic, CropQuotientsFromFillRect(aFillRect)); - rPropMap.setProperty(ShapeProperty::FillBitmap, xGraphic); + if (rPropMap.supportsProperty(ShapeProperty::FillBitmapName)) + rPropMap.setProperty(ShapeProperty::FillBitmapName, xGraphic); + else + rPropMap.setProperty(ShapeProperty::FillBitmap, xGraphic); } } } diff --git a/sw/qa/extras/ooxmlexport/data/tdf141652_fillBitmapName.docx b/sw/qa/extras/ooxmlexport/data/tdf141652_fillBitmapName.docx deleted file mode 100644 index 4a47a544d6bb..000000000000 Binary files a/sw/qa/extras/ooxmlexport/data/tdf141652_fillBitmapName.docx and /dev/null differ diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx index 6c35215f584a..c54580ee766a 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx @@ -274,16 +274,6 @@ DECLARE_OOXMLEXPORT_TEST(testDMLShapeFillBitmapCrop, "dml-shape-fillbitmapcrop.d } -DECLARE_OOXMLEXPORT_TEST(test141652_fillBitmapName, "tdf141652_fillBitmapName.docx") -{ - text::GraphicCrop aGraphicCropStruct = getProperty<text::GraphicCrop>(getShape(1), "GraphicCrop"); - CPPUNIT_ASSERT_DOUBLES_EQUAL( sal_Int32(-769), aGraphicCropStruct.Right, 10); - - CPPUNIT_ASSERT_EQUAL( sal_Int32( 0 ), aGraphicCropStruct.Left ); - CPPUNIT_ASSERT_EQUAL( sal_Int32( 0 ), aGraphicCropStruct.Top ); - CPPUNIT_ASSERT_EQUAL( sal_Int32( 0 ), aGraphicCropStruct.Bottom ); -} - DECLARE_OOXMLEXPORT_TEST(testDMLShapeFillPattern, "dml-shape-fillpattern.docx") { // Hatching was ignored by the export.