summaryrefslogtreecommitdiff
path: root/sw/qa
diff options
context:
space:
mode:
Diffstat (limited to 'sw/qa')
-rw-r--r--sw/qa/extras/htmlexport/htmlexport.cxx2
-rw-r--r--sw/qa/extras/rtfexport/rtfexport2.cxx4
-rw-r--r--sw/qa/extras/rtfimport/rtfimport.cxx4
-rw-r--r--sw/qa/extras/tiledrendering/tiledrendering.cxx4
4 files changed, 7 insertions, 7 deletions
diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx b/sw/qa/extras/htmlexport/htmlexport.cxx
index 1ba766356cad..7f10e4befa90 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -397,7 +397,7 @@ DECLARE_HTMLEXPORT_ROUNDTRIP_TEST(testReqIfOleImg, "reqif-ole-img.xhtml")
Size aLogic(pDevice->PixelToLogic(aPixel, MapMode(MapUnit::Map100thMM)));
awt::Size aSize = xShape->getSize();
// This was only 1247, size was not set explicitly.
- CPPUNIT_ASSERT_EQUAL(aLogic.getWidth(), aSize.Width);
+ CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(aLogic.getWidth()), aSize.Width);
// Check mime/media types.
CPPUNIT_ASSERT_EQUAL(OUString("image/png"), getProperty<OUString>(xGraphic, "MimeType"));
diff --git a/sw/qa/extras/rtfexport/rtfexport2.cxx b/sw/qa/extras/rtfexport/rtfexport2.cxx
index 6f2180da49ea..571c96e5d6a2 100644
--- a/sw/qa/extras/rtfexport/rtfexport2.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport2.cxx
@@ -125,11 +125,11 @@ DECLARE_RTFEXPORT_TEST(testN192129, "n192129.rtf")
awt::Size aActualSize(xShape->getSize());
if ((aExpectedSize.Width() - aActualSize.Width) / 2 != 0)
{
- CPPUNIT_ASSERT_EQUAL(aExpectedSize.Width(), aActualSize.Width);
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(aExpectedSize.Width()), aActualSize.Width);
}
if ((aExpectedSize.Height() - aActualSize.Height) / 2 != 0)
{
- CPPUNIT_ASSERT_EQUAL(aExpectedSize.Height(), aActualSize.Height);
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(aExpectedSize.Height()), aActualSize.Height);
}
}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx
index 4211c88429e7..54b42e9f9b59 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -1372,8 +1372,8 @@ DECLARE_RTFIMPORT_TEST(testWatermark, "watermark.rtf")
uno::Reference<drawing::XShape> xShape(getShape(1), uno::UNO_QUERY);
awt::Size aActualSize(xShape->getSize());
- CPPUNIT_ASSERT_EQUAL(aExpectedSize.Width(), aActualSize.Width);
- CPPUNIT_ASSERT_EQUAL(aExpectedSize.Height(), aActualSize.Height);
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(aExpectedSize.Width()), aActualSize.Width);
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(aExpectedSize.Height()), aActualSize.Height);
}
DECLARE_RTFIMPORT_TEST(testTdf104016, "tdf104016.rtf")
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index 6d1dbaed5d27..df913f7f9e7f 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -525,8 +525,8 @@ void SwTiledRenderingTest::testSearchViewArea()
{
{"SearchItem.SearchString", uno::makeAny(OUString("Heading"))},
{"SearchItem.Backward", uno::makeAny(false)},
- {"SearchItem.SearchStartPointX", uno::makeAny(aPoint.getX())},
- {"SearchItem.SearchStartPointY", uno::makeAny(aPoint.getY())}
+ {"SearchItem.SearchStartPointX", uno::makeAny(static_cast<sal_Int32>(aPoint.getX()))},
+ {"SearchItem.SearchStartPointY", uno::makeAny(static_cast<sal_Int32>(aPoint.getY()))}
}));
comphelper::dispatchCommand(".uno:ExecuteSearch", aPropertyValues);
// This was just "Heading", i.e. SwView::SearchAndWrap() did not search from only the top of the second page.