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>

3 files changed, 12 insertions, 12 deletions

diff --git a/sd/qa/unit/export-tests-ooxml2.cxx b/sd/qa/unit/export-tests-ooxml2.cxx
index 71f44a0776b6..fba5f93f5499 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -2695,14 +2695,14 @@ void SdOOXMLExportTest2::testTdf1225573_FontWorkScaleX()
     awt::Rectangle aBoundRectArch;
     xShapeArchProps->getPropertyValue(UNO_NAME_MISC_OBJ_BOUNDRECT) >>= aBoundRectArch;
     // difference should be zero, but allow some range for stroke thickness
-    CPPUNIT_ASSERT_LESS(static_cast<tools::Long>(50), labs(aBoundRectArch.Width - 13081));
+    CPPUNIT_ASSERT_LESS(50L, labs(aBoundRectArch.Width - 13081));
 
     // Error was, that text in shapes of category "Warp" was not scaled to the path.
     uno::Reference<beans::XPropertySet> xShapeWaveProps(getShapeFromPage(0, 1, xDocShRef));
     awt::Rectangle aBoundRectWave;
     xShapeWaveProps->getPropertyValue(UNO_NAME_MISC_OBJ_BOUNDRECT) >>= aBoundRectWave;
     // difference should be zero, but allow some range for stroke thickness
-    CPPUNIT_ASSERT_LESS(static_cast<tools::Long>(50), labs(aBoundRectWave.Width - 11514));
+    CPPUNIT_ASSERT_LESS(50L, labs(aBoundRectWave.Width - 11514));
 
     xDocShRef->DoClose();
 }
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index 2a0603456bee..e54e02ddecd5 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -1112,13 +1112,13 @@ void SdExportTest::testBulletsAsImage()
 
         if (nExportFormat == ODP || nExportFormat == PPT)
         {
-            CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessageBase.getStr(), 16L, aGraphic.GetSizePixel().Width());
-            CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessageBase.getStr(), 16L, aGraphic.GetSizePixel().Height());
+            CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessageBase.getStr(), tools::Long(16), aGraphic.GetSizePixel().Width());
+            CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessageBase.getStr(), tools::Long(16), aGraphic.GetSizePixel().Height());
         }
         else // FIXME: what happened here
         {
-            CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessageBase.getStr(), 64L, aGraphic.GetSizePixel().Width());
-            CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessageBase.getStr(), 64L, aGraphic.GetSizePixel().Height());
+            CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessageBase.getStr(), tools::Long(64), aGraphic.GetSizePixel().Width());
+            CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessageBase.getStr(), tools::Long(64), aGraphic.GetSizePixel().Height());
         }
 
         // Graphic Size
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 6e6b08d2bad2..acac88729506 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -1795,10 +1795,10 @@ void SdImportTest::testTdf103473()
     SdrTextObj *const pObj = dynamic_cast<SdrTextObj *const>(pPage->GetObj(0));
     CPPUNIT_ASSERT(pObj);
     ::tools::Rectangle aRect = pObj->GetGeoRect();
-    CPPUNIT_ASSERT_EQUAL(3629L, aRect.Left());
-    CPPUNIT_ASSERT_EQUAL(4431L, aRect.Top());
-    CPPUNIT_ASSERT_EQUAL(8353L, aRect.Right());
-    CPPUNIT_ASSERT_EQUAL(9155L, aRect.Bottom());
+    CPPUNIT_ASSERT_EQUAL(tools::Long(3629), aRect.Left());
+    CPPUNIT_ASSERT_EQUAL(tools::Long(4431), aRect.Top());
+    CPPUNIT_ASSERT_EQUAL(tools::Long(8353), aRect.Right());
+    CPPUNIT_ASSERT_EQUAL(tools::Long(9155), aRect.Bottom());
 
     xDocShRef->DoClose();
 }
@@ -2226,8 +2226,8 @@ bool SdImportTest::checkPattern(sd::DrawDocShellRef const & rDocRef, int nShapeN
             ReadDIB(aBitmap, aBitmapStream, true);
         }
     }
-    CPPUNIT_ASSERT_EQUAL(8L, aBitmap.GetSizePixel().Width());
-    CPPUNIT_ASSERT_EQUAL(8L, aBitmap.GetSizePixel().Height());
+    CPPUNIT_ASSERT_EQUAL(tools::Long(8), aBitmap.GetSizePixel().Width());
+    CPPUNIT_ASSERT_EQUAL(tools::Long(8), aBitmap.GetSizePixel().Height());
     return checkPatternValues(rExpected, aBitmap);
 }