summaryrefslogtreecommitdiff
path: root/sd/qa
diff options
context:
space:
mode:
authorNoel Grandin <noelgrandin@gmail.com>2022-11-02 19:39:01 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2022-11-02 20:30:29 +0100
commit4d863fd8e38748607636d0033262baa62a3e9eb2 (patch)
treede15f5cd695199cfd56f1893bbb31cf06fc044d1 /sd/qa
parent1a4151dcdf45a0fa946b6ddf5e1b5cca37d24619 (diff)
tdf#54857 elide more dynamic_cast
Change-Id: I42bef355eeef15e3733a5ee57b0569887cfa5e84 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142183 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd/qa')
-rw-r--r--sd/qa/unit/SdrPdfImportTest.cxx2
-rw-r--r--sd/qa/unit/ShapeImportExportTest.cxx22
-rw-r--r--sd/qa/unit/export-tests-ooxml1.cxx28
-rw-r--r--sd/qa/unit/export-tests-ooxml3.cxx2
-rw-r--r--sd/qa/unit/export-tests.cxx10
-rw-r--r--sd/qa/unit/import-tests.cxx22
-rw-r--r--sd/qa/unit/import-tests2.cxx20
-rw-r--r--sd/qa/unit/misc-tests.cxx4
-rw-r--r--sd/qa/unit/tiledrendering/tiledrendering.cxx2
9 files changed, 56 insertions, 56 deletions
diff --git a/sd/qa/unit/SdrPdfImportTest.cxx b/sd/qa/unit/SdrPdfImportTest.cxx
index 7c10eebc17e5..372ccf13f534 100644
--- a/sd/qa/unit/SdrPdfImportTest.cxx
+++ b/sd/qa/unit/SdrPdfImportTest.cxx
@@ -137,7 +137,7 @@ CPPUNIT_TEST_FIXTURE(SdrPdfImportTest, testImportSimpleText)
// Object should be a text object containing one paragraph with
// content "This is PDF!"
- SdrTextObj* pTextObject = dynamic_cast<SdrTextObj*>(pImportedObject);
+ SdrTextObj* pTextObject = DynCastSdrTextObj(pImportedObject);
CPPUNIT_ASSERT(pTextObject);
OutlinerParaObject* pOutlinerParagraphObject = pTextObject->GetOutlinerParaObject();
const EditTextObject& aEdit = pOutlinerParagraphObject->GetTextObject();
diff --git a/sd/qa/unit/ShapeImportExportTest.cxx b/sd/qa/unit/ShapeImportExportTest.cxx
index 1b5ff45ca859..535f3f4eda7e 100644
--- a/sd/qa/unit/ShapeImportExportTest.cxx
+++ b/sd/qa/unit/ShapeImportExportTest.cxx
@@ -74,7 +74,7 @@ void ShapeImportExportTest::testTextDistancesOOXML()
for (auto const& rString : aObjectDesc)
{
- auto* pTextObj = dynamic_cast<SdrTextObj*>(searchObject(pPage, rString));
+ auto* pTextObj = DynCastSdrTextObj(searchObject(pPage, rString));
CPPUNIT_ASSERT(pTextObj);
CPPUNIT_ASSERT_EQUAL(tools::Long(-1292), pTextObj->GetTextUpperDistance());
CPPUNIT_ASSERT_EQUAL(tools::Long(2708), pTextObj->GetTextLowerDistance());
@@ -91,7 +91,7 @@ void ShapeImportExportTest::testTextDistancesOOXML()
for (auto const& rString : aObjectDesc)
{
- auto* pTextObj = dynamic_cast<SdrTextObj*>(searchObject(pPage, rString));
+ auto* pTextObj = DynCastSdrTextObj(searchObject(pPage, rString));
CPPUNIT_ASSERT(pTextObj);
CPPUNIT_ASSERT_EQUAL(tools::Long(0), pTextObj->GetTextUpperDistance());
CPPUNIT_ASSERT_EQUAL(tools::Long(1000), pTextObj->GetTextLowerDistance());
@@ -108,7 +108,7 @@ void ShapeImportExportTest::testTextDistancesOOXML()
for (auto const& rString : aObjectDesc)
{
- auto* pTextObj = dynamic_cast<SdrTextObj*>(searchObject(pPage, rString));
+ auto* pTextObj = DynCastSdrTextObj(searchObject(pPage, rString));
CPPUNIT_ASSERT(pTextObj);
CPPUNIT_ASSERT_EQUAL(tools::Long(708), pTextObj->GetTextUpperDistance());
CPPUNIT_ASSERT_EQUAL(tools::Long(708), pTextObj->GetTextLowerDistance());
@@ -125,7 +125,7 @@ void ShapeImportExportTest::testTextDistancesOOXML()
for (auto const& rString : aObjectDesc)
{
- auto* pTextObj = dynamic_cast<SdrTextObj*>(searchObject(pPage, rString));
+ auto* pTextObj = DynCastSdrTextObj(searchObject(pPage, rString));
CPPUNIT_ASSERT(pTextObj);
CPPUNIT_ASSERT_EQUAL(tools::Long(0), pTextObj->GetTextUpperDistance());
CPPUNIT_ASSERT_EQUAL(tools::Long(0), pTextObj->GetTextLowerDistance());
@@ -142,7 +142,7 @@ void ShapeImportExportTest::testTextDistancesOOXML()
for (auto const& rString : aObjectDesc)
{
- auto* pTextObj = dynamic_cast<SdrTextObj*>(searchObject(pPage, rString));
+ auto* pTextObj = DynCastSdrTextObj(searchObject(pPage, rString));
CPPUNIT_ASSERT(pTextObj);
CPPUNIT_ASSERT_EQUAL(tools::Long(1000), pTextObj->GetTextUpperDistance());
CPPUNIT_ASSERT_EQUAL(tools::Long(0), pTextObj->GetTextLowerDistance());
@@ -159,7 +159,7 @@ void ShapeImportExportTest::testTextDistancesOOXML()
for (auto const& rString : aObjectDesc)
{
- auto* pTextObj = dynamic_cast<SdrTextObj*>(searchObject(pPage, rString));
+ auto* pTextObj = DynCastSdrTextObj(searchObject(pPage, rString));
CPPUNIT_ASSERT(pTextObj);
CPPUNIT_ASSERT_EQUAL(tools::Long(2708), pTextObj->GetTextUpperDistance());
CPPUNIT_ASSERT_EQUAL(tools::Long(-1292), pTextObj->GetTextLowerDistance());
@@ -183,7 +183,7 @@ void ShapeImportExportTest::testTextDistancesOOXML_LargerThanTextAreaSpecialCase
for (auto const& rName : aObjectNames)
{
- auto* pTextObj = dynamic_cast<SdrTextObj*>(searchObject(pPage, rName));
+ auto* pTextObj = DynCastSdrTextObj(searchObject(pPage, rName));
CPPUNIT_ASSERT(pTextObj);
CPPUNIT_ASSERT_EQUAL(tools::Long(-792), pTextObj->GetTextUpperDistance());
CPPUNIT_ASSERT_EQUAL(tools::Long(2208), pTextObj->GetTextLowerDistance());
@@ -199,7 +199,7 @@ void ShapeImportExportTest::testTextDistancesOOXML_LargerThanTextAreaSpecialCase
for (auto const& rName : aObjectNames)
{
- auto* pTextObj = dynamic_cast<SdrTextObj*>(searchObject(pPage, rName));
+ auto* pTextObj = DynCastSdrTextObj(searchObject(pPage, rName));
CPPUNIT_ASSERT(pTextObj);
CPPUNIT_ASSERT_EQUAL(tools::Long(-292), pTextObj->GetTextUpperDistance());
CPPUNIT_ASSERT_EQUAL(tools::Long(1708), pTextObj->GetTextLowerDistance());
@@ -215,7 +215,7 @@ void ShapeImportExportTest::testTextDistancesOOXML_LargerThanTextAreaSpecialCase
for (auto const& rName : aObjectNames)
{
- auto* pTextObj = dynamic_cast<SdrTextObj*>(searchObject(pPage, rName));
+ auto* pTextObj = DynCastSdrTextObj(searchObject(pPage, rName));
CPPUNIT_ASSERT(pTextObj);
CPPUNIT_ASSERT_EQUAL(tools::Long(708), pTextObj->GetTextUpperDistance());
CPPUNIT_ASSERT_EQUAL(tools::Long(708), pTextObj->GetTextLowerDistance());
@@ -231,7 +231,7 @@ void ShapeImportExportTest::testTextDistancesOOXML_LargerThanTextAreaSpecialCase
for (auto const& rName : aObjectNames)
{
- auto* pTextObj = dynamic_cast<SdrTextObj*>(searchObject(pPage, rName));
+ auto* pTextObj = DynCastSdrTextObj(searchObject(pPage, rName));
CPPUNIT_ASSERT(pTextObj);
CPPUNIT_ASSERT_EQUAL(tools::Long(1708), pTextObj->GetTextUpperDistance());
CPPUNIT_ASSERT_EQUAL(tools::Long(-292), pTextObj->GetTextLowerDistance());
@@ -247,7 +247,7 @@ void ShapeImportExportTest::testTextDistancesOOXML_LargerThanTextAreaSpecialCase
for (auto const& rName : aObjectNames)
{
- auto* pTextObj = dynamic_cast<SdrTextObj*>(searchObject(pPage, rName));
+ auto* pTextObj = DynCastSdrTextObj(searchObject(pPage, rName));
CPPUNIT_ASSERT(pTextObj);
CPPUNIT_ASSERT_EQUAL(tools::Long(2208), pTextObj->GetTextUpperDistance());
CPPUNIT_ASSERT_EQUAL(tools::Long(-792), pTextObj->GetTextLowerDistance());
diff --git a/sd/qa/unit/export-tests-ooxml1.cxx b/sd/qa/unit/export-tests-ooxml1.cxx
index 93234b2bb794..a9bec3abfd8e 100644
--- a/sd/qa/unit/export-tests-ooxml1.cxx
+++ b/sd/qa/unit/export-tests-ooxml1.cxx
@@ -532,7 +532,7 @@ void SdOOXMLExportTest1::testBnc887230()
const SdrPage* pPage = GetPage(1);
- const SdrTextObj* pObj = dynamic_cast<SdrTextObj*>(pPage->GetObj(0));
+ const SdrTextObj* pObj = DynCastSdrTextObj(pPage->GetObj(0));
// Without the fix in place, this test would have failed with
//- Expected: 255
//- Actual : 13421823
@@ -550,14 +550,14 @@ void SdOOXMLExportTest1::testBnc870233_1()
// First shape has red, bold font
{
- const SdrTextObj* pObj = dynamic_cast<SdrTextObj*>(pPage->GetObj(0));
+ const SdrTextObj* pObj = DynCastSdrTextObj(pPage->GetObj(0));
checkFontAttributes<Color, SvxColorItem>(pObj, Color(0xff0000), EE_CHAR_COLOR);
checkFontAttributes<FontWeight, SvxWeightItem>(pObj, WEIGHT_BOLD, EE_CHAR_WEIGHT);
}
// Second shape has blue, italic font
{
- const SdrTextObj* pObj = dynamic_cast<SdrTextObj*>(pPage->GetObj(1));
+ const SdrTextObj* pObj = DynCastSdrTextObj(pPage->GetObj(1));
checkFontAttributes<Color, SvxColorItem>(pObj, Color(0x0000ff), EE_CHAR_COLOR);
checkFontAttributes<FontItalic, SvxPostureItem>(pObj, ITALIC_NORMAL, EE_CHAR_ITALIC);
}
@@ -576,7 +576,7 @@ void SdOOXMLExportTest1::testBnc870233_2()
{
const SdrObjGroup* pObjGroup = dynamic_cast<SdrObjGroup*>(pPage->GetObj(0));
CPPUNIT_ASSERT(pObjGroup);
- const SdrTextObj* pObj = dynamic_cast<SdrTextObj*>(pObjGroup->GetSubList()->GetObj(1));
+ const SdrTextObj* pObj = DynCastSdrTextObj(pObjGroup->GetSubList()->GetObj(1));
checkFontAttributes<Color, SvxColorItem>(pObj, Color(0x0000ff), EE_CHAR_COLOR);
}
@@ -584,7 +584,7 @@ void SdOOXMLExportTest1::testBnc870233_2()
{
const SdrObjGroup* pObjGroup = dynamic_cast<SdrObjGroup*>(pPage->GetObj(1));
CPPUNIT_ASSERT(pObjGroup);
- const SdrTextObj* pObj = dynamic_cast<SdrTextObj*>(pObjGroup->GetSubList()->GetObj(1));
+ const SdrTextObj* pObj = DynCastSdrTextObj(pObjGroup->GetSubList()->GetObj(1));
checkFontAttributes<Color, SvxColorItem>(pObj, Color(0x1f497d), EE_CHAR_COLOR);
}
@@ -592,7 +592,7 @@ void SdOOXMLExportTest1::testBnc870233_2()
{
const SdrObjGroup* pObjGroup = dynamic_cast<SdrObjGroup*>(pPage->GetObj(2));
CPPUNIT_ASSERT(pObjGroup);
- const SdrTextObj* pObj = dynamic_cast<SdrTextObj*>(pObjGroup->GetSubList()->GetObj(1));
+ const SdrTextObj* pObj = DynCastSdrTextObj(pObjGroup->GetSubList()->GetObj(1));
checkFontAttributes<Color, SvxColorItem>(pObj, Color(0xffffff), EE_CHAR_COLOR);
}
}
@@ -608,7 +608,7 @@ void SdOOXMLExportTest1::testN828390_4()
{
std::vector<EECharAttrib> rLst;
SdrObject* pObj = pPage->GetObj(0);
- SdrTextObj* pTxtObj = dynamic_cast<SdrTextObj*>(pObj);
+ SdrTextObj* pTxtObj = DynCastSdrTextObj(pObj);
CPPUNIT_ASSERT(pTxtObj);
const EditTextObject& aEdit = pTxtObj->GetOutlinerParaObject()->GetTextObject();
aEdit.GetCharAttribs(0, rLst);
@@ -645,7 +645,7 @@ void SdOOXMLExportTest1::testN828390_5()
const SdrPage* pPage = GetPage(1);
{
SdrObject* pObj = pPage->GetObj(0);
- SdrTextObj* pTxtObj = dynamic_cast<SdrTextObj*>(pObj);
+ SdrTextObj* pTxtObj = DynCastSdrTextObj(pObj);
CPPUNIT_ASSERT(pTxtObj);
const EditTextObject& aEdit = pTxtObj->GetOutlinerParaObject()->GetTextObject();
const SvxNumBulletItem& rNumFmt = aEdit.GetParaAttribs(3).Get(EE_PARA_NUMBULLET);
@@ -783,7 +783,7 @@ void SdOOXMLExportTest1::testN828390()
std::vector<EECharAttrib> rLst;
// Get the object
SdrObject* pObj = pPage->GetObj(0);
- SdrTextObj* pTxtObj = dynamic_cast<SdrTextObj*>(pObj);
+ SdrTextObj* pTxtObj = DynCastSdrTextObj(pObj);
CPPUNIT_ASSERT(pTxtObj);
const EditTextObject& aEdit = pTxtObj->GetOutlinerParaObject()->GetTextObject();
aEdit.GetCharAttribs(0, rLst);
@@ -853,7 +853,7 @@ void SdOOXMLExportTest1::testBnc822347_EmptyBullet()
SdrOutliner* pOutliner = pDoc->GetInternalOutliner();
const SdrPage* pPage = pDoc->GetPage(1);
SdrObject* pObject = pPage->GetObj(0);
- SdrTextObj* pTextObject = dynamic_cast<SdrTextObj*>(pObject);
+ SdrTextObj* pTextObject = DynCastSdrTextObj(pObject);
CPPUNIT_ASSERT(pTextObject);
OutlinerParaObject* pOutlinerParagraphObject = pTextObject->GetOutlinerParaObject();
@@ -878,7 +878,7 @@ void SdOOXMLExportTest1::testFdo90607()
saveAndReload("Impress Office Open XML");
const SdrPage* pPage = GetPage(1);
- SdrTextObj* pTxtObj = dynamic_cast<SdrTextObj*>(pPage->GetObj(1));
+ SdrTextObj* pTxtObj = DynCastSdrTextObj(pPage->GetObj(1));
CPPUNIT_ASSERT_MESSAGE("no text object", pTxtObj != nullptr);
OutlinerParaObject* pOutlinerParagraphObject = pTxtObj->GetOutlinerParaObject();
const sal_Int16 nDepth = pOutlinerParagraphObject->GetDepth(0);
@@ -955,7 +955,7 @@ void SdOOXMLExportTest1::testBulletStartNumber()
saveAndReload("Impress Office Open XML");
const SdrPage* pPage = GetPage(1);
- SdrTextObj* pTxtObj = dynamic_cast<SdrTextObj*>(pPage->GetObj(0));
+ SdrTextObj* pTxtObj = DynCastSdrTextObj(pPage->GetObj(0));
CPPUNIT_ASSERT_MESSAGE("no text object", pTxtObj != nullptr);
const EditTextObject& aEdit = pTxtObj->GetOutlinerParaObject()->GetTextObject();
const SvxNumBulletItem* pNumFmt = aEdit.GetParaAttribs(0).GetItem(EE_PARA_NUMBULLET);
@@ -1052,7 +1052,7 @@ void SdOOXMLExportTest1::testBulletColor()
const SdrPage* pPage = GetPage(1);
- SdrTextObj* pTxtObj = dynamic_cast<SdrTextObj*>(pPage->GetObj(0));
+ SdrTextObj* pTxtObj = DynCastSdrTextObj(pPage->GetObj(0));
CPPUNIT_ASSERT_MESSAGE("no text object", pTxtObj != nullptr);
const EditTextObject& aEdit = pTxtObj->GetOutlinerParaObject()->GetTextObject();
@@ -1098,7 +1098,7 @@ void SdOOXMLExportTest1::testBulletMarginAndIndentation()
const SdrPage* pPage = GetPage(1);
- SdrTextObj* pTxtObj = dynamic_cast<SdrTextObj*>(pPage->GetObj(0));
+ SdrTextObj* pTxtObj = DynCastSdrTextObj(pPage->GetObj(0));
CPPUNIT_ASSERT_MESSAGE("no text object", pTxtObj != nullptr);
const EditTextObject& aEdit = pTxtObj->GetOutlinerParaObject()->GetTextObject();
diff --git a/sd/qa/unit/export-tests-ooxml3.cxx b/sd/qa/unit/export-tests-ooxml3.cxx
index a4e5d882d8e6..62fe34150896 100644
--- a/sd/qa/unit/export-tests-ooxml3.cxx
+++ b/sd/qa/unit/export-tests-ooxml3.cxx
@@ -1351,7 +1351,7 @@ void SdOOXMLExportTest3::testTdf126234()
// check relative size of the bullet, 400% is a legitimate value for MS Office document
// Without a fix, it will fail to set the size correctly
const SdrPage* pPage = GetPage(1);
- SdrTextObj* pTxtObj = dynamic_cast<SdrTextObj*>(pPage->GetObj(0));
+ SdrTextObj* pTxtObj = DynCastSdrTextObj(pPage->GetObj(0));
CPPUNIT_ASSERT_MESSAGE("no text object", pTxtObj != nullptr);
const EditTextObject& aEdit = pTxtObj->GetOutlinerParaObject()->GetTextObject();
const SvxNumBulletItem* pNumFmt = aEdit.GetParaAttribs(0).GetItem(EE_PARA_NUMBULLET);
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index 14fe41e2099f..83e27d471bff 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -297,10 +297,10 @@ void SdExportTest::testTransparentBackground()
const SdrPage* pPage = GetPage(1);
- const SdrTextObj* pObj1 = dynamic_cast<SdrTextObj*>(pPage->GetObj(0));
+ const SdrTextObj* pObj1 = DynCastSdrTextObj(pPage->GetObj(0));
checkFontAttributes<Color, SvxColorItem>(pObj1, COL_TRANSPARENT, EE_CHAR_BKGCOLOR);
- const SdrTextObj* pObj2 = dynamic_cast<SdrTextObj*>(pPage->GetObj(1));
+ const SdrTextObj* pObj2 = DynCastSdrTextObj(pPage->GetObj(1));
checkFontAttributes<Color, SvxColorItem>(pObj2, COL_YELLOW, EE_CHAR_BKGCOLOR);
}
@@ -310,7 +310,7 @@ void SdExportTest::testTdf142716()
saveAndReload("Impress Office Open XML");
const SdrPage* pPage = GetPage(1);
- const SdrTextObj* pObj = dynamic_cast<SdrTextObj*>(pPage->GetObj(0));
+ const SdrTextObj* pObj = DynCastSdrTextObj(pPage->GetObj(0));
OUString sText = pObj->GetOutlinerParaObject()->GetTextObject().GetText(0);
@@ -1707,7 +1707,7 @@ void SdExportTest::testColumnsODG()
CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int32(700)),
xColProps->getPropertyValue("AutomaticDistance"));
- auto pTextObj = dynamic_cast<SdrTextObj*>(SdrObject::getSdrObjectFromXShape(xShape));
+ auto pTextObj = DynCastSdrTextObj(SdrObject::getSdrObjectFromXShape(xShape));
CPPUNIT_ASSERT(pTextObj);
CPPUNIT_ASSERT_EQUAL(sal_Int16(2), pTextObj->GetTextColumnsNumber());
@@ -1731,7 +1731,7 @@ void SdExportTest::testColumnsODG()
CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int32(700)),
xColProps->getPropertyValue("AutomaticDistance"));
- auto pTextObj = dynamic_cast<SdrTextObj*>(SdrObject::getSdrObjectFromXShape(xShape));
+ auto pTextObj = DynCastSdrTextObj(SdrObject::getSdrObjectFromXShape(xShape));
CPPUNIT_ASSERT(pTextObj);
CPPUNIT_ASSERT_EQUAL(sal_Int16(2), pTextObj->GetTextColumnsNumber());
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 8f36b016a75b..1121403f4835 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -803,7 +803,7 @@ void SdImportTest::testN759180()
// Get the object
SdrObject* pObj = pPage->GetObj(0);
- SdrTextObj* pTxtObj = dynamic_cast<SdrTextObj*>(pObj);
+ SdrTextObj* pTxtObj = DynCastSdrTextObj(pObj);
CPPUNIT_ASSERT(pTxtObj);
std::vector<EECharAttrib> rLst;
const EditTextObject& aEdit = pTxtObj->GetOutlinerParaObject()->GetTextObject();
@@ -833,7 +833,7 @@ void SdImportTest::testN862510_1()
{
std::vector<EECharAttrib> rLst;
SdrObject* pObj = pPage->GetObj(0);
- SdrTextObj* pTxtObj = dynamic_cast<SdrTextObj*>(pObj);
+ SdrTextObj* pTxtObj = DynCastSdrTextObj(pObj);
CPPUNIT_ASSERT(pTxtObj);
const EditTextObject& aEdit = pTxtObj->GetOutlinerParaObject()->GetTextObject();
aEdit.GetCharAttribs(0, rLst);
@@ -874,7 +874,7 @@ void SdImportTest::testN862510_4()
{
std::vector<EECharAttrib> rLst;
SdrObject* pObj = pPage->GetObj(0);
- SdrTextObj* pTxtObj = dynamic_cast<SdrTextObj*>(pObj);
+ SdrTextObj* pTxtObj = DynCastSdrTextObj(pObj);
CPPUNIT_ASSERT(pTxtObj);
const EditTextObject& aEdit = pTxtObj->GetOutlinerParaObject()->GetTextObject();
aEdit.GetCharAttribs(0, rLst);
@@ -894,7 +894,7 @@ void SdImportTest::testN828390_2()
const SdrPage* pPage = GetPage(1);
SdrObject* pObj = pPage->GetObj(0);
- SdrTextObj* pTxtObj = dynamic_cast<SdrTextObj*>(pObj);
+ SdrTextObj* pTxtObj = DynCastSdrTextObj(pObj);
CPPUNIT_ASSERT(pTxtObj);
const EditTextObject& aEdit = pTxtObj->GetOutlinerParaObject()->GetTextObject();
CPPUNIT_ASSERT_EQUAL(OUString("Linux "), aEdit.GetText(0));
@@ -907,7 +907,7 @@ void SdImportTest::testN828390_3()
const SdrPage* pPage = GetPage(1);
SdrObject* pObj = pPage->GetObj(0);
- SdrTextObj* pTxtObj = dynamic_cast<SdrTextObj*>(pObj);
+ SdrTextObj* pTxtObj = DynCastSdrTextObj(pObj);
CPPUNIT_ASSERT(pTxtObj);
const EditTextObject& aEdit = pTxtObj->GetOutlinerParaObject()->GetTextObject();
std::vector<EECharAttrib> rLst;
@@ -1014,7 +1014,7 @@ void SdImportTest::testN778859()
{
// Get the object
SdrObject* pObj = pPage->GetObj(1);
- SdrTextObj* pTxtObj = dynamic_cast<SdrTextObj*>(pObj);
+ SdrTextObj* pTxtObj = DynCastSdrTextObj(pObj);
CPPUNIT_ASSERT_MESSAGE("no text object", pTxtObj != nullptr);
CPPUNIT_ASSERT(!pTxtObj->IsAutoFit());
}
@@ -1026,7 +1026,7 @@ void SdImportTest::testFdo68594()
const SdrPage* pPage = &(GetPage(1)->TRG_GetMasterPage());
SdrObject* pObj = pPage->GetObj(1);
- SdrTextObj* pTxtObj = dynamic_cast<SdrTextObj*>(pObj);
+ SdrTextObj* pTxtObj = DynCastSdrTextObj(pObj);
CPPUNIT_ASSERT_MESSAGE("no text object", pTxtObj != nullptr);
const SvxColorItem* pC = &pTxtObj->GetMergedItem(EE_CHAR_COLOR);
CPPUNIT_ASSERT_MESSAGE("no color item", pC != nullptr);
@@ -1261,13 +1261,13 @@ void SdImportTest::testMultiColTexts()
loadFromURL(u"pptx/multicol.pptx");
const SdrPage* pPage = GetPage(1);
- auto pTextObj = dynamic_cast<SdrTextObj*>(pPage->GetObj(0));
+ auto pTextObj = DynCastSdrTextObj(pPage->GetObj(0));
CPPUNIT_ASSERT(pTextObj);
CPPUNIT_ASSERT_EQUAL(sal_Int16(2), pTextObj->GetTextColumnsNumber());
CPPUNIT_ASSERT_EQUAL(sal_Int32(1000), pTextObj->GetTextColumnsSpacing());
- auto pMasterTextObj = dynamic_cast<SdrTextObj*>(pPage->TRG_GetMasterPage().GetObj(0));
+ auto pMasterTextObj = DynCastSdrTextObj(pPage->TRG_GetMasterPage().GetObj(0));
CPPUNIT_ASSERT(pMasterTextObj);
CPPUNIT_ASSERT_EQUAL(sal_Int16(2), pMasterTextObj->GetTextColumnsNumber());
@@ -1354,7 +1354,7 @@ void SdImportTest::testBnc584721_1()
const SdrPage* pPage = &(GetPage(1)->TRG_GetMasterPage());
SdrObject* pObj = pPage->GetObj(0);
- SdrTextObj* pTxtObj = dynamic_cast<SdrTextObj*>(pObj);
+ SdrTextObj* pTxtObj = DynCastSdrTextObj(pObj);
CPPUNIT_ASSERT_MESSAGE("no text object", pTxtObj != nullptr);
const EditTextObject& aEdit = pTxtObj->GetOutlinerParaObject()->GetTextObject();
CPPUNIT_ASSERT_EQUAL(OUString("Click to edit Master title style"), aEdit.GetText(0));
@@ -1744,7 +1744,7 @@ void SdImportTest::testBulletSuffix()
// check suffix of the char bullet
const SdrPage* pPage = GetPage(1);
- SdrTextObj* pTxtObj = dynamic_cast<SdrTextObj*>(pPage->GetObj(0));
+ SdrTextObj* pTxtObj = DynCastSdrTextObj(pPage->GetObj(0));
CPPUNIT_ASSERT_MESSAGE("no text object", pTxtObj != nullptr);
const EditTextObject& aEdit = pTxtObj->GetOutlinerParaObject()->GetTextObject();
const SvxNumBulletItem* pNumFmt = aEdit.GetParaAttribs(1).GetItem(EE_PARA_NUMBULLET);
diff --git a/sd/qa/unit/import-tests2.cxx b/sd/qa/unit/import-tests2.cxx
index c6e335661e8c..8572bb5efdd4 100644
--- a/sd/qa/unit/import-tests2.cxx
+++ b/sd/qa/unit/import-tests2.cxx
@@ -427,7 +427,7 @@ void SdImportTest2::testTdf103792()
CPPUNIT_ASSERT_MESSAGE("No page found", pPage != nullptr);
SdrObject* pObj = pPage->GetObj(0);
CPPUNIT_ASSERT_MESSAGE("Wrong object", pObj != nullptr);
- SdrTextObj* pTxtObj = dynamic_cast<SdrTextObj*>(pObj);
+ SdrTextObj* pTxtObj = DynCastSdrTextObj(pObj);
CPPUNIT_ASSERT_MESSAGE("Not a text object", pTxtObj != nullptr);
const EditTextObject& aEdit = pTxtObj->GetOutlinerParaObject()->GetTextObject();
@@ -694,7 +694,7 @@ void SdImportTest2::testTdf103477()
const SdrPage* pPage = GetPage(1);
- SdrTextObj* pTxtObj = dynamic_cast<SdrTextObj*>(pPage->GetObj(6));
+ SdrTextObj* pTxtObj = DynCastSdrTextObj(pPage->GetObj(6));
CPPUNIT_ASSERT_MESSAGE("no text object", pTxtObj != nullptr);
const EditTextObject& aEdit = pTxtObj->GetOutlinerParaObject()->GetTextObject();
@@ -1053,7 +1053,7 @@ void SdImportTest2::testTdf108925()
loadFromURL(u"odp/tdf108925.odp");
const SdrPage* pPage = GetPage(1);
- SdrTextObj* pTxtObj = dynamic_cast<SdrTextObj*>(pPage->GetObj(0));
+ SdrTextObj* pTxtObj = DynCastSdrTextObj(pPage->GetObj(0));
CPPUNIT_ASSERT_MESSAGE("No text object", pTxtObj != nullptr);
const EditTextObject& aEdit = pTxtObj->GetOutlinerParaObject()->GetTextObject();
@@ -1123,7 +1123,7 @@ void SdImportTest2::testTdf90626()
{
loadFromURL(u"pptx/tdf90626.pptx");
const SdrPage* pPage = GetPage(1);
- SdrTextObj* pTxtObj = dynamic_cast<SdrTextObj*>(pPage->GetObj(1));
+ SdrTextObj* pTxtObj = DynCastSdrTextObj(pPage->GetObj(1));
CPPUNIT_ASSERT_MESSAGE("No text object", pTxtObj != nullptr);
const EditTextObject& aEdit = pTxtObj->GetOutlinerParaObject()->GetTextObject();
for (int i = 0; i < 4; i++)
@@ -1140,7 +1140,7 @@ void SdImportTest2::testTdf138148()
{
loadFromURL(u"pptx/tdf138148.pptx");
const SdrPage* pPage = GetPage(1);
- SdrTextObj* pTxtObj = dynamic_cast<SdrTextObj*>(pPage->GetObj(0));
+ SdrTextObj* pTxtObj = DynCastSdrTextObj(pPage->GetObj(0));
CPPUNIT_ASSERT_MESSAGE("No text object", pTxtObj != nullptr);
const EditTextObject& aEdit = pTxtObj->GetOutlinerParaObject()->GetTextObject();
for (int i = 0; i < 2; i++)
@@ -1207,7 +1207,7 @@ void SdImportTest2::testTdf134210()
void SdImportTest2::testTdf114913()
{
loadFromURL(u"pptx/tdf114913.pptx");
- SdrTextObj* pTxtObj = dynamic_cast<SdrTextObj*>(GetPage(1)->GetObj(1));
+ SdrTextObj* pTxtObj = DynCastSdrTextObj(GetPage(1)->GetObj(1));
CPPUNIT_ASSERT_MESSAGE("No text object", pTxtObj != nullptr);
const SvxNumBulletItem* pItem
= pTxtObj->GetOutlinerParaObject()->GetTextObject().GetParaAttribs(0).GetItem(
@@ -1394,7 +1394,7 @@ void SdImportTest2::testTdf116899()
void SdImportTest2::testTdf77747()
{
loadFromURL(u"ppt/tdf77747.ppt");
- SdrTextObj* pTxtObj = dynamic_cast<SdrTextObj*>(GetPage(1)->GetObj(0));
+ SdrTextObj* pTxtObj = DynCastSdrTextObj(GetPage(1)->GetObj(0));
CPPUNIT_ASSERT_MESSAGE("No text object", pTxtObj != nullptr);
const SvxNumBulletItem* pNumFmt
= pTxtObj->GetOutlinerParaObject()->GetTextObject().GetParaAttribs(0).GetItem(
@@ -1709,7 +1709,7 @@ void SdImportTest2::testTdf49856()
{
loadFromURL(u"ppt/tdf49856.ppt");
const SdrPage* pPage = GetPage(1);
- SdrTextObj* pTxtObj = dynamic_cast<SdrTextObj*>(pPage->GetObj(1));
+ SdrTextObj* pTxtObj = DynCastSdrTextObj(pPage->GetObj(1));
CPPUNIT_ASSERT_MESSAGE("No text object", pTxtObj != nullptr);
const EditTextObject& aEdit = pTxtObj->GetOutlinerParaObject()->GetTextObject();
const SvxNumBulletItem* pNumFmt = aEdit.GetParaAttribs(2).GetItem(EE_PARA_NUMBULLET);
@@ -1989,7 +1989,7 @@ void SdImportTest2::testTdf149961AutofitIndentation()
const SdrPage* pPage = GetPage(1);
{
- SdrTextObj* pTxtObj = dynamic_cast<SdrTextObj*>(pPage->GetObj(0));
+ SdrTextObj* pTxtObj = DynCastSdrTextObj(pPage->GetObj(0));
CPPUNIT_ASSERT_MESSAGE("no text object", pTxtObj != nullptr);
const EditTextObject& aEdit = pTxtObj->GetOutlinerParaObject()->GetTextObject();
@@ -2002,7 +2002,7 @@ void SdImportTest2::testTdf149961AutofitIndentation()
}
{
- SdrTextObj* pTxtObj = dynamic_cast<SdrTextObj*>(pPage->GetObj(1));
+ SdrTextObj* pTxtObj = DynCastSdrTextObj(pPage->GetObj(1));
CPPUNIT_ASSERT_MESSAGE("no text object", pTxtObj != nullptr);
const EditTextObject& aEdit = pTxtObj->GetOutlinerParaObject()->GetTextObject();
diff --git a/sd/qa/unit/misc-tests.cxx b/sd/qa/unit/misc-tests.cxx
index 5a14354ae8e1..f637476dbc7b 100644
--- a/sd/qa/unit/misc-tests.cxx
+++ b/sd/qa/unit/misc-tests.cxx
@@ -427,7 +427,7 @@ void SdMiscTest::testTextColumns()
xShapes->add(xShape);
// Set up columns
- auto pTextObj = dynamic_cast<SdrTextObj*>(SdrObject::getSdrObjectFromXShape(xShape));
+ auto pTextObj = DynCastSdrTextObj(SdrObject::getSdrObjectFromXShape(xShape));
CPPUNIT_ASSERT(pTextObj);
pTextObj->SetMergedItem(SfxInt16Item(SDRATTR_TEXTCOLUMNS_NUMBER, 2));
pTextObj->SetMergedItem(SdrMetricItem(SDRATTR_TEXTCOLUMNS_SPACING, 1000));
@@ -438,7 +438,7 @@ void SdMiscTest::testTextColumns()
uno::Reference<container::XIndexAccess> xIndexAccess(xDrawPage, uno::UNO_QUERY_THROW);
uno::Reference<drawing::XShape> xShape(xIndexAccess->getByIndex(0), uno::UNO_QUERY_THROW);
- auto pTextObj = dynamic_cast<SdrTextObj*>(SdrObject::getSdrObjectFromXShape(xShape));
+ auto pTextObj = DynCastSdrTextObj(SdrObject::getSdrObjectFromXShape(xShape));
CPPUNIT_ASSERT(pTextObj);
CPPUNIT_ASSERT_EQUAL(sal_Int16(2), pTextObj->GetTextColumnsNumber());
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index a0b6ff4cd9e5..3529290162c9 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -2445,7 +2445,7 @@ void SdTiledRenderingTest::testPasteTextOnSlide()
CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(3), pActualPage->GetObjCount());
SdrObject* pObject = pActualPage->GetObj(2);
CPPUNIT_ASSERT(pObject);
- SdrTextObj* pTextObj = dynamic_cast<SdrTextObj*>(pObject);
+ SdrTextObj* pTextObj = DynCastSdrTextObj(pObject);
CPPUNIT_ASSERT(pTextObj);
CPPUNIT_ASSERT_EQUAL(SdrObjKind::Text, pTextObj->GetObjIdentifier());
const Point aPos = pTextObj->GetLastBoundRect().TopLeft();