From de78304d92140901d19a6ea17bdc1d568df955c4 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 5 Nov 2020 14:04:04 +0000 Subject: make SdrObject Identifiers SdrObjKind enum members MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit with unique values so that, e.g. if (pObj->GetObjIdentifier() == OBJ_LINE) is only true if pObj is a SdrPathObj and not a E3dScene Change-Id: I30c91e57eb27141390c644dec42e2a4bee96edf0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105374 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara --- sd/qa/unit/export-tests-ooxml1.cxx | 2 +- sd/qa/unit/export-tests-ooxml2.cxx | 12 ++++++------ sd/qa/unit/import-tests-smartart.cxx | 2 +- sd/qa/unit/tiledrendering/LOKitSearchTest.cxx | 16 ++++++++-------- sd/qa/unit/tiledrendering/tiledrendering.cxx | 16 ++++++++-------- sd/source/core/sdpage.cxx | 5 +++-- sd/source/ui/app/sdxfer.cxx | 2 +- sd/source/ui/dlg/dlgolbul.cxx | 3 ++- sd/source/ui/func/fuconarc.cxx | 4 ++-- sd/source/ui/func/fuconbez.cxx | 2 +- sd/source/ui/func/fuconrec.cxx | 2 +- sd/source/ui/func/fuconuno.cxx | 4 ++-- sd/source/ui/func/fuoaprms.cxx | 8 ++++---- sd/source/ui/func/fuolbull.cxx | 2 ++ sd/source/ui/inc/fuconuno.hxx | 2 +- sd/source/ui/view/drviews4.cxx | 2 +- sd/source/ui/view/drviewse.cxx | 2 +- sd/source/ui/view/viewshel.cxx | 2 ++ 18 files changed, 47 insertions(+), 41 deletions(-) (limited to 'sd') diff --git a/sd/qa/unit/export-tests-ooxml1.cxx b/sd/qa/unit/export-tests-ooxml1.cxx index 7e47d964f7a0..861ca9517044 100644 --- a/sd/qa/unit/export-tests-ooxml1.cxx +++ b/sd/qa/unit/export-tests-ooxml1.cxx @@ -838,7 +838,7 @@ void SdOOXMLExportTest1::testTdf111884() CPPUNIT_ASSERT_MESSAGE("no shape", pShape != nullptr); // must be a group shape - CPPUNIT_ASSERT_EQUAL(static_cast(OBJ_GRUP), pShape->GetObjIdentifier()); + CPPUNIT_ASSERT_EQUAL(OBJ_GRUP, pShape->GetObjIdentifier()); xDocShRef->DoClose(); } diff --git a/sd/qa/unit/export-tests-ooxml2.cxx b/sd/qa/unit/export-tests-ooxml2.cxx index e71c4f5ec904..71f44a0776b6 100644 --- a/sd/qa/unit/export-tests-ooxml2.cxx +++ b/sd/qa/unit/export-tests-ooxml2.cxx @@ -400,7 +400,7 @@ void SdOOXMLExportTest2::testBnc822341() const SdrObject* pObj = pPage->GetObj(0); CPPUNIT_ASSERT_MESSAGE( "no object", pObj != nullptr); - CPPUNIT_ASSERT_EQUAL( static_cast(OBJ_OLE2), pObj->GetObjIdentifier() ); + CPPUNIT_ASSERT_EQUAL( OBJ_OLE2, pObj->GetObjIdentifier() ); } utl::TempFile tempFile2; @@ -433,7 +433,7 @@ void SdOOXMLExportTest2::testBnc822341() const SdrObject* pObj = pPage->GetObj(0); CPPUNIT_ASSERT_MESSAGE( "no object", pObj != nullptr); - CPPUNIT_ASSERT_EQUAL( static_cast(OBJ_OLE2), pObj->GetObjIdentifier() ); + CPPUNIT_ASSERT_EQUAL( OBJ_OLE2, pObj->GetObjIdentifier() ); } xDocShRef->DoClose(); @@ -460,7 +460,7 @@ void SdOOXMLExportTest2::testMathObject() const SdrPage *pPage = GetPage(1, xDocShRef); const SdrObject* pObj = pPage->GetObj(0); CPPUNIT_ASSERT_MESSAGE("no object", pObj != nullptr); - CPPUNIT_ASSERT_EQUAL(static_cast(OBJ_OLE2), pObj->GetObjIdentifier()); + CPPUNIT_ASSERT_EQUAL(OBJ_OLE2, pObj->GetObjIdentifier()); } utl::TempFile tempFile2; @@ -480,7 +480,7 @@ void SdOOXMLExportTest2::testMathObject() const SdrPage *pPage = GetPage(1, xDocShRef); const SdrObject* pObj = pPage->GetObj(0); CPPUNIT_ASSERT_MESSAGE("no object", pObj != nullptr); - CPPUNIT_ASSERT_EQUAL(static_cast(OBJ_OLE2), pObj->GetObjIdentifier()); + CPPUNIT_ASSERT_EQUAL(OBJ_OLE2, pObj->GetObjIdentifier()); } xDocShRef->DoClose(); @@ -507,7 +507,7 @@ void SdOOXMLExportTest2::testMathObjectPPT2010() const SdrPage *pPage = GetPage(1, xDocShRef); const SdrObject* pObj = pPage->GetObj(0); CPPUNIT_ASSERT_MESSAGE("no object", pObj != nullptr); - CPPUNIT_ASSERT_EQUAL(static_cast(OBJ_OLE2), pObj->GetObjIdentifier()); + CPPUNIT_ASSERT_EQUAL(OBJ_OLE2, pObj->GetObjIdentifier()); } xDocShRef->DoClose(); @@ -2918,7 +2918,7 @@ void SdOOXMLExportTest2::testTdf129372() const SdrObject* pObj = pPage->GetObj(0); CPPUNIT_ASSERT_MESSAGE( "no object", pObj != nullptr); - CPPUNIT_ASSERT_EQUAL( static_cast(OBJ_OLE2), pObj->GetObjIdentifier() ); + CPPUNIT_ASSERT_EQUAL( OBJ_OLE2, pObj->GetObjIdentifier() ); } void SdOOXMLExportTest2::testShapeGlowEffect() diff --git a/sd/qa/unit/import-tests-smartart.cxx b/sd/qa/unit/import-tests-smartart.cxx index 4a7da0915f24..6cb1e91f7307 100644 --- a/sd/qa/unit/import-tests-smartart.cxx +++ b/sd/qa/unit/import-tests-smartart.cxx @@ -1478,7 +1478,7 @@ void SdImportTestSmartArt::testTdf131553() CPPUNIT_ASSERT(pObjGroup); const SdrObject *pObj = pObjGroup->GetSubList()->GetObj(1); CPPUNIT_ASSERT_MESSAGE("no object", pObj != nullptr); - CPPUNIT_ASSERT_EQUAL(static_cast(OBJ_OLE2), pObj->GetObjIdentifier()); + CPPUNIT_ASSERT_EQUAL(OBJ_OLE2, pObj->GetObjIdentifier()); xDocShRef->DoClose(); } diff --git a/sd/qa/unit/tiledrendering/LOKitSearchTest.cxx b/sd/qa/unit/tiledrendering/LOKitSearchTest.cxx index 07e50a93051b..a34914b88a60 100644 --- a/sd/qa/unit/tiledrendering/LOKitSearchTest.cxx +++ b/sd/qa/unit/tiledrendering/LOKitSearchTest.cxx @@ -621,7 +621,7 @@ void LOKitSearchTest::testSearchIn2MixedObjects() SdrObject* pObject = pPage->GetObj(0); CPPUNIT_ASSERT(pObject); - CPPUNIT_ASSERT_EQUAL(sal_uInt16(OBJ_TEXT), pObject->GetObjIdentifier()); + CPPUNIT_ASSERT_EQUAL(OBJ_TEXT, pObject->GetObjIdentifier()); } // Check Object 2 @@ -629,7 +629,7 @@ void LOKitSearchTest::testSearchIn2MixedObjects() SdrObject* pObject = pPage->GetObj(1); CPPUNIT_ASSERT(pObject); - CPPUNIT_ASSERT_EQUAL(sal_uInt16(OBJ_GRAF), pObject->GetObjIdentifier()); + CPPUNIT_ASSERT_EQUAL(OBJ_GRAF, pObject->GetObjIdentifier()); SdrGrafObj* pGraphicObject = dynamic_cast(pObject); CPPUNIT_ASSERT(pGraphicObject); @@ -709,14 +709,14 @@ void LOKitSearchTest::testSearchIn6MixedObjects() { SdrObject* pObject = pPage->GetObj(0); CPPUNIT_ASSERT(pObject); - CPPUNIT_ASSERT_EQUAL(sal_uInt16(OBJ_TEXT), pObject->GetObjIdentifier()); + CPPUNIT_ASSERT_EQUAL(OBJ_TEXT, pObject->GetObjIdentifier()); } // Check Object 2 { SdrObject* pObject = pPage->GetObj(1); CPPUNIT_ASSERT(pObject); - CPPUNIT_ASSERT_EQUAL(sal_uInt16(OBJ_GRAF), pObject->GetObjIdentifier()); + CPPUNIT_ASSERT_EQUAL(OBJ_GRAF, pObject->GetObjIdentifier()); SdrGrafObj* pGraphicObject = dynamic_cast(pObject); CPPUNIT_ASSERT(pGraphicObject); auto const& pVectorGraphicData = pGraphicObject->GetGraphic().getVectorGraphicData(); @@ -729,21 +729,21 @@ void LOKitSearchTest::testSearchIn6MixedObjects() { SdrObject* pObject = pPage->GetObj(2); CPPUNIT_ASSERT(pObject); - CPPUNIT_ASSERT_EQUAL(sal_uInt16(OBJ_CUSTOMSHAPE), pObject->GetObjIdentifier()); + CPPUNIT_ASSERT_EQUAL(OBJ_CUSTOMSHAPE, pObject->GetObjIdentifier()); } // Check Object 4 { SdrObject* pObject = pPage->GetObj(3); CPPUNIT_ASSERT(pObject); - CPPUNIT_ASSERT_EQUAL(sal_uInt16(OBJ_CUSTOMSHAPE), pObject->GetObjIdentifier()); + CPPUNIT_ASSERT_EQUAL(OBJ_CUSTOMSHAPE, pObject->GetObjIdentifier()); } // Check Object 5 { SdrObject* pObject = pPage->GetObj(4); CPPUNIT_ASSERT(pObject); - CPPUNIT_ASSERT_EQUAL(sal_uInt16(OBJ_GRAF), pObject->GetObjIdentifier()); + CPPUNIT_ASSERT_EQUAL(OBJ_GRAF, pObject->GetObjIdentifier()); SdrGrafObj* pGraphicObject = dynamic_cast(pObject); CPPUNIT_ASSERT(pGraphicObject); auto const& pVectorGraphicData = pGraphicObject->GetGraphic().getVectorGraphicData(); @@ -756,7 +756,7 @@ void LOKitSearchTest::testSearchIn6MixedObjects() { SdrObject* pObject = pPage->GetObj(5); CPPUNIT_ASSERT(pObject); - CPPUNIT_ASSERT_EQUAL(sal_uInt16(OBJ_GRAF), pObject->GetObjIdentifier()); + CPPUNIT_ASSERT_EQUAL(OBJ_GRAF, pObject->GetObjIdentifier()); SdrGrafObj* pGraphicObject = dynamic_cast(pObject); CPPUNIT_ASSERT(pGraphicObject); auto const& pVectorGraphicData = pGraphicObject->GetGraphic().getVectorGraphicData(); diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx b/sd/qa/unit/tiledrendering/tiledrendering.cxx index 86c522723904..b71e91b6b820 100644 --- a/sd/qa/unit/tiledrendering/tiledrendering.cxx +++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx @@ -405,7 +405,7 @@ void SdTiledRenderingTest::testPostKeyEvent() sd::ViewShell* pViewShell = pXImpressDocument->GetDocShell()->GetViewShell(); SdPage* pActualPage = pViewShell->GetActualPage(); SdrObject* pObject = pActualPage->GetObj(0); - CPPUNIT_ASSERT_EQUAL(static_cast(OBJ_TITLETEXT), pObject->GetObjIdentifier()); + CPPUNIT_ASSERT_EQUAL(OBJ_TITLETEXT, pObject->GetObjIdentifier()); SdrTextObj* pTextObj = static_cast(pObject); SdrView* pView = pViewShell->GetView(); pView->MarkObj(pTextObj, pView->GetSdrPageView()); @@ -433,7 +433,7 @@ void SdTiledRenderingTest::testPostMouseEvent() sd::ViewShell* pViewShell = pXImpressDocument->GetDocShell()->GetViewShell(); SdPage* pActualPage = pViewShell->GetActualPage(); SdrObject* pObject = pActualPage->GetObj(0); - CPPUNIT_ASSERT_EQUAL(static_cast(OBJ_TITLETEXT), pObject->GetObjIdentifier()); + CPPUNIT_ASSERT_EQUAL(OBJ_TITLETEXT, pObject->GetObjIdentifier()); SdrTextObj* pTextObj = static_cast(pObject); SdrView* pView = pViewShell->GetView(); pView->MarkObj(pTextObj, pView->GetSdrPageView()); @@ -1084,7 +1084,7 @@ void SdTiledRenderingTest::testCursorVisibility_SingleClick() SdPage* pActualPage = pViewShell->GetActualPage(); SdrObject* pObject1 = pActualPage->GetObj(0); CPPUNIT_ASSERT(pObject1 != nullptr); - CPPUNIT_ASSERT_EQUAL(static_cast(OBJ_TITLETEXT), pObject1->GetObjIdentifier()); + CPPUNIT_ASSERT_EQUAL(OBJ_TITLETEXT, pObject1->GetObjIdentifier()); SdrTextObj* pTextObject = static_cast(pObject1); // Click once outside of the text (in the first quartile) => no editing. @@ -1133,7 +1133,7 @@ void SdTiledRenderingTest::testCursorVisibility_DoubleClick() SdPage* pActualPage = pViewShell->GetActualPage(); SdrObject* pObject1 = pActualPage->GetObj(0); CPPUNIT_ASSERT(pObject1 != nullptr); - CPPUNIT_ASSERT_EQUAL(static_cast(OBJ_TITLETEXT), pObject1->GetObjIdentifier()); + CPPUNIT_ASSERT_EQUAL(OBJ_TITLETEXT, pObject1->GetObjIdentifier()); SdrTextObj* pTextObject = static_cast(pObject1); // Double-click outside the text to enter edit mode. @@ -1165,7 +1165,7 @@ void SdTiledRenderingTest::testCursorVisibility_MultiView() SdPage* pActualPage = pViewShell->GetActualPage(); SdrObject* pObject1 = pActualPage->GetObj(0); CPPUNIT_ASSERT(pObject1); - CPPUNIT_ASSERT_EQUAL(static_cast(OBJ_TITLETEXT), pObject1->GetObjIdentifier()); + CPPUNIT_ASSERT_EQUAL(OBJ_TITLETEXT, pObject1->GetObjIdentifier()); SdrTextObj* pTextObject = static_cast(pObject1); // Make sure that cursor state is not changed just because we create a second view. @@ -1213,7 +1213,7 @@ void SdTiledRenderingTest::testCursorVisibility_Escape() SdPage* pActualPage = pViewShell->GetActualPage(); SdrObject* pObject1 = pActualPage->GetObj(0); CPPUNIT_ASSERT(pObject1 != nullptr); - CPPUNIT_ASSERT_EQUAL(static_cast(OBJ_TITLETEXT), pObject1->GetObjIdentifier()); + CPPUNIT_ASSERT_EQUAL(OBJ_TITLETEXT, pObject1->GetObjIdentifier()); SdrTextObj* pTextObject = static_cast(pObject1); // Click once on the text to start editing. @@ -1504,7 +1504,7 @@ void SdTiledRenderingTest::testTdf103083() SdPage* pActualPage = pViewShell->GetActualPage(); SdrObject* pObject1 = pActualPage->GetObj(1); - CPPUNIT_ASSERT_EQUAL(static_cast(OBJ_OUTLINETEXT), pObject1->GetObjIdentifier()); + CPPUNIT_ASSERT_EQUAL(OBJ_OUTLINETEXT, pObject1->GetObjIdentifier()); SdrTextObj* pTextObject = static_cast(pObject1); SdrView* pView = pViewShell->GetView(); @@ -2280,7 +2280,7 @@ void SdTiledRenderingTest::testPasteTextOnSlide() CPPUNIT_ASSERT(pObject); SdrTextObj* pTextObj = dynamic_cast(pObject); CPPUNIT_ASSERT(pTextObj); - CPPUNIT_ASSERT_EQUAL(static_cast(OBJ_TEXT), pTextObj->GetObjIdentifier()); + CPPUNIT_ASSERT_EQUAL(OBJ_TEXT, pTextObj->GetObjIdentifier()); // This test is unreliable: it gives alternating results for the following coordinates. // As a compromise, instead of disabling it altogether, we allow for both sets of values. const Point aPos = pTextObj->GetLastBoundRect().TopLeft(); diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 15f2be5fc22e..fb670e9585d4 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -1508,7 +1508,7 @@ static void findAutoLayoutShapesImpl( SdPage& rPage, const LayoutDescriptor& rDe continue; bool bPresStyle = pObj->GetStyleSheet() && (pObj->GetStyleSheet()->GetFamily() == SfxStyleFamily::Page); - SdrObjKind eSdrObjKind = static_cast< SdrObjKind >( pObj->GetObjIdentifier() ); + SdrObjKind eSdrObjKind = pObj->GetObjIdentifier(); switch( eKind ) { @@ -1910,7 +1910,7 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const ::tools::Rectangle& rN if (mbScaleObjects) { - SdrObjKind eObjKind = static_cast(pObj->GetObjIdentifier()); + SdrObjKind eObjKind = pObj->GetObjIdentifier(); if (bIsPresObjOnMaster) { @@ -2191,6 +2191,7 @@ static SdrObject* convertPresentationObjectImpl(SdPage& rPage, SdrObject* pSourc case OBJ_MEDIA: eObjKind = PresObjKind::Media; break; case OBJ_GRAF: eObjKind = PresObjKind::Graphic; break; case OBJ_OLE2: eObjKind = PresObjKind::Object; break; + default: break; } } diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx index c473468e1dfe..a5d599de1a1e 100644 --- a/sd/source/ui/app/sdxfer.cxx +++ b/sd/source/ui/app/sdxfer.cxx @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sd/source/ui/dlg/dlgolbul.cxx b/sd/source/ui/dlg/dlgolbul.cxx index 0f8f46c4a5fd..5065ced24d20 100644 --- a/sd/source/ui/dlg/dlgolbul.cxx +++ b/sd/source/ui/dlg/dlgolbul.cxx @@ -68,7 +68,6 @@ OutlineBulletDlg::OutlineBulletDlg(weld::Window* pParent, const SfxItemSet* pAtt SdrObject* pObj = rMarkList.GetMark(nNum)->GetMarkedSdrObj(); if( pObj->GetObjInventor() == SdrInventor::Default ) { - switch(pObj->GetObjIdentifier()) { case OBJ_TITLETEXT: @@ -77,6 +76,8 @@ OutlineBulletDlg::OutlineBulletDlg(weld::Window* pParent, const SfxItemSet* pAtt case OBJ_OUTLINETEXT: bOutliner = true; break; + default: + break; } } } diff --git a/sd/source/ui/func/fuconarc.cxx b/sd/source/ui/func/fuconarc.cxx index e42db7025863..2d2fa73574b3 100644 --- a/sd/source/ui/func/fuconarc.cxx +++ b/sd/source/ui/func/fuconarc.cxx @@ -92,7 +92,7 @@ void FuConstructArc::DoExecute( SfxRequest& rReq ) SdrCircObj* pNewCircle = new SdrCircObj( mpView->getSdrModelFromSdrView(), - ToSdrCircKind(static_cast(mpView->GetCurrentObjIdentifier())), + ToSdrCircKind(mpView->GetCurrentObjIdentifier()), aNewRectangle, static_cast<::tools::Long>(pPhiStart->GetValue () * 10.0), static_cast<::tools::Long>(pPhiEnd->GetValue () * 10.0)); @@ -193,7 +193,7 @@ void FuConstructArc::Activate() break; } - mpView->SetCurrentObj(static_cast(aObjKind)); + mpView->SetCurrentObj(aObjKind); FuConstruct::Activate(); } diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx index dffec4d18d99..a28bb06eb959 100644 --- a/sd/source/ui/func/fuconbez.cxx +++ b/sd/source/ui/func/fuconbez.cxx @@ -333,7 +333,7 @@ void FuConstructBezierPolygon::Activate() break; } - mpView->SetCurrentObj(static_cast(eKind)); + mpView->SetCurrentObj(eKind); FuConstruct::Activate(); } diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx index b74547587fc3..958ed8042c81 100644 --- a/sd/source/ui/func/fuconrec.cxx +++ b/sd/source/ui/func/fuconrec.cxx @@ -424,7 +424,7 @@ void FuConstructRectangle::Activate() break; } - mpView->SetCurrentObj(static_cast(aObjKind)); + mpView->SetCurrentObj(aObjKind); FuConstruct::Activate(); } diff --git a/sd/source/ui/func/fuconuno.cxx b/sd/source/ui/func/fuconuno.cxx index 6edfaaa769c9..27d3ae247b25 100644 --- a/sd/source/ui/func/fuconuno.cxx +++ b/sd/source/ui/func/fuconuno.cxx @@ -45,7 +45,7 @@ FuConstructUnoControl::FuConstructUnoControl ( SfxRequest& rReq) : FuConstruct(pViewSh, pWin, pView, pDoc, rReq) , nInventor(SdrInventor::Unknown) - , nIdentifier(0) + , nIdentifier(OBJ_NONE) { } @@ -67,7 +67,7 @@ void FuConstructUnoControl::DoExecute( SfxRequest& rReq ) if( pInventorItem ) nInventor = static_cast(pInventorItem->GetValue()); if( pIdentifierItem ) - nIdentifier = pIdentifierItem->GetValue(); + nIdentifier = static_cast(pIdentifierItem->GetValue()); mpViewShell->GetViewShellBase().GetToolBarManager()->SetToolBar( ToolBarManager::ToolBarGroup::Function, diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx index 38bb2b032d82..2673611f63a4 100644 --- a/sd/source/ui/func/fuoaprms.cxx +++ b/sd/source/ui/func/fuoaprms.cxx @@ -287,8 +287,8 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) { SdrObject* pObject1 = rMarkList.GetMark(0)->GetMarkedSdrObj(); SdrObject* pObject2 = rMarkList.GetMark(1)->GetMarkedSdrObj(); - SdrObjKind eKind1 = static_cast(pObject1->GetObjIdentifier()); - SdrObjKind eKind2 = static_cast(pObject2->GetObjIdentifier()); + SdrObjKind eKind1 = pObject1->GetObjIdentifier(); + SdrObjKind eKind2 = pObject2->GetObjIdentifier(); SdAnimationInfo* pInfo1 = SdDrawDocument::GetAnimationInfo(pObject1); SdAnimationInfo* pInfo2 = SdDrawDocument::GetAnimationInfo(pObject2); pInfo = nullptr; @@ -629,8 +629,8 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) DBG_ASSERT(nCount == 2, "This effect expects two selected objects"); SdrObject* pObject1 = rMarkList.GetMark(0)->GetMarkedSdrObj(); SdrObject* pObject2 = rMarkList.GetMark(1)->GetMarkedSdrObj(); - SdrObjKind eKind1 = static_cast(pObject1->GetObjIdentifier()); - SdrObjKind eKind2 = static_cast(pObject2->GetObjIdentifier()); + SdrObjKind eKind1 = pObject1->GetObjIdentifier(); + SdrObjKind eKind2 = pObject2->GetObjIdentifier(); SdrObject* pRunningObj = nullptr; if (pObject1->GetObjInventor() == SdrInventor::Default && diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx index a5fe859d4f0a..b8e141daad5d 100644 --- a/sd/source/ui/func/fuolbull.cxx +++ b/sd/source/ui/func/fuolbull.cxx @@ -296,6 +296,8 @@ const SfxPoolItem* FuBulletAndPosition::GetNumBulletItem(SfxItemSet& aNewAttr, s case OBJ_OUTLINETEXT: bOutliner = true; break; + default: + break; } } } diff --git a/sd/source/ui/inc/fuconuno.hxx b/sd/source/ui/inc/fuconuno.hxx index c627f81d7780..d66b2713848e 100644 --- a/sd/source/ui/inc/fuconuno.hxx +++ b/sd/source/ui/inc/fuconuno.hxx @@ -57,7 +57,7 @@ private: OUString aOldLayer; SdrInventor nInventor; - sal_uInt16 nIdentifier; + SdrObjKind nIdentifier; }; } // end of namespace sd diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx index f71ecc6a6014..b6a9d424a8db 100644 --- a/sd/source/ui/view/drviews4.cxx +++ b/sd/source/ui/view/drviews4.cxx @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index bde926aef869..db9662bb7650 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index f97c26ea5ece..1ae50f7ae7e6 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -829,6 +829,8 @@ const SfxPoolItem* ViewShell::GetNumBulletItem(SfxItemSet& aNewAttr, sal_uInt16& case OBJ_OUTLINETEXT: bOutliner = true; break; + default: + break; } } } -- cgit