diff options
Diffstat (limited to 'sd/source/ui/slidesorter/view')
10 files changed, 50 insertions, 52 deletions
diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx index 0cf7ea0274df..a023aa4fd154 100644 --- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx +++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx @@ -287,8 +287,8 @@ void SlideSorterView::HandleDataChangeEvent() GetPageObjectPainter()->SetTheme(mrSlideSorter.GetTheme()); // Update the color used by the background painter. - ::boost::shared_ptr<BackgroundPainter> pPainter ( - ::boost::dynamic_pointer_cast<BackgroundPainter>(mpBackgroundPainter)); + std::shared_ptr<BackgroundPainter> pPainter ( + std::dynamic_pointer_cast<BackgroundPainter>(mpBackgroundPainter)); if (pPainter) pPainter->SetColor(mrSlideSorter.GetTheme()->GetColor(Theme::Color_Background)); @@ -417,7 +417,7 @@ void SlideSorterView::Layout () pWindow->SetViewOrigin (aViewBox.TopLeft()); pWindow->SetViewSize (aViewBox.GetSize()); - ::boost::shared_ptr<PageObjectLayouter> pPageObjectLayouter( + std::shared_ptr<PageObjectLayouter> pPageObjectLayouter( mpLayouter->GetPageObjectLayouter()); if (pPageObjectLayouter) { @@ -509,7 +509,7 @@ void SlideSorterView::UpdatePreciousFlags() mbPreciousFlagUpdatePending = false; model::SharedPageDescriptor pDescriptor; - ::boost::shared_ptr<cache::PageCache> pCache = GetPreviewCache(); + std::shared_ptr<cache::PageCache> pCache = GetPreviewCache(); sal_Int32 nPageCount (mrModel.GetPageCount()); for (int nIndex=0; nIndex<=nPageCount; ++nIndex) @@ -698,7 +698,7 @@ void SlideSorterView::ConfigurationChanged ( } -::boost::shared_ptr<cache::PageCache> SlideSorterView::GetPreviewCache() +std::shared_ptr<cache::PageCache> SlideSorterView::GetPreviewCache() { sd::Window *pWindow (mrSlideSorter.GetContentWindow()); if (pWindow && mpPreviewCache.get() == NULL) @@ -841,7 +841,7 @@ bool SlideSorterView::SetState ( return bModified; } -::boost::shared_ptr<PageObjectPainter> SlideSorterView::GetPageObjectPainter() +std::shared_ptr<PageObjectPainter> SlideSorterView::GetPageObjectPainter() { if ( ! mpPageObjectPainter) mpPageObjectPainter.reset(new PageObjectPainter(mrSlideSorter)); diff --git a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx index 5e5ef8580416..f73529409104 100644 --- a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx +++ b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx @@ -25,9 +25,9 @@ #include "model/SlideSorterModel.hxx" #include "model/SlsPageEnumerationProvider.hxx" +#include <memory> #include <set> #include <boost/bind.hpp> -#include <boost/enable_shared_from_this.hpp> namespace sd { namespace slidesorter { namespace view { @@ -38,11 +38,11 @@ class PageObjectRun; class AnimatorAccess { public: - virtual void AddRun (const ::boost::shared_ptr<PageObjectRun>& rRun) = 0; - virtual void RemoveRun (const ::boost::shared_ptr<PageObjectRun>& rRun) = 0; + virtual void AddRun (const std::shared_ptr<PageObjectRun>& rRun) = 0; + virtual void RemoveRun (const std::shared_ptr<PageObjectRun>& rRun) = 0; virtual model::SlideSorterModel& GetModel (void) const = 0; virtual view::SlideSorterView& GetView (void) const = 0; - virtual ::boost::shared_ptr<controller::Animator> GetAnimator (void) = 0; + virtual std::shared_ptr<controller::Animator> GetAnimator (void) = 0; virtual VclPtr<sd::Window> GetContentWindow (void) = 0; protected: @@ -52,7 +52,7 @@ protected: /** Controller of the position offsets of all page objects in one row or one column. */ -class PageObjectRun : public ::boost::enable_shared_from_this<PageObjectRun> +class PageObjectRun : public std::enable_shared_from_this<PageObjectRun> { public: PageObjectRun ( @@ -88,8 +88,8 @@ public: class Comparator { public: bool operator() ( - const ::boost::shared_ptr<PageObjectRun>& rpRunA, - const ::boost::shared_ptr<PageObjectRun>& rpRunB) const + const std::shared_ptr<PageObjectRun>& rpRunA, + const std::shared_ptr<PageObjectRun>& rpRunB) const { return rpRunA->mnRunIndex < rpRunB->mnRunIndex; } @@ -101,7 +101,7 @@ private: void RestartAnimation(); }; -typedef ::boost::shared_ptr<PageObjectRun> SharedPageObjectRun; +typedef std::shared_ptr<PageObjectRun> SharedPageObjectRun; Point Blend (const Point& rPointA, const Point& rPointB, const double nT) { @@ -122,19 +122,19 @@ public: const InsertPosition& rInsertPosition, const controller::Animator::AnimationMode eAnimationMode); - virtual void AddRun (const ::boost::shared_ptr<PageObjectRun>& rRun) SAL_OVERRIDE; - virtual void RemoveRun (const ::boost::shared_ptr<PageObjectRun>& rRun) SAL_OVERRIDE; + virtual void AddRun (const std::shared_ptr<PageObjectRun>& rRun) SAL_OVERRIDE; + virtual void RemoveRun (const std::shared_ptr<PageObjectRun>& rRun) SAL_OVERRIDE; virtual model::SlideSorterModel& GetModel() const SAL_OVERRIDE { return mrModel; } virtual view::SlideSorterView& GetView() const SAL_OVERRIDE { return mrView; } - virtual ::boost::shared_ptr<controller::Animator> GetAnimator() SAL_OVERRIDE { return mpAnimator; } + virtual std::shared_ptr<controller::Animator> GetAnimator() SAL_OVERRIDE { return mpAnimator; } virtual VclPtr<sd::Window> GetContentWindow() SAL_OVERRIDE { return mrSlideSorter.GetContentWindow(); } private: model::SlideSorterModel& mrModel; view::SlideSorterView& mrView; SlideSorter& mrSlideSorter; - ::boost::shared_ptr<controller::Animator> mpAnimator; + std::shared_ptr<controller::Animator> mpAnimator; typedef ::std::set<SharedPageObjectRun, PageObjectRun::Comparator> RunContainer; RunContainer maRuns; InsertPosition maInsertPosition; @@ -264,7 +264,7 @@ InsertAnimator::Implementation::RunContainer::const_iterator nRunIndex)); } -void InsertAnimator::Implementation::AddRun (const ::boost::shared_ptr<PageObjectRun>& rRun) +void InsertAnimator::Implementation::AddRun (const std::shared_ptr<PageObjectRun>& rRun) { if (rRun) { @@ -276,7 +276,7 @@ void InsertAnimator::Implementation::AddRun (const ::boost::shared_ptr<PageObjec } } -void InsertAnimator::Implementation::RemoveRun (const ::boost::shared_ptr<PageObjectRun>& rRun) +void InsertAnimator::Implementation::RemoveRun (const std::shared_ptr<PageObjectRun>& rRun) { if (rRun) { diff --git a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx index d10615fc3b86..ba7805234ffa 100644 --- a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx +++ b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx @@ -85,7 +85,7 @@ void InsertionIndicatorOverlay::Create (const SdTransferable* pTransferable) if (pTransferable == NULL) return; - ::boost::shared_ptr<controller::TransferableData> pData ( + std::shared_ptr<controller::TransferableData> pData ( controller::TransferableData::GetFromTransferable(pTransferable)); if ( ! pData) return; @@ -110,9 +110,9 @@ void InsertionIndicatorOverlay::Create ( const sal_Int32 nSelectionCount) { view::Layouter& rLayouter (mrSlideSorter.GetView().GetLayouter()); - ::boost::shared_ptr<view::PageObjectLayouter> pPageObjectLayouter ( + std::shared_ptr<view::PageObjectLayouter> pPageObjectLayouter ( rLayouter.GetPageObjectLayouter()); - ::boost::shared_ptr<view::Theme> pTheme (mrSlideSorter.GetTheme()); + std::shared_ptr<view::Theme> pTheme (mrSlideSorter.GetTheme()); const Size aOriginalPreviewSize (pPageObjectLayouter->GetPreviewSize( PageObjectLayouter::WindowCoordinateSystem)); @@ -241,8 +241,8 @@ void InsertionIndicatorOverlay::PaintPageCount ( const Point& rFirstPageOffset) const { // Paint the number of slides. - ::boost::shared_ptr<view::Theme> pTheme (mrSlideSorter.GetTheme()); - ::boost::shared_ptr<vcl::Font> pFont(Theme::GetFont(Theme::Font_PageCount, rDevice)); + std::shared_ptr<view::Theme> pTheme (mrSlideSorter.GetTheme()); + std::shared_ptr<vcl::Font> pFont(Theme::GetFont(Theme::Font_PageCount, rDevice)); if (pFont) { OUString sNumber (OUString::number(nSelectionCount)); @@ -323,7 +323,7 @@ void InsertionIndicatorOverlay::Show() { mbIsVisible = true; - ::boost::shared_ptr<LayeredDevice> pLayeredDevice ( + std::shared_ptr<LayeredDevice> pLayeredDevice ( mrSlideSorter.GetView().GetLayeredDevice()); if (pLayeredDevice) { @@ -340,7 +340,7 @@ void InsertionIndicatorOverlay::Hide() { mbIsVisible = false; - ::boost::shared_ptr<LayeredDevice> pLayeredDevice ( + std::shared_ptr<LayeredDevice> pLayeredDevice ( mrSlideSorter.GetView().GetLayeredDevice()); if (pLayeredDevice) { diff --git a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx index 697b8d478b46..c7124188487d 100644 --- a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx +++ b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx @@ -39,7 +39,7 @@ class LayerInvalidator : public ILayerInvalidator { public: LayerInvalidator ( - const ::boost::shared_ptr<LayeredDevice>& rpLayeredDevice, + const std::shared_ptr<LayeredDevice>& rpLayeredDevice, sd::Window *pTargetWindow, const int nLayer) : mpLayeredDevice(rpLayeredDevice), @@ -59,7 +59,7 @@ public: } private: - const ::boost::shared_ptr<LayeredDevice> mpLayeredDevice; + const std::shared_ptr<LayeredDevice> mpLayeredDevice; VclPtr<sd::Window> mpTargetWindow; const int mnLayer; }; @@ -129,7 +129,7 @@ private: void ValidateRectangle (const Rectangle& rBox); }; -typedef ::boost::shared_ptr<Layer> SharedLayer; +typedef std::shared_ptr<Layer> SharedLayer; } // end of anonymous namespace diff --git a/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx b/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx index f614842afe33..de7f06eb4f57 100644 --- a/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx +++ b/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx @@ -27,9 +27,7 @@ #include <vcl/virdev.hxx> #include <boost/noncopyable.hpp> -#include <boost/scoped_ptr.hpp> -#include <boost/shared_ptr.hpp> -#include <boost/enable_shared_from_this.hpp> +#include <memory> #include <vector> class Rectangle; @@ -41,7 +39,7 @@ namespace sd { namespace slidesorter { namespace view { Each layer may contain any number of painters. */ class LayeredDevice - : public ::boost::enable_shared_from_this<LayeredDevice> + : public std::enable_shared_from_this<LayeredDevice> { public: diff --git a/sd/source/ui/slidesorter/view/SlsLayouter.cxx b/sd/source/ui/slidesorter/view/SlsLayouter.cxx index b63b307435e2..65a83e7a68a7 100644 --- a/sd/source/ui/slidesorter/view/SlsLayouter.cxx +++ b/sd/source/ui/slidesorter/view/SlsLayouter.cxx @@ -57,8 +57,8 @@ public: /// rows. sal_Int32 mnMaxRowCount; Size maPageObjectSize; - ::boost::shared_ptr<PageObjectLayouter> mpPageObjectLayouter; - ::boost::shared_ptr<view::Theme> mpTheme; + std::shared_ptr<PageObjectLayouter> mpPageObjectLayouter; + std::shared_ptr<view::Theme> mpTheme; /** Specify how the gap between two page objects is associated with the page objects. @@ -201,7 +201,7 @@ public: protected: Implementation ( sd::Window *pWindow, - const ::boost::shared_ptr<view::Theme>& rpTheme); + const std::shared_ptr<view::Theme>& rpTheme); explicit Implementation (const Implementation& rImplementation); virtual void CalculateRowAndColumnCount (const Size& rWindowSize) = 0; @@ -272,7 +272,7 @@ class GridImplementation : public Layouter::Implementation public: GridImplementation ( sd::Window *pWindow, - const ::boost::shared_ptr<view::Theme>& rpTheme); + const std::shared_ptr<view::Theme>& rpTheme); explicit GridImplementation(const Implementation& rImplementation); virtual Layouter::Orientation GetOrientation() const SAL_OVERRIDE; @@ -293,7 +293,7 @@ protected: Layouter::Layouter ( sd::Window *pWindow, - const ::boost::shared_ptr<Theme>& rpTheme) + const std::shared_ptr<Theme>& rpTheme) : mpImplementation(new GridImplementation(pWindow, rpTheme)), mpWindow(pWindow) { @@ -303,7 +303,7 @@ Layouter::~Layouter() { } -::boost::shared_ptr<PageObjectLayouter> Layouter::GetPageObjectLayouter() const +std::shared_ptr<PageObjectLayouter> Layouter::GetPageObjectLayouter() const { return mpImplementation->mpPageObjectLayouter; } @@ -428,7 +428,7 @@ Layouter::Implementation* Layouter::Implementation::Create ( Layouter::Implementation::Implementation ( sd::Window *pWindow, - const ::boost::shared_ptr<view::Theme>& rpTheme) + const std::shared_ptr<view::Theme>& rpTheme) : mpWindow(pWindow), mnRequestedLeftBorder(5), mnRequestedRightBorder(5), @@ -1103,7 +1103,7 @@ void VerticalImplementation::CalculateLogicalInsertPosition ( GridImplementation::GridImplementation ( sd::Window *pWindow, - const ::boost::shared_ptr<view::Theme>& rpTheme) + const std::shared_ptr<view::Theme>& rpTheme) : Implementation(pWindow, rpTheme) { } diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx index a2c8e4643eba..49fa50983d69 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx @@ -33,8 +33,8 @@ #include <vcl/svapp.hxx> #include <vcl/vclenum.hxx> #include <vcl/virdev.hxx> -#include <boost/scoped_ptr.hpp> #include "CustomAnimationEffect.hxx" +#include <memory> using namespace ::drawinglayer::primitive2d; @@ -101,7 +101,7 @@ bool PageObjectPainter::UpdatePageObjectLayouter() return true; } -void PageObjectPainter::SetTheme (const ::boost::shared_ptr<view::Theme>& rpTheme) +void PageObjectPainter::SetTheme (const std::shared_ptr<view::Theme>& rpTheme) { mpTheme = rpTheme; } @@ -292,7 +292,7 @@ void PageObjectPainter::PaintCustomAnimationEffect ( const model::SharedPageDescriptor& rpDescriptor) { SdPage* pPage = rpDescriptor->GetPage(); - boost::shared_ptr< MainSequence > aMainSequence = pPage->getMainSequence(); + std::shared_ptr< MainSequence > aMainSequence = pPage->getMainSequence(); EffectSequence::iterator aIter = aMainSequence->getBegin(); EffectSequence::iterator aEnd = aMainSequence->getEnd(); if ( aIter != aEnd ) diff --git a/sd/source/ui/slidesorter/view/SlsTheme.cxx b/sd/source/ui/slidesorter/view/SlsTheme.cxx index d7fddd2b7d5a..f669b6ad4639 100644 --- a/sd/source/ui/slidesorter/view/SlsTheme.cxx +++ b/sd/source/ui/slidesorter/view/SlsTheme.cxx @@ -59,7 +59,7 @@ ColorData HGBAdapt ( nNewBrightness>=0 ? nNewBrightness : nBrightness); } -Theme::Theme (const ::boost::shared_ptr<controller::Properties>& rpProperties) +Theme::Theme (const std::shared_ptr<controller::Properties>& rpProperties) : maBackgroundColor(rpProperties->GetBackgroundColor().GetColor()), maPageBackgroundColor(COL_WHITE), maGradients(), @@ -82,7 +82,7 @@ Theme::Theme (const ::boost::shared_ptr<controller::Properties>& rpProperties) Update(rpProperties); } -void Theme::Update (const ::boost::shared_ptr<controller::Properties>& rpProperties) +void Theme::Update (const std::shared_ptr<controller::Properties>& rpProperties) { // Set up colors. maBackgroundColor = rpProperties->GetBackgroundColor().GetColor(); @@ -128,11 +128,11 @@ void Theme::Update (const ::boost::shared_ptr<controller::Properties>& rpPropert } } -::boost::shared_ptr<vcl::Font> Theme::GetFont ( +std::shared_ptr<vcl::Font> Theme::GetFont ( const FontType eType, const OutputDevice& rDevice) { - ::boost::shared_ptr<vcl::Font> pFont; + std::shared_ptr<vcl::Font> pFont; switch (eType) { diff --git a/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx b/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx index ffd9a825319c..3ad7c0ba7151 100644 --- a/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx +++ b/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx @@ -83,9 +83,9 @@ const SdrPage* ViewCacheContext::GetPage (cache::CacheKey aKey) return static_cast<const SdrPage*>(aKey); } -::boost::shared_ptr<std::vector<cache::CacheKey> > ViewCacheContext::GetEntryList (bool bVisible) +std::shared_ptr<std::vector<cache::CacheKey> > ViewCacheContext::GetEntryList (bool bVisible) { - ::boost::shared_ptr<std::vector<cache::CacheKey> > pKeys (new std::vector<cache::CacheKey>()); + std::shared_ptr<std::vector<cache::CacheKey> > pKeys (new std::vector<cache::CacheKey>()); model::PageEnumeration aPageEnumeration ( bVisible diff --git a/sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx b/sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx index 19b814a73879..02740539292a 100644 --- a/sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx +++ b/sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx @@ -45,7 +45,7 @@ public: virtual bool IsIdle() SAL_OVERRIDE; virtual bool IsVisible (cache::CacheKey aKey) SAL_OVERRIDE; virtual const SdrPage* GetPage (cache::CacheKey aKey) SAL_OVERRIDE; - virtual ::boost::shared_ptr<std::vector<cache::CacheKey> > GetEntryList (bool bVisible) SAL_OVERRIDE; + virtual std::shared_ptr<std::vector<cache::CacheKey> > GetEntryList (bool bVisible) SAL_OVERRIDE; virtual sal_Int32 GetPriority (cache::CacheKey aKey) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference<com::sun::star::uno::XInterface> GetModel() SAL_OVERRIDE; |