boost->std

Change-Id: I3fd9e1599c5ad812879a58cf1dabbcd393105e1c
Reviewed-on: https://gerrit.libreoffice.org/18564
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

19 files changed, 58 insertions, 58 deletions

diff --git a/slideshow/source/engine/activitiesqueue.cxx b/slideshow/source/engine/activitiesqueue.cxx
index 5009dbe62681..dab919003daa 100644
--- a/slideshow/source/engine/activitiesqueue.cxx
+++ b/slideshow/source/engine/activitiesqueue.cxx
@@ -26,8 +26,8 @@
 #include "activity.hxx"
 #include "activitiesqueue.hxx"
 
-#include <boost/shared_ptr.hpp>
 #include <algorithm>
+#include <memory>
 
 
 using namespace ::com::sun::star;
@@ -37,7 +37,7 @@ namespace slideshow
     namespace internal
     {
         ActivitiesQueue::ActivitiesQueue(
-          const ::boost::shared_ptr< ::canvas::tools::ElapsedTime >& pPresTimer ) :
+          const std::shared_ptr< ::canvas::tools::ElapsedTime >& pPresTimer ) :
             mpTimer( pPresTimer ),
             maCurrentActivitiesWaiting(),
             maCurrentActivitiesReinsert(),
diff --git a/slideshow/source/engine/eventqueue.cxx b/slideshow/source/engine/eventqueue.cxx
index 77a23336e238..b69f0d8d2183 100644
--- a/slideshow/source/engine/eventqueue.cxx
+++ b/slideshow/source/engine/eventqueue.cxx
@@ -27,8 +27,8 @@
 #include <eventqueue.hxx>
 #include <slideshowexceptions.hxx>
 
-#include <boost/shared_ptr.hpp>
 #include <limits>
+#include <memory>
 
 
 using namespace ::com::sun::star;
@@ -46,7 +46,7 @@ namespace slideshow
 
 
         EventQueue::EventQueue(
-            boost::shared_ptr<canvas::tools::ElapsedTime> const & pPresTimer )
+            std::shared_ptr<canvas::tools::ElapsedTime> const & pPresTimer )
             : maMutex(),
               maEvents(),
               maNextEvents(),
