diff options
Diffstat (limited to 'sc/qa/unit')
-rw-r--r-- | sc/qa/unit/filters-test.cxx | 12 | ||||
-rw-r--r-- | sc/qa/unit/jumbosheets-test.cxx | 8 | ||||
-rw-r--r-- | sc/qa/unit/subsequent_filters_test.cxx | 4 |
3 files changed, 12 insertions, 12 deletions
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx index 7025fdc52018..9c14df33b862 100644 --- a/sc/qa/unit/filters-test.cxx +++ b/sc/qa/unit/filters-test.cxx @@ -502,19 +502,19 @@ void ScFiltersTest::testCommentSize() CPPUNIT_ASSERT(pCaption); const tools::Rectangle& rOldRect = pCaption->GetLogicRect(); - CPPUNIT_ASSERT_EQUAL(tools::Long(2899), rOldRect.getWidth()); - CPPUNIT_ASSERT_EQUAL(tools::Long(939), rOldRect.getHeight()); + CPPUNIT_ASSERT_EQUAL(tools::Long(2899), rOldRect.getOpenWidth()); + CPPUNIT_ASSERT_EQUAL(tools::Long(939), rOldRect.getOpenHeight()); pNote->SetText(aPos, "first\nsecond\nthird"); const tools::Rectangle& rNewRect = pCaption->GetLogicRect(); - CPPUNIT_ASSERT_EQUAL(rOldRect.getWidth(), rNewRect.getWidth()); - CPPUNIT_ASSERT_EQUAL(tools::Long(1605), rNewRect.getHeight()); + CPPUNIT_ASSERT_EQUAL(rOldRect.getOpenWidth(), rNewRect.getOpenWidth()); + CPPUNIT_ASSERT_EQUAL(tools::Long(1605), rNewRect.getOpenHeight()); rDoc.GetUndoManager()->Undo(); - CPPUNIT_ASSERT_EQUAL(rOldRect.getWidth(), pCaption->GetLogicRect().getWidth()); - CPPUNIT_ASSERT_EQUAL(rOldRect.getHeight(), pCaption->GetLogicRect().getHeight()); + CPPUNIT_ASSERT_EQUAL(rOldRect.getOpenWidth(), pCaption->GetLogicRect().getOpenWidth()); + CPPUNIT_ASSERT_EQUAL(rOldRect.getOpenHeight(), pCaption->GetLogicRect().getOpenHeight()); xDocSh->DoClose(); } diff --git a/sc/qa/unit/jumbosheets-test.cxx b/sc/qa/unit/jumbosheets-test.cxx index f21c27aafbda..e3ae57564499 100644 --- a/sc/qa/unit/jumbosheets-test.cxx +++ b/sc/qa/unit/jumbosheets-test.cxx @@ -255,8 +255,8 @@ void ScJumboSheetsTest::testTdf134553() // Without the fix in place, this test would have failed here CPPUNIT_ASSERT(pOleObj); - CPPUNIT_ASSERT_EQUAL(tools::Long(12741), pOleObj->GetLogicRect().getWidth()); - CPPUNIT_ASSERT_EQUAL(tools::Long(7620), pOleObj->GetLogicRect().getHeight()); + CPPUNIT_ASSERT_EQUAL(tools::Long(12741), pOleObj->GetLogicRect().getOpenWidth()); + CPPUNIT_ASSERT_EQUAL(tools::Long(7620), pOleObj->GetLogicRect().getOpenHeight()); CPPUNIT_ASSERT_EQUAL(tools::Long(4574), pOleObj->GetLogicRect().getX()); CPPUNIT_ASSERT_EQUAL(tools::Long(437), pOleObj->GetLogicRect().getY()); @@ -279,8 +279,8 @@ void ScJumboSheetsTest::testTdf134553() pOleObj = getSingleChartObject(rDoc, 0); CPPUNIT_ASSERT(pOleObj); - CPPUNIT_ASSERT_EQUAL(tools::Long(12741), pOleObj->GetLogicRect().getWidth()); - CPPUNIT_ASSERT_EQUAL(tools::Long(7620), pOleObj->GetLogicRect().getHeight()); + CPPUNIT_ASSERT_EQUAL(tools::Long(12741), pOleObj->GetLogicRect().getOpenWidth()); + CPPUNIT_ASSERT_EQUAL(tools::Long(7620), pOleObj->GetLogicRect().getOpenHeight()); CPPUNIT_ASSERT_EQUAL(tools::Long(5097), pOleObj->GetLogicRect().getX()); // tdf#147458: Without the fix in place, this test would have failed with // - Expected: 1058 diff --git a/sc/qa/unit/subsequent_filters_test.cxx b/sc/qa/unit/subsequent_filters_test.cxx index 0019b50ce192..1dea49286b1a 100644 --- a/sc/qa/unit/subsequent_filters_test.cxx +++ b/sc/qa/unit/subsequent_filters_test.cxx @@ -1916,8 +1916,8 @@ void ScFiltersTest::testChartImportXLS() const SdrOle2Obj* pOleObj = getSingleChartObject(rDoc, 0); CPPUNIT_ASSERT_MESSAGE("Failed to retrieve a chart object from the 2nd sheet.", pOleObj); - CPPUNIT_ASSERT_EQUAL(tools::Long(11137), pOleObj->GetLogicRect().getWidth()); - CPPUNIT_ASSERT(8640L > pOleObj->GetLogicRect().getHeight()); + CPPUNIT_ASSERT_EQUAL(tools::Long(11137), pOleObj->GetLogicRect().getOpenWidth()); + CPPUNIT_ASSERT(8640L > pOleObj->GetLogicRect().getOpenHeight()); xDocSh->DoClose(); } |