From 03b3562a91c54e0c1b77982e1ca391b1131ac3c2 Mon Sep 17 00:00:00 2001
From: Takeshi Abe <tabe@fixedpoint.jp>
Date: Wed, 13 Mar 2019 00:10:20 +0900
Subject: 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>
---
 filter/source/msfilter/svdfppt.cxx | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'filter')

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 );
 
-- 
cgit