diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-18 14:24:50 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-19 11:57:57 +0100 |
| commit | a5be07d6b627a18f104e2feed063ff9020e8c610 (patch) | |
| tree | 389ea7a3c163bcafca743373b94cda4fba937552 /include/oox | |
| parent | b0cecbfb03dba67f01d1411a1e8b7402c2ca90ce (diff) | |
inline use-once typedefs
Change-Id: I5c3ffc03c26b3428f1f336e6ecba7838a1cf1157
Reviewed-on: https://gerrit.libreoffice.org/46764
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/oox')
| -rw-r--r-- | include/oox/dump/dumperbase.hxx | 11 | ||||
| -rw-r--r-- | include/oox/helper/graphichelper.hxx | 3 | ||||
| -rw-r--r-- | include/oox/helper/storagebase.hxx | 5 |
3 files changed, 7 insertions, 12 deletions
diff --git a/include/oox/dump/dumperbase.hxx b/include/oox/dump/dumperbase.hxx index 97a36f3699ba..9a1f3586b3e9 100644 --- a/include/oox/dump/dumperbase.hxx +++ b/include/oox/dump/dumperbase.hxx @@ -880,8 +880,7 @@ protected: const OUString* implGetOption( const OUString& rKey ) const; private: - typedef std::shared_ptr< SharedConfigData > SharedConfigDataRef; - SharedConfigDataRef mxCfgData; + std::shared_ptr< SharedConfigData > mxCfgData; }; typedef std::shared_ptr< Config > ConfigRef; @@ -984,13 +983,12 @@ private: void writeItemName( const String& rItemName ); private: - typedef ::std::vector< sal_Int32 > StringLenVec; - css::uno::Reference< css::io::XTextOutputStream2 > mxStrm; OUString maIndent; OUStringBuffer maLine; OUString maLastItem; - StringLenVec maColPos; + ::std::vector< sal_Int32 > + maColPos; size_t mnCol; size_t mnItemLevel; size_t mnMultiLevel; @@ -1681,8 +1679,7 @@ protected: virtual bool implReadRecordHeader( BinaryInputStream& rBaseStrm, sal_Int64& ornRecId, sal_Int64& ornRecSize ) = 0; private: - typedef std::shared_ptr< StreamDataSequence > StreamDataSeqRef; - StreamDataSeqRef mxRecData; + std::shared_ptr< StreamDataSequence > mxRecData; }; diff --git a/include/oox/helper/graphichelper.hxx b/include/oox/helper/graphichelper.hxx index 545bdd0fd938..9eb77ee60318 100644 --- a/include/oox/helper/graphichelper.hxx +++ b/include/oox/helper/graphichelper.hxx @@ -157,7 +157,6 @@ public: private: - typedef ::std::map< sal_Int32, sal_Int32 > SystemPalette; typedef ::std::deque< css::uno::Reference< css::graphic::XGraphicObject > > GraphicObjectDeque; typedef ::std::map< OUString, css::uno::Reference< css::graphic::XGraphic > > EmbeddedGraphicMap; @@ -165,7 +164,7 @@ private: css::uno::Reference< css::graphic::XGraphicProvider2 > mxGraphicProvider; css::uno::Reference< css::awt::XUnitConversion > mxUnitConversion; css::awt::DeviceInfo maDeviceInfo; ///< Current output device info. - SystemPalette maSystemPalette; ///< Maps system colors (XML tokens) to RGB color values. + ::std::map< sal_Int32, sal_Int32 > maSystemPalette; ///< Maps system colors (XML tokens) to RGB color values. StorageRef mxStorage; ///< Storage containing embedded graphics. mutable GraphicObjectDeque maGraphicObjects; ///< Caches all created graphic objects to keep them alive. mutable EmbeddedGraphicMap maEmbeddedGraphics; ///< Maps all embedded graphics by their storage path. diff --git a/include/oox/helper/storagebase.hxx b/include/oox/helper/storagebase.hxx index 7f88c5ff2123..537517fbff73 100644 --- a/include/oox/helper/storagebase.hxx +++ b/include/oox/helper/storagebase.hxx @@ -172,9 +172,8 @@ private: StorageRef getSubStorage( const OUString& rElementName, bool bCreateMissing ); private: - typedef RefMap< OUString, StorageBase > SubStorageMap; - - SubStorageMap maSubStorages; ///< Map of direct sub storages. + RefMap< OUString, StorageBase > + maSubStorages; ///< Map of direct sub storages. css::uno::Reference< css::io::XInputStream > mxInStream; ///< Cached base input stream (to keep it alive). css::uno::Reference< css::io::XStream > |