diff options
148 files changed, 424 insertions, 449 deletions
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx index 9d8b0adccd84..411cb5506cd2 100644 --- a/basctl/source/dlged/dlged.cxx +++ b/basctl/source/dlged/dlged.cxx @@ -606,7 +606,7 @@ void DlgEditor::SetInsertObj( sal_uInt16 eObj ) { eActObj = eObj; - pDlgEdView->SetCurrentObj( eActObj, DlgInventor ); + pDlgEdView->SetCurrentObj( eActObj, SdrInventor::BasicDialog ); } void DlgEditor::CreateDefaultObject() diff --git a/basctl/source/dlged/dlgedfac.cxx b/basctl/source/dlged/dlgedfac.cxx index cb2fbc68660d..8933f9a305e0 100644 --- a/basctl/source/dlged/dlgedfac.cxx +++ b/basctl/source/dlged/dlgedfac.cxx @@ -61,7 +61,7 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjCreatorParams, aParams, SdrObject* ) } SdrObject* pNewObj = nullptr; - if( (aParams.nInventor == DlgInventor) && + if( (aParams.nInventor == SdrInventor::BasicDialog) && (aParams.nObjIdentifier >= OBJ_DLG_PUSHBUTTON) && (aParams.nObjIdentifier <= OBJ_DLG_FORMHSCROLL) ) { diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx index 10020bfdf260..a8dd5625cf58 100644 --- a/basctl/source/dlged/dlgedobj.cxx +++ b/basctl/source/dlged/dlgedobj.cxx @@ -749,9 +749,9 @@ OUString DlgEdObj::GetUniqueName() const return aUniqueName; } -sal_uInt32 DlgEdObj::GetObjInventor() const +SdrInventor DlgEdObj::GetObjInventor() const { - return DlgInventor; + return SdrInventor::BasicDialog; } sal_uInt16 DlgEdObj::GetObjIdentifier() const diff --git a/basctl/source/inc/dlgeddef.hxx b/basctl/source/inc/dlgeddef.hxx index bb649a453ebe..e14bc28dd0f2 100644 --- a/basctl/source/inc/dlgeddef.hxx +++ b/basctl/source/inc/dlgeddef.hxx @@ -25,11 +25,6 @@ namespace basctl { -const sal_uInt32 DlgInventor = sal_uInt32('D')*0x00000001+ - sal_uInt32('L')*0x00000100+ - sal_uInt32('G')*0x00010000+ - sal_uInt32('1')*0x01000000; - enum { OBJ_DLG_CONTROL = 1, diff --git a/basctl/source/inc/dlgedobj.hxx b/basctl/source/inc/dlgedobj.hxx index 101a69523f76..3eb50a29eb75 100644 --- a/basctl/source/inc/dlgedobj.hxx +++ b/basctl/source/inc/dlgedobj.hxx @@ -92,7 +92,7 @@ public: void SetDlgEdForm( DlgEdForm* pForm ) { pDlgEdForm = pForm; } DlgEdForm* GetDlgEdForm() const { return pDlgEdForm; } - virtual sal_uInt32 GetObjInventor() const override; + virtual SdrInventor GetObjInventor() const override; virtual sal_uInt16 GetObjIdentifier() const override; virtual DlgEdObj* Clone() const override; // not working yet diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index c11767a955a7..43d95f5b129d 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -1927,7 +1927,7 @@ void SvxSwPosSizeTabPage::SetView( const SdrView* pSdrView ) { const SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); SdrObjKind eKind = (SdrObjKind) pObj->GetObjIdentifier(); - if( ( pObj->GetObjInventor() == SdrInventor ) && + if( ( pObj->GetObjInventor() == SdrInventor::Default ) && ( eKind==OBJ_TEXT || eKind==OBJ_TITLETEXT || eKind==OBJ_OUTLINETEXT) && pObj->HasText() ) { diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx index e8d080e3a812..85b4f311de3c 100644 --- a/cui/source/tabpages/tabline.cxx +++ b/cui/source/tabpages/tabline.cxx @@ -69,7 +69,7 @@ SvxLineTabDialog::SvxLineTabDialog mbAreaTP( false ) { bool bLineOnly = false; - if( pObj && pObj->GetObjInventor() == SdrInventor ) + if( pObj && pObj->GetObjInventor() == SdrInventor::Default ) { switch( pObj->GetObjIdentifier() ) { diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index 98d1f9b765f4..3e791e23b18c 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -876,7 +876,7 @@ void SvxPositionSizeTabPage::Construct() const SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); const SdrObjKind eKind((SdrObjKind)pObj->GetObjIdentifier()); - if((pObj->GetObjInventor() == SdrInventor) && + if((pObj->GetObjInventor() == SdrInventor::Default) && (OBJ_TEXT == eKind || OBJ_TITLETEXT == eKind || OBJ_OUTLINETEXT == eKind) && pObj->HasText()) { diff --git a/editeng/source/uno/unoforou.cxx b/editeng/source/uno/unoforou.cxx index dfa76ffb80cd..5a3f5f46cf97 100644 --- a/editeng/source/uno/unoforou.cxx +++ b/editeng/source/uno/unoforou.cxx @@ -476,7 +476,7 @@ bool SvxOutlinerForwarder::SetDepth( sal_Int32 nPara, sal_Int16 nNewDepth ) { rOutliner.SetDepth( pPara, nNewDepth ); -// const bool bOutlinerText = pSdrObject && (pSdrObject->GetObjInventor() == SdrInventor) && (pSdrObject->GetObjIdentifier() == OBJ_OUTLINETEXT); +// const bool bOutlinerText = pSdrObject && (pSdrObject->GetObjInventor() == SdrInventor::Default) && (pSdrObject->GetObjIdentifier() == OBJ_OUTLINETEXT); if( bOutlinerText ) rOutliner.SetLevelDependendStyleSheet( nPara ); diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 6c67b1ee15cb..8c017ec260df 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -460,9 +460,9 @@ void SvxMSDffManager::SolveSolver( const SvxMSDffSolverContainer& rSolver ) SdrGluePointList* pList = pO->ForceGluePointList(); sal_Int32 nId = nC; - sal_uInt32 nInventor = pO->GetObjInventor(); + SdrInventor nInventor = pO->GetObjInventor(); - if( nInventor == SdrInventor ) + if( nInventor == SdrInventor::Default ) { bool bValidGluePoint = false; sal_uInt32 nObjId = pO->GetObjIdentifier(); diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 6eada0130a03..74054409fe97 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -2224,7 +2224,7 @@ SdrObject* SdrPowerPointImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* { TSS_Type nDestinationInstance = pTextObj->GetDestinationInstance() ; SdrOutliner& rOutliner = pText->ImpGetDrawOutliner(); - if ( ( pText->GetObjInventor() == SdrInventor ) && ( pText->GetObjIdentifier() == OBJ_TITLETEXT ) ) // Outliner-Style for Title-Text object?!? (->of DL) + if ( ( pText->GetObjInventor() == SdrInventor::Default ) && ( pText->GetObjIdentifier() == OBJ_TITLETEXT ) ) // Outliner-Style for Title-Text object?!? (->of DL) rOutliner.Init( OutlinerMode::TitleObject ); // Outliner reset bool bOldUpdateMode = rOutliner.GetUpdateMode(); diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx index 22ab642f9e81..d0ccd36d806e 100644 --- a/include/filter/msfilter/svdfppt.hxx +++ b/include/filter/msfilter/svdfppt.hxx @@ -177,12 +177,6 @@ enum class TSS_Type : unsigned { Unknown = 0xffffffff // or invalid }; -// Inventor-Id for PPT UserData -const sal_uInt32 PPTInventor = sal_uInt32('P') * 0x00000001 - + sal_uInt32('P') * 0x00000100 - + sal_uInt32('T') * 0x00010000 - + sal_uInt32('0') * 0x01000000; - const int nMaxPPTLevels = 5; // Object IDs for StarDraw UserData diff --git a/include/svx/fmglob.hxx b/include/svx/fmglob.hxx index b82231ed29e0..cc8f51ce175c 100644 --- a/include/svx/fmglob.hxx +++ b/include/svx/fmglob.hxx @@ -23,11 +23,6 @@ #include <com/sun/star/form/FormComponentType.hpp> #include <svx/svdobj.hxx> -const sal_uInt32 FmFormInventor = sal_uInt32('F')*0x00000001+ - sal_uInt32('M')*0x00000100+ - sal_uInt32('0')*0x00010000+ - sal_uInt32('1')*0x01000000; - const sal_uInt16 OBJ_FM_CONTROL = css::form::FormComponentType::CONTROL; // for form components const sal_uInt16 OBJ_FM_EDIT = css::form::FormComponentType::TEXTFIELD; diff --git a/include/svx/fmview.hxx b/include/svx/fmview.hxx index 5e28fe49fc50..6de1f3b3668d 100644 --- a/include/svx/fmview.hxx +++ b/include/svx/fmview.hxx @@ -93,7 +93,7 @@ public: const css::uno::Reference< css::util::XNumberFormats >& _rxNumberFormats, sal_uInt16 _nControlObjectID, const OUString& _rFieldPostfix, - sal_uInt32 _nInventor, + SdrInventor _nInventor, sal_uInt16 _nLabelObjectID, SdrPage* _pLabelPage, SdrPage* _pControlPage, diff --git a/include/svx/galmisc.hxx b/include/svx/galmisc.hxx index 4598c262cb39..4031af58369e 100644 --- a/include/svx/galmisc.hxx +++ b/include/svx/galmisc.hxx @@ -61,7 +61,6 @@ enum class SgaObjKind Inet = 6 // graphics from the internet }; -#define IV_IMAPINFO (sal_uInt32('S')*0x00000001+sal_uInt32('D')*0x00000100+sal_uInt32('U')*0x00010000+sal_uInt32('D')*0x01000000) #define ID_IMAPINFO 2 #define GAL_RES(nId) ResId(nId, *GetGalleryResMgr()) @@ -106,10 +105,10 @@ class SgaIMapInfo : public SdrObjUserData, public SfxListener ImageMap aImageMap; public: - SgaIMapInfo() : SdrObjUserData( IV_IMAPINFO, ID_IMAPINFO ) {}; + SgaIMapInfo() : SdrObjUserData( SdrInventor::SgaImap, ID_IMAPINFO ) {}; SgaIMapInfo( const ImageMap& rImageMap) : - SdrObjUserData( IV_IMAPINFO, ID_IMAPINFO ), + SdrObjUserData( SdrInventor::SgaImap, ID_IMAPINFO ), aImageMap( rImageMap ) {}; virtual ~SgaIMapInfo() override {}; diff --git a/include/svx/globl3d.hxx b/include/svx/globl3d.hxx index 88fec321b895..a258b6b189c7 100644 --- a/include/svx/globl3d.hxx +++ b/include/svx/globl3d.hxx @@ -22,11 +22,6 @@ #include <sal/types.h> -const sal_uInt32 E3dInventor = sal_uInt32('E')*0x00000001+ - sal_uInt32('3')*0x00000100+ - sal_uInt32('D')*0x00010000+ - sal_uInt32('1')*0x01000000; - const sal_uInt16 E3D_SCENE_ID = 1; const sal_uInt16 E3D_POLYSCENE_ID = 2; const sal_uInt16 E3D_OBJECT_ID = 3; // should not be used, it's only a helper class for E3DScene and E3DCompoundObject diff --git a/include/svx/obj3d.hxx b/include/svx/obj3d.hxx index 5f852962309b..accfb8f69b1a 100644 --- a/include/svx/obj3d.hxx +++ b/include/svx/obj3d.hxx @@ -145,10 +145,10 @@ public: virtual ~E3dObject() override; - virtual sal_uInt32 GetObjInventor() const override; + virtual SdrInventor GetObjInventor() const override; virtual sal_uInt16 GetObjIdentifier() const override; - virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const override; + virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const override; virtual void NbcSetLayer(SdrLayerID nLayer) override; diff --git a/include/svx/sidebar/SelectionAnalyzer.hxx b/include/svx/sidebar/SelectionAnalyzer.hxx index 196f1dd269cd..c4ed2fa1a105 100644 --- a/include/svx/sidebar/SelectionAnalyzer.hxx +++ b/include/svx/sidebar/SelectionAnalyzer.hxx @@ -24,7 +24,7 @@ class SdrMarkList; class SdrObject; - +enum class SdrInventor : sal_uInt32; namespace svx { namespace sidebar { @@ -57,7 +57,7 @@ private: static vcl::EnumContext::Context GetContextForObjectId_SD ( const sal_uInt16 nObjectId, const ViewType eViewType); - static sal_uInt32 GetInventorTypeFromMark ( + static SdrInventor GetInventorTypeFromMark ( const SdrMarkList& rMarkList); static sal_uInt16 GetObjectTypeFromMark ( const SdrMarkList& rMarkList); diff --git a/include/svx/svdcrtv.hxx b/include/svx/svdcrtv.hxx index a294bb544f7d..c66b05488d3e 100644 --- a/include/svx/svdcrtv.hxx +++ b/include/svx/svdcrtv.hxx @@ -48,7 +48,7 @@ protected: sal_Int32 nAutoCloseDistPix; sal_Int32 nFreeHandMinDistPix; - sal_uInt32 nAktInvent; // set the current ones + SdrInventor nAktInvent; // set the current ones sal_uInt16 nAktIdent; // Obj for re-creating bool b1stPointAsCenter : 1; @@ -60,7 +60,7 @@ private: SVX_DLLPRIVATE void ImpClearVars(); protected: - bool ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, const Point& rPnt, OutputDevice* pOut, + bool ImpBegCreateObj(SdrInventor nInvent, sal_uInt16 nIdent, const Point& rPnt, OutputDevice* pOut, sal_Int16 nMinMov, const Rectangle& rLogRect, SdrObject* pPreparedFactoryObject); void ShowCreateObj(/*OutputDevice* pOut, bool bFull*/); @@ -99,10 +99,10 @@ public: // Determine whether a measurement tool activated bool IsMeasureTool() const; - void SetCurrentObj(sal_uInt16 nIdent, sal_uInt32 nInvent=SdrInventor); - void TakeCurrentObj(sal_uInt16& nIdent, sal_uInt32& nInvent) const { nInvent=nAktInvent; nIdent=nAktIdent; } - sal_uInt32 GetCurrentObjInventor() const { return nAktInvent; } - sal_uInt16 GetCurrentObjIdentifier() const { return nAktIdent; } + void SetCurrentObj(sal_uInt16 nIdent, SdrInventor nInvent=SdrInventor::Default); + void TakeCurrentObj(sal_uInt16& nIdent, SdrInventor& nInvent) const { nInvent=nAktInvent; nIdent=nAktIdent; } + SdrInventor GetCurrentObjInventor() const { return nAktInvent; } + sal_uInt16 GetCurrentObjIdentifier() const { return nAktIdent; } // Beginning the regular Create bool BegCreateObj(const Point& rPnt, OutputDevice* pOut=nullptr, short nMinMov=-3); diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx index 3ad19c843699..211594aa9e89 100644 --- a/include/svx/svdedxv.hxx +++ b/include/svx/svdedxv.hxx @@ -262,7 +262,7 @@ public: const rtl::Reference< sdr::SelectionController >& getSelectionController() const { return mxSelectionController; } /** returns true if the shape identified by its inventor and identifier supports format paint brush operation */ - static bool SupportsFormatPaintbrush( sal_uInt32 nObjectInventor, sal_uInt16 nObjectIdentifier ); + static bool SupportsFormatPaintbrush( SdrInventor nObjectInventor, sal_uInt16 nObjectIdentifier ); /** returns a format paint brush set from the current selection */ void TakeFormatPaintBrush( std::shared_ptr< SfxItemSet >& rFormatSet ); diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx index b398a19071aa..ace6f5367e02 100644 --- a/include/svx/svdobj.hxx +++ b/include/svx/svdobj.hxx @@ -142,6 +142,20 @@ enum SdrObjKind { OBJ_MAXI }; +enum class SdrInventor : sal_uInt32 { + Unknown = 0, + BasicDialog = sal_uInt32( 'D' | ('L' << 8) | ('G' << 16) | ('1' << 24) ), + Default = sal_uInt32( 'S' | ('V' << 8) | ('D' << 16) | ('r' << 24) ), + E3d = sal_uInt32( 'E' | ('3' << 8) | ('D' << 16) | ('1' << 24) ), + FmForm = sal_uInt32( 'F' | ('M' << 8) | ('0' << 16) | ('1' << 24) ), + IMap = sal_uInt32( 'I' | ('M' << 8) | ('A' << 16) | ('P' << 24) ), + ReportDesign = sal_uInt32( 'R' | ('P' << 8) | ('T' << 16) | ('1' << 24) ), + ScOrSwDraw = sal_uInt32( 'S' | ('C' << 8) | ('3' << 16) | ('0' << 24) ), // Used in sc/ and sw/ + SgaImap = sal_uInt32( 'S' | ('D' << 8) | ('U' << 16) | ('D' << 24) ), + StarDrawUserData = sal_uInt32( 'S' | ('D' << 8) | ('U' << 16) | ('D' << 24) ), + Swg = sal_uInt32( 'S' | ('W' << 8) | ('G' << 16) ), +}; + enum class SdrUserCallType { MoveOnly, // only moved, size unchanged Resize, // size and maybe position changed @@ -188,7 +202,7 @@ public: class SVX_DLLPUBLIC SdrObjUserData { protected: - sal_uInt32 nInventor; + SdrInventor nInventor; sal_uInt16 nIdentifier; private: @@ -197,12 +211,12 @@ private: bool operator!=(const SdrObjUserData& rData) const = delete; public: - SdrObjUserData(sal_uInt32 nInv, sal_uInt16 nId); + SdrObjUserData(SdrInventor nInv, sal_uInt16 nId); SdrObjUserData(const SdrObjUserData& rData); virtual ~SdrObjUserData(); virtual SdrObjUserData* Clone(SdrObject* pObj1) const = 0; // #i71039# NULL -> 0 - sal_uInt32 GetInventor() const { return nInventor;} + SdrInventor GetInventor() const { return nInventor;} sal_uInt16 GetId() const { return nIdentifier;} }; @@ -434,7 +448,7 @@ public: void AddReference(SdrVirtObj& rVrtObj); void DelReference(SdrVirtObj& rVrtObj); - virtual sal_uInt32 GetObjInventor() const; + virtual SdrInventor GetObjInventor() const; virtual sal_uInt16 GetObjIdentifier() const; virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; @@ -990,14 +1004,14 @@ public: struct SdrObjCreatorParams { - sal_uInt32 nInventor; - sal_uInt16 nObjIdentifier; + SdrInventor nInventor; + sal_uInt16 nObjIdentifier; }; struct SdrObjUserDataCreatorParams { - sal_uInt32 nInventor; - sal_uInt16 nObjIdentifier; - SdrObject* pObject; + SdrInventor nInventor; + sal_uInt16 nObjIdentifier; + SdrObject* pObject; }; /** @@ -1011,8 +1025,8 @@ struct SdrObjUserDataCreatorParams class SVX_DLLPUBLIC SdrObjFactory { public: - static SdrObject* MakeNewObject(sal_uInt32 nInventor, sal_uInt16 nObjIdentifier, SdrPage* pPage, SdrModel* pModel=nullptr); - static SdrObject* MakeNewObject(sal_uInt32 nInventor, sal_uInt16 nObjIdentifier, const Rectangle& rSnapRect, SdrPage* pPage); + static SdrObject* MakeNewObject(SdrInventor nInventor, sal_uInt16 nObjIdentifier, SdrPage* pPage, SdrModel* pModel=nullptr); + static SdrObject* MakeNewObject(SdrInventor nInventor, sal_uInt16 nObjIdentifier, const Rectangle& rSnapRect, SdrPage* pPage); static void InsertMakeObjectHdl(Link<SdrObjCreatorParams, SdrObject*> const & rLink); static void RemoveMakeObjectHdl(Link<SdrObjCreatorParams, SdrObject*> const & rLink); static void InsertMakeUserDataHdl(Link<SdrObjUserDataCreatorParams, SdrObjUserData*> const & rLink); @@ -1020,7 +1034,7 @@ public: private: static SVX_DLLPRIVATE SdrObject* CreateObjectFromFactory( - sal_uInt32 nInventor, sal_uInt16 nIdentifier, SdrPage* pPage, SdrModel* pModel ); + SdrInventor nInventor, sal_uInt16 nIdentifier, SdrPage* pPage, SdrModel* pModel ); SdrObjFactory() = delete; }; diff --git a/include/svx/svdovirt.hxx b/include/svx/svdovirt.hxx index d81732e863fb..3484671d5557 100644 --- a/include/svx/svdovirt.hxx +++ b/include/svx/svdovirt.hxx @@ -55,7 +55,7 @@ public: virtual void SetModel(SdrModel* pNewModel) override; virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const override; - virtual sal_uInt32 GetObjInventor() const override; + virtual SdrInventor GetObjInventor() const override; virtual sal_uInt16 GetObjIdentifier() const override; virtual SdrObjList* GetSubList() const override; diff --git a/include/svx/svdtypes.hxx b/include/svx/svdtypes.hxx index f999a92c91d8..7f800ea985ee 100644 --- a/include/svx/svdtypes.hxx +++ b/include/svx/svdtypes.hxx @@ -22,14 +22,6 @@ #include <sal/types.h> -/* - * SdrObject - */ -const sal_uInt32 SdrInventor=sal_uInt32('S')*0x00000001+ - sal_uInt32('V')*0x00000100+ - sal_uInt32('D')*0x00010000+ - sal_uInt32('r')*0x01000000; - // commands for EndCreate() enum class SdrCreateCmd { diff --git a/include/svx/unoapi.hxx b/include/svx/unoapi.hxx index 6afd9c137c44..35e7098ee051 100644 --- a/include/svx/unoapi.hxx +++ b/include/svx/unoapi.hxx @@ -33,12 +33,13 @@ class SdrObject; class SdrPage; class SvxNumBulletItem; class SfxItemPool; +enum class SdrInventor : sal_uInt32; /** * Creates a StarOffice API wrapper with the given type and inventor * Deprecated: This will be replaced with a function returning XShape. */ -SVX_DLLPUBLIC SvxShape* CreateSvxShapeByTypeAndInventor(sal_uInt16 nType, sal_uInt32 nInventor, OUString const & referer) +SVX_DLLPUBLIC SvxShape* CreateSvxShapeByTypeAndInventor(sal_uInt16 nType, SdrInventor nInventor, OUString const & referer) throw (css::uno::RuntimeException, std::exception); /** Returns a StarOffice API wrapper for the given SdrObject */ diff --git a/include/svx/unopage.hxx b/include/svx/unopage.hxx index 881032726b86..7bbdc1672523 100644 --- a/include/svx/unopage.hxx +++ b/include/svx/unopage.hxx @@ -49,6 +49,7 @@ class SdrObject; class SvxShape; class SvxShapeGroup; class SvxShapeConnector; +enum class SdrInventor : sal_uInt32; /** * Macros to convert Twips<->100tel mm @@ -88,14 +89,14 @@ class SVX_DLLPUBLIC SvxDrawPage : public ::cppu::WeakAggImplHelper6< css::drawin SdrObject *CreateSdrObject( const css::uno::Reference< css::drawing::XShape >& xShape, bool bBeginning = false ) throw(); // Determine Type and Inventor - static void GetTypeAndInventor( sal_uInt16& rType, sal_uInt32& rInventor, const OUString& aName ) throw(); + static void GetTypeAndInventor( sal_uInt16& rType, SdrInventor& rInventor, const OUString& aName ) throw(); // Creating a SdrObject using it's Description. // Can be used by derived classes to support their owen Shapes (e.g. Controls). virtual SdrObject *CreateSdrObject_( const css::uno::Reference< css::drawing::XShape >& xShape ) throw (css::uno::RuntimeException, std::exception); - static SvxShape* CreateShapeByTypeAndInventor( sal_uInt16 nType, sal_uInt32 nInventor, SdrObject *pObj, SvxDrawPage *pPage = nullptr, OUString const & referer = OUString() ) throw (css::uno::RuntimeException); + static SvxShape* CreateShapeByTypeAndInventor( sal_uInt16 nType, SdrInventor nInventor, SdrObject *pObj, SvxDrawPage *pPage = nullptr, OUString const & referer = OUString() ) throw (css::uno::RuntimeException); // The following method is called if a SvxShape object is to be created. // Derived classes can create a derivation or an SvxShape aggregating object. diff --git a/reportdesign/inc/RptDef.hxx b/reportdesign/inc/RptDef.hxx index 41c7ea6b77a6..329012368c10 100644 --- a/reportdesign/inc/RptDef.hxx +++ b/reportdesign/inc/RptDef.hxx @@ -49,11 +49,6 @@ namespace rptui #define RPT_LAYER_HIDDEN 2 -const sal_uInt32 ReportInventor = sal_uInt32('R')*0x00000001+ - sal_uInt32('P')*0x00000100+ - sal_uInt32('T')*0x00010000+ - sal_uInt32('1')*0x01000000; - #define OBJ_DLG_FIXEDTEXT ((sal_uInt16) OBJ_MAXI + 1) #define OBJ_DLG_IMAGECONTROL OBJ_FM_IMAGECONTROL diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx index 105273f03827..6a41ea967602 100644 --- a/reportdesign/inc/RptObject.hxx +++ b/reportdesign/inc/RptObject.hxx @@ -151,7 +151,7 @@ public: virtual css::uno::Reference< css::uno::XInterface > getUnoShape() override; virtual sal_uInt16 GetObjIdentifier() const override; - virtual sal_uInt32 GetObjInventor() const override; + virtual SdrInventor GetObjInventor() const override; private: virtual void impl_setUnoShape( const css::uno::Reference< css::uno::XInterface >& rxUnoShape ) override; @@ -195,7 +195,7 @@ public: virtual css::uno::Reference< css::uno::XInterface > getUnoShape() override; virtual sal_uInt16 GetObjIdentifier() const override; - virtual sal_uInt32 GetObjInventor() const override; + virtual SdrInventor GetObjInventor() const override; // Clone() should make a complete copy of the object. virtual OOle2Obj* Clone() const override; virtual void initializeOle() override; @@ -247,7 +247,7 @@ public: virtual css::uno::Reference< css::uno::XInterface > getUnoShape() override; virtual sal_uInt16 GetObjIdentifier() const override; - virtual sal_uInt32 GetObjInventor() const override; + virtual SdrInventor GetObjInventor() const override; virtual OUnoObject* Clone() const override; OUnoObject& operator=(const OUnoObject& rObj); diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx index d099b5c1cdc1..32a7b77a54c0 100644 --- a/reportdesign/source/core/sdr/RptObject.cxx +++ b/reportdesign/source/core/sdr/RptObject.cxx @@ -485,9 +485,9 @@ sal_uInt16 OCustomShape::GetObjIdentifier() const return sal_uInt16(OBJ_CUSTOMSHAPE); } -sal_uInt32 OCustomShape::GetObjInventor() const +SdrInventor OCustomShape::GetObjInventor() const { - return ReportInventor; + return SdrInventor::ReportDesign; } SdrPage* OCustomShape::GetImplPage() const @@ -645,9 +645,9 @@ sal_uInt16 OUnoObject::GetObjIdentifier() const return sal_uInt16(m_nObjectType); } -sal_uInt32 OUnoObject::GetObjInventor() const +SdrInventor OUnoObject::GetObjInventor() const { - return ReportInventor; + return SdrInventor::ReportDesign; } SdrPage* OUnoObject::GetImplPage() const @@ -925,9 +925,9 @@ sal_uInt16 OOle2Obj::GetObjIdentifier() const return m_nType; } -sal_uInt32 OOle2Obj::GetObjInventor() const +SdrInventor OOle2Obj::GetObjInventor() const { - return ReportInventor; + return SdrInventor::ReportDesign; } SdrPage* OOle2Obj::GetImplPage() const diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 7605e292373f..c4395fc9f58d 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -3136,7 +3136,7 @@ void OReportController::createControl(const Sequence< PropertyValue >& _aArgs,co uno::Reference< report::XReportComponent> xShapeProp; if ( _nObjectId == OBJ_CUSTOMSHAPE ) { - pNewControl = SdrObjFactory::MakeNewObject( ReportInventor, _nObjectId, pSectionWindow->getReportSection().getPage(),m_aReportModel.get() ); + pNewControl = SdrObjFactory::MakeNewObject( SdrInventor::ReportDesign, _nObjectId, pSectionWindow->getReportSection().getPage(),m_aReportModel.get() ); xShapeProp.set(pNewControl->getUnoShape(),uno::UNO_QUERY); OUString sCustomShapeType = getDesignView()->GetInsertObjString(); if ( sCustomShapeType.isEmpty() ) @@ -3146,7 +3146,7 @@ void OReportController::createControl(const Sequence< PropertyValue >& _aArgs,co } else if ( _nObjectId == OBJ_OLE2 || OBJ_DLG_SUBREPORT == _nObjectId ) { - pNewControl = SdrObjFactory::MakeNewObject( ReportInventor, _nObjectId, pSectionWindow->getReportSection().getPage(),m_aReportModel.get() ); + pNewControl = SdrObjFactory::MakeNewObject( SdrInventor::ReportDesign, _nObjectId, pSectionWindow->getReportSection().getPage(),m_aReportModel.get() ); pNewControl->SetLogicRect(Rectangle(3000,500,8000,5500)); // switch height and width xShapeProp.set(pNewControl->getUnoShape(),uno::UNO_QUERY_THROW); @@ -3162,7 +3162,7 @@ void OReportController::createControl(const Sequence< PropertyValue >& _aArgs,co SdrUnoObj* pControl( nullptr ); FmFormView::createControlLabelPair( getDesignView() ,nLeftMargin,0 - ,nullptr,nullptr,_nObjectId,OUString(),ReportInventor,OBJ_DLG_FIXEDTEXT, + ,nullptr,nullptr,_nObjectId,OUString(),SdrInventor::ReportDesign,OBJ_DLG_FIXEDTEXT, nullptr,pSectionWindow->getReportSection().getPage(),m_aReportModel.get(), pLabel,pControl); delete pLabel; @@ -3457,7 +3457,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) // find this in svx FmFormView::createControlLabelPair( getDesignView() ,nLeftMargin,0 - ,xField,xNumberFormats,nOBJID,OUString(),ReportInventor,OBJ_DLG_FIXEDTEXT, + ,xField,xNumberFormats,nOBJID,OUString(),SdrInventor::ReportDesign,OBJ_DLG_FIXEDTEXT, pSectionWindow[1]->getReportSection().getPage(),pSectionWindow[0]->getReportSection().getPage(),m_aReportModel.get(), pControl[0],pControl[1]); if ( pControl[0] && pControl[1] ) diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx index 56a78933805e..33f9669f6562 100644 --- a/reportdesign/source/ui/report/ViewsWindow.cxx +++ b/reportdesign/source/ui/report/ViewsWindow.cxx @@ -352,7 +352,7 @@ void OViewsWindow::SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType ) TSectionsMap::const_iterator aIter = m_aSections.begin(); TSectionsMap::const_iterator aEnd = m_aSections.end(); for (;aIter != aEnd ; ++aIter) - (*aIter)->getReportSection().getSectionView().SetCurrentObj( eObj, ReportInventor ); + (*aIter)->getReportSection().getSectionView().SetCurrentObj( eObj, SdrInventor::ReportDesign ); m_sShapeType = _sShapeType; } diff --git a/reportdesign/source/ui/report/dlgedfac.cxx b/reportdesign/source/ui/report/dlgedfac.cxx index 07a2e4c9c3d2..0bc995800283 100644 --- a/reportdesign/source/ui/report/dlgedfac.cxx +++ b/reportdesign/source/ui/report/dlgedfac.cxx @@ -47,7 +47,7 @@ IMPL_STATIC_LINK( DlgEdFactory, MakeObject, SdrObjCreatorParams, aParams, SdrObject* ) { SdrObject* pNewObj = nullptr; - if ( aParams.nInventor == ReportInventor ) + if ( aParams.nInventor == SdrInventor::ReportDesign ) { switch( aParams.nObjIdentifier ) { diff --git a/sc/inc/userdat.hxx b/sc/inc/userdat.hxx index ee07183811f4..c8e8d6a98ec0 100644 --- a/sc/inc/userdat.hxx +++ b/sc/inc/userdat.hxx @@ -26,8 +26,6 @@ #include "global.hxx" #include "address.hxx" -#define SC_DRAWLAYER 0x30334353 // Inventor: "SC30" - // Object-Ids fuer UserData #define SC_UD_OBJDATA 1 #define SC_UD_IMAPDATA 2 diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx index 1396caa9861c..e57729057b82 100644 --- a/sc/source/core/data/drwlayer.cxx +++ b/sc/source/core/data/drwlayer.cxx @@ -1855,7 +1855,7 @@ namespace for( sal_uInt16 i = 0; i < nCount; i++ ) { SdrObjUserData* pData = pObj->GetUserData( i ); - if( pData && pData->GetInventor() == SC_DRAWLAYER && pData->GetId() == nId ) + if( pData && pData->GetInventor() == SdrInventor::ScOrSwDraw && pData->GetId() == nId ) return pData; } return nullptr; @@ -1867,7 +1867,7 @@ namespace for( sal_uInt16 i = nCount; i > 0; i-- ) { SdrObjUserData* pData = pObj->GetUserData( i-1 ); - if( pData && pData->GetInventor() == SC_DRAWLAYER && pData->GetId() == nId ) + if( pData && pData->GetInventor() == SdrInventor::ScOrSwDraw && pData->GetId() == nId ) pObj->DeleteUserData(i-1); } } @@ -1983,7 +1983,7 @@ ScDrawObjData* ScDrawLayer::GetNonRotatedObjData( SdrObject* pObj, bool bCreate for( sal_uInt16 i = 0; i < nCount; i++ ) { SdrObjUserData* pData = pObj->GetUserData( i ); - if( pData && pData->GetInventor() == SC_DRAWLAYER && pData->GetId() == SC_UD_OBJDATA && ++nFound == 2 ) + if( pData && pData->GetInventor() == SdrInventor::ScOrSwDraw && pData->GetId() == SC_UD_OBJDATA && ++nFound == 2 ) return static_cast<ScDrawObjData*>(pData); } if( pObj && bCreate ) diff --git a/sc/source/core/data/userdat.cxx b/sc/source/core/data/userdat.cxx index cc5fe0d39875..1a76e397a081 100644 --- a/sc/source/core/data/userdat.cxx +++ b/sc/source/core/data/userdat.cxx @@ -34,7 +34,7 @@ ScDrawObjFactory::~ScDrawObjFactory() IMPL_STATIC_LINK( ScDrawObjFactory, MakeUserData, SdrObjUserDataCreatorParams, aParams, SdrObjUserData* ) { - if ( aParams.nInventor == SC_DRAWLAYER ) + if ( aParams.nInventor == SdrInventor::ScOrSwDraw ) { if ( aParams.nObjIdentifier == SC_UD_OBJDATA ) return new ScDrawObjData; @@ -48,7 +48,7 @@ IMPL_STATIC_LINK( } ScDrawObjData::ScDrawObjData() : - SdrObjUserData( SC_DRAWLAYER, SC_UD_OBJDATA ), + SdrObjUserData( SdrInventor::ScOrSwDraw, SC_UD_OBJDATA ), maStart( ScAddress::INITIALIZE_INVALID ), maEnd( ScAddress::INITIALIZE_INVALID ), meType( DrawingObject ) @@ -61,12 +61,12 @@ ScDrawObjData* ScDrawObjData::Clone( SdrObject* ) const } ScIMapInfo::ScIMapInfo() : - SdrObjUserData( SC_DRAWLAYER, SC_UD_IMAPDATA ) + SdrObjUserData( SdrInventor::ScOrSwDraw, SC_UD_IMAPDATA ) { } ScIMapInfo::ScIMapInfo( const ImageMap& rImageMap ) : - SdrObjUserData( SC_DRAWLAYER, SC_UD_IMAPDATA ), + SdrObjUserData( SdrInventor::ScOrSwDraw, SC_UD_IMAPDATA ), aImageMap( rImageMap ) { } @@ -87,7 +87,7 @@ SdrObjUserData* ScIMapInfo::Clone( SdrObject* ) const } ScMacroInfo::ScMacroInfo() : - SdrObjUserData( SC_DRAWLAYER, SC_UD_MACRODATA ) + SdrObjUserData( SdrInventor::ScOrSwDraw, SC_UD_MACRODATA ) { } diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx index 0f7d5b257521..78a13d3c7956 100644 --- a/sc/source/ui/app/drwtrans.cxx +++ b/sc/source/ui/app/drwtrans.cxx @@ -128,7 +128,7 @@ ScDrawTransferObj::ScDrawTransferObj( SdrModel* pClipModel, ScDocShell* pContain // URL button SdrUnoObj* pUnoCtrl = dynamic_cast<SdrUnoObj*>( pObject ); - if (pUnoCtrl && FmFormInventor == pUnoCtrl->GetObjInventor()) + if (pUnoCtrl && SdrInventor::FmForm == pUnoCtrl->GetObjInventor()) { uno::Reference<awt::XControlModel> xControlModel = pUnoCtrl->GetUnoControlModel(); OSL_ENSURE( xControlModel.is(), "uno control without model" ); diff --git a/sc/source/ui/app/seltrans.cxx b/sc/source/ui/app/seltrans.cxx index 8060b1ad3be6..5dbebf4e1141 100644 --- a/sc/source/ui/app/seltrans.cxx +++ b/sc/source/ui/app/seltrans.cxx @@ -44,7 +44,7 @@ static bool lcl_IsURLButton( SdrObject* pObject ) bool bRet = false; SdrUnoObj* pUnoCtrl = dynamic_cast<SdrUnoObj*>( pObject ); - if (pUnoCtrl && FmFormInventor == pUnoCtrl->GetObjInventor()) + if (pUnoCtrl && SdrInventor::FmForm == pUnoCtrl->GetObjInventor()) { uno::Reference<awt::XControlModel> xControlModel = pUnoCtrl->GetUnoControlModel(); OSL_ENSURE( xControlModel.is(), "uno control without model" ); diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx index 989fc898657e..9851f081e2c1 100644 --- a/sc/source/ui/drawfunc/drawsh5.cxx +++ b/sc/source/ui/drawfunc/drawsh5.cxx @@ -81,7 +81,7 @@ void ScDrawShell::GetHLinkState( SfxItemSet& rSet ) // Hyperlink aHLinkItem.SetInsertMode(HLINK_FIELD); } SdrUnoObj* pUnoCtrl = dynamic_cast<SdrUnoObj*>( pObj ); - if (pUnoCtrl && FmFormInventor == pUnoCtrl->GetObjInventor()) + if (pUnoCtrl && SdrInventor::FmForm == pUnoCtrl->GetObjInventor()) { uno::Reference<awt::XControlModel> xControlModel = pUnoCtrl->GetUnoControlModel(); OSL_ENSURE( xControlModel.is(), "UNO-Control ohne Model" ); @@ -167,7 +167,7 @@ void ScDrawShell::ExecuteHLink( SfxRequest& rReq ) { SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); SdrUnoObj* pUnoCtrl = dynamic_cast<SdrUnoObj*>( pObj ); - if (pUnoCtrl && FmFormInventor == pUnoCtrl->GetObjInventor()) + if (pUnoCtrl && SdrInventor::FmForm == pUnoCtrl->GetObjInventor()) { uno::Reference<awt::XControlModel> xControlModel = pUnoCtrl->GetUnoControlModel(); diff --git a/sc/source/ui/drawfunc/fuconuno.cxx b/sc/source/ui/drawfunc/fuconuno.cxx index 449b0b2112fa..dfb4f0f09b0e 100644 --- a/sc/source/ui/drawfunc/fuconuno.cxx +++ b/sc/source/ui/drawfunc/fuconuno.cxx @@ -31,13 +31,13 @@ FuConstUnoControl::FuConstUnoControl(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pViewP, SdrModel* pDoc, SfxRequest& rReq) : FuConstruct(pViewSh, pWin, pViewP, pDoc, rReq) - , nInventor(0) + , nInventor(SdrInventor::Unknown) , nIdentifier(0) { 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/sc/source/ui/inc/fuconuno.hxx b/sc/source/ui/inc/fuconuno.hxx index 699e6c4f187b..b17cc84b5cc6 100644 --- a/sc/source/ui/inc/fuconuno.hxx +++ b/sc/source/ui/inc/fuconuno.hxx @@ -22,12 +22,14 @@ #include "fuconstr.hxx" +enum class SdrInventor : sal_uInt32; + /** Draw Control */ class FuConstUnoControl : public FuConstruct { protected: - sal_uInt32 nInventor; - sal_uInt16 nIdentifier; + SdrInventor nInventor; + sal_uInt16 nIdentifier; public: FuConstUnoControl(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pView, diff --git a/sc/source/ui/view/tabvwshg.cxx b/sc/source/ui/view/tabvwshg.cxx index 73cbb2ca2073..5b2a4dcbcb18 100644 --- a/sc/source/ui/view/tabvwshg.cxx +++ b/sc/source/ui/view/tabvwshg.cxx @@ -58,7 +58,7 @@ void ScTabViewShell::InsertURLButton( const OUString& rName, const OUString& rUR ScDrawView* pDrView = pView->GetScDrawView(); SdrModel* pModel = pDrView->GetModel(); - SdrObject* pObj = SdrObjFactory::MakeNewObject(FmFormInventor, OBJ_FM_BUTTON, + SdrObject* pObj = SdrObjFactory::MakeNewObject(SdrInventor::FmForm, OBJ_FM_BUTTON, pDrView->GetSdrPageView()->GetPage(), pModel); SdrUnoObj* pUnoCtrl = dynamic_cast<SdrUnoObj*>( pObj ); OSL_ENSURE( pUnoCtrl, "no SdrUnoObj"); 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()) { diff --git a/svx/source/dialog/connctrl.cxx b/svx/source/dialog/connctrl.cxx index a81710f8674f..1e172b430202 100644 --- a/svx/source/dialog/connctrl.cxx +++ b/svx/source/dialog/connctrl.cxx @@ -153,9 +153,9 @@ void SvxXConnectionPreview::Construct() for( size_t i = 0; i < nMarkCount && !bFound; ++i ) { const SdrObject* pObj = rMarkList.GetMark( i )->GetMarkedSdrObj(); - sal_uInt32 nInv = pObj->GetObjInventor(); + SdrInventor nInv = pObj->GetObjInventor(); sal_uInt16 nId = pObj->GetObjIdentifier(); - if( nInv == SdrInventor && nId == OBJ_EDGE ) + if( nInv == SdrInventor::Default && nId == OBJ_EDGE ) { bFound = true; const SdrEdgeObj* pTmpEdgeObj = static_cast<const SdrEdgeObj*>(pObj); diff --git a/svx/source/dialog/imapwnd.hxx b/svx/source/dialog/imapwnd.hxx index 9492cabb6fad..585506467fda 100644 --- a/svx/source/dialog/imapwnd.hxx +++ b/svx/source/dialog/imapwnd.hxx @@ -45,12 +45,6 @@ struct NotifyInfo #define SVD_IMAP_USERDATA 0x0001 -const sal_uInt32 IMapInventor = sal_uInt32('I') * 0x00000001+ - sal_uInt32('M') * 0x00000100+ - sal_uInt32('A') * 0x00010000+ - sal_uInt32('P') * 0x01000000; - - typedef std::shared_ptr< IMapObject > IMapObjectPtr; class IMapUserData : public SdrObjUserData @@ -61,11 +55,11 @@ class IMapUserData : public SdrObjUserData public: explicit IMapUserData( const IMapObjectPtr& rIMapObj ) : - SdrObjUserData ( IMapInventor, SVD_IMAP_USERDATA ), + SdrObjUserData ( SdrInventor::IMap, SVD_IMAP_USERDATA ), mpObj ( rIMapObj ) {} IMapUserData( const IMapUserData& rIMapUserData ) : - SdrObjUserData ( IMapInventor, SVD_IMAP_USERDATA ), + SdrObjUserData ( SdrInventor::IMap, SVD_IMAP_USERDATA ), mpObj ( rIMapUserData.mpObj ) {} virtual ~IMapUserData() override { } diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx index 54b0b429fe36..877575cd6758 100644 --- a/svx/source/engine3d/obj3d.cxx +++ b/svx/source/engine3d/obj3d.cxx @@ -243,9 +243,9 @@ void E3dObject::SetRectsDirty(bool bNotMyself) } } -sal_uInt32 E3dObject::GetObjInventor() const +SdrInventor E3dObject::GetObjInventor() const { - return E3dInventor; + return SdrInventor::E3d; } sal_uInt16 E3dObject::GetObjIdentifier() const diff --git a/svx/source/engine3d/objfac3d.cxx b/svx/source/engine3d/objfac3d.cxx index 185205a0de45..7baa7a5eba2b 100644 --- a/svx/source/engine3d/objfac3d.cxx +++ b/svx/source/engine3d/objfac3d.cxx @@ -47,7 +47,7 @@ E3dObjFactory::~E3dObjFactory() IMPL_STATIC_LINK( E3dObjFactory, MakeObject, SdrObjCreatorParams, aParams, SdrObject* ) { - if ( aParams.nInventor == E3dInventor ) + if ( aParams.nInventor == SdrInventor::E3d ) { switch ( aParams.nObjIdentifier ) { diff --git a/svx/source/form/fmdpage.cxx b/svx/source/form/fmdpage.cxx index 64380802c4b2..8ce3e23b3ab9 100644 --- a/svx/source/form/fmdpage.cxx +++ b/svx/source/form/fmdpage.cxx @@ -82,7 +82,7 @@ SdrObject *SvxFmDrawPage::CreateSdrObject_( const css::uno::Reference< css::draw css::uno::Reference< css::drawing::XShape > SvxFmDrawPage::CreateShape( SdrObject *pObj ) const throw (css::uno::RuntimeException, std::exception) { - if( FmFormInventor == pObj->GetObjInventor() ) + if( SdrInventor::FmForm == pObj->GetObjInventor() ) { css::uno::Reference< css::drawing::XShape > xShape = static_cast<SvxShape*>(new SvxShapeControl( pObj )); return xShape; diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx index 3f851c874bce..8f4090dd859a 100644 --- a/svx/source/form/fmobj.cxx +++ b/svx/source/form/fmobj.cxx @@ -323,9 +323,9 @@ void FmFormObj::SetPage(SdrPage* _pNewPage) } -sal_uInt32 FmFormObj::GetObjInventor() const +SdrInventor FmFormObj::GetObjInventor() const { - return FmFormInventor; + return SdrInventor::FmForm; } diff --git a/svx/source/form/fmobjfac.cxx b/svx/source/form/fmobjfac.cxx index dc244543556f..a9f0c548bc30 100644 --- a/svx/source/form/fmobjfac.cxx +++ b/svx/source/form/fmobjfac.cxx @@ -112,7 +112,7 @@ IMPL_STATIC_LINK( FmFormObjFactory, MakeObject, SdrObjCreatorParams, aParams, SdrObject*) { SdrObject* pNewObj = nullptr; - if (aParams.nInventor == FmFormInventor) + if (aParams.nInventor == SdrInventor::FmForm) { OUString sServiceSpecifier; diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx index 4712864f557a..7ed87afc1257 100644 --- a/svx/source/form/fmpgeimp.cxx +++ b/svx/source/form/fmpgeimp.cxx @@ -177,8 +177,8 @@ void FmFormPageImpl::initFrom( FmFormPageImpl& i_foreignImpl ) FmFormObj* pForeignObj = dynamic_cast< FmFormObj* >( aForeignIter.Next() ); FmFormObj* pOwnObj = dynamic_cast< FmFormObj* >( aOwnIter.Next() ); - bool bForeignIsForm = pForeignObj && ( pForeignObj->GetObjInventor() == FmFormInventor ); - bool bOwnIsForm = pOwnObj && ( pOwnObj->GetObjInventor() == FmFormInventor ); + bool bForeignIsForm = pForeignObj && ( pForeignObj->GetObjInventor() == SdrInventor::FmForm ); + bool bOwnIsForm = pOwnObj && ( pOwnObj->GetObjInventor() == SdrInventor::FmForm ); if ( bForeignIsForm != bOwnIsForm ) { diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index 30370464bca8..e44a926ca671 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -486,7 +486,7 @@ void FmFormShell::Execute(SfxRequest &rReq) } SfxUInt16Item aIdentifierItem( SID_FM_CONTROL_IDENTIFIER, nIdentifier ); - SfxUInt32Item aInventorItem( SID_FM_CONTROL_INVENTOR, FmFormInventor ); + SfxUInt32Item aInventorItem( SID_FM_CONTROL_INVENTOR, (sal_uInt32) SdrInventor::FmForm ); const SfxPoolItem* pArgs[] = { &aIdentifierItem, &aInventorItem, nullptr diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 5b5381820cb7..63df4cbee9ab 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -580,14 +580,14 @@ bool isControlList(const SdrMarkList& rMarkList) SdrObjListIter aIter(*pObj->GetSubList()); while (aIter.IsMore() && bControlList) { - bControlList = FmFormInventor == aIter.Next()->GetObjInventor(); + bControlList = SdrInventor::FmForm == aIter.Next()->GetObjInventor(); bHadAnyLeafs = true; } } else { bHadAnyLeafs = true; - bControlList = FmFormInventor == pObj->GetObjInventor(); + bControlList = SdrInventor::FmForm == pObj->GetObjInventor(); } } } diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx index 38f2e20b8ba4..e70361d6d91b 100644 --- a/svx/source/form/fmundo.cxx +++ b/svx/source/form/fmundo.cxx @@ -332,7 +332,7 @@ void FmXUndoEnvironment::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) void FmXUndoEnvironment::Inserted(SdrObject* pObj) { - if (pObj->GetObjInventor() == FmFormInventor) + if (pObj->GetObjInventor() == SdrInventor::FmForm) { FmFormObj* pFormObj = dynamic_cast<FmFormObj*>( pObj ); Inserted( pFormObj ); @@ -446,7 +446,7 @@ void FmXUndoEnvironment::Removed(SdrObject* pObj) // object, which is sufficient here return; - if (pObj->GetObjInventor() == FmFormInventor) + if (pObj->GetObjInventor() == SdrInventor::FmForm) { FmFormObj* pFormObj = dynamic_cast<FmFormObj*>( pObj ); Removed(pFormObj); diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx index 7622eb6f9c57..c94ba7c8e7d1 100644 --- a/svx/source/form/fmview.cxx +++ b/svx/source/form/fmview.cxx @@ -567,7 +567,7 @@ FmFormObj* FmFormView::getMarkedGrid() const void FmFormView::createControlLabelPair( OutputDevice* _pOutDev, sal_Int32 _nXOffsetMM, sal_Int32 _nYOffsetMM, const Reference< XPropertySet >& _rxField, const Reference< XNumberFormats >& _rxNumberFormats, - sal_uInt16 _nControlObjectID, const OUString& _rFieldPostfix, sal_uInt32 _nInventor, sal_uInt16 _nLabelObjectID, + sal_uInt16 _nControlObjectID, const OUString& _rFieldPostfix, SdrInventor _nInventor, sal_uInt16 _nLabelObjectID, SdrPage* _pLabelPage, SdrPage* _pControlPage, SdrModel* _pModel, SdrUnoObj*& _rpLabel, SdrUnoObj*& _rpControl ) { FmXFormView::createControlLabelPair( diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index f2defdd84139..bac41bc254fb 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -1485,7 +1485,7 @@ SdrObject* FmXFormView::implCreateXFormsControl( const svx::OXFormsDescriptor &_ const MapMode eSourceMode(MapUnit::Map100thMM); const sal_uInt16 nObjID = OBJ_FM_BUTTON; ::Size controlSize(4000, 500); - FmFormObj *pControl = static_cast<FmFormObj*>(SdrObjFactory::MakeNewObject( FmFormInventor, nObjID, nullptr )); + FmFormObj *pControl = static_cast<FmFormObj*>(SdrObjFactory::MakeNewObject( SdrInventor::FmForm, nObjID, nullptr )); controlSize.Width() = Fraction(controlSize.Width(), 1) * eTargetMode.GetScaleX(); controlSize.Height() = Fraction(controlSize.Height(), 1) * eTargetMode.GetScaleY(); ::Point controlPos( OutputDevice::LogicToLogic( ::Point( controlSize.Width(), 0 ), eSourceMode, eTargetMode ) ); @@ -1523,7 +1523,7 @@ bool FmXFormView::createControlLabelPair( OutputDevice& _rOutDev, sal_Int32 _nXO const OUString& _rCommand, const sal_Int32 _nCommandType ) { if ( !createControlLabelPair( _rOutDev, _nXOffsetMM, _nYOffsetMM, - _rxField, _rxNumberFormats, _nControlObjectID, _rFieldPostfix, FmFormInventor, OBJ_FM_FIXEDTEXT, + _rxField, _rxNumberFormats, _nControlObjectID, _rFieldPostfix, SdrInventor::FmForm, OBJ_FM_FIXEDTEXT, nullptr, nullptr, nullptr, _rpLabel, _rpControl ) ) return false; @@ -1546,7 +1546,7 @@ bool FmXFormView::createControlLabelPair( OutputDevice& _rOutDev, sal_Int32 _nXO bool FmXFormView::createControlLabelPair( OutputDevice& _rOutDev, sal_Int32 _nXOffsetMM, sal_Int32 _nYOffsetMM, const Reference< XPropertySet >& _rxField, const Reference< XNumberFormats >& _rxNumberFormats, sal_uInt16 _nControlObjectID, - const OUString& _rFieldPostfix, sal_uInt32 _nInventor, sal_uInt16 _nLabelObjectID, + const OUString& _rFieldPostfix, SdrInventor _nInventor, sal_uInt16 _nLabelObjectID, SdrPage* _pLabelPage, SdrPage* _pControlPage, SdrModel* _pModel, SdrUnoObj*& _rpLabel, SdrUnoObj*& _rpControl) { sal_Int32 nDataType = 0; @@ -1780,7 +1780,7 @@ void FmXFormView::saveMarkList() SdrObjListIter aIter( *pObj->GetSubList() ); bool bMixed = false; while ( aIter.IsMore() && !bMixed ) - bMixed = ( aIter.Next()->GetObjInventor() != FmFormInventor ); + bMixed = ( aIter.Next()->GetObjInventor() != SdrInventor::FmForm ); if ( !bMixed ) { @@ -1790,7 +1790,7 @@ void FmXFormView::saveMarkList() } else { - if ( pObj->GetObjInventor() == FmFormInventor ) + if ( pObj->GetObjInventor() == SdrInventor::FmForm ) { // this is a form layer object m_pView->MarkObj( pMark->GetMarkedSdrObj(), pMark->GetPageView(), true /* unmark! */ ); } @@ -1891,7 +1891,7 @@ void FmXFormView::restoreMarkList( SdrMarkList& _rRestoredMarkList ) { SdrMark* pMark = m_aMark.GetMark(i); SdrObject* pObj = pMark->GetMarkedSdrObj(); - if ( pObj->GetObjInventor() == FmFormInventor ) + if ( pObj->GetObjInventor() == SdrInventor::FmForm ) if ( !m_pView->IsObjMarked( pObj ) ) m_pView->MarkObj( pObj, pMark->GetPageView() ); } diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx index e8976066af13..86b00d8d4bcb 100644 --- a/svx/source/gallery2/galmisc.cxx +++ b/svx/source/gallery2/galmisc.cxx @@ -79,7 +79,7 @@ BitmapEx GalleryResGetBitmapEx( sal_uInt32 nId ) IMPL_STATIC_LINK( SgaUserDataFactory, MakeUserData, SdrObjUserDataCreatorParams, aParams, SdrObjUserData* ) { - if ( aParams.nInventor == IV_IMAPINFO && aParams.nObjIdentifier == ID_IMAPINFO ) + if ( aParams.nInventor == SdrInventor::SgaImap && aParams.nObjIdentifier == ID_IMAPINFO ) return new SgaIMapInfo; return nullptr; } @@ -172,7 +172,7 @@ bool CreateIMapGraphic( const FmFormModel& rModel, Graphic& rGraphic, ImageMap& { const SdrObjUserData* pUserData = pObj->GetUserData( i ); - if ( ( pUserData->GetInventor() == IV_IMAPINFO ) && ( pUserData->GetId() == ID_IMAPINFO ) ) + if ( ( pUserData->GetInventor() == SdrInventor::SgaImap ) && ( pUserData->GetId() == ID_IMAPINFO ) ) { rGraphic = static_cast<const SdrGrafObj*>( pObj )->GetGraphic(); rImageMap = static_cast<const SgaIMapInfo*>( pUserData )->GetImageMap(); diff --git a/svx/source/inc/fmobj.hxx b/svx/source/inc/fmobj.hxx index cb0455d5e120..7bd6b552b82b 100644 --- a/svx/source/inc/fmobj.hxx +++ b/svx/source/inc/fmobj.hxx @@ -68,7 +68,7 @@ public: SAL_DLLPRIVATE virtual ~FmFormObj() override; SAL_DLLPRIVATE virtual void SetPage(SdrPage* pNewPage) override; - SAL_DLLPRIVATE virtual sal_uInt32 GetObjInventor() const override; + SAL_DLLPRIVATE virtual SdrInventor GetObjInventor() const override; SAL_DLLPRIVATE virtual sal_uInt16 GetObjIdentifier() const override; SAL_DLLPRIVATE virtual void NbcReformatText() override; diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx index d423df57a6ad..71e4d0821d6a 100644 --- a/svx/source/inc/fmvwimp.hxx +++ b/svx/source/inc/fmvwimp.hxx @@ -57,6 +57,7 @@ namespace vcl { class Window; } class OutputDevice; class SdrUnoObj; struct ImplSVEvent; +enum class SdrInventor : sal_uInt32; namespace com { namespace sun { namespace star { namespace awt { @@ -256,7 +257,7 @@ private: const css::uno::Reference< css::util::XNumberFormats >& _rxNumberFormats, sal_uInt16 _nControlObjectID, const OUString& _rFieldPostfix, - sal_uInt32 _nInventor, + SdrInventor _nInventor, sal_uInt16 _nLabelObjectID, SdrPage* _pLabelPage, SdrPage* _pControlPage, diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx index 5f76ca86b9f5..a511436cd97d 100644 --- a/svx/source/sdr/properties/textproperties.cxx +++ b/svx/source/sdr/properties/textproperties.cxx @@ -274,7 +274,7 @@ namespace sdr if(GetStyleSheet()) { - if((OBJ_OUTLINETEXT == rObj.GetTextKind()) && (SdrInventor == rObj.GetObjInventor())) + if((OBJ_OUTLINETEXT == rObj.GetTextKind()) && (SdrInventor::Default == rObj.GetObjInventor())) { OUString aNewStyleSheetName(GetStyleSheet()->GetName()); aNewStyleSheetName = aNewStyleSheetName.copy(0, aNewStyleSheetName.getLength() - 1); @@ -361,7 +361,7 @@ namespace sdr { SdrTextObj& rObj = static_cast<SdrTextObj&>(GetSdrObject()); - if( rObj.GetObjInventor() == SdrInventor ) + if( rObj.GetObjInventor() == SdrInventor::Default ) { const sal_uInt16 nSdrObjKind = rObj.GetObjIdentifier(); diff --git a/svx/source/sidebar/SelectionAnalyzer.cxx b/svx/source/sidebar/SelectionAnalyzer.cxx index abba1f998c69..d77c903ad0ea 100644 --- a/svx/source/sidebar/SelectionAnalyzer.cxx +++ b/svx/source/sidebar/SelectionAnalyzer.cxx @@ -50,11 +50,11 @@ EnumContext::Context SelectionAnalyzer::GetContextForSelection_SC (const SdrMark } else { - const sal_uInt32 nInv = pObj->GetObjInventor(); - const sal_uInt16 nObjId = pObj->GetObjIdentifier(); - if (nInv == SdrInventor) + const SdrInventor nInv = pObj->GetObjInventor(); + const sal_uInt16 nObjId = pObj->GetObjIdentifier(); + if (nInv == SdrInventor::Default) eContext = GetContextForObjectId_SC(nObjId); - else if (nInv == FmFormInventor) + else if (nInv == SdrInventor::FmForm) eContext = EnumContext::Context_Form; } break; @@ -65,7 +65,7 @@ EnumContext::Context SelectionAnalyzer::GetContextForSelection_SC (const SdrMark // Multi selection. switch (GetInventorTypeFromMark(rMarkList)) { - case SdrInventor: + case SdrInventor::Default: { const sal_uInt16 nObjId (GetObjectTypeFromMark(rMarkList)); if (nObjId == 0) @@ -75,13 +75,15 @@ EnumContext::Context SelectionAnalyzer::GetContextForSelection_SC (const SdrMark break; } - case FmFormInventor: + case SdrInventor::FmForm: eContext = EnumContext::Context_Form; break; - case 0: + case SdrInventor::Unknown: eContext = EnumContext::Context_MultiObject; break; + + default: break; } } } @@ -138,9 +140,9 @@ EnumContext::Context SelectionAnalyzer::GetContextForSelection_SD ( } else { - const sal_uInt32 nInv = pObj->GetObjInventor(); - sal_uInt16 nObjId = pObj->GetObjIdentifier(); - if (nInv == SdrInventor) + const SdrInventor nInv = pObj->GetObjInventor(); + sal_uInt16 nObjId = pObj->GetObjIdentifier(); + if (nInv == SdrInventor::Default) { if (nObjId == OBJ_GRUP) { @@ -150,11 +152,11 @@ EnumContext::Context SelectionAnalyzer::GetContextForSelection_SD ( } eContext = GetContextForObjectId_SD(nObjId, eViewType); } - else if (nInv == E3dInventor) + else if (nInv == SdrInventor::E3d) { eContext = EnumContext::Context_3DObject; } - else if (nInv == FmFormInventor) + else if (nInv == SdrInventor::FmForm) { eContext = EnumContext::Context_Form; } @@ -166,7 +168,7 @@ EnumContext::Context SelectionAnalyzer::GetContextForSelection_SD ( { switch (GetInventorTypeFromMark(rMarkList)) { - case SdrInventor: + case SdrInventor::Default: { const sal_uInt16 nObjId = GetObjectTypeFromMark(rMarkList); if (nObjId == 0) @@ -176,17 +178,19 @@ EnumContext::Context SelectionAnalyzer::GetContextForSelection_SD ( break; } - case E3dInventor: + case SdrInventor::E3d: eContext = EnumContext::Context_3DObject; break; - case FmFormInventor: + case SdrInventor::FmForm: eContext = EnumContext::Context_Form; break; - case 0: + case SdrInventor::Unknown: eContext = EnumContext::Context_MultiObject; break; + + default: break; } break; } @@ -305,25 +309,25 @@ EnumContext::Context SelectionAnalyzer::GetContextForObjectId_SD ( } -sal_uInt32 SelectionAnalyzer::GetInventorTypeFromMark (const SdrMarkList& rMarkList) +SdrInventor SelectionAnalyzer::GetInventorTypeFromMark (const SdrMarkList& rMarkList) { const size_t nMarkCount (rMarkList.GetMarkCount()); if (nMarkCount < 1) - return 0; + return SdrInventor::Unknown; SdrMark* pMark = rMarkList.GetMark(0); SdrObject* pObj = pMark->GetMarkedSdrObj(); - const sal_uInt32 nFirstInv = pObj->GetObjInventor(); + const SdrInventor nFirstInv = pObj->GetObjInventor(); for (size_t nIndex=1; nIndex<nMarkCount; ++nIndex) { pMark = rMarkList.GetMark(nIndex); pObj = pMark->GetMarkedSdrObj(); - const sal_uInt32 nInv (pObj->GetObjInventor()); + const SdrInventor nInv (pObj->GetObjInventor()); if (nInv != nFirstInv) - return 0; + return SdrInventor::Unknown; } return nFirstInv; diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx index ed22fa0331c1..09703ceffadd 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx @@ -157,7 +157,7 @@ namespace const SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); const SdrObjKind eKind((SdrObjKind)pObj->GetObjIdentifier()); - if((pObj->GetObjInventor() == SdrInventor) && (OBJ_TEXT == eKind || OBJ_TITLETEXT == eKind || OBJ_OUTLINETEXT == eKind)) + if((pObj->GetObjInventor() == SdrInventor::Default) && (OBJ_TEXT == eKind || OBJ_TITLETEXT == eKind || OBJ_OUTLINETEXT == eKind)) { const SdrTextObj* pSdrTextObj = dynamic_cast< const SdrTextObj* >(pObj); diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx index c2311edb7b30..18664280cbe1 100644 --- a/svx/source/svdraw/svdcrtv.cxx +++ b/svx/source/svdraw/svdcrtv.cxx @@ -189,7 +189,7 @@ void SdrCreateView::ImpClearConnectMarker() void SdrCreateView::ImpClearVars() { - nAktInvent=SdrInventor; + nAktInvent=SdrInventor::Default; nAktIdent=OBJ_NONE; pAktCreate=nullptr; pCreatePV=nullptr; @@ -269,10 +269,10 @@ bool SdrCreateView::CheckEdgeMode() if (pAktCreate!=nullptr) { // is managed by EdgeObj - if (nAktInvent==SdrInventor && nAktIdent==OBJ_EDGE) return false; + if (nAktInvent==SdrInventor::Default && nAktIdent==OBJ_EDGE) return false; } - if (!IsCreateMode() || nAktInvent!=SdrInventor || nAktIdent!=OBJ_EDGE) + if (!IsCreateMode() || nAktInvent!=SdrInventor::Default || nAktIdent!=OBJ_EDGE) { ImpClearConnectMarker(); return false; @@ -333,20 +333,20 @@ bool SdrCreateView::MouseMove(const MouseEvent& rMEvt, vcl::Window* pWin) bool SdrCreateView::IsTextTool() const { - return meEditMode==SdrViewEditMode::Create && nAktInvent==SdrInventor && (nAktIdent==OBJ_TEXT || nAktIdent==OBJ_TEXTEXT || nAktIdent==OBJ_TITLETEXT || nAktIdent==OBJ_OUTLINETEXT); + return meEditMode==SdrViewEditMode::Create && nAktInvent==SdrInventor::Default && (nAktIdent==OBJ_TEXT || nAktIdent==OBJ_TEXTEXT || nAktIdent==OBJ_TITLETEXT || nAktIdent==OBJ_OUTLINETEXT); } bool SdrCreateView::IsEdgeTool() const { - return meEditMode==SdrViewEditMode::Create && nAktInvent==SdrInventor && (nAktIdent==OBJ_EDGE); + return meEditMode==SdrViewEditMode::Create && nAktInvent==SdrInventor::Default && (nAktIdent==OBJ_EDGE); } bool SdrCreateView::IsMeasureTool() const { - return meEditMode==SdrViewEditMode::Create && nAktInvent==SdrInventor && (nAktIdent==OBJ_MEASURE); + return meEditMode==SdrViewEditMode::Create && nAktInvent==SdrInventor::Default && (nAktIdent==OBJ_MEASURE); } -void SdrCreateView::SetCurrentObj(sal_uInt16 nIdent, sal_uInt32 nInvent) +void SdrCreateView::SetCurrentObj(sal_uInt16 nIdent, SdrInventor nInvent) { if (nAktInvent!=nInvent || nAktIdent!=nIdent) { @@ -380,7 +380,7 @@ void SdrCreateView::SetCurrentObj(sal_uInt16 nIdent, sal_uInt32 nInvent) ImpSetGlueVisible3(IsEdgeTool()); } -bool SdrCreateView::ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, const Point& rPnt, OutputDevice* pOut, +bool SdrCreateView::ImpBegCreateObj(SdrInventor nInvent, sal_uInt16 nIdent, const Point& rPnt, OutputDevice* pOut, short nMinMov, const Rectangle& rLogRect, SdrObject* pPreparedFactoryObject) { bool bRet=false; @@ -395,7 +395,7 @@ bool SdrCreateView::ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, const { // otherwise no side registered! OUString aLay(maActualLayer); - if(nInvent == SdrInventor && nIdent == OBJ_MEASURE && !maMeasureLayer.isEmpty()) + if(nInvent == SdrInventor::Default && nIdent == OBJ_MEASURE && !maMeasureLayer.isEmpty()) { aLay = maMeasureLayer; } @@ -423,7 +423,7 @@ bool SdrCreateView::ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, const } Point aPnt(rPnt); - if (nAktInvent!=SdrInventor || (nAktIdent!=sal_uInt16(OBJ_EDGE) && + if (nAktInvent!=SdrInventor::Default || (nAktIdent!=sal_uInt16(OBJ_EDGE) && nAktIdent!=sal_uInt16(OBJ_FREELINE) && nAktIdent!=sal_uInt16(OBJ_FREEFILL) )) { // no snapping for Edge and Freehand aPnt=GetSnapPos(aPnt,pCreatePV); @@ -436,7 +436,7 @@ bool SdrCreateView::ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, const // object should not be created. Since it is possible to use it as a helper // object (e.g. in letting the user define an area with the interactive // construction) at least no items should be set at that object. - if(nInvent != SdrInventor || nIdent != OBJ_NONE) + if(nInvent != SdrInventor::Default || nIdent != OBJ_NONE) { pAktCreate->SetMergedItemSet(maDefaultAttr); } @@ -449,7 +449,7 @@ bool SdrCreateView::ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, const pAktCreate->SetMergedItemSet(aSet); } - if (mpModel && nInvent==SdrInventor && (nIdent==OBJ_TEXT || nIdent==OBJ_TEXTEXT || + if (mpModel && nInvent==SdrInventor::Default && (nIdent==OBJ_TEXT || nIdent==OBJ_TEXTEXT || nIdent==OBJ_TITLETEXT || nIdent==OBJ_OUTLINETEXT)) { // default for all text frames: no background, no border @@ -518,7 +518,7 @@ bool SdrCreateView::BegCreateObj(const Point& rPnt, OutputDevice* pOut, short nM bool SdrCreateView::BegCreatePreparedObject(const Point& rPnt, sal_Int16 nMinMov, SdrObject* pPreparedFactoryObject) { - sal_uInt32 nInvent(nAktInvent); + SdrInventor nInvent(nAktInvent); sal_uInt16 nIdent(nAktIdent); if(pPreparedFactoryObject) @@ -533,7 +533,7 @@ bool SdrCreateView::BegCreatePreparedObject(const Point& rPnt, sal_Int16 nMinMov bool SdrCreateView::BegCreateCaptionObj(const Point& rPnt, const Size& rObjSiz, OutputDevice* pOut, short nMinMov) { - return ImpBegCreateObj(SdrInventor,OBJ_CAPTION,rPnt,pOut,nMinMov, + return ImpBegCreateObj(SdrInventor::Default,OBJ_CAPTION,rPnt,pOut,nMinMov, Rectangle(rPnt,Size(rObjSiz.Width()+1,rObjSiz.Height()+1)), nullptr); } diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index f8e7c727fe52..2f618b0e10fa 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -1148,7 +1148,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(bool bDontDeleteReally) !pTextObj->HasFill() && !pTextObj->HasLine(); - if(pTEObj->IsInserted() && bDelObj && pTextObj->GetObjInventor()==SdrInventor && !bDontDeleteReally) + if(pTEObj->IsInserted() && bDelObj && pTextObj->GetObjInventor()==SdrInventor::Default && !bDontDeleteReally) { SdrObjKind eIdent=(SdrObjKind)pTextObj->GetObjIdentifier(); if(eIdent==OBJ_TEXT || eIdent==OBJ_TEXTEXT) @@ -2080,7 +2080,7 @@ void SdrObjEditView::MarkListHasChanged() { const SdrObject* pObj= rMarkList.GetMark(0)->GetMarkedSdrObj(); // check for table - if( pObj && (pObj->GetObjInventor() == SdrInventor ) && (pObj->GetObjIdentifier() == OBJ_TABLE) ) + if( pObj && (pObj->GetObjInventor() == SdrInventor::Default ) && (pObj->GetObjIdentifier() == OBJ_TABLE) ) { mxSelectionController = sdr::table::CreateTableController( this, pObj, mxLastSelectionController ); if( mxSelectionController.is() ) @@ -2144,9 +2144,9 @@ sal_uInt16 SdrObjEditView::GetSelectionLevel() const return nLevel; } -bool SdrObjEditView::SupportsFormatPaintbrush( sal_uInt32 nObjectInventor, sal_uInt16 nObjectIdentifier ) +bool SdrObjEditView::SupportsFormatPaintbrush( SdrInventor nObjectInventor, sal_uInt16 nObjectIdentifier ) { - if( nObjectInventor != SdrInventor && nObjectInventor != E3dInventor ) + if( nObjectInventor != SdrInventor::Default && nObjectInventor != SdrInventor::E3d ) return false; switch(nObjectIdentifier) { diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index 21895ed767e0..c379541d4dd8 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -576,7 +576,7 @@ bool SdrMarkView::ImpIsFrameHandles() const if (nMarkCount==1 && bStdDrag && bFrmHdl) { const SdrObject* pObj=GetMarkedObjectByIndex(0); - if (pObj->GetObjInventor()==SdrInventor) + if (pObj->GetObjInventor()==SdrInventor::Default) { sal_uInt16 nIdent=pObj->GetObjIdentifier(); if (nIdent==OBJ_LINE || nIdent==OBJ_EDGE || nIdent==OBJ_CAPTION || nIdent==OBJ_MEASURE || nIdent==OBJ_CUSTOMSHAPE || nIdent==OBJ_TABLE ) @@ -2097,7 +2097,7 @@ void SdrMarkView::MarkListHasChanged() bool bOneEdgeMarked=false; if (GetMarkedObjectCount()==1) { const SdrObject* pObj=GetMarkedObjectByIndex(0); - if (pObj->GetObjInventor()==SdrInventor) { + if (pObj->GetObjInventor()==SdrInventor::Default) { sal_uInt16 nIdent=pObj->GetObjIdentifier(); bOneEdgeMarked=nIdent==OBJ_EDGE; } diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 0f3de29393c0..7d5a15d1110d 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -157,7 +157,7 @@ SdrObjMacroHitRec::SdrObjMacroHitRec() : bDown(false) {} -SdrObjUserData::SdrObjUserData(sal_uInt32 nInv, sal_uInt16 nId) : +SdrObjUserData::SdrObjUserData(SdrInventor nInv, sal_uInt16 nId) : nInventor(nInv), nIdentifier(nId) {} @@ -535,9 +535,9 @@ SfxItemPool & SdrObject::GetObjectItemPool() const return SdrObject::GetGlobalDrawObjectItemPool(); } -sal_uInt32 SdrObject::GetObjInventor() const +SdrInventor SdrObject::GetObjInventor() const { - return SdrInventor; + return SdrInventor::Default; } sal_uInt16 SdrObject::GetObjIdentifier() const @@ -3100,7 +3100,6 @@ bool SdrObject::HasText() const return false; } - SdrDelayBroadcastObjectChange::SdrDelayBroadcastObjectChange( SdrObject& rObj ) : mrObj(rObj), mbOldDelayBroadcastObjectChange( rObj.mbDelayBroadcastObjectChange) { @@ -3121,7 +3120,7 @@ SdrDelayBroadcastObjectChange::~SdrDelayBroadcastObjectChange() } -SdrObject* SdrObjFactory::CreateObjectFromFactory( sal_uInt32 nInventor, sal_uInt16 nObjIdentifier, SdrPage* , SdrModel* ) +SdrObject* SdrObjFactory::CreateObjectFromFactory( SdrInventor nInventor, sal_uInt16 nObjIdentifier, SdrPage* , SdrModel* ) { SdrObjCreatorParams aParams { nInventor, nObjIdentifier }; for (const auto & i : ImpGetUserMakeObjHdl()) { @@ -3133,14 +3132,14 @@ SdrObject* SdrObjFactory::CreateObjectFromFactory( sal_uInt32 nInventor, sal_uIn return nullptr; } -SdrObject* SdrObjFactory::MakeNewObject(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrPage* pPage, SdrModel* pModel) +SdrObject* SdrObjFactory::MakeNewObject(SdrInventor nInvent, sal_uInt16 nIdent, SdrPage* pPage, SdrModel* pModel) { if (!pModel && pPage) pModel = pPage->GetModel(); SdrObject* pObj = nullptr; - if (nInvent == SdrInventor) + if (nInvent == SdrInventor::Default) { switch (nIdent) { @@ -3198,7 +3197,7 @@ SdrObject* SdrObjFactory::MakeNewObject(sal_uInt32 nInvent, sal_uInt16 nIdent, S } SdrObject* SdrObjFactory::MakeNewObject( - sal_uInt32 nInventor, sal_uInt16 nIdentifier, const Rectangle& rSnapRect, SdrPage* pPage ) + SdrInventor nInventor, sal_uInt16 nIdentifier, const Rectangle& rSnapRect, SdrPage* pPage ) { SdrModel* pModel = pPage ? pPage->GetModel() : nullptr; @@ -3206,7 +3205,7 @@ SdrObject* SdrObjFactory::MakeNewObject( bool bSetSnapRect = true; - if (nInventor == SdrInventor) + if (nInventor == SdrInventor::Default) { switch (nIdentifier) { diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index db5197fb8cc2..1ba7ff83f623 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -1294,18 +1294,27 @@ bool ImpPathForDragAndCreate::MovCreate(SdrDragStat& rStat) if (pView!=nullptr && pView->IsCreateMode()) { // switch to different CreateTool, if appropriate sal_uInt16 nIdent; - sal_uInt32 nInvent; + SdrInventor nInvent; pView->TakeCurrentObj(nIdent,nInvent); - if (nInvent==SdrInventor && pU->eAktKind!=(SdrObjKind)nIdent) { + if (nInvent==SdrInventor::Default && pU->eAktKind!=(SdrObjKind)nIdent) { SdrObjKind eNewKind=(SdrObjKind)nIdent; switch (eNewKind) { - case OBJ_CARC: case OBJ_CIRC: case OBJ_CCUT: case OBJ_SECT: eNewKind=OBJ_CARC; + case OBJ_CARC: + case OBJ_CIRC: + case OBJ_CCUT: + case OBJ_SECT: + eNewKind=OBJ_CARC; SAL_FALLTHROUGH; case OBJ_RECT: - case OBJ_LINE: case OBJ_PLIN: case OBJ_POLY: - case OBJ_PATHLINE: case OBJ_PATHFILL: - case OBJ_FREELINE: case OBJ_FREEFILL: - case OBJ_SPLNLINE: case OBJ_SPLNFILL: { + case OBJ_LINE: + case OBJ_PLIN: + case OBJ_POLY: + case OBJ_PATHLINE: + case OBJ_PATHFILL: + case OBJ_FREELINE: + case OBJ_FREEFILL: + case OBJ_SPLNLINE: + case OBJ_SPLNFILL: { pU->eAktKind=eNewKind; pU->bMixedCreate=true; pU->nBezierStartPoint=rXPoly.GetPointCount(); diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx index 37ded6fc972f..16566fb9cfbf 100644 --- a/svx/source/svdraw/svdotxln.cxx +++ b/svx/source/svdraw/svdotxln.cxx @@ -101,7 +101,7 @@ void ImpSdrObjTextLink::Closed() ImpSdrObjTextLinkUserData::ImpSdrObjTextLinkUserData(): - SdrObjUserData(SdrInventor,SDRUSERDATA_OBJTEXTLINK), + SdrObjUserData(SdrInventor::Default,SDRUSERDATA_OBJTEXTLINK), aFileDate0( DateTime::EMPTY ), pLink(nullptr), eCharSet(RTL_TEXTENCODING_DONTKNOW) @@ -149,7 +149,7 @@ void SdrTextObj::ReleaseTextLink() for (sal_uInt16 nNum=nCount; nNum>0;) { nNum--; SdrObjUserData* pData=GetUserData(nNum); - if (pData->GetInventor()==SdrInventor && pData->GetId()==SDRUSERDATA_OBJTEXTLINK) { + if (pData->GetInventor()==SdrInventor::Default && pData->GetId()==SDRUSERDATA_OBJTEXTLINK) { DeleteUserData(nNum); } } @@ -249,7 +249,7 @@ ImpSdrObjTextLinkUserData* SdrTextObj::GetLinkUserData() const for (sal_uInt16 nNum=nCount; nNum>0;) { nNum--; SdrObjUserData * pData=GetUserData(nNum); - if (pData->GetInventor() == SdrInventor + if (pData->GetInventor() == SdrInventor::Default && pData->GetId() == SDRUSERDATA_OBJTEXTLINK) { return static_cast<ImpSdrObjTextLinkUserData *>(pData); diff --git a/svx/source/svdraw/svdovirt.cxx b/svx/source/svdraw/svdovirt.cxx index 6b65fcf62a81..f277a14adca8 100644 --- a/svx/source/svdraw/svdovirt.cxx +++ b/svx/source/svdraw/svdovirt.cxx @@ -93,7 +93,7 @@ void SdrVirtObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const rRefObj.TakeObjInfo(rInfo); } -sal_uInt32 SdrVirtObj::GetObjInventor() const +SdrInventor SdrVirtObj::GetObjInventor() const { return rRefObj.GetObjInventor(); } diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx index 144d3497a361..329ca480b815 100644 --- a/svx/source/svdraw/svdview.cxx +++ b/svx/source/svdraw/svdview.cxx @@ -890,7 +890,7 @@ bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) case SdrEventKind::BeginDragHelpline: bRet=BegDragHelpLine(rVEvt.nHlplIdx,rVEvt.pPV); break; case SdrEventKind::BeginDragObj: bRet=BegDragObj(aLogicPos,nullptr,rVEvt.pHdl,mnMinMovLog); break; case SdrEventKind::BeginCreateObj: { - if (nAktInvent==SdrInventor && nAktIdent==OBJ_CAPTION) { + if (nAktInvent==SdrInventor::Default && nAktIdent==OBJ_CAPTION) { long nHgt=SdrEngineDefaults::GetFontHeight(); bRet=BegCreateCaptionObj(aLogicPos,Size(5*nHgt,2*nHgt)); } else bRet=BegCreateObj(aLogicPos); diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx index 167d6a65c5eb..40f02f2f1349 100644 --- a/svx/source/unodraw/unomod.cxx +++ b/svx/source/unodraw/unomod.cxx @@ -174,7 +174,7 @@ css::uno::Reference<css::uno::XInterface> create( if( nType != UHASHMAP_NOTFOUND ) { sal_uInt16 nT = (sal_uInt16)(nType & ~E3D_INVENTOR_FLAG); - sal_uInt32 nI = (nType & E3D_INVENTOR_FLAG)?E3dInventor:SdrInventor; + SdrInventor nI = (nType & E3D_INVENTOR_FLAG) ? SdrInventor::E3d : SdrInventor::Default; return uno::Reference< uno::XInterface >( static_cast<drawing::XShape*>(SvxDrawPage::CreateShapeByTypeAndInventor( nT, nI, nullptr, nullptr, referer )) ); } @@ -492,7 +492,7 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawingModel::createInstance( c } // create the API wrapper - pShape = CreateSvxShapeByTypeAndInventor( nType, SdrInventor, "" ); + pShape = CreateSvxShapeByTypeAndInventor( nType, SdrInventor::Default, "" ); // set shape type if( pShape ) diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx index e1cb31a38278..f6cb548da731 100644 --- a/svx/source/unodraw/unopage.cxx +++ b/svx/source/unodraw/unopage.cxx @@ -482,7 +482,7 @@ SdrObject *SvxDrawPage::CreateSdrObject_(const Reference< drawing::XShape > & xS throw (css::uno::RuntimeException, std::exception) { sal_uInt16 nType = 0; - sal_uInt32 nInventor = 0; + SdrInventor nInventor; GetTypeAndInventor( nType, nInventor, xShape->getShapeType() ); if (!nType) @@ -548,7 +548,7 @@ SdrObject *SvxDrawPage::CreateSdrObject_(const Reference< drawing::XShape > & xS return pNewObj; } -void SvxDrawPage::GetTypeAndInventor( sal_uInt16& rType, sal_uInt32& rInventor, const OUString& aName ) throw() +void SvxDrawPage::GetTypeAndInventor( sal_uInt16& rType, SdrInventor& rInventor, const OUString& aName ) throw() { sal_uInt32 nTempType = UHashMap::getId( aName ); @@ -557,25 +557,25 @@ void SvxDrawPage::GetTypeAndInventor( sal_uInt16& rType, sal_uInt32& rInventor, if( aName == "com.sun.star.drawing.TableShape" || aName == "com.sun.star.presentation.TableShape" ) { - rInventor = SdrInventor; + rInventor = SdrInventor::Default; rType = OBJ_TABLE; } #if HAVE_FEATURE_AVMEDIA else if ( aName == "com.sun.star.presentation.MediaShape" ) { - rInventor = SdrInventor; + rInventor = SdrInventor::Default; rType = OBJ_MEDIA; } #endif } else if(nTempType & E3D_INVENTOR_FLAG) { - rInventor = E3dInventor; + rInventor = SdrInventor::E3d; rType = (sal_uInt16)(nTempType & ~E3D_INVENTOR_FLAG); } else { - rInventor = SdrInventor; + rInventor = SdrInventor::Default; rType = (sal_uInt16)nTempType; switch( rType ) @@ -589,13 +589,13 @@ void SvxDrawPage::GetTypeAndInventor( sal_uInt16& rType, sal_uInt32& rInventor, } } -SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( sal_uInt16 nType, sal_uInt32 nInventor, SdrObject *pObj, SvxDrawPage *mpPage, OUString const & referer ) +SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( sal_uInt16 nType, SdrInventor nInventor, SdrObject *pObj, SvxDrawPage *mpPage, OUString const & referer ) throw (css::uno::RuntimeException) { SvxShape* pRet = nullptr; switch( nInventor ) { - case E3dInventor: + case SdrInventor::E3d: { switch( nType ) { @@ -624,7 +624,7 @@ SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( sal_uInt16 nType, sal_uInt3 } break; } - case SdrInventor: + case SdrInventor::Default: { switch( nType ) { @@ -785,7 +785,7 @@ SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( sal_uInt16 nType, sal_uInt3 { sal_uInt32 nObjId = nType; - if( nInventor == E3dInventor ) + if( nInventor == SdrInventor::E3d ) nObjId |= E3D_INVENTOR_FLAG; switch(nObjId) @@ -858,7 +858,7 @@ uno::Sequence< OUString > SAL_CALL SvxDrawPage::getSupportedServiceNames() throw return aSeq; } -SvxShape* CreateSvxShapeByTypeAndInventor(sal_uInt16 nType, sal_uInt32 nInventor, OUString const & referer) +SvxShape* CreateSvxShapeByTypeAndInventor(sal_uInt16 nType, SdrInventor nInventor, OUString const & referer) throw (css::uno::RuntimeException, std::exception) { return SvxDrawPage::CreateShapeByTypeAndInventor( nType, nInventor, nullptr, nullptr, referer ); diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 323df4fd5eb9..a93e1eb3b973 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -360,19 +360,19 @@ void SvxShape::impl_initFromSdrObject() StartListening( *mpModel ); } - const sal_uInt32 nInventor = mpObj->GetObjInventor(); + const SdrInventor nInventor = mpObj->GetObjInventor(); // is it one of ours (svx) ? - if( nInventor == SdrInventor || nInventor == E3dInventor || nInventor == FmFormInventor ) + if( nInventor == SdrInventor::Default || nInventor == SdrInventor::E3d || nInventor == SdrInventor::FmForm ) { - if(nInventor == FmFormInventor) + if(nInventor == SdrInventor::FmForm) { mpImpl->mnObjId = OBJ_UNO; } else { mpImpl->mnObjId = mpObj->GetObjIdentifier(); - if( nInventor == E3dInventor ) + if( nInventor == SdrInventor::E3d ) mpImpl->mnObjId |= E3D_INVENTOR_FLAG; } @@ -1062,7 +1062,7 @@ void SvxShape::Notify( SfxBroadcaster&, const SfxHint& rHint ) throw() static bool svx_needLogicRectHack( SdrObject* pObj ) { - if( pObj->GetObjInventor() == SdrInventor) + if( pObj->GetObjInventor() == SdrInventor::Default) { switch(pObj->GetObjIdentifier()) { @@ -1201,7 +1201,7 @@ void SAL_CALL SvxShape::setSize( const awt::Size& rSize ) Size aLocalSize( rSize.Width, rSize.Height ); ForceMetricToItemPoolMetric(aLocalSize); - if(mpObj->GetObjInventor() == SdrInventor && mpObj->GetObjIdentifier() == OBJ_MEASURE ) + if(mpObj->GetObjInventor() == SdrInventor::Default && mpObj->GetObjIdentifier() == OBJ_MEASURE ) { Fraction aWdt(aLocalSize.Width(),aRect.Right()-aRect.Left()); Fraction aHgt(aLocalSize.Height(),aRect.Bottom()-aRect.Top()); @@ -1945,7 +1945,7 @@ uno::Any SvxShape::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleE case SDRATTR_CIRCKIND: { - if( mpObj->GetObjInventor() == SdrInventor) + if( mpObj->GetObjInventor() == SdrInventor::Default) { drawing::CircleKind eKind; switch(mpObj->GetObjIdentifier()) @@ -2630,11 +2630,11 @@ bool SvxShape::getPropertyValueImpl( const OUString&, const SfxItemPropertySimpl case OWN_ATTR_LDBITMAP: { sal_uInt16 nId; - if( mpObj->GetObjInventor() == SdrInventor && mpObj->GetObjIdentifier() == OBJ_OLE2 ) + if( mpObj->GetObjInventor() == SdrInventor::Default && mpObj->GetObjIdentifier() == OBJ_OLE2 ) { nId = RID_UNODRAW_OLE2; } - else if( mpObj->GetObjInventor() == SdrInventor && mpObj->GetObjIdentifier() == OBJ_GRAF ) + else if( mpObj->GetObjInventor() == SdrInventor::Default && mpObj->GetObjIdentifier() == OBJ_GRAF ) { nId = RID_UNODRAW_GRAPHICS; } @@ -3165,7 +3165,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() { ::SolarMutexGuard aGuard; - if( mpObj.is() && mpObj->GetObjInventor() == SdrInventor) + if( mpObj.is() && mpObj->GetObjInventor() == SdrInventor::Default) { const sal_uInt16 nIdent = mpObj->GetObjIdentifier(); @@ -3692,11 +3692,11 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() } } } - else if( mpObj.is() && mpObj->GetObjInventor() == FmFormInventor) + else if( mpObj.is() && mpObj->GetObjInventor() == SdrInventor::FmForm) { #if OSL_DEBUG_LEVEL > 0 const sal_uInt16 nIdent = mpObj->GetObjIdentifier(); - OSL_ENSURE( nIdent == OBJ_UNO, "SvxShape::_getSupportedServiceNames: FmFormInventor, but no UNO object?" ); + OSL_ENSURE( nIdent == OBJ_UNO, "SvxShape::_getSupportedServiceNames: SdrInventor::FmForm, but no UNO object?" ); #endif static uno::Sequence< OUString > *pSeq = nullptr; if( nullptr == pSeq ) diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx index 6b7f0d86591e..cda12f763730 100644 --- a/svx/source/unodraw/unoshtxt.cxx +++ b/svx/source/unodraw/unoshtxt.cxx @@ -584,7 +584,7 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetBackgroundTextForwarder() } - mpTextForwarder = new SvxOutlinerForwarder( *mpOutliner, (mpObject->GetObjInventor() == SdrInventor) && (mpObject->GetObjIdentifier() == OBJ_OUTLINETEXT) ); + mpTextForwarder = new SvxOutlinerForwarder( *mpOutliner, (mpObject->GetObjInventor() == SdrInventor::Default) && (mpObject->GetObjIdentifier() == OBJ_OUTLINETEXT) ); // delay listener subscription and UAA initialization until Outliner is fully setup bCreated = true; @@ -682,7 +682,7 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetEditModeTextForwarder() if( pEditOutliner ) { - mpTextForwarder = new SvxOutlinerForwarder( *pEditOutliner, (mpObject->GetObjInventor() == SdrInventor) && (mpObject->GetObjIdentifier() == OBJ_OUTLINETEXT) ); + mpTextForwarder = new SvxOutlinerForwarder( *pEditOutliner, (mpObject->GetObjInventor() == SdrInventor::Default) && (mpObject->GetObjIdentifier() == OBJ_OUTLINETEXT) ); mbForwarderIsEditMode = true; } } diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx index 79bb65dd85f4..4b5af6012089 100644 --- a/sw/inc/fesh.hxx +++ b/sw/inc/fesh.hxx @@ -525,7 +525,7 @@ public: After RESTRAINTEND the object is created and selected. BreakCreate interrupts the process. In this case no object is selected. */ bool BeginCreate( sal_uInt16 /*SdrObjKind ?*/ eSdrObjectKind, const Point &rPos ); - bool BeginCreate( sal_uInt16 /*SdrObjKind ?*/ eSdrObjectKind, sal_uInt32 eObjInventor, const Point &); + bool BeginCreate( sal_uInt16 /*SdrObjKind ?*/ eSdrObjectKind, SdrInventor eObjInventor, const Point &); void MoveCreate ( const Point &rPos ); bool EndCreate ( SdrCreateCmd eSdrCreateCmd ); void BreakCreate(); diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx index 536e75c63872..d3eec4ad5783 100644 --- a/sw/inc/view.hxx +++ b/sw/inc/view.hxx @@ -531,7 +531,7 @@ public: bool IsBezierEditMode(); bool AreOnlyFormsSelected() const; bool HasDrwObj(SdrObject *pSdrObj) const; - bool HasOnlyObj(SdrObject *pSdrObj, sal_uInt32 eObjInventor) const; + bool HasOnlyObj(SdrObject *pSdrObj, SdrInventor eObjInventor) const; bool BeginTextEdit( SdrObject* pObj, SdrPageView* pPV=nullptr, vcl::Window* pWin=nullptr, bool bIsNewObj=false, bool bSetSelectionToStart=false ); diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx index 44b7e79696e1..58517a7f9cbc 100644 --- a/sw/source/core/doc/doclay.cxx +++ b/sw/source/core/doc/doclay.cxx @@ -128,7 +128,7 @@ SdrObject* SwDoc::CloneSdrObj( const SdrObject& rObj, bool bMoveWithinDoc, } SdrObject *pObj = rObj.Clone(); - if( bMoveWithinDoc && FmFormInventor == pObj->GetObjInventor() ) + if( bMoveWithinDoc && SdrInventor::FmForm == pObj->GetObjInventor() ) { // We need to preserve the Name for Controls uno::Reference< awt::XControlModel > xModel = static_cast<SdrUnoObj*>(pObj)->GetUnoControlModel(); diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx index c60b09022062..ded98a2114a3 100644 --- a/sw/source/core/draw/dcontact.cxx +++ b/sw/source/core/draw/dcontact.cxx @@ -160,7 +160,7 @@ SwContact* GetUserCall( const SdrObject* pObj ) bool IsMarqueeTextObj( const SdrObject& rObj ) { SdrTextAniKind eTKind; - return SdrInventor == rObj.GetObjInventor() && + return SdrInventor::Default == rObj.GetObjInventor() && OBJ_TEXT == rObj.GetObjIdentifier() && ( SDRTEXTANI_SCROLL == ( eTKind = static_cast<const SdrTextObj&>(rObj).GetTextAniKind()) || SDRTEXTANI_ALTERNATE == eTKind || SDRTEXTANI_SLIDE == eTKind ); @@ -550,7 +550,7 @@ void SwFlyDrawContact::GetAnchoredObjs( std::list<SwAnchoredObject*>& _roAnchore bool CheckControlLayer( const SdrObject *pObj ) { - if ( FmFormInventor == pObj->GetObjInventor() ) + if ( SdrInventor::FmForm == pObj->GetObjInventor() ) return true; if ( dynamic_cast<const SdrObjGroup*>( pObj) != nullptr ) { diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx index fd85ace26495..59aa2a6cd375 100644 --- a/sw/source/core/draw/dflyobj.cxx +++ b/sw/source/core/draw/dflyobj.cxx @@ -130,9 +130,9 @@ SwFlyDrawObj::~SwFlyDrawObj() // SwFlyDrawObj - Factory-Methods -sal_uInt32 SwFlyDrawObj::GetObjInventor() const +SdrInventor SwFlyDrawObj::GetObjInventor() const { - return SWGInventor; + return SdrInventor::Swg; } sal_uInt16 SwFlyDrawObj::GetObjIdentifier() const diff --git a/sw/source/core/draw/dobjfac.cxx b/sw/source/core/draw/dobjfac.cxx index e092f6d26917..e3587646202d 100644 --- a/sw/source/core/draw/dobjfac.cxx +++ b/sw/source/core/draw/dobjfac.cxx @@ -26,7 +26,7 @@ SwObjectFactory aSwObjectFactory; IMPL_STATIC_LINK( SwObjectFactory, MakeObject, SdrObjCreatorParams, aParams, SdrObject* ) { - if ( aParams.nInventor == SWGInventor ) + if ( aParams.nInventor == SdrInventor::Swg ) { // No switch, there's only one at the moment OSL_ENSURE( aParams.nObjIdentifier == SwFlyDrawObjIdentifier, diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx index 51fd93275954..e39fc6ae0de4 100644 --- a/sw/source/core/frmedt/fefly1.cxx +++ b/sw/source/core/frmedt/fefly1.cxx @@ -1619,7 +1619,7 @@ ObjCntType SwFEShell::GetObjCntType( const SdrObject& rObj ) pInvestigatedObj = &rObj; } - if( FmFormInventor == pInvestigatedObj->GetObjInventor() ) + if( SdrInventor::FmForm == pInvestigatedObj->GetObjInventor() ) { eType = OBJCNT_CONTROL; uno::Reference< awt::XControlModel > xModel = diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx index 3bda5e2b1344..840fc938219a 100644 --- a/sw/source/core/frmedt/feshview.cxx +++ b/sw/source/core/frmedt/feshview.cxx @@ -1663,7 +1663,7 @@ bool SwFEShell::BeginCreate( sal_uInt16 /*SdrObjKind ?*/ eSdrObjectKind, const return bRet; } -bool SwFEShell::BeginCreate( sal_uInt16 /*SdrObjKind ?*/ eSdrObjectKind, sal_uInt32 eObjInventor, +bool SwFEShell::BeginCreate( sal_uInt16 /*SdrObjKind ?*/ eSdrObjectKind, SdrInventor eObjInventor, const Point &rPos ) { bool bRet = false; @@ -1755,7 +1755,7 @@ bool SwFEShell::ImpEndCreate() // alien identifier should end up on defaults // duplications possible!! - sal_uInt16 nIdent = SdrInventor == rSdrObj.GetObjInventor() + sal_uInt16 nIdent = SdrInventor::Default == rSdrObj.GetObjInventor() ? rSdrObj.GetObjIdentifier() : 0xFFFF; @@ -2688,7 +2688,7 @@ void SwFEShell::CheckUnboundObjects() // Alien identifier should roll into the default, // Duplications are possible!! sal_uInt16 nIdent = - Imp()->GetDrawView()->GetCurrentObjInventor() == SdrInventor ? + Imp()->GetDrawView()->GetCurrentObjInventor() == SdrInventor::Default ? Imp()->GetDrawView()->GetCurrentObjIdentifier() : 0xFFFF; SwFormatAnchor aAnch; @@ -2893,7 +2893,7 @@ long SwFEShell::GetSectionWidth( SwFormat const & rFormat ) const SdrView* pDrawView = GetDrawView(); SdrModel* pDrawModel = pDrawView->GetModel(); SdrObject* pObj = SdrObjFactory::MakeNewObject( - SdrInventor, eSdrObjectKind, + SdrInventor::Default, eSdrObjectKind, nullptr, pDrawModel); if(pObj) diff --git a/sw/source/core/inc/dflyobj.hxx b/sw/source/core/inc/dflyobj.hxx index acfdcb898df4..3d097c07e998 100644 --- a/sw/source/core/inc/dflyobj.hxx +++ b/sw/source/core/inc/dflyobj.hxx @@ -27,10 +27,6 @@ class SwFlyFrame; class SwFrameFormat; class SdrObjMacroHitRec; -const sal_uInt32 SWGInventor = sal_uInt32('S')*0x00000001 + - sal_uInt32('W')*0x00000100 + - sal_uInt32('G')*0x00010000; - const sal_uInt16 SwFlyDrawObjIdentifier = 0x0001; // DrawObjects for Flys @@ -50,8 +46,8 @@ public: virtual ~SwFlyDrawObj() override; // for instantiation of this class while loading (via factory) - virtual sal_uInt32 GetObjInventor() const override; - virtual sal_uInt16 GetObjIdentifier() const override; + virtual SdrInventor GetObjInventor() const override; + virtual sal_uInt16 GetObjIdentifier() const override; }; // virtual objects for Flys diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index af0bfe21cc7a..6d39a48129ea 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -301,7 +301,7 @@ uno::Reference< drawing::XShape > SwFmDrawPage::CreateShape( SdrObject *pObj ) c throw (uno::RuntimeException, std::exception) { uno::Reference< drawing::XShape > xRet; - if(dynamic_cast<const SwVirtFlyDrawObj*>( pObj) != nullptr || pObj->GetObjInventor() == SWGInventor) + if(dynamic_cast<const SwVirtFlyDrawObj*>( pObj) != nullptr || pObj->GetObjInventor() == SdrInventor::Swg) { SwFlyDrawContact* pFlyContact = static_cast<SwFlyDrawContact*>(pObj->GetUserCall()); if(pFlyContact) @@ -667,7 +667,7 @@ void SwXDrawPage::add(const uno::Reference< drawing::XShape > & xShape) SdrObject* pObj = pSvxShape->GetSdrObject(); // #108784# - set layer of new drawing object to corresponding // invisible layer. - if(FmFormInventor != pObj->GetObjInventor()) + if(SdrInventor::FmForm != pObj->GetObjInventor()) pObj->SetLayer( bOpaque ? pDoc->getIDocumentDrawModelAccess().GetInvisibleHeavenId() : pDoc->getIDocumentDrawModelAccess().GetInvisibleHellId() ); else pObj->SetLayer(pDoc->getIDocumentDrawModelAccess().GetInvisibleControlsId()); @@ -1109,7 +1109,7 @@ void SwXShape::setPropertyValue(const OUString& rPropertyName, const uno::Any& a // set layer of new drawing // object to corresponding invisible layer. bool bIsVisible = pDoc->getIDocumentDrawModelAccess().IsVisibleLayerId( pObj->GetLayer() ); - if(FmFormInventor != pObj->GetObjInventor()) + if(SdrInventor::FmForm != pObj->GetObjInventor()) { pObj->SetLayer( *o3tl::doAccess<bool>(aValue) ? ( bIsVisible ? pDoc->getIDocumentDrawModelAccess().GetHeavenId() : pDoc->getIDocumentDrawModelAccess().GetInvisibleHeavenId() ) @@ -1784,7 +1784,7 @@ uno::Sequence< beans::PropertyState > SwXShape::getPropertyStates( if(pObject) { bGroupMember = pObject->GetUpGroup() != nullptr; - bFormControl = pObject->GetObjInventor() == FmFormInventor; + bFormControl = pObject->GetObjInventor() == SdrInventor::FmForm; } const OUString* pNames = aPropertyNames.getConstArray(); beans::PropertyState* pRet = aRet.getArray(); @@ -2802,7 +2802,7 @@ void SwXGroupShape::add( const uno::Reference< XShape >& xShape ) throw (uno::Ru SwDoc* pDoc = pFormat->GetDoc(); // set layer of new drawing // object to corresponding invisible layer. - if( FmFormInventor != pObj->GetObjInventor()) + if( SdrInventor::FmForm != pObj->GetObjInventor()) { pObj->SetLayer( pSwShape->pImpl->GetOpaque() ? pDoc->getIDocumentDrawModelAccess().GetInvisibleHeavenId() diff --git a/sw/source/filter/html/htmldrawreader.cxx b/sw/source/filter/html/htmldrawreader.cxx index 61b69da31619..7a25f7a44fa7 100644 --- a/sw/source/filter/html/htmldrawreader.cxx +++ b/sw/source/filter/html/htmldrawreader.cxx @@ -358,7 +358,7 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable ) // #i52858# - method name changed SwDrawModel* pModel = m_pDoc->getIDocumentDrawModelAccess().GetOrCreateDrawModel(); SdrPage* pPg = pModel->GetPage( 0 ); - m_pMarquee = SdrObjFactory::MakeNewObject( SdrInventor, + m_pMarquee = SdrObjFactory::MakeNewObject( SdrInventor::Default, OBJ_TEXT, pPg, pModel ); if( !m_pMarquee ) return; diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx index 0dceef8cc4de..532efa47ea09 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -685,7 +685,7 @@ void SwHTMLParser::SetControlSize( const uno::Reference< drawing::XShape >& rSha // Schauen, ob es ein SdrObject dafuer gibt const SdrObject *pObj = pFrameFormat ? pFrameFormat->FindSdrObject() : nullptr; OSL_ENSURE( pObj, "SdrObject nicht gefunden" ); - OSL_ENSURE( pObj && FmFormInventor == pObj->GetObjInventor(), "falscher Inventor" ); + OSL_ENSURE( pObj && SdrInventor::FmForm == pObj->GetObjInventor(), "falscher Inventor" ); const SdrView* pDrawView = pVSh ? pVSh->GetDrawView() : nullptr; diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx index 6250b987b451..f0de3f6e2dcc 100644 --- a/sw/source/filter/html/htmlforw.cxx +++ b/sw/source/filter/html/htmlforw.cxx @@ -628,7 +628,7 @@ const SdrObject *SwHTMLWriter::GetHTMLControl( const SwDrawFrameFormat& rFormat // Schauen, ob es ein SdrObject dafuer gibt const SdrObject *pObj = rFormat.FindSdrObject(); - if( !pObj || FmFormInventor != pObj->GetObjInventor() ) + if( !pObj || SdrInventor::FmForm != pObj->GetObjInventor() ) return nullptr; const SdrUnoObj& rFormObj = dynamic_cast<const SdrUnoObj&>(*pObj); diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 2aea2cc1ee54..7830a3260126 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -4580,7 +4580,7 @@ void DocxAttributeOutput::WritePostponedMath(const SwOLENode* pPostponedMath) void DocxAttributeOutput::WritePostponedFormControl(const SdrObject* pObject) { - if (!pObject || pObject->GetObjInventor() != FmFormInventor) + if (!pObject || pObject->GetObjInventor() != SdrInventor::FmForm) return; SdrUnoObj *pFormObj = const_cast<SdrUnoObj*>(dynamic_cast< const SdrUnoObj*>(pObject)); diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index fc362a9474d1..699ad22fde26 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -1957,7 +1957,7 @@ void RtfAttributeOutput::OutputFlyFrame_Impl(const ww8::Frame& rFrame, const Poi m_aRun->append("{" OOO_STRING_SVTOOLS_RTF_FIELD); m_aRun->append("{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_FLDINST); - if (pObject && pObject->GetObjInventor() == FmFormInventor) + if (pObject && pObject->GetObjInventor() == SdrInventor::FmForm) { if (const SdrUnoObj* pFormObj = dynamic_cast< const SdrUnoObj*>(pObject)) { diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx index 1d47d51daa83..4c1ef187430d 100644 --- a/sw/source/filter/ww8/writerhelper.cxx +++ b/sw/source/filter/ww8/writerhelper.cxx @@ -247,7 +247,7 @@ namespace ww8 default: if (const SdrObject* pObj = rFormat.FindRealSdrObject()) { - if (pObj->GetObjInventor() == FmFormInventor) + if (pObj->GetObjInventor() == SdrInventor::FmForm) meWriterType = eFormControl; else meWriterType = eDrawing; @@ -372,7 +372,7 @@ namespace sw void SetLayer::SetObjectLayer(SdrObject &rObject, Layer eLayer) const { - if (FmFormInventor == rObject.GetObjInventor()) + if (SdrInventor::FmForm == rObject.GetObjInventor()) rObject.SetLayer(mnFormLayer); else { diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index 24c2583314d0..9fc44252d0d6 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -366,7 +366,7 @@ namespace bool WW8Export::MiserableFormFieldExportHack(const SwFrameFormat& rFrameFormat) { const SdrObject *pObject = rFrameFormat.FindRealSdrObject(); - if (!pObject || pObject->GetObjInventor() != FmFormInventor) + if (!pObject || pObject->GetObjInventor() != SdrInventor::FmForm) return false; const SdrUnoObj *pFormObj = dynamic_cast< const SdrUnoObj* >(pObject); diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index 3c0a4a32df3f..0b139cf3ac2d 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -2041,7 +2041,7 @@ bool WW8_WrPlcSubDoc::WriteGenericText( WW8Export& rWrt, sal_uInt8 nTTyp, { // is it an writer or sdr - textbox? const SdrObject& rObj = *static_cast<SdrObject const *>(aContent[ i ]); - if (rObj.GetObjInventor() == FmFormInventor) + if (rObj.GetObjInventor() == SdrInventor::FmForm) { sal_uInt8 nOldTyp = rWrt.m_nTextTyp; rWrt.m_nTextTyp = nTTyp; diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index 35059e45b998..09e6dfd3f893 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -2626,20 +2626,16 @@ SwFrameFormat* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp ) for (sal_uInt16 i = 0; i < nCount; i++ ) { SdrObjUserData* pData = pObject->GetUserData( i ); - if( pData && pData->GetInventor() == SW_DRAWLAYER + if( pData && pData->GetInventor() == SdrInventor::ScOrSwDraw && pData->GetId() == SW_UD_IMAPDATA) { SwMacroInfo* macInf = dynamic_cast<SwMacroInfo*>(pData); - if( macInf )// && macInf->GetShapeId() == pF->nSpId) + if( macInf && macInf->GetShapeId() == pF->nSpId ) { - sal_Int32 nShapeId = macInf->GetShapeId(); - if ( nShapeId == pF->nSpId ) - { - lnName = macInf->GetHlink(); - aObjName = macInf->GetName(); - aTarFrame = macInf->GetTarFrame(); - break; - } + lnName = macInf->GetHlink(); + aObjName = macInf->GetName(); + aTarFrame = macInf->GetTarFrame(); + break; } } } diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 045cf7353279..10094cf44931 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -165,7 +165,7 @@ SwMacroInfo* GetMacroInfo( SdrObject* pObj, bool bCreate ) // static for( sal_uInt16 i = 0; i < nCount; i++ ) { SdrObjUserData* pData = pObj->GetUserData( i ); - if( pData && pData->GetInventor() == SW_DRAWLAYER + if( pData && pData->GetInventor() == SdrInventor::ScOrSwDraw && pData->GetId() == SW_UD_IMAPDATA) { return dynamic_cast<SwMacroInfo*>(pData); @@ -6503,7 +6503,7 @@ namespace sw } SwMacroInfo::SwMacroInfo() - : SdrObjUserData( SW_DRAWLAYER, SW_UD_IMAPDATA ) + : SdrObjUserData( SdrInventor::ScOrSwDraw, SW_UD_IMAPDATA ) , mnShapeId(-1) { } diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index 7d9dd965277d..dd7e397796c1 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -27,8 +27,6 @@ #include <fltshell.hxx> #include <svx/svdobj.hxx> -#define SW_DRAWLAYER 0x30334353 -#define SW_UD_IMAPDATA 2 #include <vector> #include <stack> @@ -54,6 +52,7 @@ #include <editeng/lrspitem.hxx> #include <oox/ole/olehelper.hxx> +#define SW_UD_IMAPDATA 2 class SwDoc; class SwPaM; diff --git a/sw/source/uibase/ribbar/conform.cxx b/sw/source/uibase/ribbar/conform.cxx index 4c46d3c106c5..7b4d9a87007f 100644 --- a/sw/source/uibase/ribbar/conform.cxx +++ b/sw/source/uibase/ribbar/conform.cxx @@ -68,7 +68,7 @@ bool ConstFormControl::MouseButtonDown(const MouseEvent& rMEvt) m_pWin->SetPointer(Pointer(PointerStyle::DrawRect)); m_aStartPos = m_pWin->PixelToLogic(rMEvt.GetPosPixel()); - bReturn = m_pSh->BeginCreate( static_cast< sal_uInt16 >(m_pWin->GetSdrDrawMode()), FmFormInventor, m_aStartPos); + bReturn = m_pSh->BeginCreate( static_cast< sal_uInt16 >(m_pWin->GetSdrDrawMode()), SdrInventor::FmForm, m_aStartPos); if (bReturn) m_pWin->SetDrawAction(true); @@ -102,7 +102,7 @@ void ConstFormControl::CreateDefaultObject() SdrView *pSdrView = m_pSh->GetDrawView(); pSdrView->SetDesignMode(); - m_pSh->BeginCreate( static_cast< sal_uInt16 >(m_pWin->GetSdrDrawMode()), FmFormInventor, aStartPos); + m_pSh->BeginCreate( static_cast< sal_uInt16 >(m_pWin->GetSdrDrawMode()), SdrInventor::FmForm, aStartPos); m_pSh->MoveCreate(aEndPos); m_pSh->EndCreate(SdrCreateCmd::ForceEnd); } diff --git a/sw/source/uibase/shells/drformsh.cxx b/sw/source/uibase/shells/drformsh.cxx index e93f75913aa8..634f37a7aef1 100644 --- a/sw/source/uibase/shells/drformsh.cxx +++ b/sw/source/uibase/shells/drformsh.cxx @@ -89,7 +89,7 @@ void SwDrawFormShell::Execute(SfxRequest &rReq) if (rMarkList.GetMark(0)) { SdrUnoObj* pUnoCtrl = dynamic_cast<SdrUnoObj*>( rMarkList.GetMark(0)->GetMarkedSdrObj() ); - if (pUnoCtrl && FmFormInventor == pUnoCtrl->GetObjInventor()) + if (pUnoCtrl && SdrInventor::FmForm == pUnoCtrl->GetObjInventor()) { if(bConvertToText) { @@ -177,7 +177,7 @@ void SwDrawFormShell::GetState(SfxItemSet& rSet) if (rMarkList.GetMark(0)) { SdrUnoObj* pUnoCtrl = dynamic_cast<SdrUnoObj*>( rMarkList.GetMark(0)->GetMarkedSdrObj() ); - if (pUnoCtrl && FmFormInventor == pUnoCtrl->GetObjInventor()) + if (pUnoCtrl && SdrInventor::FmForm == pUnoCtrl->GetObjInventor()) { uno::Reference< awt::XControlModel > xControlModel = pUnoCtrl->GetUnoControlModel(); diff --git a/sw/source/uibase/shells/textdrw.cxx b/sw/source/uibase/shells/textdrw.cxx index bbb3f43b14b8..5dc92e64013b 100644 --- a/sw/source/uibase/shells/textdrw.cxx +++ b/sw/source/uibase/shells/textdrw.cxx @@ -60,7 +60,7 @@ void SwBaseShell::InsertURLButton(const OUString& rURL, const OUString& rTarget, rSh.StartAction(); rSh.StartUndo( UNDO_UI_INSERT_URLBTN ); - if (rSh.BeginCreate(OBJ_FM_BUTTON, FmFormInventor, aStartPos)) + if (rSh.BeginCreate(OBJ_FM_BUTTON, SdrInventor::FmForm, aStartPos)) { pSdrView->SetOrtho(false); Size aSz(GetView().GetEditWin().PixelToLogic(Size(140, 20))); diff --git a/sw/source/uibase/uiview/viewdraw.cxx b/sw/source/uibase/uiview/viewdraw.cxx index e10de8e71927..9f0d1a58c015 100644 --- a/sw/source/uibase/uiview/viewdraw.cxx +++ b/sw/source/uibase/uiview/viewdraw.cxx @@ -601,8 +601,8 @@ bool SwView::BeginTextEdit(SdrObject* pObj, SdrPageView* pPV, vcl::Window* pWin, bool SwView::IsTextTool() const { - sal_uInt16 nId; - sal_uInt32 nInvent; + sal_uInt16 nId; + SdrInventor nInvent; SdrView *pSdrView = GetWrtShell().GetDrawView(); OSL_ENSURE( pSdrView, "IsTextTool without DrawView?" ); @@ -610,7 +610,7 @@ bool SwView::IsTextTool() const pSdrView->SetCreateMode(false); pSdrView->TakeCurrentObj(nId,nInvent); - return (nInvent==SdrInventor); + return nInvent == SdrInventor::Default; } SdrView* SwView::GetDrawView() const @@ -664,7 +664,7 @@ bool SwView::AreOnlyFormsSelected() const // Except controls, are still normal draw objects selected? SdrObject *pSdrObj = rMarkList.GetMark(i)->GetMarkedSdrObj(); - if (!HasOnlyObj(pSdrObj, FmFormInventor)) + if (!HasOnlyObj(pSdrObj, SdrInventor::FmForm)) { bForm = false; break; @@ -690,13 +690,13 @@ bool SwView::HasDrwObj(SdrObject *pSdrObj) const if ((bRet = HasDrwObj(pList->GetObj(i)))) break; } - else if (SdrInventor == pSdrObj->GetObjInventor() || pSdrObj->Is3DObj()) + else if (SdrInventor::Default == pSdrObj->GetObjInventor() || pSdrObj->Is3DObj()) return true; return bRet; } -bool SwView::HasOnlyObj(SdrObject *pSdrObj, sal_uInt32 eObjInventor) const +bool SwView::HasOnlyObj(SdrObject *pSdrObj, SdrInventor eObjInventor) const { bool bRet = false; diff --git a/sw/source/uibase/wrtsh/wrtsh3.cxx b/sw/source/uibase/wrtsh/wrtsh3.cxx index 9b5cb4e176b0..c154df4cd7b5 100644 --- a/sw/source/uibase/wrtsh/wrtsh3.cxx +++ b/sw/source/uibase/wrtsh/wrtsh3.cxx @@ -179,7 +179,7 @@ bool SwWrtShell::GetURLFromButton( OUString& rURL, OUString& rDescr ) const if (rMarkList.GetMark(0)) { SdrUnoObj* pUnoCtrl = dynamic_cast<SdrUnoObj*>( rMarkList.GetMark(0)->GetMarkedSdrObj() ); - if (pUnoCtrl && FmFormInventor == pUnoCtrl->GetObjInventor()) + if (pUnoCtrl && SdrInventor::FmForm == pUnoCtrl->GetObjInventor()) { uno::Reference< awt::XControlModel > xControlModel = pUnoCtrl->GetUnoControlModel(); |