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 /sd | |
| 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 'sd')
| -rw-r--r-- | sd/inc/stlsheet.hxx | 3 | ||||
| -rw-r--r-- | sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/view/DocumentRenderer.cxx | 3 |
3 files changed, 3 insertions, 7 deletions
diff --git a/sd/inc/stlsheet.hxx b/sd/inc/stlsheet.hxx index a24a2b31cafc..d80da5e73578 100644 --- a/sd/inc/stlsheet.hxx +++ b/sd/inc/stlsheet.hxx @@ -151,8 +151,7 @@ private: SdStyleSheet& operator=( const SdStyleSheet& ) = delete; }; -typedef rtl::Reference< SdStyleSheet > SdStyleSheetRef; -typedef std::vector< SdStyleSheetRef > SdStyleSheetVector; +typedef std::vector< rtl::Reference< SdStyleSheet > > SdStyleSheetVector; #endif // INCLUDED_SD_INC_STLSHEET_HXX diff --git a/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx b/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx index b81bb696bef0..0175f6e07200 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx @@ -36,8 +36,6 @@ class FontProvider : public SdGlobalResource { public: - typedef std::shared_ptr<vcl::Font> SharedFontPointer; - /** Return the single instance of this class. Throws a RuntimeException when no instance can be created. */ @@ -57,7 +55,7 @@ private: replaced by another one only when GetFont() is called with a device with a different map mode or by a call to Invalidate(). */ - SharedFontPointer maFont; + std::shared_ptr<vcl::Font> maFont; FontProvider(); virtual ~FontProvider() override; diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index 426f06615983..7bf0ba2d15e2 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -2027,8 +2027,7 @@ private: } // create pairs of pages to print on each page - typedef std::vector< std::pair< sal_uInt16, sal_uInt16 > > PairVector; - PairVector aPairVector; + std::vector< std::pair< sal_uInt16, sal_uInt16 > > aPairVector; if ( ! aPageVector.empty()) { sal_uInt32 nFirstIndex = 0, nLastIndex = aPageVector.size() - 1; |