diff --git a/slideshow/source/engine/rehearsetimingsactivity.cxx b/slideshow/source/engine/rehearsetimingsactivity.cxx
index a5103c0bec6f..47f18e94a52d 100644
--- a/slideshow/source/engine/rehearsetimingsactivity.cxx
+++ b/slideshow/source/engine/rehearsetimingsactivity.cxx
@@ -59,7 +59,7 @@ class RehearseTimingsActivity::WakeupEvent : public Event,
                                              private ::boost::noncopyable
 {
 public:
-    WakeupEvent( boost::shared_ptr< ::canvas::tools::ElapsedTime > const& pTimeBase,
+    WakeupEvent( std::shared_ptr< ::canvas::tools::ElapsedTime > const& pTimeBase,
                  ActivitySharedPtr const&                                 rActivity,
                  ActivitiesQueue &                                        rActivityQueue ) :
         Event("WakeupEvent"),
diff --git a/slideshow/source/engine/rehearsetimingsactivity.hxx b/slideshow/source/engine/rehearsetimingsactivity.hxx
index f35b735e04dd..79f01f45f4a8 100644
--- a/slideshow/source/engine/rehearsetimingsactivity.hxx
+++ b/slideshow/source/engine/rehearsetimingsactivity.hxx
@@ -97,9 +97,9 @@ private:
     class MouseHandler;
     friend class MouseHandler;
 
-    typedef ::std::vector<
-        ::std::pair<UnoViewSharedPtr,
-                    boost::shared_ptr<cppcanvas::CustomSprite> > > ViewsVecT;
+    typedef std::vector<
+        std::pair<UnoViewSharedPtr,
+                    std::shared_ptr<cppcanvas::CustomSprite> > > ViewsVecT;
 
     template <typename func_type>
     void for_each_sprite( func_type const & func ) const
diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx
index 65d22e8c8e0d..f15cc842b726 100644
--- a/slideshow/source/engine/shapes/viewmediashape.cxx
+++ b/slideshow/source/engine/shapes/viewmediashape.cxx
@@ -87,10 +87,10 @@ namespace slideshow
             ENSURE_OR_THROW( mpViewLayer->getCanvas(), "ViewMediaShape::ViewMediaShape(): Invalid ViewLayer canvas" );
             ENSURE_OR_THROW( mxComponentContext.is(), "ViewMediaShape::ViewMediaShape(): Invalid component context" );
 
-            UnoViewSharedPtr pUnoView (::boost::dynamic_pointer_cast<UnoView>(rViewLayer));
-            if (pUnoView)
+            UnoViewSharedPtr xUnoView(std::dynamic_pointer_cast<UnoView>(rViewLayer));
+            if (xUnoView)
             {
-                mbIsSoundEnabled = pUnoView->isSoundEnabled();
+                mbIsSoundEnabled = xUnoView->isSoundEnabled();
             }
         }
 
diff --git a/slideshow/source/engine/slide/layermanager.cxx b/slideshow/source/engine/slide/layermanager.cxx
index fa739429b9d8..2c78e7866d6c 100644
--- a/slideshow/source/engine/slide/layermanager.cxx
+++ b/slideshow/source/engine/slide/layermanager.cxx
@@ -557,7 +557,7 @@ namespace slideshow
                 {
                 }
 
-                virtual bool isOnView(boost::shared_ptr<View> const& /*rView*/) const SAL_OVERRIDE
+                virtual bool isOnView(std::shared_ptr<View> const& /*rView*/) const SAL_OVERRIDE
                 {
                     return true; // visible on all views
                 }
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
index 99e34530dd31..9a145ddf8f13 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -445,7 +445,7 @@ private:
     boost::optional<sal_Int32>          maEraseInk;
     //end changed
 
-    boost::shared_ptr<canvas::tools::ElapsedTime> mpPresTimer;
+    std::shared_ptr<canvas::tools::ElapsedTime> mpPresTimer;
     ScreenUpdater                           maScreenUpdater;
     EventQueue                              maEventQueue;
     EventMultiplexer                        maEventMultiplexer;
@@ -2005,7 +2005,7 @@ sal_Bool SlideShowImpl::update( double & nNextTimeout )
             //Get a shared-ptr that outlives the scope-guard which will
             //ensure that the pointed-to-item exists in the case of a
             //::dispose clearing mpPresTimer
-            boost::shared_ptr<canvas::tools::ElapsedTime> xTimer(mpPresTimer);
+            std::shared_ptr<canvas::tools::ElapsedTime> xTimer(mpPresTimer);
             comphelper::ScopeGuard scopeGuard(
                 boost::bind( &canvas::tools::ElapsedTime::releaseTimer,
                              boost::cref(xTimer) ) );
diff --git a/slideshow/source/engine/slideview.cxx b/slideshow/source/engine/slideview.cxx
index e3c00ea6d9c1..4aa348f60e98 100644
--- a/slideshow/source/engine/slideview.cxx
+++ b/slideshow/source/engine/slideview.cxx
@@ -84,7 +84,7 @@ struct SpriteEntry
         return mnPriority < rRHS.mnPriority;
     }
 
-    boost::weak_ptr< cppcanvas::CustomSprite > mpSprite;
+    std::weak_ptr< cppcanvas::CustomSprite > mpSprite;
     double                                     mnPriority;
 };
 
@@ -570,7 +570,7 @@ private:
                   basegfx::B2IRange(0,0,rSpriteSize.getX(),rSpriteSize.getY()));
     }
 
-    virtual bool isOnView(boost::shared_ptr<View> const& rView) const SAL_OVERRIDE
+    virtual bool isOnView(std::shared_ptr<View> const& rView) const SAL_OVERRIDE
     {
         return rView.get() == mpParentView;
     }
@@ -692,7 +692,7 @@ private:
     virtual void setCursorShape( sal_Int16 nPointerShape ) SAL_OVERRIDE;
 
     // ViewLayer interface
