diff options
| author | Vladimir Glazunov <vg@openoffice.org> | 2010-11-01 16:40:46 +0100 |
|---|---|---|
| committer | Vladimir Glazunov <vg@openoffice.org> | 2010-11-01 16:40:46 +0100 |
| commit | f89817da62023a4228dc5c4652d51d1c036d60a5 (patch) | |
| tree | ae44621a79f7a74289e33c268f6b23f4704f8d70 /svtools/inc | |
| parent | d33b58aa369a9347727c3bb7361b537024ad2ce0 (diff) | |
| parent | d363b075683f89babef27425ed029583b0fb85dd (diff) | |
CWS-TOOLING: integrate CWS svarray
Diffstat (limited to 'svtools/inc')
| -rw-r--r-- | svtools/inc/svtools/parrtf.hxx | 4 | ||||
| -rw-r--r-- | svtools/inc/svtools/syntaxhighlight.hxx | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/svtools/inc/svtools/parrtf.hxx b/svtools/inc/svtools/parrtf.hxx index 179f5a28259a..b96e3937231d 100644 --- a/svtools/inc/svtools/parrtf.hxx +++ b/svtools/inc/svtools/parrtf.hxx @@ -30,7 +30,7 @@ #include "svtools/svtdllapi.h" #include <svtools/svparser.hxx> -#include <svl/svarray.hxx> +#include <stack> struct RtfParserState_Impl { @@ -42,7 +42,7 @@ struct RtfParserState_Impl {} }; -SV_DECL_VARARR( RtfParserStates_Impl, RtfParserState_Impl, 16, 16 ) +typedef std::stack< RtfParserState_Impl > RtfParserStates_Impl; class SVT_DLLPUBLIC SvRTFParser : public SvParser { diff --git a/svtools/inc/svtools/syntaxhighlight.hxx b/svtools/inc/svtools/syntaxhighlight.hxx index 8cf7126fa24c..e406c33fc54f 100644 --- a/svtools/inc/svtools/syntaxhighlight.hxx +++ b/svtools/inc/svtools/syntaxhighlight.hxx @@ -57,8 +57,6 @@ #include <tools/string.hxx> #include <tools/gen.hxx> -#include <svl/svarray.hxx> - // Token-Typen TT_... enum TokenTypes @@ -79,8 +77,7 @@ enum TokenTypes struct HighlightPortion { UINT16 nBegin; UINT16 nEnd; TokenTypes tokenType; }; - -SV_DECL_VARARR(HighlightPortions, HighlightPortion, 0, 16) +typedef std::vector<HighlightPortion> HighlightPortions; ///////////////////////////////////////////////////////////////////////// // Hilfsklasse zur Untersuchung von JavaScript-Modulen, zunaechst zum |