summaryrefslogtreecommitdiff
path: root/include/filter
diff options
context:
space:
mode:
authorTakeshi Abe <tabe@fixedpoint.jp>2019-03-13 00:10:20 +0900
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-04-12 10:49:10 +0200
commit03b3562a91c54e0c1b77982e1ca391b1131ac3c2 (patch)
treee3f5a897ea18eac117f554b1f4e55e5bcfdb368d /include/filter
parent70040ba199ab34a792beb34cbafdbc8edc0e22ea (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 'include/filter')
-rw-r--r--include/filter/msfilter/svdfppt.hxx3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx
index f907cc01d40e..66be39501c79 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -281,7 +281,6 @@ struct PptFontEntityAtom
friend SvStream& ReadPptFontEntityAtom(SvStream& rIn, PptFontEntityAtom& rAtom);
};
-class PptFontCollection;
enum class PptViewTypeEnum : sal_uInt16
{
NONE = 0,
@@ -463,7 +462,7 @@ protected:
::std::vector< PPTOleEntry > aOleObjectList;
- std::unique_ptr<PptFontCollection> m_pFonts;
+ std::unique_ptr<std::vector<std::unique_ptr<PptFontEntityAtom>>> m_pFonts;
sal_uInt32 nStreamLen;