diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2014-06-20 13:50:32 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2014-06-23 15:42:46 +0100 |
| commit | 295b97b2a654e00ac5a8e6a3545284fa583fce78 (patch) | |
| tree | 08a949fd0bd861149776dd4cb55d2d5cbebc24df | |
| parent | 9e5e9dd1b276043d2e9f45c01d72b2e89d8abdf2 (diff) | |
fdo#76260 - Switch from vector to std::stack.
std::stack uses std::deque which is extremely expensive for this case.
This change saves 43bn of 98bn cycles spent in createFastChildContext.
Change-Id: I63919a9826563171f128e09d7206ac6cfdde336f
| -rw-r--r-- | writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 6 | ||||
| -rw-r--r-- | writerfilter/source/ooxml/OOXMLFastContextHandler.hxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx index cc208041e2f0..b89a5cf33f56 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx @@ -179,7 +179,7 @@ bool OOXMLFastContextHandler::prepareMceContext(Token_t nElement, const uno::Ref m_bDiscardChildren = false; aState.m_bTookChoice = m_bTookChoice; m_bTookChoice = false; - m_aSavedAlternateStates.push(aState); + m_aSavedAlternateStates.push_back(aState); } break; case OOXML_Choice: @@ -241,8 +241,8 @@ throw (uno::RuntimeException, xml::sax::SAXException, std::exception) m_bDiscardChildren = false; else if (Element == (NS_mce | OOXML_AlternateContent)) { - SavedAlternateState aState(m_aSavedAlternateStates.top()); - m_aSavedAlternateStates.pop(); + SavedAlternateState aState(m_aSavedAlternateStates.back()); + m_aSavedAlternateStates.pop_back(); m_bDiscardChildren = aState.m_bDiscardChildren; m_bTookChoice = aState.m_bTookChoice; } diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx index 053985dbb700..88b1b80cd83a 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx @@ -290,7 +290,7 @@ private: uno::Reference< uno::XComponentContext > m_xContext; bool m_bDiscardChildren; bool m_bTookChoice; ///< Did we take the Choice or want Fallback instead? - std::stack<SavedAlternateState> m_aSavedAlternateStates; + std::vector<SavedAlternateState> m_aSavedAlternateStates; static sal_uInt32 mnInstanceCount; |