Kaydet (Commit) 91573182 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Fine to let GetObjectItemPool return just SfxItemPool*

Change-Id: Id461dea979c394add57cbc4b1a50bc1a4c183d1b
üst eec640d9
......@@ -467,7 +467,7 @@ public:
virtual void SetModel(SdrModel* pNewModel);
SdrModel* GetModel() const { return pModel;}
SdrItemPool* GetObjectItemPool() const;
SfxItemPool* GetObjectItemPool() const;
void AddListener(SfxListener& rListener);
void RemoveListener(SfxListener& rListener);
......
......@@ -614,10 +614,10 @@ SdrItemPool& SdrObject::GetGlobalDrawObjectItemPool()
return *mpGlobalItemPool;
}
SdrItemPool* SdrObject::GetObjectItemPool() const
SfxItemPool* SdrObject::GetObjectItemPool() const
{
if(pModel)
return (SdrItemPool*)(&pModel->GetItemPool());
return &pModel->GetItemPool();
// use a static global default pool
return &SdrObject::GetGlobalDrawObjectItemPool();
......@@ -2094,7 +2094,7 @@ const SfxPoolItem& SdrObject::GetObjectItem(const sal_uInt16 nWhich) const
SfxMapUnit SdrObject::GetObjectMapUnit() const
{
SfxMapUnit aRetval(SFX_MAPUNIT_100TH_MM);
SdrItemPool* pPool = GetObjectItemPool();
SfxItemPool* pPool = GetObjectItemPool();
if(pPool)
{
......
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