diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2017-04-06 18:53:04 +0900 |
|---|---|---|
| committer | Takeshi Abe <tabe@fixedpoint.jp> | 2017-04-07 01:08:49 +0000 |
| commit | a9bd83bdd390724372d2da3451fae083a72af5b0 (patch) | |
| tree | 79c63645e01fc11404ad1c1dcbb23895003a0378 /starmath/source | |
| parent | 709f49bce86d2df4154d8075818f57cacfecb401 (diff) | |
starmath: Move SmNodeStack to mathmlimport.hxx
which is the only place using it.
Change-Id: I87d5a1f0d0993f7585c9767fc32eb46158503dfb
Reviewed-on: https://gerrit.libreoffice.org/36197
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Takeshi Abe <tabe@fixedpoint.jp>
Diffstat (limited to 'starmath/source')
| -rw-r--r-- | starmath/source/mathmlimport.cxx | 12 | ||||
| -rw-r--r-- | starmath/source/mathmlimport.hxx | 3 |
2 files changed, 15 insertions, 0 deletions
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx index abcea1149093..13cf4d62a01e 100644 --- a/starmath/source/mathmlimport.cxx +++ b/starmath/source/mathmlimport.cxx @@ -84,6 +84,18 @@ using namespace ::xmloff::token; #define IMPORT_SVC_NAME "com.sun.star.xml.XMLImportFilter" +namespace { + +SmNode* popOrZero(SmNodeStack& rStack) +{ + if (rStack.empty()) + return nullptr; + auto pTmp = std::move(rStack.front()); + rStack.pop_front(); + return pTmp.release(); +} + +} sal_uLong SmXMLImportWrapper::Import(SfxMedium &rMedium) { diff --git a/starmath/source/mathmlimport.hxx b/starmath/source/mathmlimport.hxx index addab491ca3f..ded4ced23b72 100644 --- a/starmath/source/mathmlimport.hxx +++ b/starmath/source/mathmlimport.hxx @@ -26,6 +26,7 @@ #include <xmloff/xmltoken.hxx> #include <node.hxx> +#include <deque> #include <memory> class SfxMedium; @@ -37,6 +38,8 @@ namespace com { namespace sun { namespace star { } } } +typedef std::deque<std::unique_ptr<SmNode>> SmNodeStack; + class SmXMLImportWrapper { css::uno::Reference<css::frame::XModel> xModel; |