From 42172ea6478023d94d4f76f3b525180d2ff25695 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 5 Aug 2014 23:04:07 +0200 Subject: Let GetObjectItemPool return a reference Change-Id: Ibbcfa3452afcf88dbb6050765e081a1be2381334 --- sd/source/ui/dlg/morphdlg.cxx | 6 +++--- sd/source/ui/func/fumorph.cxx | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/dlg/morphdlg.cxx b/sd/source/ui/dlg/morphdlg.cxx index f8895e2efb71..301ef799fcfb 100644 --- a/sd/source/ui/dlg/morphdlg.cxx +++ b/sd/source/ui/dlg/morphdlg.cxx @@ -44,9 +44,9 @@ MorphDlg::MorphDlg( ::Window* pParent, const SdrObject* pObj1, const SdrObject* LoadSettings(); - SfxItemPool* pPool = (SfxItemPool*) pObj1->GetObjectItemPool(); - SfxItemSet aSet1( *pPool ); - SfxItemSet aSet2( *pPool ); + SfxItemPool & pPool = pObj1->GetObjectItemPool(); + SfxItemSet aSet1( pPool ); + SfxItemSet aSet2( pPool ); aSet1.Put(pObj1->GetMergedItemSet()); aSet2.Put(pObj2->GetMergedItemSet()); diff --git a/sd/source/ui/func/fumorph.cxx b/sd/source/ui/func/fumorph.cxx index 5aa763ab8864..272a95d8b1da 100644 --- a/sd/source/ui/func/fumorph.cxx +++ b/sd/source/ui/func/fumorph.cxx @@ -342,8 +342,8 @@ void FuMorph::ImpInsertPolygons( long nStartLineWidth = 0; long nEndLineWidth = 0; SdrPageView* pPageView = mpView->GetSdrPageView(); - SfxItemPool* pPool = pObj1->GetObjectItemPool(); - SfxItemSet aSet1( *pPool,SDRATTR_START,SDRATTR_NOTPERSIST_FIRST-1,EE_ITEMS_START,EE_ITEMS_END,0 ); + SfxItemPool & pPool = pObj1->GetObjectItemPool(); + SfxItemSet aSet1( pPool,SDRATTR_START,SDRATTR_NOTPERSIST_FIRST-1,EE_ITEMS_START,EE_ITEMS_END,0 ); SfxItemSet aSet2( aSet1 ); bool bLineColor = false; bool bFillColor = false; -- cgit