diff options
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/qa/unit/SdrPdfImportTest.cxx | 6 | ||||
| -rw-r--r-- | sd/qa/unit/tiledrendering/LOKitSearchTest.cxx | 27 | ||||
| -rw-r--r-- | sd/source/ui/view/Outliner.cxx | 2 |
3 files changed, 12 insertions, 23 deletions
diff --git a/sd/qa/unit/SdrPdfImportTest.cxx b/sd/qa/unit/SdrPdfImportTest.cxx index ea5f2aee477f..abf68b8f8676 100644 --- a/sd/qa/unit/SdrPdfImportTest.cxx +++ b/sd/qa/unit/SdrPdfImportTest.cxx @@ -107,8 +107,7 @@ CPPUNIT_TEST_FIXTURE(SdrPdfImportTest, testImportSimpleText) Graphic aGraphic = pGraphicObject->GetGraphic(); auto const& pVectorGraphicData = aGraphic.getVectorGraphicData(); CPPUNIT_ASSERT(pVectorGraphicData); - CPPUNIT_ASSERT_EQUAL(VectorGraphicDataType::Pdf, - pVectorGraphicData->getVectorGraphicDataType()); + CPPUNIT_ASSERT_EQUAL(VectorGraphicDataType::Pdf, pVectorGraphicData->getType()); // Mark the object SdrView* pView = pViewShell->GetView(); @@ -197,8 +196,7 @@ CPPUNIT_TEST_FIXTURE(SdrPdfImportTest, testAnnotationsImportExport) Graphic aGraphic = pGraphicObject->GetGraphic(); auto const& pVectorGraphicData = aGraphic.getVectorGraphicData(); CPPUNIT_ASSERT(pVectorGraphicData); - CPPUNIT_ASSERT_EQUAL(VectorGraphicDataType::Pdf, - pVectorGraphicData->getVectorGraphicDataType()); + CPPUNIT_ASSERT_EQUAL(VectorGraphicDataType::Pdf, pVectorGraphicData->getType()); // Write the PDF aContainer = pVectorGraphicData->getBinaryDataContainer(); diff --git a/sd/qa/unit/tiledrendering/LOKitSearchTest.cxx b/sd/qa/unit/tiledrendering/LOKitSearchTest.cxx index 6397f8c25acc..9b898119a47c 100644 --- a/sd/qa/unit/tiledrendering/LOKitSearchTest.cxx +++ b/sd/qa/unit/tiledrendering/LOKitSearchTest.cxx @@ -303,8 +303,7 @@ void LOKitSearchTest::testSearchInPDFNonExisting() Graphic aGraphic = pGraphicObject->GetGraphic(); auto const& pVectorGraphicData = aGraphic.getVectorGraphicData(); CPPUNIT_ASSERT(pVectorGraphicData); - CPPUNIT_ASSERT_EQUAL(VectorGraphicDataType::Pdf, - pVectorGraphicData->getVectorGraphicDataType()); + CPPUNIT_ASSERT_EQUAL(VectorGraphicDataType::Pdf, pVectorGraphicData->getType()); lcl_search("NonExisting"); @@ -332,8 +331,7 @@ void LOKitSearchTest::testSearchInPDF() Graphic aGraphic = pGraphicObject->GetGraphic(); auto const& pVectorGraphicData = aGraphic.getVectorGraphicData(); CPPUNIT_ASSERT(pVectorGraphicData); - CPPUNIT_ASSERT_EQUAL(VectorGraphicDataType::Pdf, - pVectorGraphicData->getVectorGraphicDataType()); + CPPUNIT_ASSERT_EQUAL(VectorGraphicDataType::Pdf, pVectorGraphicData->getType()); // Search lcl_search("ABC"); @@ -381,8 +379,7 @@ void LOKitSearchTest::testSearchInPDFOnePDFObject() Graphic aGraphic = pGraphicObject->GetGraphic(); auto const& pVectorGraphicData = aGraphic.getVectorGraphicData(); CPPUNIT_ASSERT(pVectorGraphicData); - CPPUNIT_ASSERT_EQUAL(VectorGraphicDataType::Pdf, - pVectorGraphicData->getVectorGraphicDataType()); + CPPUNIT_ASSERT_EQUAL(VectorGraphicDataType::Pdf, pVectorGraphicData->getType()); // Search down lcl_search("ABC", false, false); @@ -419,8 +416,7 @@ void LOKitSearchTest::testSearchInPDFInMultiplePages() Graphic aGraphic = pGraphicObject->GetGraphic(); auto const& pVectorGraphicData = aGraphic.getVectorGraphicData(); CPPUNIT_ASSERT(pVectorGraphicData); - CPPUNIT_ASSERT_EQUAL(VectorGraphicDataType::Pdf, - pVectorGraphicData->getVectorGraphicDataType()); + CPPUNIT_ASSERT_EQUAL(VectorGraphicDataType::Pdf, pVectorGraphicData->getType()); } // Search for "him" @@ -511,8 +507,7 @@ void LOKitSearchTest::testSearchInPDFInMultiplePagesBackwards() Graphic aGraphic = pGraphicObject->GetGraphic(); auto const& pVectorGraphicData = aGraphic.getVectorGraphicData(); CPPUNIT_ASSERT(pVectorGraphicData); - CPPUNIT_ASSERT_EQUAL(VectorGraphicDataType::Pdf, - pVectorGraphicData->getVectorGraphicDataType()); + CPPUNIT_ASSERT_EQUAL(VectorGraphicDataType::Pdf, pVectorGraphicData->getType()); } // Expected for backwards search is: @@ -633,8 +628,7 @@ void LOKitSearchTest::testSearchIn2MixedObjects() auto const& pVectorGraphicData = aGraphic.getVectorGraphicData(); CPPUNIT_ASSERT(pVectorGraphicData); - CPPUNIT_ASSERT_EQUAL(VectorGraphicDataType::Pdf, - pVectorGraphicData->getVectorGraphicDataType()); + CPPUNIT_ASSERT_EQUAL(VectorGraphicDataType::Pdf, pVectorGraphicData->getType()); } // Let's try to search now @@ -716,8 +710,7 @@ void LOKitSearchTest::testSearchIn6MixedObjects() CPPUNIT_ASSERT(pGraphicObject); auto const& pVectorGraphicData = pGraphicObject->GetGraphic().getVectorGraphicData(); CPPUNIT_ASSERT(pVectorGraphicData); - CPPUNIT_ASSERT_EQUAL(VectorGraphicDataType::Pdf, - pVectorGraphicData->getVectorGraphicDataType()); + CPPUNIT_ASSERT_EQUAL(VectorGraphicDataType::Pdf, pVectorGraphicData->getType()); } // Check Object 3 @@ -743,8 +736,7 @@ void LOKitSearchTest::testSearchIn6MixedObjects() CPPUNIT_ASSERT(pGraphicObject); auto const& pVectorGraphicData = pGraphicObject->GetGraphic().getVectorGraphicData(); CPPUNIT_ASSERT(pVectorGraphicData); - CPPUNIT_ASSERT_EQUAL(VectorGraphicDataType::Svg, - pVectorGraphicData->getVectorGraphicDataType()); + CPPUNIT_ASSERT_EQUAL(VectorGraphicDataType::Svg, pVectorGraphicData->getType()); } // Check Object 6 @@ -756,8 +748,7 @@ void LOKitSearchTest::testSearchIn6MixedObjects() CPPUNIT_ASSERT(pGraphicObject); auto const& pVectorGraphicData = pGraphicObject->GetGraphic().getVectorGraphicData(); CPPUNIT_ASSERT(pVectorGraphicData); - CPPUNIT_ASSERT_EQUAL(VectorGraphicDataType::Pdf, - pVectorGraphicData->getVectorGraphicDataType()); + CPPUNIT_ASSERT_EQUAL(VectorGraphicDataType::Pdf, pVectorGraphicData->getType()); } // Search "ABC" which is in all objects (2 times in Object 3) diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index 59e740b4bda1..1e58117cdb81 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -1154,7 +1154,7 @@ bool isValidVectorGraphicObject(const sd::outliner::IteratorPosition& rPosition) if (pGraphicObject) { auto const& pVectorGraphicData = pGraphicObject->GetGraphic().getVectorGraphicData(); - if (pVectorGraphicData && VectorGraphicDataType::Pdf == pVectorGraphicData->getVectorGraphicDataType()) + if (pVectorGraphicData && VectorGraphicDataType::Pdf == pVectorGraphicData->getType()) { return true; } |