diff options
| author | Noel Grandin <noel@peralex.com> | 2012-08-08 14:52:00 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-08-13 22:47:03 +0200 |
| commit | 03ec685a0839482995bf8815a1528ee15d2afe3c (patch) | |
| tree | 0922a6f6301bbe61a7c198cd10a77ec01e317f66 /filter/inc | |
| parent | 07f4263cdec47be554da18cc37d2078d170c5ec3 (diff) | |
Convert property lists from tools/list.hxx to std::vector
Change-Id: I447883a8bbfa01ef60e7ad870c0f9ddefb7fdada
Diffstat (limited to 'filter/inc')
| -rw-r--r-- | filter/inc/filter/msfilter/svdfppt.hxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/filter/inc/filter/msfilter/svdfppt.hxx b/filter/inc/filter/msfilter/svdfppt.hxx index c559a820ab14..4693ff617a21 100644 --- a/filter/inc/filter/msfilter/svdfppt.hxx +++ b/filter/inc/filter/msfilter/svdfppt.hxx @@ -33,7 +33,6 @@ #include <tools/string.hxx> #include <tools/gen.hxx> #include <tools/color.hxx> -#include <tools/list.hxx> #include <svx/svdobj.hxx> #include <editeng/numitem.hxx> #include <editeng/editdata.hxx> @@ -1037,11 +1036,14 @@ struct StyleTextProp9 void Read( SvStream& rSt ); }; +typedef std::vector<PPTParaPropSet*> PPTParaPropSetList; +typedef std::vector<PPTCharPropSet*> PPTCharPropSetList; + struct PPTStyleTextPropReader { - ::std::vector< sal_uInt32 > aSpecMarkerList; // hiword -> Flags, loword -> Position - List aParaPropList; - List aCharPropList; + std::vector< sal_uInt32 > aSpecMarkerList; // hiword -> Flags, loword -> Position + PPTParaPropSetList aParaPropList; + PPTCharPropSetList aCharPropList; PPTStyleTextPropReader( SvStream& rIn, @@ -1160,6 +1162,7 @@ public: ); PPTParagraphObj( PPTStyleTextPropReader&, + sal_uInt32 nCurPos, const PPTStyleSheet&, sal_uInt32 nInstance, PPTTextRulerInterpreter& rRuler |