-    virtual bool isOnView(boost::shared_ptr<View> const& rView) const SAL_OVERRIDE;
+    virtual bool isOnView(std::shared_ptr<View> const& rView) const SAL_OVERRIDE;
     virtual void clear() const SAL_OVERRIDE;
     virtual void clearAll() const SAL_OVERRIDE;
     virtual cppcanvas::CanvasSharedPtr getCanvas() const SAL_OVERRIDE;
@@ -727,7 +727,7 @@ private:
     void updateClip();
 
 private:
-    typedef std::vector< boost::weak_ptr<SlideViewLayer> > ViewLayerVector;
+    typedef std::vector< std::weak_ptr<SlideViewLayer> > ViewLayerVector;
 
     /// Prune viewlayers from deceased ones, optionally update them
     void pruneLayers( bool bWithViewLayerUpdate=false ) const;
@@ -833,14 +833,14 @@ ViewLayerSharedPtr SlideView::createViewLayer( const basegfx::B2DRange& rLayerBo
     if( nNumLayers > LAYER_ULLAGE )
         pruneLayers();
 
-    boost::shared_ptr<SlideViewLayer> pViewLayer( new SlideViewLayer(mpCanvas,
+    std::shared_ptr<SlideViewLayer> xViewLayer( new SlideViewLayer(mpCanvas,
                                                                      getTransformation(),
                                                                      rLayerBounds,
                                                                      maUserSize,
                                                                      this) );
-    maViewLayers.push_back( pViewLayer );
+    maViewLayers.push_back(xViewLayer);
 
-    return pViewLayer;
+    return xViewLayer;
 }
 
 bool SlideView::updateScreen() const
@@ -915,7 +915,7 @@ void SlideView::setCursorShape( sal_Int16 nPointerShape )
         mxView->setMouseCursor( nPointerShape );
 }
 
-bool SlideView::isOnView(boost::shared_ptr<View> const& rView) const
+bool SlideView::isOnView(std::shared_ptr<View> const& rView) const
 {
     return rView.get() == this;
 }
@@ -1145,14 +1145,14 @@ void SlideView::pruneLayers( bool bWithViewLayerUpdate ) const
     // check all layers for validity, and retain only the live ones
     for( const auto& rViewLayer : maViewLayers )
     {
-        boost::shared_ptr< SlideViewLayer > pCurrLayer( rViewLayer.lock() );
+        std::shared_ptr< SlideViewLayer > xCurrLayer( rViewLayer.lock() );
 
-        if( pCurrLayer )
+        if (xCurrLayer)
         {
-            aValidLayers.push_back( pCurrLayer );
+            aValidLayers.push_back(xCurrLayer);
 
             if( bWithViewLayerUpdate )
-                pCurrLayer->updateView( rCurrTransform,
+                xCurrLayer->updateView( rCurrTransform,
                                         maUserSize );
         }
     }
@@ -1167,7 +1167,7 @@ UnoViewSharedPtr createSlideView( uno::Reference< presentation::XSlideShowView>
                                   EventQueue&                                          rEventQueue,
                                   EventMultiplexer&                                    rEventMultiplexer )
 {
-    boost::shared_ptr<SlideView> const that(
+    std::shared_ptr<SlideView> const that(
         comphelper::make_shared_from_UNO(
             new SlideView(xView,
                           rEventQueue,
diff --git a/slideshow/source/engine/transitions/slidechangebase.cxx b/slideshow/source/engine/transitions/slidechangebase.cxx
index a39d40162147..a029608ebef5 100644
--- a/slideshow/source/engine/transitions/slidechangebase.cxx
+++ b/slideshow/source/engine/transitions/slidechangebase.cxx
@@ -358,7 +358,7 @@ bool SlideChangeBase::operator()( double nValue )
 
 void SlideChangeBase::prepareForRun(
     const ViewEntry& /* rViewEntry */,
-    const boost::shared_ptr<cppcanvas::Canvas>& /* rDestinationCanvas */ )
+    const std::shared_ptr<cppcanvas::Canvas>& /* rDestinationCanvas */ )
 {
 }
 
diff --git a/slideshow/source/engine/transitions/slidechangebase.hxx b/slideshow/source/engine/transitions/slidechangebase.hxx
index 7860150b30f0..5eb268b5ebaa 100644
--- a/slideshow/source/engine/transitions/slidechangebase.hxx
+++ b/slideshow/source/engine/transitions/slidechangebase.hxx
@@ -98,9 +98,9 @@ protected:
         /// The view this entry is for
         UnoViewSharedPtr                              mpView;
         /// outgoing slide sprite
-        boost::shared_ptr<cppcanvas::CustomSprite>    mpOutSprite;
+        std::shared_ptr<cppcanvas::CustomSprite>    mpOutSprite;
         /// incoming slide sprite
-        boost::shared_ptr<cppcanvas::CustomSprite>    mpInSprite;
+        std::shared_ptr<cppcanvas::CustomSprite>    mpInSprite;
         /// outgoing slide bitmap
         mutable SlideBitmapSharedPtr                  mpLeavingBitmap;
         /// incoming slide bitmap
@@ -124,7 +124,7 @@ protected:
     ::basegfx::B2ISize getEnteringSlideSizePixel( const UnoViewSharedPtr& pView ) const;
 
     static void renderBitmap( SlideBitmapSharedPtr const&                 pSlideBitmap,
-                       boost::shared_ptr<cppcanvas::Canvas> const& pCanvas );
+                       std::shared_ptr<cppcanvas::Canvas> const& pCanvas );
 
     /** Called on derived classes to perform actions before first run.
 
@@ -150,9 +150,9 @@ protected:
         Current parameter value
     */
     virtual void performIn(
-        const boost::shared_ptr<cppcanvas::CustomSprite>&   rSprite,
+        const std::shared_ptr<cppcanvas::CustomSprite>&   rSprite,
         const ViewEntry&                                    rViewEntry,
-        const boost::shared_ptr<cppcanvas::Canvas>&         rDestinationCanvas,
+        const std::shared_ptr<cppcanvas::Canvas>&         rDestinationCanvas,
         double                                              t );
 
     /** Called on derived classes to implement actual slide change.
@@ -167,16 +167,16 @@ protected:
         Current parameter value
     */
     virtual void performOut(
-        const boost::shared_ptr<cppcanvas::CustomSprite>& rSprite,
+        const std::shared_ptr<cppcanvas::CustomSprite>& rSprite,
         const ViewEntry&                                  rViewEntry,
-        const boost::shared_ptr<cppcanvas::Canvas>&       rDestinationCanvas,
+        const std::shared_ptr<cppcanvas::Canvas>&       rDestinationCanvas,
         double                                            t );
 
     ScreenUpdater& getScreenUpdater() const { return mrScreenUpdater; }
 
 private:
 
-    boost::shared_ptr<cppcanvas::CustomSprite> createSprite(
+    std::shared_ptr<cppcanvas::CustomSprite> createSprite(
         UnoViewSharedPtr const &   pView,
         ::basegfx::B2DSize const & rSpriteSize,
         double                     nPrio ) const;
diff --git a/slideshow/source/engine/wakeupevent.cxx b/slideshow/source/engine/wakeupevent.cxx
index 35c13963403d..5479d103516d 100644
--- a/slideshow/source/engine/wakeupevent.cxx
+++ b/slideshow/source/engine/wakeupevent.cxx
@@ -26,7 +26,7 @@ namespace slideshow
     namespace internal
     {
         WakeupEvent::WakeupEvent(
-            boost::shared_ptr<canvas::tools::ElapsedTime> const & pTimeBase,
+            std::shared_ptr<canvas::tools::ElapsedTime> const & pTimeBase,
             ActivitiesQueue& rActivityQueue ) :
             Event("WakeupEvent"),
             maTimer(pTimeBase),
diff --git a/slideshow/source/inc/activitiesqueue.hxx b/slideshow/source/inc/activitiesqueue.hxx
index 78057f02faa0..24a0031208b1 100644
--- a/slideshow/source/inc/activitiesqueue.hxx
+++ b/slideshow/source/inc/activitiesqueue.hxx
@@ -52,7 +52,7 @@ namespace slideshow
                 adjusting and holding global presentation time.
              */
             ActivitiesQueue(
-                const ::boost::shared_ptr< ::canvas::tools::ElapsedTime >&  pPresTimer );
+                const std::shared_ptr< ::canvas::tools::ElapsedTime >&  pPresTimer );
             ~ActivitiesQueue();
 
             /** Add the given activity to the queue.
@@ -83,11 +83,11 @@ namespace slideshow
 
             /** Gets the queue's timer object.
              */
-            ::boost::shared_ptr< ::canvas::tools::ElapsedTime > const &
+            std::shared_ptr< ::canvas::tools::ElapsedTime > const &
             getTimer() const { return mpTimer; }
 
         private:
-            ::boost::shared_ptr< ::canvas::tools::ElapsedTime > mpTimer;
+            std::shared_ptr< ::canvas::tools::ElapsedTime > mpTimer;
 
             typedef ::std::deque< ActivitySharedPtr > ActivityQueue;
 
diff --git a/slideshow/source/inc/eventqueue.hxx b/slideshow/source/inc/eventqueue.hxx
index c014ff36be5b..d3f5bebc4201 100644
--- a/slideshow/source/inc/eventqueue.hxx
+++ b/slideshow/source/inc/eventqueue.hxx
@@ -44,7 +44,7 @@ namespace slideshow
         {
         public:
             EventQueue(
-                ::boost::shared_ptr< ::canvas::tools::ElapsedTime >
+                std::shared_ptr< ::canvas::tools::ElapsedTime >
                 const & pPresTimer );
 
             ~EventQueue();
@@ -113,7 +113,7 @@ namespace slideshow
 
             /** Gets the queue's timer object.
              */
-            ::boost::shared_ptr< ::canvas::tools::ElapsedTime > const &
+            std::shared_ptr< ::canvas::tools::ElapsedTime > const &
             getTimer() const { return mpTimer; }
 
         private:
@@ -140,7 +140,7 @@ namespace slideshow
             // perform timing of events via relative time
             // measurements. The world time starts, when the
             // EventQueue object is created
-            ::boost::shared_ptr< ::canvas::tools::ElapsedTime > mpTimer;
+            std::shared_ptr< ::canvas::tools::ElapsedTime > mpTimer;
         };
 
     }
diff --git a/slideshow/source/inc/shapeimporter.hxx b/slideshow/source/inc/shapeimporter.hxx
index 203530fbd853..f05e4a01fba5 100644
--- a/slideshow/source/inc/shapeimporter.hxx
+++ b/slideshow/source/inc/shapeimporter.hxx
@@ -35,9 +35,9 @@ namespace internal {
 
 struct SlideShowContext;
 
-typedef ::std::vector< ::cppcanvas::PolyPolygonSharedPtr> PolyPolygonVector;
-typedef ::boost::shared_ptr< UnoView >      UnoViewSharedPtr;
-typedef ::std::vector< UnoViewSharedPtr >   UnoViewVector;
+typedef std::vector< ::cppcanvas::PolyPolygonSharedPtr> PolyPolygonVector;
+typedef std::shared_ptr< UnoView >      UnoViewSharedPtr;
+typedef std::vector< UnoViewSharedPtr >   UnoViewVector;
 
 /** This class imports all shapes from a given XShapes object
  */
diff --git a/slideshow/source/inc/tools.hxx b/slideshow/source/inc/tools.hxx
index e1eefd7f1923..bd6a4ea7ccbe 100644
--- a/slideshow/source/inc/tools.hxx
+++ b/slideshow/source/inc/tools.hxx
@@ -281,13 +281,13 @@ namespace slideshow
 
         /** Fill a plain rectangle on the given canvas with the given color
          */
-        void fillRect( const boost::shared_ptr< cppcanvas::Canvas >& rCanvas,
+        void fillRect( const std::shared_ptr< cppcanvas::Canvas >& rCanvas,
                        const basegfx::B2DRange&                      rRect,
                        cppcanvas::Color::IntSRGBA                    aFillColor );
 
         /** Init canvas with default background (white)
          */
-        void initSlideBackground( const boost::shared_ptr< cppcanvas::Canvas >& rCanvas,
+        void initSlideBackground( const std::shared_ptr< cppcanvas::Canvas >& rCanvas,
                                   const basegfx::B2IVector&                     rSize );
 
         /// Gets a random ordinal [0,n)
@@ -389,7 +389,7 @@ namespace slideshow
 */
 
         basegfx::B2IVector getSlideSizePixel( const basegfx::B2DVector&         rSize,
-                                              const boost::shared_ptr<UnoView>& pView );
+                                              const std::shared_ptr<UnoView>& pView );
     }
 
     // TODO(Q1): this could possibly be implemented with a somewhat
diff --git a/slideshow/source/inc/unoview.hxx b/slideshow/source/inc/unoview.hxx
index 81ad021dcdad..84b8655b1dec 100644
--- a/slideshow/source/inc/unoview.hxx
+++ b/slideshow/source/inc/unoview.hxx
@@ -69,8 +69,8 @@ namespace slideshow
             virtual void setIsSoundEnabled (const bool bValue) = 0;
         };
 
-        typedef ::boost::shared_ptr< UnoView >      UnoViewSharedPtr;
-        typedef ::std::vector< UnoViewSharedPtr >   UnoViewVector;
+        typedef std::shared_ptr< UnoView >      UnoViewSharedPtr;
+        typedef std::vector< UnoViewSharedPtr >   UnoViewVector;
     }
 }
 
diff --git a/slideshow/source/inc/view.hxx b/slideshow/source/inc/view.hxx
index f83ae3423e54..5264640d5993 100644
--- a/slideshow/source/inc/view.hxx
+++ b/slideshow/source/inc/view.hxx
@@ -79,8 +79,8 @@ namespace slideshow
             virtual void setCursorShape( sal_Int16 nPointerShape ) = 0;
         };
 
-        typedef ::boost::shared_ptr< View >     ViewSharedPtr;
-        typedef ::std::vector< ViewSharedPtr >  ViewVector;
+        typedef std::shared_ptr< View >     ViewSharedPtr;
+        typedef std::vector< ViewSharedPtr >  ViewVector;
     }
 }
 
