diff options
Diffstat (limited to 'sw/qa')
| -rw-r--r-- | sw/qa/extras/layout/layout.cxx | 7 | ||||
| -rw-r--r-- | sw/qa/extras/rtfexport/rtfexport2.cxx | 3 |
2 files changed, 4 insertions, 6 deletions
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx index d8cef7ef98aa..5b90067a174f 100644 --- a/sw/qa/extras/layout/layout.cxx +++ b/sw/qa/extras/layout/layout.cxx @@ -3168,10 +3168,9 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testShapeAllowOverlap) // <bounds left="1984" top="1984" width="1137" height="1137"/> // <bounds left="2551" top="2551" width="1137" height="1137"/> // so there was a clear vertical overlap. (Allow for 1px tolerance.) - OString aMessage("Unexpected overlap: first shape's bottom is "); - aMessage += OString::number(pFirst->GetObjRect().Bottom()); - aMessage += ", second shape's top is "; - aMessage += OString::number(pSecond->GetObjRect().Top()); + OString aMessage = "Unexpected overlap: first shape's bottom is " + + OString::number(pFirst->GetObjRect().Bottom()) + ", second shape's top is " + + OString::number(pSecond->GetObjRect().Top()); CPPUNIT_ASSERT_MESSAGE(aMessage.getStr(), std::abs(pFirst->GetObjRect().Bottom() - pSecond->GetObjRect().Top()) < 15); diff --git a/sw/qa/extras/rtfexport/rtfexport2.cxx b/sw/qa/extras/rtfexport/rtfexport2.cxx index c90f4ca201db..ff63ac7db40f 100644 --- a/sw/qa/extras/rtfexport/rtfexport2.cxx +++ b/sw/qa/extras/rtfexport/rtfexport2.cxx @@ -746,8 +746,7 @@ DECLARE_RTFEXPORT_TEST(testFdo52989, "fdo52989.rtf") { // Same as n#192129, but for JPEG files. uno::Reference<drawing::XShape> xShape = getShape(1); - OString aMessage("xShape->getSize().Width() = "); - aMessage += OString::number(xShape->getSize().Width); + OString aMessage = "xShape->getSize().Width() = " + OString::number(xShape->getSize().Width); // This was 2, should be 423 (or 369?). CPPUNIT_ASSERT_MESSAGE(aMessage.getStr(), xShape->getSize().Width >= 273); |