Kaydet (Commit) 2f2c7c3d authored tarafından Julien Nabet's avatar Julien Nabet

Replace list by vector in XMLEventImportHelper (xmloff)

Change-Id: I5c8ac0a1cad628bd80550d7d0f5cec46d0f66dae
Reviewed-on: https://gerrit.libreoffice.org/45724Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarJulien Nabet <serval2412@yahoo.fr>
üst b4daa672
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include <xmloff/xmlevent.hxx> #include <xmloff/xmlevent.hxx>
#include <map> #include <map>
#include <list> #include <vector>
namespace com { namespace sun { namespace star { namespace com { namespace sun { namespace star {
...@@ -60,7 +60,7 @@ class XMLEventImportHelper ...@@ -60,7 +60,7 @@ class XMLEventImportHelper
NameMap* pEventNameMap; NameMap* pEventNameMap;
/// stack of previous aEventNameMap /// stack of previous aEventNameMap
std::list< NameMap* > aEventNameMapList; std::vector< NameMap* > aEventNameMapVector;
public: public:
XMLEventImportHelper(); XMLEventImportHelper();
......
...@@ -32,7 +32,7 @@ using ::com::sun::star::uno::Sequence; ...@@ -32,7 +32,7 @@ using ::com::sun::star::uno::Sequence;
XMLEventImportHelper::XMLEventImportHelper() : XMLEventImportHelper::XMLEventImportHelper() :
aFactoryMap(), aFactoryMap(),
pEventNameMap(new NameMap), pEventNameMap(new NameMap),
aEventNameMapList() aEventNameMapVector()
{ {
} }
...@@ -91,20 +91,20 @@ void XMLEventImportHelper::AddTranslationTable( ...@@ -91,20 +91,20 @@ void XMLEventImportHelper::AddTranslationTable(
void XMLEventImportHelper::PushTranslationTable() void XMLEventImportHelper::PushTranslationTable()
{ {
// save old map and install new one // save old map and install new one
aEventNameMapList.push_back(pEventNameMap); aEventNameMapVector.push_back(pEventNameMap);
pEventNameMap = new NameMap; pEventNameMap = new NameMap;
} }
void XMLEventImportHelper::PopTranslationTable() void XMLEventImportHelper::PopTranslationTable()
{ {
DBG_ASSERT(aEventNameMapList.size() > 0, DBG_ASSERT(aEventNameMapVector.size() > 0,
"no translation tables left to pop"); "no translation tables left to pop");
if ( !aEventNameMapList.empty() ) if ( !aEventNameMapVector.empty() )
{ {
// delete current and install old map // delete current and install old map
delete pEventNameMap; delete pEventNameMap;
pEventNameMap = aEventNameMapList.back(); pEventNameMap = aEventNameMapVector.back();
aEventNameMapList.pop_back(); aEventNameMapVector.pop_back();
} }
} }
......
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