diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-05-21 13:43:41 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-05-24 10:19:49 +0200 |
| commit | 552b1fc70fc2fca2ba3d33929f20c3172e9e8bb4 (patch) | |
| tree | e43efc255428dd52d1f174d1b4c9bd0e1d17de38 /include/oox | |
| parent | 9a453051639be4bee9339bface0bb4678eb58bf4 (diff) | |
inline some use-once typedefs
Change-Id: Idddba2f3fd05265b08dbc88edb6152d34a166052
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94730
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/oox')
| -rw-r--r-- | include/oox/drawingml/color.hxx | 4 | ||||
| -rw-r--r-- | include/oox/dump/oledumper.hxx | 10 | ||||
| -rw-r--r-- | include/oox/token/tokenmap.hxx | 5 |
3 files changed, 8 insertions, 11 deletions
diff --git a/include/oox/drawingml/color.hxx b/include/oox/drawingml/color.hxx index 23144a8fd5d5..3f2760babbad 100644 --- a/include/oox/drawingml/color.hxx +++ b/include/oox/drawingml/color.hxx @@ -142,10 +142,10 @@ private: explicit Transformation( sal_Int32 nToken, sal_Int32 nValue ) : mnToken( nToken ), mnValue( nValue ) {} }; - typedef ::std::vector< Transformation > TransformVec; mutable ColorMode meMode; /// Current color mode. - mutable TransformVec maTransforms; /// Color transformations. + mutable std::vector< Transformation > + maTransforms; /// Color transformations. mutable sal_Int32 mnC1; /// Red, red%, hue, scheme token, palette index, system token, or final RGB. mutable sal_Int32 mnC2; /// Green, green%, saturation, or system default RGB. mutable sal_Int32 mnC3; /// Blue, blue%, or luminance. diff --git a/include/oox/dump/oledumper.hxx b/include/oox/dump/oledumper.hxx index bab5eb4a077f..f3cdf0c0ca87 100644 --- a/include/oox/dump/oledumper.hxx +++ b/include/oox/dump/oledumper.hxx @@ -366,10 +366,10 @@ private: explicit StreamProperty( const String& rItemName, sal_uInt16 nData ) : maItemName( rItemName ), mnData( nData ) {} }; - typedef ::std::vector< StreamProperty > StreamPropertyVector; LargePropertyVector maLargeProps; - StreamPropertyVector maStreamProps; + std::vector< StreamProperty > + maStreamProps; NameListRef mxPropNames; sal_Int64 mnPropertiesStart; sal_Int64 mnPropertiesEnd; @@ -548,13 +548,11 @@ struct VbaFormSiteInfo VbaFormSiteInfo() : mnId( 0 ), mnLength( 0 ), mbInStream( false ) {} }; -typedef ::std::vector< VbaFormSiteInfo > VbaFormSiteInfoVector; - struct VbaFormSharedData { - OUStringVector maClassInfoProgIds; - VbaFormSiteInfoVector maSiteInfos; + OUStringVector maClassInfoProgIds; + std::vector< VbaFormSiteInfo > maSiteInfos; }; diff --git a/include/oox/token/tokenmap.hxx b/include/oox/token/tokenmap.hxx index 91fa5cdb0967..cc4705e6a046 100644 --- a/include/oox/token/tokenmap.hxx +++ b/include/oox/token/tokenmap.hxx @@ -77,9 +77,8 @@ private: static sal_Int32 getTokenPerfectHash( const char *pToken, sal_Int32 nLength ); static const css::uno::Sequence< sal_Int8 > EMPTY_BYTE_SEQ; - typedef ::std::vector< css::uno::Sequence< sal_Int8 > > TokenNameVector; - - TokenNameVector maTokenNames; + std::vector< css::uno::Sequence< sal_Int8 > > + maTokenNames; sal_Int32 mnAlphaTokens[26]; }; |