diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-05-07 15:42:35 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-05-07 17:24:18 +0100 |
| commit | 0e99a36c695d6349c8096654ddad70f962f312d0 (patch) | |
| tree | e8a74e81bd5d0b42570846c83f7f21352c9a5156 /sd | |
| parent | 274e3ec0c06e667868eca1b75193500ba92d7c14 (diff) | |
split clear and set graphic
Change-Id: I3e98e872574e9edbe97099e93d787cbbcced60dd
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/core/sdpage.cxx | 8 | ||||
| -rw-r--r-- | sd/source/ui/unoidl/unoobj.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/view/viewshe2.cxx | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 1395fe678ae1..d0220f6b631f 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -357,7 +357,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, bool bVertical, const ::t pSdrObj = new SdrOle2Obj(); BitmapEx aBmpEx(BMP_PRESOBJ_OBJECT); Graphic aGraphic( aBmpEx ); - static_cast<SdrOle2Obj*>(pSdrObj)->SetGraphic(&aGraphic); + static_cast<SdrOle2Obj*>(pSdrObj)->SetGraphic(aGraphic); } break; @@ -367,7 +367,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, bool bVertical, const ::t static_cast<SdrOle2Obj*>(pSdrObj)->SetProgName( "StarChart" ); BitmapEx aBmpEx(BMP_PRESOBJ_CHART); Graphic aGraphic( aBmpEx ); - static_cast<SdrOle2Obj*>(pSdrObj)->SetGraphic(&aGraphic); + static_cast<SdrOle2Obj*>(pSdrObj)->SetGraphic(aGraphic); } break; @@ -377,7 +377,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, bool bVertical, const ::t static_cast<SdrOle2Obj*>(pSdrObj)->SetProgName( "StarOrg" ); BitmapEx aBmpEx(BMP_PRESOBJ_ORGCHART); Graphic aGraphic( aBmpEx ); - static_cast<SdrOle2Obj*>(pSdrObj)->SetGraphic(&aGraphic); + static_cast<SdrOle2Obj*>(pSdrObj)->SetGraphic(aGraphic); } break; @@ -388,7 +388,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, bool bVertical, const ::t static_cast<SdrOle2Obj*>(pSdrObj)->SetProgName( "StarCalc" ); BitmapEx aBmpEx(BMP_PRESOBJ_TABLE); Graphic aGraphic( aBmpEx ); - static_cast<SdrOle2Obj*>(pSdrObj)->SetGraphic(&aGraphic); + static_cast<SdrOle2Obj*>(pSdrObj)->SetGraphic(aGraphic); } break; diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index da02589c0526..685bd6f5de1e 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -951,7 +951,7 @@ void SdXShape::SetEmptyPresObj(bool bEmpty) SdrOle2Obj* pOleObj = dynamic_cast< SdrOle2Obj* >( pObj ); if( pOleObj ) { - pOleObj->SetGraphic( nullptr ); + pOleObj->ClearGraphic(); } } } diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx index c56e19ac138e..7d409d7021bf 100644 --- a/sd/source/ui/view/viewshe2.cxx +++ b/sd/source/ui/view/viewshe2.cxx @@ -779,7 +779,7 @@ bool ViewShell::ActivateObject(SdrOle2Obj* pObj, long nVerb) // OLE object is no longer empty pObj->SetEmptyPresObj(false); pObj->SetOutlinerParaObject(nullptr); - pObj->SetGraphic(nullptr); + pObj->ClearGraphic(); // the empty OLE object gets a new IPObj if (!aName.isEmpty()) |