sax/qa/cppunit/test_converter.cxx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 5e6ba595f357be807bbbc30cf4ff7edda210835f
Author: Michael Stahl <mst...@redhat.com>
Date: Wed Aug 15 14:58:33 2012 +0200
warning C4310: cast truncates constant value
Change-Id: I3ebaec3953f86e8f42937e29fad54bafe87900fa
diff --git a/sax/qa/cppunit/test_converter.cxx
b/sax/qa/cppunit/test_converter.cxx
index 7becf74..26627f8 100644
--- a/sax/qa/cppunit/test_converter.cxx
+++ b/sax/qa/cppunit/test_converter.cxx
@@ -545,7 +545,7 @@ void ConverterTest::testBase64()
tempSequence = tempSeq.getAsConstList();
doTestEncodeBase64("BQIDAAABAgM=", tempSequence);
doTestDecodeBase64(tempSequence, "BQIDAAABAgM=");
- tempSeq[0] = sal_Int8(200);
+ tempSeq[0] = sal_Int8(sal_uInt8(200));
tempSeq[1] = sal_Int8(31);
tempSeq[2] = sal_Int8(77);
tempSeq[3] = sal_Int8(111);
commit 426f4c8dd1634cc4234f29c8e36b6379b68fe6e8
Author: Michael Stahl <mst...@redhat.com>
Date: Wed Aug 15 14:56:39 2012 +0200
sigh.. MSVC warning C4146: unary minus applied to unsigned type?
Change-Id: Ic2bbde637fd0a074f89b5ffa7af6e87d7cb408c5
diff --git a/sax/qa/cppunit/test_converter.cxx
b/sax/qa/cppunit/test_converter.cxx
index 7fa29b0..7becf74 100644
--- a/sax/qa/cppunit/test_converter.cxx
+++ b/sax/qa/cppunit/test_converter.cxx
@@ -371,9 +371,9 @@ void ConverterTest::testMeasure()
doTestStringToMeasure(555, "666", MeasureUnit::MM, -1000, 555);
doTestStringToMeasure(-1000, "-1001", MeasureUnit::MM, -1000, 555);
doTestStringToMeasure(0, "-0", MeasureUnit::MM, -1, 0);
- doTestStringToMeasure(2147483647, "1234567890mm", MeasureUnit::MM_10TH,
12, ::std::numeric_limits<sal_Int32>::max());
+ doTestStringToMeasure(::std::numeric_limits<sal_Int32>::max(),
"1234567890mm", MeasureUnit::MM_10TH, 12,
::std::numeric_limits<sal_Int32>::max());
doTestStringToMeasure(-300, "-300", MeasureUnit::MM, -1000, 555);
- doTestStringToMeasure(-2147483648, "-999999999999999px",
MeasureUnit::PIXEL, ::std::numeric_limits<sal_Int32>::min(), 555); //really
crazy numbers...
+ doTestStringToMeasure(::std::numeric_limits<sal_Int32>::min(),
"-999999999999999px", MeasureUnit::PIXEL,
::std::numeric_limits<sal_Int32>::min(), 555); //really crazy numbers...
doTestMeasureToString("6mm", 600, MeasureUnit::MM_100TH, MeasureUnit::MM);
doTestMeasureToString("0.005cm", 000000005, MeasureUnit::MM_100TH,
MeasureUnit::CM); // zeros in the front doesn't count
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
