strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Convert local variable from Container to std::vector and std::set

Browse source 
Change-Id: I0b15939e1d04a3a2a5f8a4e2df8f0826903a8811
This commit is contained in:
Noel Grandin 2012-08-15 15:21:27 +02:00 committed by Michael Stahl
parent f23f141807
commit f482c9fdf3
1 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
svx/source/svdraw/svdotxat.cxx
View file

@ -231,7 +231,7 @@ void SdrTextObj::ImpSetTextStyleSheetListeners()
SfxStyleSheetBasePool* pStylePool=pModel!=NULL ? pModel->GetStyleSheetPool() : NULL;
if (pStylePool!=NULL)
{
Container aStyles(1024,64,64);
std::vector<XubString*> aStyleNames;
OutlinerParaObject* pOutlinerParaObject = GetOutlinerParaObject();
if (pOutlinerParaObject!=NULL)
{
@ -256,28 +256,28 @@ void SdrTextObj::ImpSetTextStyleSheetListeners()
aStyleName += aFam;
sal_Bool bFnd(sal_False);
sal_uInt32 nNum(aStyles.Count());
sal_uInt32 nNum(aStyleNames.size());
while(!bFnd && nNum > 0)
{
// we don't want duplicate stylesheets
nNum--;
bFnd = (aStyleName.Equals(*(XubString*)aStyles.GetObject(nNum)));
bFnd = aStyleName.Equals(*aStyleNames[nNum]);
}
if(!bFnd)
{
aStyles.Insert(new XubString(aStyleName), CONTAINER_APPEND);
aStyleNames.push_back(new XubString(aStyleName));
}
}
}
}
// now replace the strings in the container by StyleSheet*
sal_uIntPtr nNum=aStyles.Count();
while (nNum>0) {
nNum--;
XubString* pName=(XubString*)aStyles.GetObject(nNum);
// now convert the strings in the vector from names to StyleSheet*
std::set<SfxStyleSheet*> aStyleSheets;
while (!aStyleNames.empty()) {
XubString* pName=aStyleNames.back();
aStyleNames.pop_back();
String aFam = pName->Copy(0, pName->Len() - 6);
@ -291,28 +291,24 @@ void SdrTextObj::ImpSetTextStyleSheetListeners()
SfxStyleSheet* pStyle=PTR_CAST(SfxStyleSheet,pStyleBase);
delete pName;
if (pStyle!=NULL && pStyle!=GetStyleSheet()) {
aStyles.Replace(pStyle,nNum);
} else {
aStyles.Remove(nNum);
aStyleSheets.insert(pStyle);
}
}
// now remove all superfluous stylesheets
nNum=GetBroadcasterCount();
sal_uIntPtr nNum=GetBroadcasterCount();
while (nNum>0) {
nNum--;
SfxBroadcaster* pBroadcast=GetBroadcasterJOE((sal_uInt16)nNum);
SfxStyleSheet* pStyle=PTR_CAST(SfxStyleSheet,pBroadcast);
if (pStyle!=NULL && pStyle!=GetStyleSheet()) { // special case for stylesheet of the object
if (aStyles.GetPos(pStyle)==CONTAINER_ENTRY_NOTFOUND) {
if (aStyleSheets.find(pStyle)==aStyleSheets.end()) {
EndListening(*pStyle);
}
}
}
// and finally, merge all stylesheets that are contained in aStyles with previous broadcasters
nNum=aStyles.Count();
while (nNum>0) {
nNum--;
SfxStyleSheet* pStyle=(SfxStyleSheet*)aStyles.GetObject(nNum);
for(std::set<SfxStyleSheet*>::const_iterator it = aStyleSheets.begin(); it != aStyleSheets.end(); ++it) {
SfxStyleSheet* pStyle=*it;
// let StartListening see for itself if there's already a listener registered
StartListening(*pStyle,sal_True);
}