diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-21 11:45:50 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-21 12:09:09 +0000 |
| commit | beb8cfcf32f855a0fb638caef4782d9d867e3102 (patch) | |
| tree | 23b5a2376ecacc2977c3ce5f3a2be182abb05b3b /sd | |
| parent | cppcanvas, oox: add missing #include <osl/endian.h> (diff) | |
| download | core-beb8cfcf32f855a0fb638caef4782d9d867e3102.tar.gz core-beb8cfcf32f855a0fb638caef4782d9d867e3102.zip | |
convert inventorId to scoped enum
SW_DRAWLAYER had the same value as SC_DRAWLAYER, so I merged it into the
ScOrSwDraw enum constant
Change-Id: I5c45d378c00364d11cc960c9e48a6e3f10928724
Reviewed-on: https://gerrit.libreoffice.org/31037
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd')
51 files changed, 148 insertions, 152 deletions
diff --git a/sd/inc/glob.hxx b/sd/inc/glob.hxx index 6f66420624a1..f5c5ebc59dba 100644 --- a/sd/inc/glob.hxx +++ b/sd/inc/glob.hxx @@ -43,12 +43,6 @@ #define SD_IF_SDTOOLPANELSHELL SFX_INTERFACE_SD_START + 30 -// Inventor-Id for StarDraw UserData -const sal_uInt32 SdUDInventor=sal_uInt32('S')*0x00000001+ - sal_uInt32('D')*0x00000100+ - sal_uInt32('U')*0x00010000+ - sal_uInt32('D')*0x01000000; - // Object-Ids for StarDraw UserData #define SD_ANIMATIONINFO_ID 1 #define SD_IMAPINFO_ID 2 diff --git a/sd/inc/imapinfo.hxx b/sd/inc/imapinfo.hxx index b07d99a530ef..665a68f33b06 100644 --- a/sd/inc/imapinfo.hxx +++ b/sd/inc/imapinfo.hxx @@ -32,14 +32,14 @@ class SdIMapInfo : public SdrObjUserData, public SfxListener public: SdIMapInfo() : - SdrObjUserData( SdUDInventor, SD_IMAPINFO_ID ) {}; + SdrObjUserData( SdrInventor::StarDrawUserData, SD_IMAPINFO_ID ) {}; SdIMapInfo( const ImageMap& rImageMap ) : - SdrObjUserData( SdUDInventor, SD_IMAPINFO_ID ), + SdrObjUserData( SdrInventor::StarDrawUserData, SD_IMAPINFO_ID ), aImageMap( rImageMap ) {}; SdIMapInfo( const SdIMapInfo& rIMapInfo ) : - SdrObjUserData( SdUDInventor, SD_IMAPINFO_ID ), + SdrObjUserData( SdrInventor::StarDrawUserData, SD_IMAPINFO_ID ), SfxListener(), aImageMap( rIMapInfo.aImageMap ) {}; diff --git a/sd/source/core/EffectMigration.cxx b/sd/source/core/EffectMigration.cxx index 67f2c80b7ba5..607f7982b3d7 100644 --- a/sd/source/core/EffectMigration.cxx +++ b/sd/source/core/EffectMigration.cxx @@ -497,7 +497,7 @@ void EffectMigration::SetAnimationEffect( SvxShape* pShape, AnimationEffect eEff pMainSequence->append( pEffect ); - if( ( pObj->GetObjInventor() == SdrInventor ) && ( pObj->GetObjIdentifier() == OBJ_OUTLINETEXT ) ) + if( ( pObj->GetObjInventor() == SdrInventor::Default ) && ( pObj->GetObjIdentifier() == OBJ_OUTLINETEXT ) ) { // special case for outline text, effects are always mapped to text group effect pMainSequence-> diff --git a/sd/source/core/anminfo.cxx b/sd/source/core/anminfo.cxx index 4b31dc1a82cd..ba3c2978e6d9 100644 --- a/sd/source/core/anminfo.cxx +++ b/sd/source/core/anminfo.cxx @@ -33,7 +33,7 @@ using namespace ::com::sun::star; SdAnimationInfo::SdAnimationInfo(SdrObject& rObject) - : SdrObjUserData(SdUDInventor, SD_ANIMATIONINFO_ID), + : SdrObjUserData(SdrInventor::StarDrawUserData, SD_ANIMATIONINFO_ID), mePresObjKind (PRESOBJ_NONE), meEffect (presentation::AnimationEffect_NONE), meTextEffect (presentation::AnimationEffect_NONE), diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index eda9ce821b10..f11fce123771 100644 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.cxx @@ -757,7 +757,7 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool // listeners. while( (pObj = rPresentationShapes.getNextShape()) ) { - if (pObj->GetObjInventor() == SdrInventor) + if (pObj->GetObjInventor() == SdrInventor::Default) { OutlinerParaObject* pOPO = pObj->GetOutlinerParaObject(); sal_uInt16 nId = pObj->GetObjIdentifier(); diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx index 875d544ec4fb..8c7cdba2bad8 100644 --- a/sd/source/core/drawdoc2.cxx +++ b/sd/source/core/drawdoc2.cxx @@ -99,7 +99,7 @@ SdrObject* SdDrawDocument::GetObj(const OUString& rObjName) const pObj = aIter.Next(); if( ( pObj->GetName().equals(rObjName) ) || - ( SdrInventor == pObj->GetObjInventor() && + ( SdrInventor::Default == pObj->GetObjInventor() && OBJ_OLE2 == pObj->GetObjIdentifier() && rObjName == static_cast< SdrOle2Obj* >( pObj )->GetPersistName() ) ) { @@ -124,7 +124,7 @@ SdrObject* SdDrawDocument::GetObj(const OUString& rObjName) const pObj = aIter.Next(); if( ( pObj->GetName().equals(rObjName) ) || - ( SdrInventor == pObj->GetObjInventor() && + ( SdrInventor::Default == pObj->GetObjInventor() && OBJ_OLE2 == pObj->GetObjIdentifier() && rObjName == static_cast< SdrOle2Obj* >( pObj )->GetPersistName() ) ) { @@ -231,7 +231,7 @@ void SdDrawDocument::UpdatePageObjectsInNotes(sal_uInt16 nStartPos) { SdrObject* pObj = pPage->GetObj(nObj); if (pObj->GetObjIdentifier() == OBJ_PAGE && - pObj->GetObjInventor() == SdrInventor) + pObj->GetObjInventor() == SdrInventor::Default) { // The page object is the preceding page (drawing page) SAL_WARN_IF(!nStartPos, "sd", "Position of notes page must not be 0."); @@ -964,7 +964,7 @@ SdAnimationInfo* SdDrawDocument::GetShapeUserData(SdrObject& rObject, bool bCrea for (nUD = 0; nUD < nUDCount; nUD++) { SdrObjUserData* pUD = rObject.GetUserData(nUD); - if((pUD->GetInventor() == SdUDInventor) && (pUD->GetId() == SD_ANIMATIONINFO_ID)) + if((pUD->GetInventor() == SdrInventor::StarDrawUserData) && (pUD->GetId() == SD_ANIMATIONINFO_ID)) { pRet = dynamic_cast<SdAnimationInfo*>(pUD); break; @@ -992,7 +992,7 @@ SdIMapInfo* SdDrawDocument::GetIMapInfo( SdrObject* pObject ) { SdrObjUserData* pUserData = pObject->GetUserData( i ); - if ( ( pUserData->GetInventor() == SdUDInventor ) && ( pUserData->GetId() == SD_IMAPINFO_ID ) ) + if ( ( pUserData->GetInventor() == SdrInventor::StarDrawUserData ) && ( pUserData->GetId() == SD_IMAPINFO_ID ) ) pIMapInfo = static_cast<SdIMapInfo*>(pUserData); } diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx index 68c8c124d452..62754d37aac0 100644 --- a/sd/source/core/drawdoc3.cxx +++ b/sd/source/core/drawdoc3.cxx @@ -1021,7 +1021,7 @@ bool SdDrawDocument::InsertBookmarkAsObject( if (pObj) { // Found an object - if (pObj->GetObjInventor() == SdrInventor && + if (pObj->GetObjInventor() == SdrInventor::Default && pObj->GetObjIdentifier() == OBJ_OLE2) { bOLEObjFound = true; diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index 72d68895f693..9d27b77b21e9 100644 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -885,7 +885,7 @@ void SdDrawDocument::SpellObject(SdrTextObj* pObj) OutlinerMode nOldOutlMode = pOutl->GetMode(); OutlinerMode nOutlMode = OutlinerMode::TextObject; - if (pObj->GetObjInventor() == SdrInventor && + if (pObj->GetObjInventor() == SdrInventor::Default && pObj->GetObjIdentifier() == OBJ_OUTLINETEXT) { nOutlMode = OutlinerMode::OutlineObject; @@ -1120,7 +1120,7 @@ void SdDrawDocument::RenameLayoutTemplate(const OUString& rOldLayoutName, const { SdrObject* pObj = pPage->GetObj(nObj); - if (pObj->GetObjInventor() == SdrInventor) + if (pObj->GetObjInventor() == SdrInventor::Default) { switch( pObj->GetObjIdentifier() ) { @@ -1163,7 +1163,7 @@ void SdDrawDocument::RenameLayoutTemplate(const OUString& rOldLayoutName, const { SdrObject* pObj = pPage->GetObj(nObj); - if (pObj->GetObjInventor() == SdrInventor) + if (pObj->GetObjInventor() == SdrInventor::Default) { switch(pObj->GetObjIdentifier()) { diff --git a/sd/source/core/sdobjfac.cxx b/sd/source/core/sdobjfac.cxx index a3fc3dc06f29..abffd218030b 100644 --- a/sd/source/core/sdobjfac.cxx +++ b/sd/source/core/sdobjfac.cxx @@ -37,7 +37,7 @@ SdObjectFactory aSdObjectFactory; IMPL_STATIC_LINK( SdObjectFactory, MakeUserData, SdrObjUserDataCreatorParams, aParams, SdrObjUserData* ) { - if ( aParams.nInventor == SdUDInventor ) + if ( aParams.nInventor == SdrInventor::StarDrawUserData ) { switch( aParams.nObjIdentifier ) { diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 7e844b01dfdd..945056d55f71 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -1463,7 +1463,7 @@ void findAutoLayoutShapesImpl( SdPage& rPage, const LayoutDescriptor& rDescripto if( pObj->IsEmptyPresObj() ) continue; - if( pObj->GetObjInventor() != SdrInventor ) + if( pObj->GetObjInventor() != SdrInventor::Default ) continue; // do not reuse shapes that are already part of the layout @@ -2811,11 +2811,11 @@ bool SdPage::checkVisibility( // empty presentation objects only visible during edit mode if( (bIsPrinting || !bEdit || bIsInsidePageObj ) && pObj->IsEmptyPresObj() ) { - if( (pObj->GetObjInventor() != SdrInventor) || ( (pObj->GetObjIdentifier() != OBJ_RECT) && (pObj->GetObjIdentifier() != OBJ_PAGE) ) ) + if( (pObj->GetObjInventor() != SdrInventor::Default) || ( (pObj->GetObjIdentifier() != OBJ_RECT) && (pObj->GetObjIdentifier() != OBJ_PAGE) ) ) return false; } - if( ( pObj->GetObjInventor() == SdrInventor ) && ( pObj->GetObjIdentifier() == OBJ_TEXT ) ) + if( ( pObj->GetObjInventor() == SdrInventor::Default ) && ( pObj->GetObjIdentifier() == OBJ_TEXT ) ) { const SdPage* pCheckPage = dynamic_cast< const SdPage* >(pObj->GetPage()); @@ -2862,7 +2862,7 @@ bool SdPage::checkVisibility( } // i63977, do not print SdrpageObjs from master pages - if( ( pObj->GetObjInventor() == SdrInventor ) && ( pObj->GetObjIdentifier() == OBJ_PAGE ) ) + if( ( pObj->GetObjInventor() == SdrInventor::Default ) && ( pObj->GetObjIdentifier() == OBJ_PAGE ) ) { if( pObj->GetPage() && pObj->GetPage()->IsMasterPage() ) return false; diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx index 564499979404..e8f119fa5d3e 100644 --- a/sd/source/core/sdpage2.cxx +++ b/sd/source/core/sdpage2.cxx @@ -149,7 +149,7 @@ void SdPage::SetPresentationLayout(const OUString& rLayoutName, { auto pObj = GetObj(nObj); - if (pObj->GetObjInventor() == SdrInventor && + if (pObj->GetObjInventor() == SdrInventor::Default && pObj->GetObjIdentifier() == OBJ_OUTLINETEXT) { if (!bListsFilled || !bReplaceStyleSheets) @@ -228,7 +228,7 @@ void SdPage::SetPresentationLayout(const OUString& rLayoutName, } } } - else if (pObj->GetObjInventor() == SdrInventor && + else if (pObj->GetObjInventor() == SdrInventor::Default && pObj->GetObjIdentifier() == OBJ_TITLETEXT) { // We do net get PresObjKind via GetPresObjKind() since there are diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index e7120f493c80..8bc792b3bfb4 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -1038,7 +1038,7 @@ SdrTextObj* HtmlExport::GetLayoutTextObject(SdrPage* pPage) for (size_t nObject = 0; nObject < nObjectCount; ++nObject) { SdrObject* pObject = pPage->GetObj(nObject); - if (pObject->GetObjInventor() == SdrInventor && + if (pObject->GetObjInventor() == SdrInventor::Default && pObject->GetObjIdentifier() == OBJ_OUTLINETEXT) { pResult = static_cast<SdrTextObj*>(pObject); @@ -1867,7 +1867,7 @@ bool HtmlExport::CreateHtmlForPresPages() if (!aHRef.isEmpty()) { // a circle? - if (pObject->GetObjInventor() == SdrInventor && + if (pObject->GetObjInventor() == SdrInventor::Default && pObject->GetObjIdentifier() == OBJ_CIRC && bIsSquare ) { @@ -1877,7 +1877,7 @@ bool HtmlExport::CreateHtmlForPresPages() aHRef)); } // a polygon? - else if (pObject->GetObjInventor() == SdrInventor && + else if (pObject->GetObjInventor() == SdrInventor::Default && (pObject->GetObjIdentifier() == OBJ_PATHLINE || pObject->GetObjIdentifier() == OBJ_PLIN || pObject->GetObjIdentifier() == OBJ_POLY)) diff --git a/sd/source/filter/xml/sdtransform.cxx b/sd/source/filter/xml/sdtransform.cxx index 855e63dcde3a..726fa02425ef 100644 --- a/sd/source/filter/xml/sdtransform.cxx +++ b/sd/source/filter/xml/sdtransform.cxx @@ -207,7 +207,7 @@ void SdTransformOOo2xDocument::transformTextShape( SdrTextObj& rTextShape ) if( (nDepth != -1) && (!getBulletState( aParaSet, mrOutliner.GetStyleSheet( nPara ), bState ) || !bState) ) { // disable bullet if text::enable-bullet="false" is found - if( (nDepth > 0 ) && (rTextShape.GetObjInventor() == SdrInventor) && (rTextShape.GetObjIdentifier() == OBJ_OUTLINETEXT) ) + if( (nDepth > 0 ) && (rTextShape.GetObjInventor() == SdrInventor::Default) && (rTextShape.GetObjIdentifier() == OBJ_OUTLINETEXT) ) { // for outline object and level > 0 burn in the style sheet because it will be changed to "outline 1" SfxStyleSheet* pStyleSheet = mrOutliner.GetStyleSheet( nPara ); diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx index a1d84340e94a..12b55eeb1d8f 100644 --- a/sd/source/ui/app/sdxfer.cxx +++ b/sd/source/ui/app/sdxfer.cxx @@ -185,11 +185,11 @@ void SdTransferable::CreateObjectReplacement( SdrObject* pObj ) { mpGraphic = new Graphic( static_cast< SdrGrafObj* >( pObj )->GetTransformedGraphic() ); } - else if( pObj->IsUnoObj() && FmFormInventor == pObj->GetObjInventor() && ( pObj->GetObjIdentifier() == (sal_uInt16) OBJ_FM_BUTTON ) ) + else if( pObj->IsUnoObj() && SdrInventor::FmForm == pObj->GetObjInventor() && ( pObj->GetObjIdentifier() == (sal_uInt16) OBJ_FM_BUTTON ) ) { SdrUnoObj* pUnoCtrl = static_cast< SdrUnoObj* >( pObj ); - if (pUnoCtrl && FmFormInventor == pUnoCtrl->GetObjInventor()) + if (pUnoCtrl && SdrInventor::FmForm == pUnoCtrl->GetObjInventor()) { Reference< css::awt::XControlModel > xControlModel( pUnoCtrl->GetUnoControlModel() ); diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index b023d0a2c23a..9f37ab71f887 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -721,11 +721,11 @@ void AnimationWindow::AddObj (::sd::View& rView ) SdrMark* pMark = rMarkList.GetMark(0); SdrObject* pObject = pMark->GetMarkedSdrObj(); SdAnimationInfo* pAnimInfo = SdDrawDocument::GetAnimationInfo( pObject ); - sal_uInt32 nInv = pObject->GetObjInventor(); - sal_uInt16 nId = pObject->GetObjIdentifier(); + SdrInventor nInv = pObject->GetObjInventor(); + sal_uInt16 nId = pObject->GetObjIdentifier(); // Animated Bitmap (GIF) - if( nInv == SdrInventor && nId == OBJ_GRAF && static_cast<SdrGrafObj*>( pObject )->IsAnimated() ) + if( nInv == SdrInventor::Default && nId == OBJ_GRAF && static_cast<SdrGrafObj*>( pObject )->IsAnimated() ) { const SdrGrafObj* pGrafObj = static_cast<SdrGrafObj*>(pObject); Graphic aGraphic( pGrafObj->GetTransformedGraphic() ); diff --git a/sd/source/ui/dlg/dlgolbul.cxx b/sd/source/ui/dlg/dlgolbul.cxx index 4fbeeb673a6b..ae69b2aa22da 100644 --- a/sd/source/ui/dlg/dlgolbul.cxx +++ b/sd/source/ui/dlg/dlgolbul.cxx @@ -73,7 +73,7 @@ OutlineBulletDlg::OutlineBulletDlg( for(size_t nNum = 0; nNum < nCount; ++nNum) { SdrObject* pObj = rMarkList.GetMark(nNum)->GetMarkedSdrObj(); - if( pObj->GetObjInventor() == SdrInventor ) + if( pObj->GetObjInventor() == SdrInventor::Default ) { switch(pObj->GetObjIdentifier()) diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index 9b9416a279e0..d6a0434a9d39 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -611,7 +611,7 @@ void SdPageObjsTLB::AddShapeList ( if( !aStr.isEmpty() ) { - if( pObj->GetObjInventor() == SdrInventor && pObj->GetObjIdentifier() == OBJ_OLE2 ) + if( pObj->GetObjInventor() == SdrInventor::Default && pObj->GetObjIdentifier() == OBJ_OLE2 ) { SvTreeListEntry *pNewEntry = InsertEntry( aStr, @@ -645,7 +645,7 @@ void SdPageObjsTLB::AddShapeList ( } } } - else if( pObj->GetObjInventor() == SdrInventor && pObj->GetObjIdentifier() == OBJ_GRAF ) + else if( pObj->GetObjInventor() == SdrInventor::Default && pObj->GetObjIdentifier() == OBJ_GRAF ) { SvTreeListEntry *pNewEntry = InsertEntry( aStr, @@ -913,11 +913,11 @@ void SdPageObjsTLB::RequestingChildren( SvTreeListEntry* pFileEntry ) OUString aStr( GetObjectName( pObj ) ); if( !aStr.isEmpty() ) { - if( pObj->GetObjInventor() == SdrInventor && pObj->GetObjIdentifier() == OBJ_OLE2 ) + if( pObj->GetObjInventor() == SdrInventor::Default && pObj->GetObjIdentifier() == OBJ_OLE2 ) { InsertEntry(aStr, maImgOle, maImgOle, pPageEntry); } - else if( pObj->GetObjInventor() == SdrInventor && pObj->GetObjIdentifier() == OBJ_GRAF ) + else if( pObj->GetObjInventor() == SdrInventor::Default && pObj->GetObjIdentifier() == OBJ_GRAF ) { InsertEntry(aStr, maImgGraphic, maImgGraphic, pPageEntry); } diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index df252fbcc333..d1a0b7472dd8 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -202,14 +202,14 @@ void SdTPAction::Construct() SdrMark* pMark = rMarkList.GetMark(0); pObj = pMark->GetMarkedSdrObj(); - sal_uInt32 nInv = pObj->GetObjInventor(); - sal_uInt16 nSdrObjKind = pObj->GetObjIdentifier(); + SdrInventor nInv = pObj->GetObjInventor(); + sal_uInt16 nSdrObjKind = pObj->GetObjIdentifier(); - if (nInv == SdrInventor && nSdrObjKind == OBJ_OLE2) + if (nInv == SdrInventor::Default && nSdrObjKind == OBJ_OLE2) { pOleObj = static_cast<SdrOle2Obj*>(pObj); } - else if (nInv == SdrInventor && nSdrObjKind == OBJ_GRAF) + else if (nInv == SdrInventor::Default && nSdrObjKind == OBJ_GRAF) { pGrafObj = static_cast<SdrGrafObj*>(pObj); } diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx index f695c7afc930..e5ec8b91c1be 100644 --- a/sd/source/ui/func/fuconstr.cxx +++ b/sd/source/ui/func/fuconstr.cxx @@ -189,7 +189,7 @@ bool FuConstruct::MouseButtonUp(const MouseEvent& rMEvt) if (mpView->GetDragMode() == SdrDragMode::Move && mpView->IsRotateAllowed() && (mpViewShell->GetFrameView()->IsClickChangeRotation() || - (pSingleObj && pSingleObj->GetObjInventor()==E3dInventor))) + (pSingleObj && pSingleObj->GetObjInventor()==SdrInventor::E3d))) { mpView->SetDragMode(SdrDragMode::Rotate); } diff --git a/sd/source/ui/func/fuconuno.cxx b/sd/source/ui/func/fuconuno.cxx index 8e8e29dbfe96..2632a7a6b05a 100644 --- a/sd/source/ui/func/fuconuno.cxx +++ b/sd/source/ui/func/fuconuno.cxx @@ -49,7 +49,7 @@ FuConstructUnoControl::FuConstructUnoControl ( SdDrawDocument* pDoc, SfxRequest& rReq) : FuConstruct(pViewSh, pWin, pView, pDoc, rReq) - , nInventor(0) + , nInventor(SdrInventor::Unknown) , nIdentifier(0) { } @@ -70,7 +70,7 @@ void FuConstructUnoControl::DoExecute( SfxRequest& rReq ) const SfxUInt32Item* pInventorItem = rReq.GetArg<SfxUInt32Item>(SID_FM_CONTROL_INVENTOR); const SfxUInt16Item* pIdentifierItem = rReq.GetArg<SfxUInt16Item>(SID_FM_CONTROL_IDENTIFIER); if( pInventorItem ) - nInventor = pInventorItem->GetValue(); + nInventor = (SdrInventor)pInventorItem->GetValue(); if( pIdentifierItem ) nIdentifier = pIdentifierItem->GetValue(); diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx index f593a96474d4..45c8dddbaaa2 100644 --- a/sd/source/ui/func/fudraw.cxx +++ b/sd/source/ui/func/fudraw.cxx @@ -690,10 +690,10 @@ void FuDraw::DoubleClick(const MouseEvent& rMEvt) SdrMark* pMark = rMarkList.GetMark(0); SdrObject* pObj = pMark->GetMarkedSdrObj(); - sal_uInt32 nInv = pObj->GetObjInventor(); - sal_uInt16 nSdrObjKind = pObj->GetObjIdentifier(); + SdrInventor nInv = pObj->GetObjInventor(); + sal_uInt16 nSdrObjKind = pObj->GetObjIdentifier(); - if (nInv == SdrInventor && nSdrObjKind == OBJ_OLE2) + if (nInv == SdrInventor::Default && nSdrObjKind == OBJ_OLE2) { DrawDocShell* pDocSh = mpDoc->GetDocSh(); @@ -705,7 +705,7 @@ void FuDraw::DoubleClick(const MouseEvent& rMEvt) mpViewShell->ActivateObject( static_cast<SdrOle2Obj*>(pObj), 0); } } - else if (nInv == SdrInventor && nSdrObjKind == OBJ_GRAF && pObj->IsEmptyPresObj() ) + else if (nInv == SdrInventor::Default && nSdrObjKind == OBJ_GRAF && pObj->IsEmptyPresObj() ) { mpViewShell->GetViewFrame()-> GetDispatcher()->Execute( SID_INSERT_GRAPHIC, @@ -722,7 +722,7 @@ void FuDraw::DoubleClick(const MouseEvent& rMEvt) SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, { &aItem }); } - else if (nInv == SdrInventor && nSdrObjKind == OBJ_GRUP) + else if (nInv == SdrInventor::Default && nSdrObjKind == OBJ_GRUP) { // hit group -> select subobject mpView->UnMarkAll(); diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx b/sd/source/ui/func/fuformatpaintbrush.cxx index d665ce0c607c..a234e78f96bb 100644 --- a/sd/source/ui/func/fuformatpaintbrush.cxx +++ b/sd/source/ui/func/fuformatpaintbrush.cxx @@ -226,7 +226,7 @@ void FuFormatPaintBrush::Deactivate() } } -bool FuFormatPaintBrush::HasContentForThisType( sal_uInt32 nObjectInventor, sal_uInt16 nObjectIdentifier ) const +bool FuFormatPaintBrush::HasContentForThisType( SdrInventor nObjectInventor, sal_uInt16 nObjectIdentifier ) const { if( mxItemSet.get() == nullptr ) return false; diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index 82e42bafb81c..f68e92bfa0ca 100644 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -571,7 +571,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq ) SdrMark* pMark = rMarkList.GetMark(0); SdrObject* pObj = pMark->GetMarkedSdrObj(); - if (pObj->GetObjInventor() == SdrInventor && + if (pObj->GetObjInventor() == SdrInventor::Default && pObj->GetObjIdentifier() == OBJ_OLE2) { if ( !static_cast<SdrOle2Obj*>(pObj)->GetObjRef().is() ) diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx index b000b3e8ddbc..aca9c8cc8905 100644 --- a/sd/source/ui/func/fuinsfil.cxx +++ b/sd/source/ui/func/fuinsfil.cxx @@ -480,7 +480,7 @@ void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium) { SdrObject* pObj = mpView->GetTextEditObject(); if( pObj && - pObj->GetObjInventor() == SdrInventor && + pObj->GetObjInventor() == SdrInventor::Default && pObj->GetObjIdentifier() == OBJ_TITLETEXT && pOutliner->GetParagraphCount() > 1 ) { diff --git a/sd/source/ui/func/fulinend.cxx b/sd/source/ui/func/fulinend.cxx index f79612f2bc52..a3ff6e656b92 100644 --- a/sd/source/ui/func/fulinend.cxx +++ b/sd/source/ui/func/fulinend.cxx @@ -71,7 +71,7 @@ void FuLineEnd::DoExecute( SfxRequest& ) pObj->TakeObjInfo( aInfoRec ); if( aInfoRec.bCanConvToPath && - pObj->GetObjInventor() == SdrInventor && + pObj->GetObjInventor() == SdrInventor::Default && pObj->GetObjIdentifier() != OBJ_GRUP ) // bCanConvToPath is sal_True for group objects, // but it crashes on ConvertToPathObj()! diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx index a63c5f12c7fb..eb7cfae7535a 100644 --- a/sd/source/ui/func/fuoaprms.cxx +++ b/sd/source/ui/func/fuoaprms.cxx @@ -295,7 +295,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) SdAnimationInfo* pInfo2 = SdDrawDocument::GetAnimationInfo(pObject2); pInfo = nullptr; - if (pObject1->GetObjInventor() == SdrInventor && + if (pObject1->GetObjInventor() == SdrInventor::Default && ((eKind1 == OBJ_LINE) || // 2 point line (eKind1 == OBJ_PLIN) || // Polygon (eKind1 == OBJ_PATHLINE)) && // Bezier curve @@ -304,7 +304,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) pInfo = pInfo2; } - if (pObject2->GetObjInventor() == SdrInventor && + if (pObject2->GetObjInventor() == SdrInventor::Default && ((eKind2 == OBJ_LINE) || // 2 point line (eKind2 == OBJ_PLIN) || // Polygon (eKind2 == OBJ_PATHLINE)) && // Bezier curve @@ -637,7 +637,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) SdrObjKind eKind2 = (SdrObjKind)pObject2->GetObjIdentifier(); SdrObject* pRunningObj = nullptr; - if (pObject1->GetObjInventor() == SdrInventor && + if (pObject1->GetObjInventor() == SdrInventor::Default && ((eKind1 == OBJ_LINE) || // 2 point line (eKind1 == OBJ_PLIN) || // Polygon (eKind1 == OBJ_PATHLINE))) // Bezier curve @@ -646,7 +646,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) pRunningObj = pObject2; } - if (pObject2->GetObjInventor() == SdrInventor && + if (pObject2->GetObjInventor() == SdrInventor::Default && ((eKind2 == OBJ_LINE) || // 2 point line (eKind2 == OBJ_PLIN) || // Polygon (eKind2 == OBJ_PATHLINE))) // Bezier curve diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx index 56d0dd25c5a7..7a28dbcb40e3 100644 --- a/sd/source/ui/func/fuolbull.cxx +++ b/sd/source/ui/func/fuolbull.cxx @@ -314,7 +314,7 @@ const SfxPoolItem* FuOutlineBullet::GetNumBulletItem(SfxItemSet& aNewAttr, sal_u for(size_t nNum = 0; nNum < nCount; ++nNum) { SdrObject* pObj = rMarkList.GetMark(nNum)->GetMarkedSdrObj(); - if( pObj->GetObjInventor() == SdrInventor ) + if( pObj->GetObjInventor() == SdrInventor::Default ) { switch(pObj->GetObjIdentifier()) { diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx index 4f58e0fb87a7..7ef6ab46b3b4 100644 --- a/sd/source/ui/func/fupoor.cxx +++ b/sd/source/ui/func/fupoor.cxx @@ -217,10 +217,10 @@ bool FuPoor::KeyInput(const KeyEvent& rKEvt) if(pObj && dynamic_cast< const SdrTextObj *>( pObj ) != nullptr) { - sal_uInt32 nInv(pObj->GetObjInventor()); + SdrInventor nInv(pObj->GetObjInventor()); sal_uInt16 nKnd(pObj->GetObjIdentifier()); - if(SdrInventor == nInv && + if(SdrInventor::Default == nInv && (OBJ_TITLETEXT == nKnd || OBJ_OUTLINETEXT == nKnd || OBJ_TEXT == nKnd)) { pCandidate = static_cast<SdrTextObj*>(pObj); @@ -849,10 +849,10 @@ bool FuPoor::KeyInput(const KeyEvent& rKEvt) if(pObj && dynamic_cast< const SdrTextObj *>( pObj ) != nullptr) { - sal_uInt32 nInv(pObj->GetObjInventor()); + SdrInventor nInv(pObj->GetObjInventor()); sal_uInt16 nKnd(pObj->GetObjIdentifier()); - if(SdrInventor == nInv && OBJ_TITLETEXT == nKnd) + if(SdrInventor::Default == nInv && OBJ_TITLETEXT == nKnd) { pCandidate = static_cast<SdrTextObj*>(pObj); } diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx index 5bdc4e01dbe0..f1e024947f0e 100644 --- a/sd/source/ui/func/fusel.cxx +++ b/sd/source/ui/func/fusel.cxx @@ -243,7 +243,7 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt) { sal_uInt16 nSdrObjKind = aVEvt.pObj->GetObjIdentifier(); - if (aVEvt.pObj->GetObjInventor() == SdrInventor && + if (aVEvt.pObj->GetObjInventor() == SdrInventor::Default && (nSdrObjKind == OBJ_TEXT || nSdrObjKind == OBJ_TITLETEXT || nSdrObjKind == OBJ_OUTLINETEXT || @@ -698,7 +698,7 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) && (rMEvt.GetClicks() != 2) && (mpViewShell->GetFrameView()->IsClickChangeRotation() || (pSingleObj - && pSingleObj->GetObjInventor()==E3dInventor)) + && pSingleObj->GetObjInventor()==SdrInventor::E3d)) && ! bSelectionOnly) { @@ -826,7 +826,7 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) ( mpView->GetDragMode() == SdrDragMode::Shear && !mpView->IsShearAllowed() && !mpView->IsDistortAllowed() ) || ( nSlotId==SID_CONVERT_TO_3D_LATHE && pSingleObj && - (pSingleObj->GetObjInventor() != SdrInventor || + (pSingleObj->GetObjInventor() != SdrInventor::Default || pSingleObj->GetObjIdentifier() == OBJ_MEASURE) ) ) { bReturn = true; diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index f020d4ee5006..1657d2a39895 100644 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -222,7 +222,7 @@ void FuText::DoExecute( SfxRequest& ) if (rMarkList.GetMarkCount() == 1) { SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); - if( pObj && (pObj->GetObjInventor() == SdrInventor ) && (pObj->GetObjIdentifier() == OBJ_TABLE) ) + if( pObj && (pObj->GetObjInventor() == SdrInventor::Default ) && (pObj->GetObjIdentifier() == OBJ_TABLE) ) { mpViewShell->GetViewShellBase().GetToolBarManager()->AddToolBarShell( ToolBarManager::TBG_FUNCTION, RID_DRAW_TABLE_TOOLBOX ); } @@ -923,7 +923,7 @@ bool FuText::KeyInput(const KeyEvent& rKEvt) } } - if ( mxTextObj.is() && mxTextObj->GetObjInventor() == SdrInventor && mxTextObj->GetObjIdentifier() == OBJ_TITLETEXT && rKEvt.GetKeyCode().GetCode() == KEY_RETURN ) + if ( mxTextObj.is() && mxTextObj->GetObjInventor() == SdrInventor::Default && mxTextObj->GetObjIdentifier() == OBJ_TITLETEXT && rKEvt.GetKeyCode().GetCode() == KEY_RETURN ) { // title text object: always soft breaks bShift = true; @@ -1036,10 +1036,10 @@ void FuText::SetInEditMode(const MouseEvent& rMEvt, bool bQuickDrag) if (GetTextObj() != mpView->GetTextEditObject() || bEmptyOutliner) { - sal_uInt32 nInv = mxTextObj->GetObjInventor(); - sal_uInt16 nSdrObjKind = mxTextObj->GetObjIdentifier(); + SdrInventor nInv = mxTextObj->GetObjInventor(); + sal_uInt16 nSdrObjKind = mxTextObj->GetObjIdentifier(); - if (nInv == SdrInventor && GetTextObj()->HasTextEdit() && + if (nInv == SdrInventor::Default && GetTextObj()->HasTextEdit() && (nSdrObjKind == OBJ_TEXT || nSdrObjKind == OBJ_TITLETEXT || nSdrObjKind == OBJ_OUTLINETEXT || !mxTextObj->IsEmptyPresObj() ) ) @@ -1064,7 +1064,7 @@ void FuText::SetInEditMode(const MouseEvent& rMEvt, bool bQuickDrag) pTextObj->setActiveText( pTextObj->CheckTextHit(aPnt ) ); } - if (mpView->SdrBeginTextEdit(pTextObj, pPV, mpWindow, true, pOutl) && mxTextObj->GetObjInventor() == SdrInventor) + if (mpView->SdrBeginTextEdit(pTextObj, pPV, mpWindow, true, pOutl) && mxTextObj->GetObjInventor() == SdrInventor::Default) { //tdf#102293 flush overlay before going on to pass clicks down to //the outline view which will want to paint selections diff --git a/sd/source/ui/func/futransf.cxx b/sd/source/ui/func/futransf.cxx index 02de2bdbb9d3..d8f33c578bbd 100644 --- a/sd/source/ui/func/futransf.cxx +++ b/sd/source/ui/func/futransf.cxx @@ -63,7 +63,7 @@ void FuTransform::DoExecute( SfxRequest& rReq ) const SdrMarkList& rMarkList = mpView->GetMarkedObjectList(); SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); if( rMarkList.GetMarkCount() == 1 && - pObj->GetObjInventor() == SdrInventor && + pObj->GetObjInventor() == SdrInventor::Default && pObj->GetObjIdentifier() == OBJ_CAPTION ) { // --------- itemset for caption -------- diff --git a/sd/source/ui/inc/fuconuno.hxx b/sd/source/ui/inc/fuconuno.hxx index 76c91a4485c3..c0fc3a959b9f 100644 --- a/sd/source/ui/inc/fuconuno.hxx +++ b/sd/source/ui/inc/fuconuno.hxx @@ -23,6 +23,8 @@ #include <svl/itemset.hxx> #include "fuconstr.hxx" +enum class SdrInventor : sal_uInt32; + namespace sd { /** @@ -56,8 +58,8 @@ protected: OUString aOldLayer; private: - sal_uInt32 nInventor; - sal_uInt16 nIdentifier; + SdrInventor nInventor; + sal_uInt16 nIdentifier; }; } // end of namespace sd diff --git a/sd/source/ui/inc/fuformatpaintbrush.hxx b/sd/source/ui/inc/fuformatpaintbrush.hxx index f5221910440d..4a3e3e83861e 100644 --- a/sd/source/ui/inc/fuformatpaintbrush.hxx +++ b/sd/source/ui/inc/fuformatpaintbrush.hxx @@ -50,7 +50,7 @@ private: void DoExecute( SfxRequest& rReq ) override; - bool HasContentForThisType( sal_uInt32 nObjectInventor, sal_uInt16 nObjectIdentifier ) const; + bool HasContentForThisType( SdrInventor nObjectInventor, sal_uInt16 nObjectIdentifier ) const; void Paste( bool, bool ); void implcancel(); diff --git a/sd/source/ui/tools/PreviewRenderer.cxx b/sd/source/ui/tools/PreviewRenderer.cxx index 9a761123cba2..ddc4e74ea613 100644 --- a/sd/source/ui/tools/PreviewRenderer.cxx +++ b/sd/source/ui/tools/PreviewRenderer.cxx @@ -517,7 +517,7 @@ drawinglayer::primitive2d::Primitive2DContainer ViewRedirector::createRedirected const bool bDoCreateGeometry (pObject->GetPage()->checkVisibility( rOriginal, rDisplayInfo, true)); if ( ! bDoCreateGeometry - && (pObject->GetObjInventor() != SdrInventor || pObject->GetObjIdentifier() != OBJ_PAGE)) + && (pObject->GetObjInventor() != SdrInventor::Default || pObject->GetObjIdentifier() != OBJ_PAGE)) { return drawinglayer::primitive2d::Primitive2DContainer(); } diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index a648abf91e9a..510256abd9ea 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -1053,7 +1053,7 @@ css::uno::Reference<css::uno::XInterface> SdXImpressDocument::create( } // create the API wrapper - pShape = CreateSvxShapeByTypeAndInventor( nType, SdrInventor, referer ); + pShape = CreateSvxShapeByTypeAndInventor( nType, SdrInventor::Default, referer ); // set shape type if( pShape && !mbClipBoard ) @@ -1063,7 +1063,7 @@ css::uno::Reference<css::uno::XInterface> SdXImpressDocument::create( } else if ( aServiceSpecifier == "com.sun.star.drawing.TableShape" ) { - SvxShape* pShape = CreateSvxShapeByTypeAndInventor( OBJ_TABLE, SdrInventor, referer ); + SvxShape* pShape = CreateSvxShapeByTypeAndInventor( OBJ_TABLE, SdrInventor::Default, referer ); if( pShape && !mbClipBoard ) pShape->SetShapeType(aServiceSpecifier); @@ -1758,11 +1758,11 @@ vcl::PDFWriter::StructElement ImplRenderPaintProc::ImplBegStructureTag( SdrObjec if ( pPDFExtOutDevData && pPDFExtOutDevData->GetIsExportTaggedPDF() ) { - sal_uInt32 nInventor = rObject.GetObjInventor(); - sal_uInt16 nIdentifier = rObject.GetObjIdentifier(); - bool bIsTextObj = dynamic_cast< const SdrTextObj *>( &rObject ) != nullptr; + SdrInventor nInventor = rObject.GetObjInventor(); + sal_uInt16 nIdentifier = rObject.GetObjIdentifier(); + bool bIsTextObj = dynamic_cast< const SdrTextObj *>( &rObject ) != nullptr; - if ( nInventor == SdrInventor ) + if ( nInventor == SdrInventor::Default ) { if ( nIdentifier == OBJ_GRUP ) eElement = vcl::PDFWriter::Section; diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index ac8f48433d12..4a1db16755e3 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -862,7 +862,7 @@ uno::Sequence< OUString > SAL_CALL SdXShape::getSupportedServiceNames() throw(cs "com.sun.star.document.LinkTarget"} ); SdrObject* pObj = mpShape->GetSdrObject(); - if(pObj && pObj->GetObjInventor() == SdrInventor ) + if(pObj && pObj->GetObjInventor() == SdrInventor::Default ) { sal_uInt32 nInventor = pObj->GetObjIdentifier(); switch( nInventor ) diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index 11c16dfac953..9e5f6feff2dc 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -409,7 +409,7 @@ SdrObject * SdGenericDrawPage::CreateSdrObject_( const Reference< drawing::XShap if( !aType.startsWith( aPrefix ) ) { SdrObject* pObj = SvxFmDrawPage::CreateSdrObject_( xShape ); - if( pObj && ( (pObj->GetObjInventor() != SdrInventor) || (pObj->GetObjIdentifier() != OBJ_PAGE) ) ) + if( pObj && ( (pObj->GetObjInventor() != SdrInventor::Default) || (pObj->GetObjIdentifier() != OBJ_PAGE) ) ) { SdDrawDocument* pDoc = static_cast<SdDrawDocument*>(GetPage()->GetModel()); if( pDoc ) @@ -1410,7 +1410,7 @@ Reference< drawing::XShape > SdGenericDrawPage::CreateShape(SdrObject *pObj) co SvxShape* pShape = nullptr; - if(pObj->GetObjInventor() == SdrInventor) + if(pObj->GetObjInventor() == SdrInventor::Default) { sal_uInt32 nInventor = pObj->GetObjIdentifier(); switch( nInventor ) diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index 5eb778bf92af..3aeac30030f6 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -1664,7 +1664,7 @@ private: while (pTextObj==nullptr && nObj < pPage->GetObjCount()) { SdrObject* pObj = pPage->GetObj(nObj++); - if (pObj->GetObjInventor() == SdrInventor + if (pObj->GetObjInventor() == SdrInventor::Default && pObj->GetObjIdentifier() == OBJ_TITLETEXT) { pTextObj = dynamic_cast<SdrTextObj*>(pObj); @@ -1688,7 +1688,7 @@ private: while (pTextObj==nullptr && nObj<pPage->GetObjCount()) { SdrObject* pObj = pPage->GetObj(nObj++); - if (pObj->GetObjInventor() == SdrInventor + if (pObj->GetObjInventor() == SdrInventor::Default && pObj->GetObjIdentifier() == OBJ_OUTLINETEXT) { pTextObj = dynamic_cast<SdrTextObj*>(pObj); diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx index 497ae7585ba8..9292cf50a08e 100644 --- a/sd/source/ui/view/drawview.cxx +++ b/sd/source/ui/view/drawview.cxx @@ -144,9 +144,9 @@ bool DrawView::SetAttributes(const SfxItemSet& rSet, { // Textedit - sal_uInt32 nInv = pEditObject->GetObjInventor(); + SdrInventor nInv = pEditObject->GetObjInventor(); - if (nInv == SdrInventor) + if (nInv == SdrInventor::Default) { sal_uInt16 eObjKind = pEditObject->GetObjIdentifier(); PresObjKind ePresObjKind = rPage.GetPresObjKind(pEditObject); @@ -270,10 +270,10 @@ bool DrawView::SetAttributes(const SfxItemSet& rSet, const size_t nMarkCount = rList.GetMarkCount(); for (size_t nMark = 0; nMark < nMarkCount; ++nMark) { - SdrObject* pObject = rList.GetMark(nMark)->GetMarkedSdrObj(); - sal_uInt32 nInv = pObject->GetObjInventor(); + SdrObject* pObject = rList.GetMark(nMark)->GetMarkedSdrObj(); + SdrInventor nInv = pObject->GetObjInventor(); - if (nInv == SdrInventor) + if (nInv == SdrInventor::Default) { sal_uInt16 eObjKind = pObject->GetObjIdentifier(); PresObjKind ePresObjKind = rPage.GetPresObjKind(pObject); diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index a5216754615a..02b965c35346 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -177,10 +177,10 @@ void DrawViewShell::SelectionHasChanged() SdrMark* pMark = rMarkList.GetMark(0); SdrObject* pObj = pMark->GetMarkedSdrObj(); - sal_uInt32 nInv = pObj->GetObjInventor(); - sal_uInt16 nSdrObjKind = pObj->GetObjIdentifier(); + SdrInventor nInv = pObj->GetObjInventor(); + sal_uInt16 nSdrObjKind = pObj->GetObjIdentifier(); - if (nInv == SdrInventor && nSdrObjKind == OBJ_OLE2) + if (nInv == SdrInventor::Default && nSdrObjKind == OBJ_OLE2) { pOleObj = static_cast<SdrOle2Obj*>(pObj); UpdateIMapDlg( pObj ); @@ -719,10 +719,10 @@ ErrCode DrawViewShell::DoVerb(long nVerb) SdrMark* pMark = rMarkList.GetMark(0); SdrObject* pObj = pMark->GetMarkedSdrObj(); - sal_uInt32 nInv = pObj->GetObjInventor(); - sal_uInt16 nSdrObjKind = pObj->GetObjIdentifier(); + SdrInventor nInv = pObj->GetObjInventor(); + sal_uInt16 nSdrObjKind = pObj->GetObjIdentifier(); - if (nInv == SdrInventor && nSdrObjKind == OBJ_OLE2) + if (nInv == SdrInventor::Default && nSdrObjKind == OBJ_OLE2) { ActivateObject( static_cast<SdrOle2Obj*>(pObj), nVerb); } diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx index 8d3ea52d9e2e..d24e4cbeaefb 100644 --- a/sd/source/ui/view/drviews3.cxx +++ b/sd/source/ui/view/drviews3.cxx @@ -900,7 +900,7 @@ void DrawViewShell::GetRulerState(SfxItemSet& rSet) if( mpDrawView->IsTextEdit() ) { SdrObject* pObj = mpDrawView->GetMarkedObjectList().GetMark( 0 )->GetMarkedSdrObj(); - if( pObj->GetObjInventor() == SdrInventor) + if( pObj->GetObjInventor() == SdrInventor::Default) { SfxItemSet aEditAttr( GetDoc()->GetPool() ); mpDrawView->GetAttributes( aEditAttr ); diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx index 5c95ce82afda..3ce20cdb5796 100644 --- a/sd/source/ui/view/drviews4.cxx +++ b/sd/source/ui/view/drviews4.cxx @@ -155,10 +155,10 @@ bool DrawViewShell::KeyInput (const KeyEvent& rKEvt, ::sd::Window* pWin) if(pObj && dynamic_cast< const SdrTextObj *>( pObj ) != nullptr) { - sal_uInt32 nInv(pObj->GetObjInventor()); - sal_uInt16 nKnd(pObj->GetObjIdentifier()); + SdrInventor nInv(pObj->GetObjInventor()); + sal_uInt16 nKnd(pObj->GetObjIdentifier()); - if(SdrInventor == nInv && + if(SdrInventor::Default == nInv && (OBJ_TITLETEXT == nKnd || OBJ_OUTLINETEXT == nKnd || OBJ_TEXT == nKnd) && bDidVisitOldObject) { @@ -622,7 +622,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin) } else { - if( (pObj->GetObjInventor() == SdrInventor) && (pObj->GetObjIdentifier() == OBJ_TABLE) ) + if( (pObj->GetObjInventor() == SdrInventor::Default) && (pObj->GetObjIdentifier() == OBJ_TABLE) ) { aPopupId = "tabletext"; } @@ -635,10 +635,10 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin) } else { - sal_uInt32 nInv = pObj->GetObjInventor(); - sal_uInt16 nId = pObj->GetObjIdentifier(); + SdrInventor nInv = pObj->GetObjInventor(); + sal_uInt16 nId = pObj->GetObjIdentifier(); - if (nInv == SdrInventor) + if (nInv == SdrInventor::Default) { switch ( nId ) { @@ -701,7 +701,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin) break; } } - else if( nInv == E3dInventor ) + else if( nInv == SdrInventor::E3d ) { if( nId == E3D_POLYSCENE_ID || nId == E3D_SCENE_ID ) { @@ -713,7 +713,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin) else aPopupId = "3dobject"; } - else if( nInv == FmFormInventor ) + else if( nInv == SdrInventor::FmForm ) { aPopupId = "form"; } diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx index 7fa40d53e97e..1e137982404e 100644 --- a/sd/source/ui/view/drviews6.cxx +++ b/sd/source/ui/view/drviews6.cxx @@ -183,12 +183,12 @@ void DrawViewShell::GetAnimationWinState( SfxItemSet& rSet ) else // 1 Object { const SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); - sal_uInt32 nInv = pObj->GetObjInventor(); - sal_uInt16 nId = pObj->GetObjIdentifier(); + SdrInventor nInv = pObj->GetObjInventor(); + sal_uInt16 nId = pObj->GetObjIdentifier(); // 1 selected group object - if( nInv == SdrInventor && nId == OBJ_GRUP ) + if( nInv == SdrInventor::Default && nId == OBJ_GRUP ) nValue = 3; - else if( nInv == SdrInventor && nId == OBJ_GRAF ) // Animated GIF ? + else if( nInv == SdrInventor::Default && nId == OBJ_GRAF ) // Animated GIF ? { sal_uInt16 nCount = 0; diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index 459ac620458c..9af3432cf119 100644 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -847,7 +847,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) for(size_t nNum = 0; nNum < nMarkCount; ++nNum) { SdrObject* pObj = rMarkList.GetMark(nNum)->GetMarkedSdrObj(); - if( pObj->GetObjInventor() == SdrInventor ) + if( pObj->GetObjInventor() == SdrInventor::Default ) { if( pObj->GetObjIdentifier() == OBJ_OUTLINETEXT ) { @@ -1295,11 +1295,11 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) // const size_t nMarkCount = aMarkList.GetMarkCount(); for (size_t i=0; i < nMarkCount && !bFoundAny; ++i) { - SdrObject* pObj= aMarkList.GetMark(i)->GetMarkedSdrObj(); - sal_uInt16 nId = pObj->GetObjIdentifier(); - sal_uInt32 nInv = pObj->GetObjInventor(); + SdrObject* pObj = aMarkList.GetMark(i)->GetMarkedSdrObj(); + sal_uInt16 nId = pObj->GetObjIdentifier(); + SdrInventor nInv = pObj->GetObjInventor(); - if(nInv == SdrInventor) + if(nInv == SdrInventor::Default) { // 2D objects switch( nId ) @@ -1358,7 +1358,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) bFoundAny = true; } } - else if(nInv == E3dInventor) + else if(nInv == SdrInventor::E3d) { // 3D objects bFoundAny = true; @@ -1420,7 +1420,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) { SdrUnoObj* pUnoCtrl = dynamic_cast<SdrUnoObj*>( mpDrawView->GetMarkedObjectList().GetMark(0)->GetMarkedSdrObj() ); - if ( pUnoCtrl && FmFormInventor == pUnoCtrl->GetObjInventor() ) + if ( pUnoCtrl && SdrInventor::FmForm == pUnoCtrl->GetObjInventor() ) { uno::Reference< awt::XControlModel > xControlModel( pUnoCtrl->GetUnoControlModel() ); if( xControlModel.is() ) diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx index fdea39d5bf36..438560f70342 100644 --- a/sd/source/ui/view/drviews9.cxx +++ b/sd/source/ui/view/drviews9.cxx @@ -142,7 +142,7 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq) SdrMark* pMark = rMarkList.GetMark(0); SdrObject* pObj = pMark->GetMarkedSdrObj(); - if (pObj->GetObjInventor() == SdrInventor && pObj->GetObjIdentifier() == OBJ_GRAF) + if (pObj->GetObjInventor() == SdrInventor::Default && pObj->GetObjIdentifier() == OBJ_GRAF) { pGrafObj = static_cast<SdrGrafObj*>(pObj); diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index 690990118e3a..cff011ed0dc2 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -1481,7 +1481,7 @@ void DrawViewShell::InsertURLButton(const OUString& rURL, const OUString& rText, if( pMarkedObj ) try { // change first marked object - if( (FmFormInventor == pMarkedObj->GetObjInventor() && pMarkedObj->GetObjIdentifier() == OBJ_FM_BUTTON) ) + if( (SdrInventor::FmForm == pMarkedObj->GetObjInventor() && pMarkedObj->GetObjIdentifier() == OBJ_FM_BUTTON) ) { bNewObj = false; @@ -1519,7 +1519,7 @@ void DrawViewShell::InsertURLButton(const OUString& rURL, const OUString& rText, if (bNewObj) try { - SdrUnoObj* pUnoCtrl = static_cast< SdrUnoObj* >( SdrObjFactory::MakeNewObject(FmFormInventor, OBJ_FM_BUTTON, + SdrUnoObj* pUnoCtrl = static_cast< SdrUnoObj* >( SdrObjFactory::MakeNewObject(SdrInventor::FmForm, OBJ_FM_BUTTON, mpDrawView->GetSdrPageView()->GetPage(), GetDoc()) ); Reference< awt::XControlModel > xControlModel( pUnoCtrl->GetUnoControlModel(), uno::UNO_QUERY_THROW ); diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx index bce88e6b2f54..e6fe654eeece 100644 --- a/sd/source/ui/view/drviewsf.cxx +++ b/sd/source/ui/view/drviewsf.cxx @@ -122,7 +122,7 @@ void DrawViewShell::GetCtrlState(SfxItemSet &rSet) bool bFound = false; SdrObject* pMarkedObj = mpDrawView->GetMarkedObjectList().GetMark(0)->GetMarkedSdrObj(); - if( pMarkedObj && (FmFormInventor == pMarkedObj->GetObjInventor()) ) + if( pMarkedObj && (SdrInventor::FmForm == pMarkedObj->GetObjInventor()) ) { SdrUnoObj* pUnoCtrl = dynamic_cast< SdrUnoObj* >( pMarkedObj ); @@ -647,7 +647,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) for (size_t nIndex = 0; nIndex < nMarkCount; ++nIndex) { SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >(rMarkList.GetMark(nIndex)->GetMarkedSdrObj()); - if (pTextObj && pTextObj->GetObjInventor() == SdrInventor) + if (pTextObj && pTextObj->GetObjInventor() == SdrInventor::Default) { if (pTextObj->GetObjIdentifier() != OBJ_OLE2) { diff --git a/sd/source/ui/view/drviewsj.cxx b/sd/source/ui/view/drviewsj.cxx index 1d2f20d64082..6043ba6b1f2a 100644 --- a/sd/source/ui/view/drviewsj.cxx +++ b/sd/source/ui/view/drviewsj.cxx @@ -106,8 +106,8 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet ) const SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); const SdrGrafObj* pSdrGrafObj = dynamic_cast< const SdrGrafObj* >(pObj); const SdrOle2Obj* pSdrOle2Obj = dynamic_cast< const SdrOle2Obj* >(pObj); - sal_uInt32 nInv = pObj->GetObjInventor(); - sal_uInt16 nId = pObj->GetObjIdentifier(); + SdrInventor nInv = pObj->GetObjInventor(); + sal_uInt16 nId = pObj->GetObjIdentifier(); SdrObjTransformInfoRec aInfoRec; pObj->TakeObjInfo( aInfoRec ); @@ -127,19 +127,19 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet ) /* If it is not a group object or 3D object, we disable "enter group". */ - if( !( ( dynamic_cast< const SdrObjGroup *>( pObj ) != nullptr && nInv == SdrInventor ) || + if( !( ( dynamic_cast< const SdrObjGroup *>( pObj ) != nullptr && nInv == SdrInventor::Default ) || (dynamic_cast< const E3dPolyScene* >(pObj) != nullptr|| dynamic_cast< const E3dScene* >(pObj) != nullptr /*|| pObj->ISA (E3dCompoundObject) */) ) ) { rSet.DisableItem( SID_ENTER_GROUP ); } // If it is not a group object, we disable "ungroup" - if(!(dynamic_cast< const SdrObjGroup *>( pObj ) != nullptr && nInv == SdrInventor)) + if(!(dynamic_cast< const SdrObjGroup *>( pObj ) != nullptr && nInv == SdrInventor::Default)) { rSet.DisableItem(SID_UNGROUP); } - if( nInv == SdrInventor && + if( nInv == SdrInventor::Default && (nId == OBJ_LINE || nId == OBJ_PLIN || nId == OBJ_PATHLINE || @@ -154,26 +154,26 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet ) { // JOE: a group object may can be converted into a PathObj rSet.DisableItem( SID_LINEEND_POLYGON ); } - if(nInv == SdrInventor && + if(nInv == SdrInventor::Default && (nId == OBJ_PATHFILL || nId == OBJ_PATHLINE || !aInfoRec.bCanConvToPath)) rSet.DisableItem( SID_CHANGEBEZIER ); - if( nInv == SdrInventor && + if( nInv == SdrInventor::Default && ( nId == OBJ_POLY || nId == OBJ_PLIN || !aInfoRec.bCanConvToPoly ) && !GetView()->IsVectorizeAllowed() ) { rSet.DisableItem( SID_CHANGEPOLYGON ); } - if(nInv == SdrInventor && nId == OBJ_TABLE ) + if(nInv == SdrInventor::Default && nId == OBJ_TABLE ) { rSet.DisableItem( SID_TEXTATTR_DLG ); } - if( nInv != SdrInventor || nId != OBJ_MEASURE ) + if( nInv != SdrInventor::Default || nId != OBJ_MEASURE ) rSet.DisableItem( SID_MEASURE_DLG ); - if( nInv != SdrInventor || nId != OBJ_EDGE ) + if( nInv != SdrInventor::Default || nId != OBJ_EDGE ) rSet.DisableItem( SID_CONNECTION_DLG ); else { @@ -197,7 +197,7 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet ) rSet.DisableItem( SID_CONNECTION_NEW_ROUTING ); } - if ( nInv == E3dInventor || + if ( nInv == SdrInventor::E3d || (!mpDrawView->IsConvertToPathObjPossible() && !mpDrawView->IsShearAllowed() && !mpDrawView->IsDistortAllowed()) ) @@ -305,10 +305,10 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet ) for( size_t i = 0; i < nMarkCount && !bText && i < 50; ++i ) { SdrObject* pObj = rMarkList.GetMark(i)->GetMarkedSdrObj(); - sal_uInt32 nInv = pObj->GetObjInventor(); - sal_uInt16 nId = pObj->GetObjIdentifier(); + SdrInventor nInv = pObj->GetObjInventor(); + sal_uInt16 nId = pObj->GetObjIdentifier(); - if (nInv == SdrInventor) + if (nInv == SdrInventor::Default) { switch (nId) { @@ -337,7 +337,7 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet ) case OBJ_TABLE: bTable = true; break; } } - else if (nInv == E3dInventor) + else if (nInv == SdrInventor::E3d) { if(dynamic_cast< const E3dScene *>( pObj ) != nullptr) b3dObj = true; diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index 35dd486ef145..edc461fe7f1d 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -919,7 +919,7 @@ SdrTextObj* OutlineView::GetTitleTextObject(SdrPage* pPage) for (size_t nObject = 0; nObject < nObjectCount; ++nObject) { SdrObject* pObject = pPage->GetObj(nObject); - if (pObject->GetObjInventor() == SdrInventor && + if (pObject->GetObjInventor() == SdrInventor::Default && pObject->GetObjIdentifier() == OBJ_TITLETEXT) { pResult = static_cast<SdrTextObj*>(pObject); @@ -940,7 +940,7 @@ SdrTextObj* OutlineView::GetOutlineTextObject(SdrPage* pPage) for (size_t nObject = 0; nObject < nObjectCount; ++nObject) { SdrObject* pObject = pPage->GetObj(nObject); - if (pObject->GetObjInventor() == SdrInventor && + if (pObject->GetObjInventor() == SdrInventor::Default && pObject->GetObjIdentifier() == OBJ_OUTLINETEXT) { pResult = static_cast<SdrTextObj*>(pObject); diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index 014a67d1fa3e..193b5a45551f 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -208,7 +208,7 @@ drawinglayer::primitive2d::Primitive2DContainer ViewRedirector::createRedirected { const bool bDoCreateGeometry(pObject->GetPage()->checkVisibility( rOriginal, rDisplayInfo, true )); - if(!bDoCreateGeometry && !(( pObject->GetObjInventor() == SdrInventor ) && ( pObject->GetObjIdentifier() == OBJ_PAGE )) ) + if(!bDoCreateGeometry && !(( pObject->GetObjInventor() == SdrInventor::Default ) && ( pObject->GetObjIdentifier() == OBJ_PAGE )) ) return xRetval; PresObjKind eKind(PRESOBJ_NONE); @@ -234,7 +234,7 @@ drawinglayer::primitive2d::Primitive2DContainer ViewRedirector::createRedirected bCreateOutline = true; } } - else if( ( pObject->GetObjInventor() == SdrInventor ) && ( pObject->GetObjIdentifier() == OBJ_TEXT ) ) + else if( ( pObject->GetObjInventor() == SdrInventor::Default ) && ( pObject->GetObjIdentifier() == OBJ_TEXT ) ) { if( pObjectsSdPage ) { @@ -250,7 +250,7 @@ drawinglayer::primitive2d::Primitive2DContainer ViewRedirector::createRedirected } } } - else if( ( pObject->GetObjInventor() == SdrInventor ) && ( pObject->GetObjIdentifier() == OBJ_PAGE ) ) + else if( ( pObject->GetObjInventor() == SdrInventor::Default ) && ( pObject->GetObjIdentifier() == OBJ_PAGE ) ) { // only for handout page, else this frame will be created for each // page preview object in SlideSorter and PagePane @@ -728,7 +728,7 @@ bool View::SdrBeginTextEdit( if( pObj && pObj->GetPage() ) { Color aBackground; - if( pObj->GetObjInventor() == SdrInventor && pObj->GetObjIdentifier() == OBJ_TABLE ) + if( pObj->GetObjInventor() == SdrInventor::Default && pObj->GetObjIdentifier() == OBJ_TABLE ) { aBackground = GetTextEditBackgroundColor(*this); } @@ -866,7 +866,7 @@ void View::SetMarkedOriginalSize() { SdrObject* pObj = GetMarkedObjectByIndex(i); - if( pObj->GetObjInventor() == SdrInventor ) + if( pObj->GetObjInventor() == SdrInventor::Default ) { if( pObj->GetObjIdentifier() == OBJ_OLE2 ) { diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index 169e751d947d..91be0281b146 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -888,7 +888,7 @@ const SfxPoolItem* ViewShell::GetNumBulletItem(SfxItemSet& aNewAttr, sal_uInt16& for(size_t nNum = 0; nNum < nCount; ++nNum) { SdrObject* pObj = rMarkList.GetMark(nNum)->GetMarkedSdrObj(); - if( pObj->GetObjInventor() == SdrInventor ) + if( pObj->GetObjInventor() == SdrInventor::Default ) { switch(pObj->GetObjIdentifier()) { |