diff options
| author | Noel Grandin <noel@peralex.com> | 2015-08-03 11:35:58 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-08-03 12:16:13 +0000 |
| commit | 5256953397b495e9271cec92cc78514d772acaf5 (patch) | |
| tree | 4fb0ff2d5938a849c19f675be5016c423fd3ea7e /writerfilter | |
| parent | 7dc5e8731fdc3a11ca429e717ec4a05e67ea1d21 (diff) | |
inline some use-once typedefs
Change-Id: I55cc82c8e180cce371c996690608090b1bfdfda4
Reviewed-on: https://gerrit.libreoffice.org/17494
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.hxx | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx index 4b2e638ce759..519f8e5eb480 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx @@ -226,13 +226,6 @@ struct AnchoredContext typedef std::shared_ptr<FieldContext> FieldContextPtr; -typedef std::stack<ContextType> ContextStack; -typedef std::stack<PropertyMapPtr> PropertyStack; -typedef std::stack< TextAppendContext > TextAppendStack; -typedef std::stack<HeaderFooterContext> HeaderFooterStack; -typedef std::stack<FieldContextPtr> FieldStack; -typedef std::stack< AnchoredContext > TextContentStack; - /*------------------------------------------------------------------------- extended tab stop struct -----------------------------------------------------------------------*/ @@ -340,12 +333,10 @@ private: css::uno::Reference<css::text::XText> m_xBodyText; css::uno::Reference<css::text::XTextContent> m_xEmbedded; - TextAppendStack m_aTextAppendStack; - - TextContentStack m_aAnchoredStack; - - HeaderFooterStack m_aHeaderFooterStack; - FieldStack m_aFieldStack; + std::stack<TextAppendContext> m_aTextAppendStack; + std::stack<AnchoredContext> m_aAnchoredStack; + std::stack<HeaderFooterContext> m_aHeaderFooterStack; + std::stack<FieldContextPtr> m_aFieldStack; bool m_bSetUserFieldContent; bool m_bSetCitation; bool m_bSetDateValue; @@ -379,8 +370,8 @@ private: std::shared_ptr<DomainMapperTableHandler> m_pTableHandler; //each context needs a stack of currently used attributes - PropertyStack m_aPropertyStacks[NUMBER_OF_CONTEXTS]; - ContextStack m_aContextStack; + std::stack<PropertyMapPtr> m_aPropertyStacks[NUMBER_OF_CONTEXTS]; + std::stack<ContextType> m_aContextStack; FontTablePtr m_pFontTable; ListsManager::Pointer m_pListTable; std::deque< css::uno::Reference<css::drawing::XShape> > m_aPendingShapes; |