diff options
| author | Bartosz Kosiorek <gang65@poczta.onet.pl> | 2021-06-23 16:55:21 +0200 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-06-24 10:30:30 +0200 |
| commit | 1eb828add814108d63ea61e38d948a0337fc4ee6 (patch) | |
| tree | 69cdf9c8f726c394b90d19ed15b6bd7e7feda30c /svx | |
| parent | 8950d991a69c9c711f8dddf655997d62a6606843 (diff) | |
EMF+ tdf#142975 Add brush support to DrawString record
Change-Id: Icfcb4199dcd755fb20e14a8166571b6d6e763f2e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117671
Tested-by: Jenkins
Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl>
(cherry picked from commit 9e8c35cc3f1f5e1c08afd46e0d0fbc07f1ff21f9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117721
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/qa/unit/sdr.cxx | 8 | ||||
| -rw-r--r-- | svx/qa/unit/svdraw.cxx | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/svx/qa/unit/sdr.cxx b/svx/qa/unit/sdr.cxx index f6eb74488797..10f9901a0d60 100644 --- a/svx/qa/unit/sdr.cxx +++ b/svx/qa/unit/sdr.cxx @@ -86,15 +86,15 @@ CPPUNIT_TEST_FIXTURE(SdrTest, testShadowScaleOrigin) // Examine the created primitives. drawinglayer::Primitive2dXmlDump aDumper; xmlDocUniquePtr pDocument = aDumper.dumpAndParse(xPrimitiveSequence); - double fShadowX = getXPath(pDocument, "//shadow/transform", "xy13").toDouble(); - double fShadowY = getXPath(pDocument, "//shadow/transform", "xy23").toDouble(); + sal_Int32 fShadowX = getXPath(pDocument, "//shadow/transform", "xy13").toInt32(); + sal_Int32 fShadowY = getXPath(pDocument, "//shadow/transform", "xy23").toInt32(); // Without the accompanying fix in place, this test would have failed with: // - Expected: -705 // - Actual : -158 // i.e. the shadow origin was not the top right corner for scaling (larger x position, so it was // visible on the right of the shape as well). - CPPUNIT_ASSERT_EQUAL(-705., std::round(fShadowX)); - CPPUNIT_ASSERT_EQUAL(-685., std::round(fShadowY)); + CPPUNIT_ASSERT_EQUAL(sal_Int32(-705), fShadowX); + CPPUNIT_ASSERT_EQUAL(sal_Int32(-684), fShadowY); } CPPUNIT_TEST_FIXTURE(SdrTest, testZeroWidthTextWrap) diff --git a/svx/qa/unit/svdraw.cxx b/svx/qa/unit/svdraw.cxx index d6e43d6f9887..fa344d80acb4 100644 --- a/svx/qa/unit/svdraw.cxx +++ b/svx/qa/unit/svdraw.cxx @@ -110,9 +110,9 @@ CPPUNIT_TEST_FIXTURE(SvdrawTest, testSemiTransparentText) // - Actual : 0 // - XPath '//unifiedtransparence' number of nodes is incorrect // i.e. the text was just plain red, not semi-transparent. - double fTransparence = getXPath(pDocument, "//unifiedtransparence", "transparence").toDouble(); - CPPUNIT_ASSERT_EQUAL(nTransparence, - static_cast<sal_Int16>(basegfx::fround(fTransparence * 100))); + sal_Int16 fTransparence + = getXPath(pDocument, "//unifiedtransparence", "transparence").toInt32(); + CPPUNIT_ASSERT_EQUAL(nTransparence, fTransparence); } CPPUNIT_TEST_FIXTURE(SvdrawTest, testHandlePathObjScale) |