Kaydet (Commit) d44bbfc5 authored tarafından Kohei Yoshida's avatar Kohei Yoshida

No implicit inlining in the header file.

üst 971417fc
...@@ -215,28 +215,20 @@ protected: ...@@ -215,28 +215,20 @@ protected:
sal_uInt16 nVersion; sal_uInt16 nVersion;
private: private:
SVX_DLLPRIVATE void operator=(const SdrObjUserData& rData); // nicht implementiert SVX_DLLPRIVATE void operator=(const SdrObjUserData& rData); // not implemented
SVX_DLLPRIVATE sal_Bool operator==(const SdrObjUserData& rData) const; // nicht implementiert SVX_DLLPRIVATE bool operator==(const SdrObjUserData& rData) const; // not implemented
SVX_DLLPRIVATE sal_Bool operator!=(const SdrObjUserData& rData) const; // nicht implementiert SVX_DLLPRIVATE bool operator!=(const SdrObjUserData& rData) const; // not implemented
public: public:
TYPEINFO(); TYPEINFO();
SdrObjUserData(sal_uInt32 nInv, sal_uInt16 nId, sal_uInt16 nVer) SdrObjUserData(sal_uInt32 nInv, sal_uInt16 nId, sal_uInt16 nVer);
: nInventor(nInv), SdrObjUserData(const SdrObjUserData& rData);
nIdentifier(nId),
nVersion(nVer)
{}
SdrObjUserData(const SdrObjUserData& rData)
: nInventor(rData.nInventor),
nIdentifier(rData.nIdentifier),
nVersion(rData.nVersion)
{}
virtual ~SdrObjUserData(); virtual ~SdrObjUserData();
virtual SdrObjUserData* Clone(SdrObject* pObj1) const = 0; // #i71039# NULL -> 0 virtual SdrObjUserData* Clone(SdrObject* pObj1) const = 0; // #i71039# NULL -> 0
sal_uInt32 GetInventor() const { return nInventor; } sal_uInt32 GetInventor() const;
sal_uInt16 GetId() const { return nIdentifier; } sal_uInt16 GetId() const;
virtual bool HasMacro (const SdrObject* pObj) const; virtual bool HasMacro (const SdrObject* pObj) const;
virtual SdrObject* CheckMacroHit (const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const; virtual SdrObject* CheckMacroHit (const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const;
...@@ -255,17 +247,15 @@ class SdrObjUserDataList ...@@ -255,17 +247,15 @@ class SdrObjUserDataList
Container aList; Container aList;
public: public:
SdrObjUserDataList() SdrObjUserDataList();
: aList(1024,4,4) ~SdrObjUserDataList();
{}
~SdrObjUserDataList() { Clear(); }
void Clear(); void Clear();
sal_uInt16 GetUserDataCount() const { return sal_uInt16(aList.Count()); } sal_uInt16 GetUserDataCount() const;
SdrObjUserData* GetUserData(sal_uInt16 nNum) const { return (SdrObjUserData*)aList.GetObject(nNum); } SdrObjUserData* GetUserData(sal_uInt16 nNum) const;
void InsertUserData(SdrObjUserData* pData, sal_uInt16 nPos=0xFFFF) { aList.Insert(pData,nPos); } void InsertUserData(SdrObjUserData* pData, sal_uInt16 nPos=0xFFFF);
SdrObjUserData* RemoveUserData(sal_uInt16 nNum) { return (SdrObjUserData*)aList.Remove(nNum);} SdrObjUserData* RemoveUserData(sal_uInt16 nNum);
void DeleteUserData(sal_uInt16 nNum) { delete RemoveUserData(nNum); } void DeleteUserData(sal_uInt16 nNum);
}; };
//************************************************************ //************************************************************
......
...@@ -141,8 +141,26 @@ void SdrObjUserCall::Changed(const SdrObject& /*rObj*/, SdrUserCallType /*eType* ...@@ -141,8 +141,26 @@ void SdrObjUserCall::Changed(const SdrObject& /*rObj*/, SdrUserCallType /*eType*
TYPEINIT0(SdrObjUserData); TYPEINIT0(SdrObjUserData);
SdrObjUserData::~SdrObjUserData() SdrObjUserData::SdrObjUserData(sal_uInt32 nInv, sal_uInt16 nId, sal_uInt16 nVer) :
nInventor(nInv),
nIdentifier(nId),
nVersion(nVer) {}
SdrObjUserData::SdrObjUserData(const SdrObjUserData& rData) :
nInventor(rData.nInventor),
nIdentifier(rData.nIdentifier),
nVersion(rData.nVersion) {}
SdrObjUserData::~SdrObjUserData() {}
sal_uInt32 SdrObjUserData::GetInventor() const
{
return nInventor;
}
sal_uInt16 SdrObjUserData::GetId() const
{ {
return nIdentifier;
} }
bool SdrObjUserData::HasMacro(const SdrObject* /*pObj*/) const bool SdrObjUserData::HasMacro(const SdrObject* /*pObj*/) const
...@@ -199,6 +217,11 @@ XubString SdrObjUserData::GetMacroPopupComment(const SdrObjMacroHitRec& /*rRec*/ ...@@ -199,6 +217,11 @@ XubString SdrObjUserData::GetMacroPopupComment(const SdrObjMacroHitRec& /*rRec*/
return String(); return String();
} }
SdrObjUserDataList::SdrObjUserDataList() :
aList(1024,4,4) {}
SdrObjUserDataList::~SdrObjUserDataList() { Clear(); }
void SdrObjUserDataList::Clear() void SdrObjUserDataList::Clear()
{ {
sal_uInt16 nAnz=GetUserDataCount(); sal_uInt16 nAnz=GetUserDataCount();
...@@ -208,6 +231,31 @@ void SdrObjUserDataList::Clear() ...@@ -208,6 +231,31 @@ void SdrObjUserDataList::Clear()
aList.Clear(); aList.Clear();
} }
sal_uInt16 SdrObjUserDataList::GetUserDataCount() const
{
return sal_uInt16(aList.Count());
}
SdrObjUserData* SdrObjUserDataList::GetUserData(sal_uInt16 nNum) const
{
return (SdrObjUserData*)aList.GetObject(nNum);
}
void SdrObjUserDataList::InsertUserData(SdrObjUserData* pData, sal_uInt16 nPos)
{
aList.Insert(pData,nPos);
}
SdrObjUserData* SdrObjUserDataList::RemoveUserData(sal_uInt16 nNum)
{
return (SdrObjUserData*)aList.Remove(nNum);
}
void SdrObjUserDataList::DeleteUserData(sal_uInt16 nNum)
{
delete RemoveUserData(nNum);
}
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
DBG_NAME(SdrObjGeoData); DBG_NAME(SdrObjGeoData);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment