Kaydet (Commit) fcc2415a authored tarafından Michael Stahl's avatar Michael Stahl

sw: replace boost::ptr_vector with std::vector

Change-Id: I5c011939ec492e0ae2cf136554b8b1f42e1253e9
üst 2f5748af
...@@ -59,8 +59,6 @@ ...@@ -59,8 +59,6 @@
#include <IDocumentFieldsAccess.hxx> #include <IDocumentFieldsAccess.hxx>
#include <boost/ptr_container/ptr_vector.hpp>
#include <memory> #include <memory>
using namespace ::com::sun::star; using namespace ::com::sun::star;
...@@ -72,6 +70,8 @@ struct TextBlockInfo_Impl ...@@ -72,6 +70,8 @@ struct TextBlockInfo_Impl
OUString sTitle; OUString sTitle;
OUString sLongName; OUString sLongName;
OUString sGroupName; OUString sGroupName;
TextBlockInfo_Impl(OUString const& rTitle, OUString const& rLongName, OUString const& rGroupName)
: sTitle(rTitle), sLongName(rLongName), sGroupName(rGroupName) {}
}; };
// Dialog for edit templates // Dialog for edit templates
...@@ -395,7 +395,7 @@ bool SwGlossaryHdl::Expand( const OUString& rShortName, ...@@ -395,7 +395,7 @@ bool SwGlossaryHdl::Expand( const OUString& rShortName,
SwGlossaries *pGlossaries, SwGlossaries *pGlossaries,
SwTextBlocks *pGlossary ) SwTextBlocks *pGlossary )
{ {
boost::ptr_vector<TextBlockInfo_Impl> aFoundArr; std::vector<TextBlockInfo_Impl> aFoundArr;
OUString aShortName( rShortName ); OUString aShortName( rShortName );
bool bCancel = false; bool bCancel = false;
// search for text block // search for text block
...@@ -424,11 +424,7 @@ bool SwGlossaryHdl::Expand( const OUString& rShortName, ...@@ -424,11 +424,7 @@ bool SwGlossaryHdl::Expand( const OUString& rShortName,
const OUString sShortName(pGlossaryList->GetBlockShortName(i, j)); const OUString sShortName(pGlossaryList->GetBlockShortName(i, j));
if( rSCmp.isEqual( rShortName, sShortName )) if( rSCmp.isEqual( rShortName, sShortName ))
{ {
TextBlockInfo_Impl* pData = new TextBlockInfo_Impl; aFoundArr.push_back(TextBlockInfo_Impl(sTitle, sLongName, sGroupName));
pData->sTitle = sTitle;
pData->sLongName = sLongName;
pData->sGroupName = sGroupName;
aFoundArr.push_back(pData);
} }
} }
} }
......
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