diff options
| author | Noel Grandin <noel@peralex.com> | 2015-08-03 14:03:54 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-08-04 08:55:56 +0200 |
| commit | 3fc7f4c582c04a11bbd6ebede8e8bdc99f3b2034 (patch) | |
| tree | adee3f9d3bef6cddf7039d4eada4e4028a65c19e /starmath | |
| parent | 9e6b501833d4e45ba0239d1adf4911f140304569 (diff) | |
svx,starmath: inline some use-once typedefs
Change-Id: I5a7405d326b7258cbed476c30f88e57559b4cc8e
Diffstat (limited to 'starmath')
| -rw-r--r-- | starmath/inc/error.hxx | 4 | ||||
| -rw-r--r-- | starmath/inc/node.hxx | 1 | ||||
| -rw-r--r-- | starmath/inc/parse.hxx | 4 | ||||
| -rw-r--r-- | starmath/source/parse.cxx | 4 |
4 files changed, 4 insertions, 9 deletions
diff --git a/starmath/inc/error.hxx b/starmath/inc/error.hxx index 9d3dc3026313..7794a4a9b14a 100644 --- a/starmath/inc/error.hxx +++ b/starmath/inc/error.hxx @@ -21,8 +21,6 @@ #include <rtl/ustring.hxx> -#include <boost/ptr_container/ptr_vector.hpp> - class SmNode; enum SmParseError @@ -48,8 +46,6 @@ struct SmErrorDesc OUString Text; }; -typedef boost::ptr_vector< SmErrorDesc > SmErrDescList; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx index 91912bb920ce..ff6f797bc105 100644 --- a/starmath/inc/node.hxx +++ b/starmath/inc/node.hxx @@ -63,7 +63,6 @@ class SmStructureNode; typedef std::shared_ptr<SmNode> SmNodePointer; typedef boost::ptr_deque<SmNode> SmNodeStack; typedef std::vector< SmNode * > SmNodeArray; -typedef std::vector< SmStructureNode * > SmStructureNodeArray; template < typename T > T* popOrZero( boost::ptr_deque<T> & rStack ) diff --git a/starmath/inc/parse.hxx b/starmath/inc/parse.hxx index d9ce5a5f7755..f44f379a7e63 100644 --- a/starmath/inc/parse.hxx +++ b/starmath/inc/parse.hxx @@ -20,8 +20,8 @@ #define INCLUDED_STARMATH_INC_PARSE_HXX #include <vcl/svapp.hxx> - #include <set> +#include <boost/ptr_container/ptr_vector.hpp> #include "types.hxx" #include "token.hxx" @@ -33,7 +33,7 @@ class SmParser OUString m_aBufferString; SmToken m_aCurToken; SmNodeStack m_aNodeStack; - SmErrDescList m_aErrDescList; + boost::ptr_vector< SmErrorDesc > m_aErrDescList; int m_nCurError; LanguageType m_nLang; sal_Int32 m_nBufferIndex, diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx index 873ac624a4d2..59f509163508 100644 --- a/starmath/source/parse.cxx +++ b/starmath/source/parse.cxx @@ -1523,8 +1523,8 @@ void SmParser::DoTerm(bool bGroupNumberIdent) } else if ( TokenInGroup(TGATTRIBUT) || TokenInGroup(TGFONTATTR)) - { SmStructureNodeArray aArray; - + { + std::vector< SmStructureNode * > aArray; bool bIsAttr; sal_uInt16 n = 0; while ( (bIsAttr = TokenInGroup(TGATTRIBUT)) |