diff options
author | Noel Grandin <noel@peralex.com> | 2015-08-04 08:06:50 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-08-04 08:55:57 +0200 |
commit | f17f89aadc5e88880df0c852289e2fa5b04254ba (patch) | |
tree | 13e85b793019f5c4eab1e2282a94a20b896bd769 /include/filter | |
parent | 50097a8bb2be903d8a985f6f03f364567bf4643d (diff) |
include: inline some use-once typedefs
Change-Id: I064e95c72e5f67178cf2875f457adac241cee529
Diffstat (limited to 'include/filter')
-rw-r--r-- | include/filter/msfilter/escherex.hxx | 6 | ||||
-rw-r--r-- | include/filter/msfilter/msdffimp.hxx | 4 | ||||
-rw-r--r-- | include/filter/msfilter/svdfppt.hxx | 13 |
3 files changed, 7 insertions, 16 deletions
diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx index 8e0e6d3a5011..5acd2335b57b 100644 --- a/include/filter/msfilter/escherex.hxx +++ b/include/filter/msfilter/escherex.hxx @@ -726,13 +726,11 @@ public: }; struct EscherShapeListEntry; -typedef ::std::vector< EscherShapeListEntry* > EscherShapeList_impl; -typedef ::std::vector< EscherConnectorListEntry* > EscherConnectorList_impl; class MSFILTER_DLLPUBLIC EscherSolverContainer { - EscherShapeList_impl maShapeList; - EscherConnectorList_impl maConnectorList; + ::std::vector< EscherShapeListEntry* > maShapeList; + ::std::vector< EscherConnectorListEntry* > maConnectorList; public: diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx index f3ce6b58627c..6108ab22703e 100644 --- a/include/filter/msfilter/msdffimp.hxx +++ b/include/filter/msfilter/msdffimp.hxx @@ -180,11 +180,9 @@ struct SvxMSDffConnectorRule friend SvStream& ReadSvxMSDffConnectorRule( SvStream& rIn, SvxMSDffConnectorRule& rAtom ); }; -typedef ::std::vector< SvxMSDffConnectorRule* > SvxMSDffConnectorRuleList; - struct MSFILTER_DLLPUBLIC SvxMSDffSolverContainer { - SvxMSDffConnectorRuleList aCList; + ::std::vector< SvxMSDffConnectorRule* > aCList; SvxMSDffSolverContainer(); ~SvxMSDffSolverContainer(); diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx index 6dc7d3d9d63f..4f9b8d8137ae 100644 --- a/include/filter/msfilter/svdfppt.hxx +++ b/include/filter/msfilter/svdfppt.hxx @@ -418,7 +418,6 @@ struct SdPageCapsule { SdrPage * page; }; -typedef ::std::vector< PPTOleEntry* > PPTOleEntryList; class PPTExtParaProv; class MSFILTER_DLLPUBLIC SdrEscherImport : public SvxMSDffManager { @@ -432,7 +431,7 @@ protected: PptDocumentAtom aDocAtom; DffRecordManager aDocRecManager; // contains all first level container and atoms of the document container - PPTOleEntryList aOleObjectList; // contains PPTOleEntrys + ::std::vector< PPTOleEntry* > aOleObjectList; PptFontCollection* m_pFonts; @@ -526,7 +525,6 @@ struct ProcessData -typedef ::std::vector< SdHyperlinkEntry* > SdHyperlinkEntryList; class SdrTextObj; class SfxObjectShell; @@ -542,7 +540,7 @@ protected: bool bOk; PptUserEditAtom aUserEditAtom; PptColorSchemeAtom aPageColors; - SdHyperlinkEntryList aHyperList; + ::std::vector< SdHyperlinkEntry* > aHyperList; sal_uInt32* pPersistPtr; sal_uLong nPersistPtrAnz; @@ -669,11 +667,10 @@ struct PPTTextSpecInfo ~PPTTextSpecInfo(); }; -typedef ::std::vector< PPTTextSpecInfo* > PPTTextSpecInfoList; struct PPTTextSpecInfoAtomInterpreter { bool bValid; - PPTTextSpecInfoList aList; + ::std::vector< PPTTextSpecInfo* > aList; PPTTextSpecInfoAtomInterpreter(); ~PPTTextSpecInfoAtomInterpreter(); @@ -717,11 +714,9 @@ struct PPTBuGraEntry PPTBuGraEntry( Graphic& rGraphic, sal_uInt32 nInstance ); }; -typedef ::std::vector< PPTBuGraEntry* > PPTBuGraEntryList; - class PPTExtParaProv { - PPTBuGraEntryList aBuGraList; + ::std::vector< PPTBuGraEntry* > aBuGraList; public: bool bStyles; |