diff options
| author | Rafael Dominguez <venccsralph@gmail.com> | 2012-03-29 19:26:11 -0430 |
|---|---|---|
| committer | Rafael Dominguez <venccsralph@gmail.com> | 2012-04-11 22:10:54 -0430 |
| commit | a9a05a06ac275ec2695ff607ed118e1b46ab7a4e (patch) | |
| tree | ca389ca9173d3242aa10990b6ccb0ff680d0d7b6 /sd/source/ui/view/drviews2.cxx | |
| parent | a9448bd1b7b64eff74198ead63154ae132ed853b (diff) | |
Replace deprecated List for vector.
Diffstat (limited to 'sd/source/ui/view/drviews2.cxx')
| -rw-r--r-- | sd/source/ui/view/drviews2.cxx | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 179fe66ea674..6ecad4c30073 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -804,7 +804,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) // der harten Attribute sowie der UserCall eingetragen, da diese beim nachfolgenden // mpDrawView->SetAttributes( *pSet, sal_True ) verloren gehen und spaeter restauriert // werden muessen - List* pAttrList = new List(); + std::vector<std::pair<SfxItemSet*,SdrObjUserCall*> > aAttrList; SdPage* pPresPage = (SdPage*) mpDrawView->GetSdrPageView()->GetPage(); sal_uLong i; @@ -816,8 +816,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) { SfxItemSet* pNewSet = new SfxItemSet( GetDoc()->GetPool(), SDRATTR_TEXT_MINFRAMEHEIGHT, SDRATTR_TEXT_AUTOGROWHEIGHT, 0 ); pNewSet->Put(pObj->GetMergedItemSet()); - pAttrList->Insert( pNewSet, LIST_APPEND ); - pAttrList->Insert( pObj->GetUserCall(), LIST_APPEND ); + aAttrList.push_back(std::make_pair(pNewSet, pObj->GetUserCall())); } } @@ -857,8 +856,10 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) if( pPresPage->IsPresObj( pObj ) ) { - SfxItemSet* pNewSet = (SfxItemSet*) pAttrList->GetObject(j++); - SdrObjUserCall* pUserCall = (SdrObjUserCall*) pAttrList->GetObject(j++); + std::pair<SfxItemSet*,SdrObjUserCall*> &rAttr = aAttrList[j++]; + + SfxItemSet* pNewSet = rAttr.first; + SdrObjUserCall* pUserCall = rAttr.second; if ( pNewSet && pNewSet->GetItemState( SDRATTR_TEXT_MINFRAMEHEIGHT ) == SFX_ITEM_ON ) { @@ -876,8 +877,6 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) delete pNewSet; } } - - delete pAttrList; } delete pSet; |