diff options
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; |