diff --git a/slideshow/source/inc/viewlayer.hxx b/slideshow/source/inc/viewlayer.hxx
index a30d210820a5..5fa1cdb49a96 100644
--- a/slideshow/source/inc/viewlayer.hxx
+++ b/slideshow/source/inc/viewlayer.hxx
@@ -57,14 +57,14 @@ namespace slideshow
                 @return true, if this layer displays on the given
                 view.
             */
-            virtual bool isOnView(boost::shared_ptr<View> const& rView) const = 0;
+            virtual bool isOnView(std::shared_ptr<View> const& rView) const = 0;
 
             /** Get the associated canvas of this layer.
 
                 The canvas returned by this method must not change, as
                 long as this object is alive.
             */
-            virtual boost::shared_ptr< cppcanvas::Canvas > getCanvas() const = 0;
+            virtual std::shared_ptr< cppcanvas::Canvas > getCanvas() const = 0;
 
             /** Clear the clipped view layer area
 
@@ -99,7 +99,7 @@ namespace slideshow
                 @return the sprite, or NULL on failure (or if this
                 canvas does not support sprites).
             */
-            virtual boost::shared_ptr< cppcanvas::CustomSprite >
+            virtual std::shared_ptr< cppcanvas::CustomSprite >
             createSprite( const basegfx::B2DVector& rSpriteSizePixel,
                           double                    nPriority ) const = 0;
 
@@ -163,7 +163,7 @@ namespace slideshow
 
         };
 
-        typedef boost::shared_ptr< ViewLayer > ViewLayerSharedPtr;
+        typedef std::shared_ptr< ViewLayer > ViewLayerSharedPtr;
     }
 }
 
diff --git a/slideshow/source/inc/wakeupevent.hxx b/slideshow/source/inc/wakeupevent.hxx
index 4819d42af3f9..9751006fb89c 100644
--- a/slideshow/source/inc/wakeupevent.hxx
+++ b/slideshow/source/inc/wakeupevent.hxx
@@ -42,7 +42,7 @@ class WakeupEvent : public Event,
 {
 public:
     WakeupEvent(
-        ::boost::shared_ptr< ::canvas::tools::ElapsedTime > const& pTimeBase,
+        std::shared_ptr< ::canvas::tools::ElapsedTime > const& pTimeBase,
         ActivitiesQueue & rActivityQueue );
 
     virtual void dispose() SAL_OVERRIDE;