diff options
author | Kohei Yoshida <kohei.yoshida@suse.com> | 2012-02-01 10:38:57 -0500 |
---|---|---|
committer | Kohei Yoshida <kohei.yoshida@suse.com> | 2012-02-01 20:21:04 -0500 |
commit | 2a7c07e2e5fbdce057aaecb87231c62d98981bcb (patch) | |
tree | f18fb28b3ec85955de96e5cdce6a74ea5b38186a /svx | |
parent | 513bbdf9c4664e2677537acb9387df84349529cd (diff) |
InsertData to AppendData, to hide the insert position.
Only a few places in sc specified insert position, and those were
not strictly necessary.
Diffstat (limited to 'svx')
-rw-r--r-- | svx/inc/svx/svdobj.hxx | 4 | ||||
-rw-r--r-- | svx/source/dialog/imapwnd.cxx | 8 | ||||
-rw-r--r-- | svx/source/gallery2/galtheme.cxx | 2 | ||||
-rw-r--r-- | svx/source/svdraw/svdobj.cxx | 24 | ||||
-rw-r--r-- | svx/source/svdraw/svdotxln.cxx | 2 |
5 files changed, 17 insertions, 23 deletions
diff --git a/svx/inc/svx/svdobj.hxx b/svx/inc/svx/svdobj.hxx index 03494441f379..ed8d8c73d6e0 100644 --- a/svx/inc/svx/svdobj.hxx +++ b/svx/inc/svx/svdobj.hxx @@ -996,9 +996,7 @@ public: sal_uInt16 GetUserDataCount() const; SdrObjUserData* GetUserData(sal_uInt16 nNum) const; - // Insert uebernimmt den auf dem Heap angelegten Record in den Besitz - // des Zeichenobjekts - void InsertUserData(SdrObjUserData* pData, sal_uInt16 nPos=0xFFFF); + void AppendUserData(SdrObjUserData* pData); // Delete entfernt den Record aus der Liste und ruft // ein delete (FreeMem+Dtor). diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx index 7fbf77173e87..262e554d578e 100644 --- a/svx/source/dialog/imapwnd.cxx +++ b/svx/source/dialog/imapwnd.cxx @@ -280,7 +280,7 @@ SdrObject* IMapWindow::CreateObj( const IMapObject* pIMapObj ) pSdrObj->SetMergedItemSetAndBroadcast(aSet); - pSdrObj->InsertUserData( new IMapUserData( pCloneIMapObj ) ); + pSdrObj->AppendUserData( new IMapUserData( pCloneIMapObj ) ); pSdrObj->SetUserCall( GetSdrUserCall() ); } @@ -309,7 +309,7 @@ void IMapWindow::SdrObjCreated( const SdrObject& rObj ) IMapRectangleObject* pObj = new IMapRectangleObject( pRectObj->GetLogicRect(), String(), String(), String(), String(), String(), sal_True, sal_False ); - pRectObj->InsertUserData( new IMapUserData( IMapObjectPtr(pObj) ) ); + pRectObj->AppendUserData( new IMapUserData( IMapObjectPtr(pObj) ) ); } break; @@ -322,7 +322,7 @@ void IMapWindow::SdrObjCreated( const SdrObject& rObj ) IMapPolygonObject* pObj = new IMapPolygonObject( Polygon(aPoly), String(), String(), String(), String(), String(), sal_True, sal_False ); pObj->SetExtraEllipse( aPoly.GetBoundRect() ); - pCircObj->InsertUserData( new IMapUserData( IMapObjectPtr(pObj) ) ); + pCircObj->AppendUserData( new IMapUserData( IMapObjectPtr(pObj) ) ); } break; @@ -338,7 +338,7 @@ void IMapWindow::SdrObjCreated( const SdrObject& rObj ) { Polygon aPoly(rXPolyPoly.getB2DPolygon(0L)); IMapPolygonObject* pObj = new IMapPolygonObject( aPoly, String(), String(), String(), String(), String(), sal_True, sal_False ); - pPathObj->InsertUserData( new IMapUserData( IMapObjectPtr(pObj) ) ); + pPathObj->AppendUserData( new IMapUserData( IMapObjectPtr(pObj) ) ); } } break; diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index c64fbb6938f3..de4de7350e8f 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -1310,7 +1310,7 @@ sal_Bool GalleryTheme::InsertTransferable( const uno::Reference< datatransfer::X SdrPage* pPage = aModel.GetModel()->GetPage(0); SdrGrafObj* pGrafObj = new SdrGrafObj( *pGraphic ); - pGrafObj->InsertUserData( new SgaIMapInfo( aImageMap ) ); + pGrafObj->AppendUserData( new SgaIMapInfo( aImageMap ) ); pPage->InsertObject( pGrafObj ); bRet = InsertModel( *aModel.GetModel(), nInsertPos ); } diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 5ce27e6487bf..2ac68a234899 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -2842,23 +2842,19 @@ SdrObjUserData* SdrObject::GetUserData(sal_uInt16 nNum) const return pPlusData->pUserDataList->GetUserData(nNum); } -void SdrObject::InsertUserData(SdrObjUserData* pData, sal_uInt16 nPos) +void SdrObject::AppendUserData(SdrObjUserData* pData) { - if (pData!=NULL) + if (!pData) { - ImpForcePlusData(); - if (!pPlusData->pUserDataList) - pPlusData->pUserDataList = new SdrObjUserDataList; - - if (nPos == 0xFFFF) - pPlusData->pUserDataList->AppendUserData(pData); - else - pPlusData->pUserDataList->InsertUserData(pData, nPos); - } - else - { - OSL_FAIL("SdrObject::InsertUserData(): pData is NULL pointer."); + OSL_FAIL("SdrObject::AppendUserData(): pData is NULL pointer."); + return; } + + ImpForcePlusData(); + if (!pPlusData->pUserDataList) + pPlusData->pUserDataList = new SdrObjUserDataList; + + pPlusData->pUserDataList->AppendUserData(pData); } void SdrObject::DeleteUserData(sal_uInt16 nNum) diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx index 58abf9025d1a..e8c8344bec84 100644 --- a/svx/source/svdraw/svdotxln.cxx +++ b/svx/source/svdraw/svdotxln.cxx @@ -151,7 +151,7 @@ void SdrTextObj::SetTextLink(const String& rFileName, const String& rFilterName, pData->aFileName=rFileName; pData->aFilterName=rFilterName; pData->eCharSet=eCharSet; - InsertUserData(pData); + AppendUserData(pData); ImpLinkAnmeldung(); } |