diff options
Diffstat (limited to 'sd/source/ui/presenter')
-rw-r--r-- | sd/source/ui/presenter/CanvasUpdateRequester.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/presenter/CanvasUpdateRequester.hxx | 6 | ||||
-rw-r--r-- | sd/source/ui/presenter/PresenterCanvas.hxx | 4 | ||||
-rw-r--r-- | sd/source/ui/presenter/PresenterPreviewCache.cxx | 6 | ||||
-rw-r--r-- | sd/source/ui/presenter/PresenterPreviewCache.hxx | 6 | ||||
-rw-r--r-- | sd/source/ui/presenter/PresenterTextView.hxx | 2 |
6 files changed, 14 insertions, 14 deletions
diff --git a/sd/source/ui/presenter/CanvasUpdateRequester.cxx b/sd/source/ui/presenter/CanvasUpdateRequester.cxx index 134ef6251e44..8a82cc2f0dab 100644 --- a/sd/source/ui/presenter/CanvasUpdateRequester.cxx +++ b/sd/source/ui/presenter/CanvasUpdateRequester.cxx @@ -38,7 +38,7 @@ public: CanvasUpdateRequester::RequesterMap CanvasUpdateRequester::maRequesterMap; -::boost::shared_ptr<CanvasUpdateRequester> CanvasUpdateRequester::Instance ( +std::shared_ptr<CanvasUpdateRequester> CanvasUpdateRequester::Instance ( const Reference<rendering::XSpriteCanvas>& rxSharedCanvas) { RequesterMap::const_iterator iRequester; @@ -49,7 +49,7 @@ CanvasUpdateRequester::RequesterMap CanvasUpdateRequester::maRequesterMap; } // No requester for the given canvas found. Create a new one. - ::boost::shared_ptr<CanvasUpdateRequester> pRequester ( + std::shared_ptr<CanvasUpdateRequester> pRequester ( new CanvasUpdateRequester(rxSharedCanvas), Deleter()); maRequesterMap.push_back(RequesterMap::value_type(rxSharedCanvas,pRequester)); return pRequester; diff --git a/sd/source/ui/presenter/CanvasUpdateRequester.hxx b/sd/source/ui/presenter/CanvasUpdateRequester.hxx index abd1973f161e..b04281921d3f 100644 --- a/sd/source/ui/presenter/CanvasUpdateRequester.hxx +++ b/sd/source/ui/presenter/CanvasUpdateRequester.hxx @@ -22,10 +22,10 @@ #include <com/sun/star/rendering/XSpriteCanvas.hpp> #include <boost/noncopyable.hpp> -#include <boost/shared_ptr.hpp> #include <sal/types.h> #include <tools/solar.h> #include <tools/link.hxx> +#include <memory> #include <vector> struct ImplSVEvent; @@ -43,7 +43,7 @@ public: /** @return the Canvas UpdateRequester object for the given shared canvas. A new object is created when it does not already exist. */ - static ::boost::shared_ptr<CanvasUpdateRequester> Instance ( + static std::shared_ptr<CanvasUpdateRequester> Instance ( const css::uno::Reference<css::rendering::XSpriteCanvas>& rxCanvas); void RequestUpdate (const bool bUpdateAll); @@ -56,7 +56,7 @@ private: typedef ::std::vector< ::std::pair< css::uno::Reference<css::rendering::XSpriteCanvas>, - ::boost::shared_ptr<CanvasUpdateRequester> > > RequesterMap; + std::shared_ptr<CanvasUpdateRequester> > > RequesterMap; static RequesterMap maRequesterMap; css::uno::Reference<css::rendering::XSpriteCanvas> mxCanvas; diff --git a/sd/source/ui/presenter/PresenterCanvas.hxx b/sd/source/ui/presenter/PresenterCanvas.hxx index af3b06d718f9..57bc21e7ac68 100644 --- a/sd/source/ui/presenter/PresenterCanvas.hxx +++ b/sd/source/ui/presenter/PresenterCanvas.hxx @@ -35,7 +35,7 @@ #include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> #include <boost/noncopyable.hpp> -#include <boost/shared_ptr.hpp> +#include <memory> namespace sd { namespace presenter { @@ -375,7 +375,7 @@ private: /** The UpdateRequester is used by updateScreen() to schedule updateScreen() calls at the shared canvas. */ - ::boost::shared_ptr<CanvasUpdateRequester> mpUpdateRequester; + std::shared_ptr<CanvasUpdateRequester> mpUpdateRequester; /** The clip rectangle as given to SetClip(). */ diff --git a/sd/source/ui/presenter/PresenterPreviewCache.cxx b/sd/source/ui/presenter/PresenterPreviewCache.cxx index 00406b0759b0..879791ec5210 100644 --- a/sd/source/ui/presenter/PresenterPreviewCache.cxx +++ b/sd/source/ui/presenter/PresenterPreviewCache.cxx @@ -55,7 +55,7 @@ public: virtual bool IsIdle() SAL_OVERRIDE; virtual bool IsVisible (CacheKey aKey) SAL_OVERRIDE; virtual const SdrPage* GetPage (CacheKey aKey) SAL_OVERRIDE; - virtual ::boost::shared_ptr<std::vector<CacheKey> > GetEntryList (bool bVisible) SAL_OVERRIDE; + virtual std::shared_ptr<std::vector<CacheKey> > GetEntryList (bool bVisible) SAL_OVERRIDE; virtual sal_Int32 GetPriority (CacheKey aKey) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference<com::sun::star::uno::XInterface> GetModel() SAL_OVERRIDE; @@ -297,10 +297,10 @@ const SdrPage* PresenterPreviewCache::PresenterCacheContext::GetPage (CacheKey a return static_cast<const SdrPage*>(aKey); } -::boost::shared_ptr<std::vector<CacheKey> > +std::shared_ptr<std::vector<CacheKey> > PresenterPreviewCache::PresenterCacheContext::GetEntryList (bool bVisible) { - ::boost::shared_ptr<std::vector<CacheKey> > pKeys (new std::vector<CacheKey>()); + std::shared_ptr<std::vector<CacheKey> > pKeys (new std::vector<CacheKey>()); if ( ! mxSlides.is()) return pKeys; diff --git a/sd/source/ui/presenter/PresenterPreviewCache.hxx b/sd/source/ui/presenter/PresenterPreviewCache.hxx index f3999ef11969..e471ddd61c16 100644 --- a/sd/source/ui/presenter/PresenterPreviewCache.hxx +++ b/sd/source/ui/presenter/PresenterPreviewCache.hxx @@ -27,7 +27,7 @@ #include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> #include <boost/noncopyable.hpp> -#include <boost/shared_ptr.hpp> +#include <memory> namespace sd { namespace presenter { @@ -97,8 +97,8 @@ private: css::uno::Reference<css::uno::XComponentContext> mxComponentContext; class PresenterCacheContext; Size maPreviewSize; - ::boost::shared_ptr<PresenterCacheContext> mpCacheContext; - ::boost::shared_ptr<sd::slidesorter::cache::PageCache> mpCache; + std::shared_ptr<PresenterCacheContext> mpCacheContext; + std::shared_ptr<sd::slidesorter::cache::PageCache> mpCache; /** This method throws a DisposedException when the object has already been disposed. diff --git a/sd/source/ui/presenter/PresenterTextView.hxx b/sd/source/ui/presenter/PresenterTextView.hxx index ac30c3c8bd10..788835c01eac 100644 --- a/sd/source/ui/presenter/PresenterTextView.hxx +++ b/sd/source/ui/presenter/PresenterTextView.hxx @@ -26,7 +26,7 @@ #include <cppuhelper/basemutex.hxx> #include <cppuhelper/implbase.hxx> #include <boost/noncopyable.hpp> -#include <boost/scoped_ptr.hpp> +#include <memory> namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; |