diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-08-14 15:45:18 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-08-14 18:08:47 +0100 |
| commit | 4466a7949af63621a2b180715de2ae3675343715 (patch) | |
| tree | ef1e50111945834e819367c98f77245565f31e22 /sw/source/filter/ww8/ww8scan.hxx | |
| parent | 6d78caf68cd63a671342e777bfe78721b424f4d6 (diff) | |
convert pPieceGrpprls to vector and merge calc and load loops together
we retain the max-short limit but no longer add a null terminating entry
Change-Id: Ie195e0c244cc08643a9c22518c85d70a883752b7
Diffstat (limited to 'sw/source/filter/ww8/ww8scan.hxx')
| -rw-r--r-- | sw/source/filter/ww8/ww8scan.hxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx index 26a94acce028..4be181b81694 100644 --- a/sw/source/filter/ww8/ww8scan.hxx +++ b/sw/source/filter/ww8/ww8scan.hxx @@ -412,7 +412,7 @@ class WW8PLCFx_PCDAttrs : public WW8PLCFx private: WW8PLCFpcd_Iter* pPcdI; WW8PLCFx_PCD* pPcd; - sal_uInt8** const pGrpprls; // attribute of Piece-table + sal_uInt8* const* pGrpprls; // attribute of Piece-table SVBT32 aShortSprm; // mini storage: can contain ONE sprm with // 1 byte param sal_uInt16 nGrpprls; // attribute count of this @@ -1011,8 +1011,7 @@ private: WW8PLCFpcd_Iter* pPieceIter; // for FastSave ( iterator for previous ) WW8PLCFx_PCD* pPLCFx_PCD; // ditto WW8PLCFx_PCDAttrs* pPLCFx_PCDAttrs; - sal_uInt8** pPieceGrpprls; // attributes of Piece-Table - sal_uInt16 nPieceGrpprls; // number of such attributes + std::vector<sal_uInt8*> aPieceGrpprls; // attributes of Piece-Table WW8PLCFpcd* OpenPieceTable( SvStream* pStr, const WW8Fib* pWwF ); void DeletePieceTable(); |