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 /sd/source | |
| 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 'sd/source')
| -rw-r--r-- | sd/source/filter/ppt/pptin.cxx | 2 | ||||
| -rw-r--r-- | sd/source/filter/ppt/pptin.hxx | 1 | ||||
| -rw-r--r-- | sd/source/ui/slideshow/slideshowimpl.hxx | 4 |
3 files changed, 3 insertions, 4 deletions
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 17946aed3fbf..9a7e2b5f93b5 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -1833,7 +1833,7 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const bool bNewAnimations if ( !bNewAnimationsUsed ) { - tAnimationVector aAnimationsOnThisPage; + std::vector< std::pair< SdrObject*, Ppt97AnimationPtr > > aAnimationsOnThisPage; // add effects from page in correct order SdrObjListIter aSdrIter( pPage, SdrIterMode::Flat ); diff --git a/sd/source/filter/ppt/pptin.hxx b/sd/source/filter/ppt/pptin.hxx index 4843bdf13507..02c22e652350 100644 --- a/sd/source/filter/ppt/pptin.hxx +++ b/sd/source/filter/ppt/pptin.hxx @@ -40,7 +40,6 @@ class Ppt97Animation; typedef std::shared_ptr< Ppt97Animation > Ppt97AnimationPtr; typedef ::std::map < SdrObject*, Ppt97AnimationPtr > tAnimationMap; -typedef std::vector< std::pair< SdrObject*, Ppt97AnimationPtr > > tAnimationVector; class ImplSdPPTImport : public SdrPowerPointImport { diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index b3c604bc97b3..dbb4eddc81b9 100644 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -81,7 +81,6 @@ struct WrappedShapeEventImpl }; typedef std::shared_ptr< WrappedShapeEventImpl > WrappedShapeEventImplPtr; -typedef std::map< css::uno::Reference< css::drawing::XShape >, WrappedShapeEventImplPtr > WrappedShapeEventImplMap; class SlideShowListenerProxy : private ::cppu::BaseMutex, public ::cppu::WeakImplHelper< css::presentation::XSlideShowListener, css::presentation::XShapeEventListener > @@ -323,7 +322,8 @@ private: bool mbUsePen; double mdUserPaintStrokeWidth; - WrappedShapeEventImplMap maShapeEventMap; + std::map< css::uno::Reference< css::drawing::XShape >, WrappedShapeEventImplPtr > + maShapeEventMap; css::uno::Reference< css::drawing::XDrawPage > mxPreviewDrawPage; css::uno::Reference< css::animations::XAnimationNode > mxPreviewAnimationNode; |