[Libreoffice-commits] core.git: filter/source include/filter

[Takeshi Abe (via logerrit)]

 filter/source/msfilter/svdfppt.cxx  |    6 +-----
 include/filter/msfilter/svdfppt.hxx |    3 +--
 2 files changed, 2 insertions(+), 7 deletions(-)

New commits:
commit 03b3562a91c54e0c1b77982e1ca391b1131ac3c2
Author:     Takeshi Abe <tabe at fixedpoint.jp>
AuthorDate: Wed Mar 13 00:10:20 2019 +0900
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri Apr 12 10:49:10 2019 +0200

    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 at collabora.co.uk>

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