diff options
| author | Kohei Yoshida <kohei.yoshida@suse.com> | 2012-01-31 13:51:53 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@suse.com> | 2012-01-31 21:38:56 -0500 |
| commit | d44bbfc5d00128d005ed896e4a4227276093e221 (patch) | |
| tree | 965e9e95cd7120be04b8069081c51bfa1a54c558 /svx/inc | |
| parent | 971417fc32d7eeebf45e7cd354edddf91fc6de7d (diff) | |
No implicit inlining in the header file.
Diffstat (limited to 'svx/inc')
| -rw-r--r-- | svx/inc/svx/svdobj.hxx | 40 |
1 files changed, 15 insertions, 25 deletions
diff --git a/svx/inc/svx/svdobj.hxx b/svx/inc/svx/svdobj.hxx index 4ad7ae278474..20116f12057d 100644 --- a/svx/inc/svx/svdobj.hxx +++ b/svx/inc/svx/svdobj.hxx @@ -215,28 +215,20 @@ protected: sal_uInt16 nVersion; private: - SVX_DLLPRIVATE void operator=(const SdrObjUserData& rData); // nicht implementiert - SVX_DLLPRIVATE sal_Bool operator==(const SdrObjUserData& rData) const; // nicht implementiert - SVX_DLLPRIVATE sal_Bool operator!=(const SdrObjUserData& rData) const; // nicht implementiert + SVX_DLLPRIVATE void operator=(const SdrObjUserData& rData); // not implemented + SVX_DLLPRIVATE bool operator==(const SdrObjUserData& rData) const; // not implemented + SVX_DLLPRIVATE bool operator!=(const SdrObjUserData& rData) const; // not implemented public: TYPEINFO(); - SdrObjUserData(sal_uInt32 nInv, sal_uInt16 nId, sal_uInt16 nVer) - : nInventor(nInv), - nIdentifier(nId), - nVersion(nVer) - {} - SdrObjUserData(const SdrObjUserData& rData) - : nInventor(rData.nInventor), - nIdentifier(rData.nIdentifier), - nVersion(rData.nVersion) - {} + SdrObjUserData(sal_uInt32 nInv, sal_uInt16 nId, sal_uInt16 nVer); + SdrObjUserData(const SdrObjUserData& rData); virtual ~SdrObjUserData(); virtual SdrObjUserData* Clone(SdrObject* pObj1) const = 0; // #i71039# NULL -> 0 - sal_uInt32 GetInventor() const { return nInventor; } - sal_uInt16 GetId() const { return nIdentifier; } + sal_uInt32 GetInventor() const; + sal_uInt16 GetId() const; virtual bool HasMacro (const SdrObject* pObj) const; virtual SdrObject* CheckMacroHit (const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const; @@ -252,20 +244,18 @@ public: class SdrObjUserDataList { - Container aList; + Container aList; public: - SdrObjUserDataList() - : aList(1024,4,4) - {} - ~SdrObjUserDataList() { Clear(); } + SdrObjUserDataList(); + ~SdrObjUserDataList(); void Clear(); - sal_uInt16 GetUserDataCount() const { return sal_uInt16(aList.Count()); } - SdrObjUserData* GetUserData(sal_uInt16 nNum) const { return (SdrObjUserData*)aList.GetObject(nNum); } - void InsertUserData(SdrObjUserData* pData, sal_uInt16 nPos=0xFFFF) { aList.Insert(pData,nPos); } - SdrObjUserData* RemoveUserData(sal_uInt16 nNum) { return (SdrObjUserData*)aList.Remove(nNum);} - void DeleteUserData(sal_uInt16 nNum) { delete RemoveUserData(nNum); } + sal_uInt16 GetUserDataCount() const; + SdrObjUserData* GetUserData(sal_uInt16 nNum) const; + void InsertUserData(SdrObjUserData* pData, sal_uInt16 nPos=0xFFFF); + SdrObjUserData* RemoveUserData(sal_uInt16 nNum); + void DeleteUserData(sal_uInt16 nNum); }; //************************************************************ |