diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2019-03-13 00:10:20 +0900 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-04-12 10:49:10 +0200 |
| commit | 03b3562a91c54e0c1b77982e1ca391b1131ac3c2 (patch) | |
| tree | e3f5a897ea18eac117f554b1f4e55e5bcfdb368d /filter | |
| parent | 70040ba199ab34a792beb34cbafdbc8edc0e22ea (diff) | |
filter: inline PptFontCollection to avoid inheritance of std::vector
Change-Id: Ib431f6f69dc3da958629f54d6d2a1ce76b9d63a5
Reviewed-on: https://gerrit.libreoffice.org/69108
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 69597b3a8b05..7b4e365cfd69 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -461,10 +461,6 @@ SvStream& ReadPptFontEntityAtom( SvStream& rIn, PptFontEntityAtom& rAtom ) return rIn; } -class PptFontCollection : public std::vector<std::unique_ptr<PptFontEntityAtom>> -{ -}; - SvStream& ReadPptUserEditAtom( SvStream& rIn, PptUserEditAtom& rAtom ) { sal_Int16 lastViewType = 0; @@ -2163,7 +2159,7 @@ bool SdrPowerPointImport::ReadFontCollection() { bRet = true; if (!m_pFonts) - m_pFonts.reset( new PptFontCollection ); + m_pFonts.reset( new std::vector<std::unique_ptr<PptFontEntityAtom>> ); std::unique_ptr<PptFontEntityAtom> pFont(new PptFontEntityAtom); ReadPptFontEntityAtom( rStCtrl, *pFont ); |