diff options
| author | Noel Grandin <noel@peralex.com> | 2020-11-13 15:15:47 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-11-13 21:01:27 +0100 |
| commit | 8182a3e03cf9eb50e43347a288bacefbed98c497 (patch) | |
| tree | 45ce3eb4bc7bf3ee2e56de8ae4965d55fe6be062 /sw | |
| parent | e0df85554b533fab67a5a91193024e4876c5ec02 (diff) | |
fix some tools::Long fallout
Change-Id: I8c15b0ee8400c3b540154bc38c51cbf04b6c3850
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105794
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport10.cxx | 8 | ||||
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport4.cxx | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx index 453b1718d5bf..47307b49789e 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx @@ -453,8 +453,8 @@ DECLARE_OOXMLEXPORT_TEST(testPictureWithSchemeColor, "picture-with-schemecolor.d uno::Reference<graphic::XGraphic> xGraphic = getProperty<uno::Reference<graphic::XGraphic> >(xImage, "Graphic"); Graphic aVclGraphic(xGraphic); BitmapEx aBitmap(aVclGraphic.GetBitmapEx()); - CPPUNIT_ASSERT_EQUAL(341L, aBitmap.GetSizePixel().Width()); - CPPUNIT_ASSERT_EQUAL(181L, aBitmap.GetSizePixel().Height()); + CPPUNIT_ASSERT_EQUAL(tools::Long(341), aBitmap.GetSizePixel().Width()); + CPPUNIT_ASSERT_EQUAL(tools::Long(181), aBitmap.GetSizePixel().Height()); Color aColor(aBitmap.GetPixelColor(120, 30)); CPPUNIT_ASSERT_EQUAL(aColor, Color( 0xb1, 0xc8, 0xdd )); aColor = aBitmap.GetPixelColor(260, 130); @@ -647,8 +647,8 @@ DECLARE_OOXMLEXPORT_TEST(testMsoBrightnessContrast, "msobrightnesscontrast.docx" imageProperties->getPropertyValue( "Graphic" ) >>= graphic; Graphic aVclGraphic(graphic); BitmapEx aBitmap(aVclGraphic.GetBitmapEx()); - CPPUNIT_ASSERT_EQUAL(58L, aBitmap.GetSizePixel().Width()); - CPPUNIT_ASSERT_EQUAL(320L, aBitmap.GetSizePixel().Height()); + CPPUNIT_ASSERT_EQUAL(tools::Long(58), aBitmap.GetSizePixel().Width()); + CPPUNIT_ASSERT_EQUAL(tools::Long(320), aBitmap.GetSizePixel().Height()); Color aColor(aBitmap.GetPixelColor(20, 30)); CPPUNIT_ASSERT_EQUAL(Color( 0xce, 0xce, 0xce ), aColor); } diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx index f2ede8360d81..e4287f12e978 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx @@ -166,8 +166,8 @@ DECLARE_OOXMLEXPORT_TEST(testTextBoxPictureFill, "textbox_picturefill.docx") Graphic aGraphic(xGraphic); CPPUNIT_ASSERT(!aGraphic.IsNone()); CPPUNIT_ASSERT(aGraphic.GetSizeBytes() > 0L); - CPPUNIT_ASSERT_EQUAL(447L, aGraphic.GetSizePixel().Width()); - CPPUNIT_ASSERT_EQUAL(528L, aGraphic.GetSizePixel().Height()); + CPPUNIT_ASSERT_EQUAL(tools::Long(447), aGraphic.GetSizePixel().Width()); + CPPUNIT_ASSERT_EQUAL(tools::Long(528), aGraphic.GetSizePixel().Height()); } DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testFDO73034, "FDO73034.docx") |