diff options
author | Caolán McNamara <caolanm@redhat.com> | 2016-10-07 08:58:55 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2016-10-07 08:58:57 +0100 |
commit | 5d2210d5f3fecbd922fdccf0fa9d4b057880b409 (patch) | |
tree | d2761cd46249c3f7f55b10ba9d238b4ddaabd8eb /include/xmloff | |
parent | 82e87b0d7c568db8fa240fb9a842a6611f73f2d7 (diff) |
might as well go back to a std::stack now
after...
commit 8daf6707ef203b26a744140f74d7cd231a25f0dd
Author: Michael Stahl <mstahl@redhat.com>
Date: Thu Oct 6 23:37:51 2016 +0200
xmloff: fix crash in ~XMLParaContext on fdo72541-1.fodt
Change-Id: I57f10e60a2f76dde048a594d8391bb5b246dfc63
Diffstat (limited to 'include/xmloff')
-rw-r--r-- | include/xmloff/xmlimp.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx index 0aedd5b2a6f7..07168bcf0b54 100644 --- a/include/xmloff/xmlimp.hxx +++ b/include/xmloff/xmlimp.hxx @@ -23,7 +23,7 @@ #include <sal/config.h> #include <set> -#include <o3tl/stack.hxx> +#include <stack> #include <xmloff/dllapi.h> #include <sal/types.h> @@ -86,8 +86,8 @@ class XMLErrors; class StyleMap; enum class SvXMLErrorFlags; -typedef o3tl::stack<SvXMLImportContextRef> SvXMLImportContexts_Impl; -typedef o3tl::stack<css::uno::Reference<css::xml::sax::XFastContextHandler>> +typedef std::stack<SvXMLImportContextRef> SvXMLImportContexts_Impl; +typedef std::stack<css::uno::Reference<css::xml::sax::XFastContextHandler>> FastSvXMLImportContexts_Impl; namespace xmloff { |