Kaydet (Commit) 11d40e46 authored tarafından Noel Grandin's avatar Noel Grandin Kaydeden (comit) Michael Stahl

Convert SV_DECL_PTRARR_DEL(TextBlockInfoArr) to boost::ptr_vector

üst 36394723
...@@ -81,9 +81,7 @@ struct TextBlockInfo_Impl ...@@ -81,9 +81,7 @@ struct TextBlockInfo_Impl
String sLongName; String sLongName;
String sGroupName; String sGroupName;
}; };
typedef TextBlockInfo_Impl* TextBlockInfo_ImplPtr; typedef boost::ptr_vector<TextBlockInfo_Impl> TextBlockInfoArr;
SV_DECL_PTRARR_DEL( TextBlockInfoArr, TextBlockInfo_ImplPtr, 0 )
SV_IMPL_PTRARR( TextBlockInfoArr, TextBlockInfo_ImplPtr )
SV_IMPL_REF( SwDocShell ) SV_IMPL_REF( SwDocShell )
/*------------------------------------------------------------------------ /*------------------------------------------------------------------------
...@@ -466,17 +464,17 @@ sal_Bool SwGlossaryHdl::Expand( const String& rShortName, ...@@ -466,17 +464,17 @@ sal_Bool SwGlossaryHdl::Expand( const String& rShortName,
pData->sTitle = sTitle; pData->sTitle = sTitle;
pData->sLongName = sLongName; pData->sLongName = sLongName;
pData->sGroupName = sGroupName; pData->sGroupName = sGroupName;
aFoundArr.Insert(pData, aFoundArr.Count()); aFoundArr.push_back(pData);
} }
} }
} }
} }
if( aFoundArr.Count() ) // one was found if( !aFoundArr.empty() ) // one was found
{ {
pGlossaries->PutGroupDoc(pGlossary); pGlossaries->PutGroupDoc(pGlossary);
if(1 == aFoundArr.Count()) if(1 == aFoundArr.size())
{ {
TextBlockInfo_Impl* pData = aFoundArr.GetObject(0); TextBlockInfo_Impl* pData = &aFoundArr.front();
pGlossary = (SwTextBlocks *)pGlossaries->GetGroupDoc(pData->sGroupName); pGlossary = (SwTextBlocks *)pGlossaries->GetGroupDoc(pData->sGroupName);
nFound = pGlossary->GetIndex( aShortName ); nFound = pGlossary->GetIndex( aShortName );
} }
...@@ -487,9 +485,9 @@ sal_Bool SwGlossaryHdl::Expand( const String& rShortName, ...@@ -487,9 +485,9 @@ sal_Bool SwGlossaryHdl::Expand( const String& rShortName,
AbstractSwSelGlossaryDlg* pDlg = pFact->CreateSwSelGlossaryDlg( 0, aShortName, DLG_SEL_GLOS ); AbstractSwSelGlossaryDlg* pDlg = pFact->CreateSwSelGlossaryDlg( 0, aShortName, DLG_SEL_GLOS );
OSL_ENSURE(pDlg, "Dialogdiet fail!"); OSL_ENSURE(pDlg, "Dialogdiet fail!");
for(sal_uInt16 i = 0; i < aFoundArr.Count(); ++i) for(sal_uInt16 i = 0; i < aFoundArr.size(); ++i)
{ {
TextBlockInfo_Impl* pData = aFoundArr.GetObject(i); TextBlockInfo_Impl* pData = &aFoundArr[i];
pDlg->InsertGlos(pData->sTitle, pData->sLongName); pDlg->InsertGlos(pData->sTitle, pData->sLongName);
} }
pDlg->SelectEntryPos(0); pDlg->SelectEntryPos(0);
...@@ -499,7 +497,7 @@ sal_Bool SwGlossaryHdl::Expand( const String& rShortName, ...@@ -499,7 +497,7 @@ sal_Bool SwGlossaryHdl::Expand( const String& rShortName,
delete pDlg; delete pDlg;
if(LISTBOX_ENTRY_NOTFOUND != nRet) if(LISTBOX_ENTRY_NOTFOUND != nRet)
{ {
TextBlockInfo_Impl* pData = aFoundArr.GetObject(nRet); TextBlockInfo_Impl* pData = &aFoundArr[nRet];
pGlossary = (SwTextBlocks *)pGlossaries->GetGroupDoc(pData->sGroupName); pGlossary = (SwTextBlocks *)pGlossaries->GetGroupDoc(pData->sGroupName);
nFound = pGlossary->GetIndex( aShortName ); nFound = pGlossary->GetIndex( aShortName );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment