diff options
Diffstat (limited to 'sw/qa/extras')
| -rw-r--r-- | sw/qa/extras/layout/layout.cxx | 20 | ||||
| -rw-r--r-- | sw/qa/extras/ww8export/ww8export2.cxx | 4 |
2 files changed, 14 insertions, 10 deletions
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx index 95891b40d7b1..4b6e9c22bd62 100644 --- a/sw/qa/extras/layout/layout.cxx +++ b/sw/qa/extras/layout/layout.cxx @@ -851,10 +851,14 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, TestTdf137025) CPPUNIT_ASSERT(pFrameFormat); // The shape has these values to copy to the associated text frame after modification:: - const tools::Long nLPaddng = xShapeProps->getPropertyValue("TextLeftDistance").get<long>(); - const tools::Long nRPaddng = xShapeProps->getPropertyValue("TextRightDistance").get<long>(); - const tools::Long nTPaddng = xShapeProps->getPropertyValue("TextUpperDistance").get<long>(); - const tools::Long nBPaddng = xShapeProps->getPropertyValue("TextLowerDistance").get<long>(); + const tools::Long nLPaddng + = xShapeProps->getPropertyValue("TextLeftDistance").get<tools::Long>(); + const tools::Long nRPaddng + = xShapeProps->getPropertyValue("TextRightDistance").get<tools::Long>(); + const tools::Long nTPaddng + = xShapeProps->getPropertyValue("TextUpperDistance").get<tools::Long>(); + const tools::Long nBPaddng + = xShapeProps->getPropertyValue("TextLowerDistance").get<tools::Long>(); CPPUNIT_ASSERT_EQUAL(tools::Long(1000), nLPaddng); CPPUNIT_ASSERT_EQUAL(tools::Long(2000), nRPaddng); @@ -868,13 +872,13 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, TestTdf137025) uno::Reference<beans::XPropertySet> xFrameProps(xTxFrm, uno::UNO_QUERY); const tools::Long nFrameLeftPaddng - = xFrameProps->getPropertyValue("LeftBorderDistance").get<long>(); + = xFrameProps->getPropertyValue("LeftBorderDistance").get<tools::Long>(); const tools::Long nFrameRightPaddng - = xFrameProps->getPropertyValue("RightBorderDistance").get<long>(); + = xFrameProps->getPropertyValue("RightBorderDistance").get<tools::Long>(); const tools::Long nFrameTopPaddng - = xFrameProps->getPropertyValue("TopBorderDistance").get<long>(); + = xFrameProps->getPropertyValue("TopBorderDistance").get<tools::Long>(); const tools::Long nFrameBottomPaddng - = xFrameProps->getPropertyValue("BottomBorderDistance").get<long>(); + = xFrameProps->getPropertyValue("BottomBorderDistance").get<tools::Long>(); // Check if the shape and frame have different setting CPPUNIT_ASSERT_EQUAL(nLPaddng, nFrameLeftPaddng); diff --git a/sw/qa/extras/ww8export/ww8export2.cxx b/sw/qa/extras/ww8export/ww8export2.cxx index bded9504b579..004451247cdf 100644 --- a/sw/qa/extras/ww8export/ww8export2.cxx +++ b/sw/qa/extras/ww8export/ww8export2.cxx @@ -343,8 +343,8 @@ DECLARE_WW8EXPORT_TEST(testTdf112074_RTLtableJustification, "tdf112074_RTLtableJ CPPUNIT_ASSERT_EQUAL_MESSAGE("Right To Left writing mode", text::WritingMode2::RL_TB, getProperty<sal_Int16>(xTable, "WritingMode")); CPPUNIT_ASSERT_EQUAL_MESSAGE("Horizontal Orientation", text::HoriOrientation::LEFT_AND_WIDTH, getProperty<sal_Int16>(xTable, "HoriOrient")); - CPPUNIT_ASSERT_MESSAGE("Table Indent", getProperty<long>(xTable, "LeftMargin") > 3000); - CPPUNIT_ASSERT_MESSAGE("Table Indent is 3750", getProperty<long>(xTable, "LeftMargin") < 4000 ); + CPPUNIT_ASSERT_MESSAGE("Table Indent", getProperty<tools::Long>(xTable, "LeftMargin") > 3000); + CPPUNIT_ASSERT_MESSAGE("Table Indent is 3750", getProperty<tools::Long>(xTable, "LeftMargin") < 4000 ); CPPUNIT_ASSERT_EQUAL( style::ParagraphAdjust_RIGHT, static_cast<style::ParagraphAdjust>(getProperty<sal_Int16>(getParagraphOrTable(2), "ParaAdjust")) ); } |