filter: convert boost::ptr_vector to std::vector

... and move it out of the header since it's only used in that class.

Change-Id: Icd5cc86428c97bdaaa07d56e17393846629721e5

1 files changed, 3 insertions, 13 deletions

diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx
index 5ef4b5c9b6f8..14fa1e5e2a24 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -56,7 +56,7 @@ class FmFormModel;
 class SdrModel;
 class SwFlyFrameFormat;
 
-struct SvxMSDffBLIPInfo;
+struct SvxMSDffBLIPInfos;
 struct SvxMSDffShapeInfo;
 struct SvxMSDffShapeOrder;
 
@@ -109,8 +109,7 @@ typedef ::std::map< sal_Int32, SdrObject* > SvxMSDffShapeIdContainer;
 
 #define SVEXT_PERSIST_STREAM "\002OlePres000"
 
-// the following two will be sorted by the order of their appearance:
-typedef boost::ptr_vector<SvxMSDffBLIPInfo> SvxMSDffBLIPInfos;
+/// the following will be sorted by the order of their appearance:
 typedef boost::ptr_vector<SvxMSDffShapeOrder> SvxMSDffShapeOrders;
 
 struct MSFILTER_DLLPUBLIC CompareSvxMSDffShapeInfoById
@@ -400,7 +399,7 @@ public:
 class MSFILTER_DLLPUBLIC SvxMSDffManager : public DffPropertyReader
 {
     FmFormModel*            pFormModel;
-    SvxMSDffBLIPInfos*      pBLIPInfos;
+    SvxMSDffBLIPInfos*      m_pBLIPInfos;
     std::unique_ptr<SvxMSDffShapeInfos_ByTxBxComp> m_xShapeInfosByTxBxComp;
     std::unique_ptr<SvxMSDffShapeInfos_ById> m_xShapeInfosById;
     SvxMSDffShapeOrders*    pShapeOrders;
@@ -722,15 +721,6 @@ public:
     SdrObject* getShapeForId( sal_Int32 nShapeId );
 };
 
-struct SvxMSDffBLIPInfo
-{
-    sal_uInt16 nBLIPType;   ///< type of BLIP: e.g. 6 for PNG
-    sal_uLong  nFilePos;    ///< offset of the BLIP in data strem
-    sal_uLong  nBLIPSize;   ///< number of bytes that the BLIP needs in stream
-    SvxMSDffBLIPInfo(sal_uInt16 nBType, sal_uLong nFPos, sal_uLong nBSize):
-        nBLIPType( nBType ), nFilePos( nFPos ), nBLIPSize( nBSize ){}
-};
-
 struct SvxMSDffShapeInfo
 {
     sal_uInt32 nShapeId; ///< shape id, used in PLCF SPA and in mso_fbtSp (FSP)