diff options
author | Julien Nabet <serval2412@yahoo.fr> | 2017-10-16 22:08:41 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-10-18 08:44:00 +0200 |
commit | a05bb7bf718caf2405c5bfaa4a90f6468f2d66ff (patch) | |
tree | 741ffef245d470b9acf38bb816fe0da7a3cf1f89 /hwpfilter/source/hwpfile.h | |
parent | ebfdb9a15a2228ca85213d7d8e478f92953a54e2 (diff) |
Replace some lists by vectors in hwpfilter
+ simplify some parts
Change-Id: I340d6b6d17f591a58c405965367c15be674103d0
Reviewed-on: https://gerrit.libreoffice.org/43439
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'hwpfilter/source/hwpfile.h')
-rw-r--r-- | hwpfilter/source/hwpfile.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/hwpfilter/source/hwpfile.h b/hwpfilter/source/hwpfile.h index 55a94b628ac5..fee55b75a91c 100644 --- a/hwpfilter/source/hwpfile.h +++ b/hwpfilter/source/hwpfile.h @@ -160,7 +160,7 @@ class DLLEXPORT HWPFile /** * Reads main paragraph list */ - bool ReadParaList(std::list<HWPPara*> &aplist, unsigned char flag = 0); + bool ReadParaList(std::vector<HWPPara*> &aplist, unsigned char flag = 0); /** * Sets if the stream is compressed */ @@ -282,14 +282,14 @@ class DLLEXPORT HWPFile HWPInfo _hwpInfo; HWPFont _hwpFont; HWPStyle _hwpStyle; - std::list<ColumnInfo*> columnlist; - // paragraph linked list - std::list<HWPPara*> plist; - // floating box linked list - std::list<FBox*> blist; - // embedded picture list(tag datas) - std::list<EmPicture*> emblist; - std::list<HyperText*> hyperlist; + std::vector<ColumnInfo*> columnlist; + // paragraph list + std::vector<HWPPara*> plist; + // floating box list + std::vector<FBox*> blist; + // embedded picture list(tag datas) + std::vector<EmPicture*> emblist; + std::vector<HyperText*> hyperlist; int currenthyper; std::vector<std::shared_ptr<ParaShape>> pslist; std::vector<std::shared_ptr<CharShape>> cslist; |