diff options
| author | Gülşah Köse <gulsah.kose@collabora.com> | 2021-02-22 14:44:03 +0300 |
|---|---|---|
| committer | Gülşah Köse <gulsah.kose@collabora.com> | 2021-02-25 07:32:10 +0100 |
| commit | befc0c2b0e0b3bf293a2446d71e38717ed53985b (patch) | |
| tree | e20dc7ad4cdf10deb2a1b05c5ba123cbd6f6a5ec | |
| parent | af64bc49d872d8a040d66387303def98eae5cd51 (diff) | |
tdf#133473 Change SDRATTR_SHADOWSIZEX flag.
SDRATTR_SHADOWSIZEX holds a percentage value. So we
shouldn't use METRIC_ITEM.
Change-Id: I9f1a20d5871f60d2899ef7d525f4cf837b0a9088
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111311
Tested-by: Jenkins
Reviewed-by: Gülşah Köse <gulsah.kose@collabora.com>
| -rw-r--r-- | include/svx/unoshprp.hxx | 4 | ||||
| -rw-r--r-- | sw/CppunitTest_sw_ooxmlimport2.mk | 1 | ||||
| -rw-r--r-- | sw/qa/extras/ooxmlexport/data/tdf133473.docx | bin | 0 -> 83030 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport16.cxx | 21 |
4 files changed, 24 insertions, 2 deletions
diff --git a/include/svx/unoshprp.hxx b/include/svx/unoshprp.hxx index d356cefb64b5..840214f5e928 100644 --- a/include/svx/unoshprp.hxx +++ b/include/svx/unoshprp.hxx @@ -224,8 +224,8 @@ { u"" UNO_NAME_SHADOWTRANSPARENCE,SDRATTR_SHADOWTRANSPARENCE, ::cppu::UnoType<sal_Int16>::get(), 0, 0}, \ { u"" UNO_NAME_SHADOWXDIST, SDRATTR_SHADOWXDIST, ::cppu::UnoType<sal_Int32>::get(), 0, 0, PropertyMoreFlags::METRIC_ITEM}, \ { u"" UNO_NAME_SHADOWYDIST, SDRATTR_SHADOWYDIST, ::cppu::UnoType<sal_Int32>::get(), 0, 0, PropertyMoreFlags::METRIC_ITEM}, \ - { u"" UNO_NAME_SHADOWSIZEX, SDRATTR_SHADOWSIZEX, ::cppu::UnoType<sal_Int32>::get(), 0, 0, PropertyMoreFlags::METRIC_ITEM}, \ - { u"" UNO_NAME_SHADOWSIZEY, SDRATTR_SHADOWSIZEY, ::cppu::UnoType<sal_Int32>::get(), 0, 0, PropertyMoreFlags::METRIC_ITEM}, \ + { u"" UNO_NAME_SHADOWSIZEX, SDRATTR_SHADOWSIZEX, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ + { u"" UNO_NAME_SHADOWSIZEY, SDRATTR_SHADOWSIZEY, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ { u"" UNO_NAME_SHADOWBLUR, SDRATTR_SHADOWBLUR, ::cppu::UnoType<sal_Int32>::get(), 0, 0, PropertyMoreFlags::METRIC_ITEM}, diff --git a/sw/CppunitTest_sw_ooxmlimport2.mk b/sw/CppunitTest_sw_ooxmlimport2.mk index a7e718147b97..67c4077fcecd 100644 --- a/sw/CppunitTest_sw_ooxmlimport2.mk +++ b/sw/CppunitTest_sw_ooxmlimport2.mk @@ -34,6 +34,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_ooxmlimport2, \ tl \ vcl \ svxcore \ + svl\ )) $(eval $(call gb_CppunitTest_use_externals,sw_ooxmlimport2,\ diff --git a/sw/qa/extras/ooxmlexport/data/tdf133473.docx b/sw/qa/extras/ooxmlexport/data/tdf133473.docx Binary files differnew file mode 100644 index 000000000000..c351db950231 --- /dev/null +++ b/sw/qa/extras/ooxmlexport/data/tdf133473.docx diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx index 047d9ebc31c1..6da14ef1a005 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx @@ -9,6 +9,11 @@ #include <swmodeltestbase.hxx> +#include <svx/svddef.hxx> +#include <svx/unoapi.hxx> +#include <svx/sdmetitm.hxx> +#include <svx/svdobj.hxx> + #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/text/XTextViewCursorSupplier.hpp> #include <com/sun/star/text/XTextTable.hpp> @@ -122,6 +127,22 @@ DECLARE_OOXMLEXPORT_TEST(testTdf138953, "croppedAndRotated.odt") CPPUNIT_ASSERT_EQUAL(sal_Int32(8664), frameRect.Width); } +DECLARE_OOXMLEXPORT_TEST(testTdf133473_shadowSize, "tdf133473.docx") +{ + uno::Reference<drawing::XShape> xShape = getShape(1); + + SdrObject* pObj(GetSdrObjectFromXShape(xShape)); + const SfxItemSet& rSet = pObj->GetMergedItemSet(); + sal_Int32 nSize1 = rSet.Get(SDRATTR_SHADOWSIZEX).GetValue(); + + // Without the accompanying fix in place, this test would have failed with: + // - Expected: 200000 + // - Actual : 113386 + // I.e. Shadow size will be smaller than actual. + + CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(200000), nSize1); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |