[Libreoffice-commits] core.git: sd/source

Caolán McNamara caolanm at redhat.com
Fri Sep 25 03:22:57 PDT 2015 

 sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx                  |    3 --
 sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx             |    2 -
 sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx                 |    4 ---
 sd/source/ui/slidesorter/controller/SlideSorterController.cxx      |    2 -
 sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx       |    2 -
 sd/source/ui/slidesorter/controller/SlsSlotManager.cxx             |    4 +--
 sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx                |    3 --
 sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx  |   11 ++++------
 sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx            |    2 -
 sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx    |    2 -
 sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx              |    2 -
 sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx |    3 --
 sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx                  |    3 --
 sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx         |    4 +--
 sd/source/ui/slidesorter/shell/SlideSorterService.hxx              |    3 --
 sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx                 |    3 --
 16 files changed, 22 insertions(+), 31 deletions(-)

New commits:
commit 72d082a6f04283c2d50d2c19c7d8ce1805b377ac
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Sep 25 10:09:26 2015 +0100

    sd/source/ui/slidesorter boost->std
    
    Change-Id: I67083a8ff1f3b880b658a9962db5921969b931f8
    Reviewed-on: https://gerrit.libreoffice.org/18839
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx
index 3045219..29390ab 100644
--- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx
@@ -25,7 +25,6 @@ class SdrPage;
 #include <vcl/bitmapex.hxx>
 #include <osl/mutex.hxx>
 #include <memory>
-#include <boost/scoped_ptr.hpp>
 
 namespace sd { namespace slidesorter { namespace cache {
 
@@ -175,7 +174,7 @@ public:
 private:
     mutable ::osl::Mutex maMutex;
 
-    ::boost::scoped_ptr<CacheBitmapContainer> mpBitmapContainer;
+    std::unique_ptr<CacheBitmapContainer> mpBitmapContainer;
 
     /** Total size of bytes that are occupied by bitmaps in the cache for
         whom the slides are currently not inside the visible area.
diff --git a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx
index 1bdafdd..315b914 100644
--- a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx
@@ -132,7 +132,7 @@ private:
 
     RequestQueue maRequestQueue;
 
-    ::boost::scoped_ptr<QueueProcessor> mpQueueProcessor;
+    std::unique_ptr<QueueProcessor> mpQueueProcessor;
 
     SharedCacheContext mpCacheContext;
 
diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx b/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx
index 13f1b8f..bdd6a8e 100644
--- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx
@@ -28,8 +28,6 @@
 #include <svx/sdrpageuser.hxx>
 
 #include <memory>
-#include <boost/scoped_ptr.hpp>
-
 
 namespace sd { namespace slidesorter { namespace cache {
 
@@ -111,7 +109,7 @@ public:
 private:
     ::osl::Mutex maMutex;
     class Container;
-    ::boost::scoped_ptr<Container> mpRequestQueue;
+    std::unique_ptr<Container> mpRequestQueue;
     SharedCacheContext mpCacheContext;
 
     /** A lower bound of the lowest priority of all elements in the queues.
diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
index c716c64..fd3f863 100644
--- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
+++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
@@ -355,7 +355,7 @@ bool SlideSorterController::Command (
                         else
                             nPopupId = RID_SLIDE_SORTER_MASTER_NOSEL_POPUP;
             }
-            ::boost::scoped_ptr<InsertionIndicatorHandler::ForceShowContext> pContext;
+            std::unique_ptr<InsertionIndicatorHandler::ForceShowContext> pContext;
             if (pPage == NULL)
             {
                 // When there is no selection, then we show the insertion
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
index 8fb9de6..95f8507 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
@@ -306,7 +306,7 @@ protected:
     virtual bool ProcessDragEvent (SelectionFunction::EventDescriptor& rDescriptor) SAL_OVERRIDE;
 
 private:
-    ::boost::scoped_ptr<DragAndDropContext> mpDragAndDropContext;
+    std::unique_ptr<DragAndDropContext> mpDragAndDropContext;
 };
 
 //===== SelectionFunction =====================================================
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index fada1c1..446c6fc 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -263,7 +263,7 @@ void SlotManager::FuTemporary (SfxRequest& rRequest)
         case SID_PHOTOALBUM:
         {
             SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
-            boost::scoped_ptr<VclAbstractDialog> pDlg(pFact ? pFact->CreateSdPhotoAlbumDialog(
+            std::unique_ptr<VclAbstractDialog> pDlg(pFact ? pFact->CreateSdPhotoAlbumDialog(
                 mrSlideSorter.GetContentWindow(),
                 pDocument) : 0);
 
@@ -904,7 +904,7 @@ void SlotManager::RenameSlide()
 
             SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
             DBG_ASSERT(pFact, "Dialog creation failed!");
-            boost::scoped_ptr<AbstractSvxNameDialog> aNameDlg(pFact->CreateSvxNameDialog(
+            std::unique_ptr<AbstractSvxNameDialog> aNameDlg(pFact->CreateSvxNameDialog(
                 mrSlideSorter.GetContentWindow(),
                 aPageName, aDescr));
             DBG_ASSERT(aNameDlg, "Dialog creation failed!");
diff --git a/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx b/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx
index df62ffd..022c88b 100644
--- a/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx
+++ b/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx
@@ -24,7 +24,6 @@
 #include <sal/types.h>
 #include <vcl/bitmap.hxx>
 #include <memory>
-#include <boost/scoped_ptr.hpp>
 
 class Size;
 
@@ -153,7 +152,7 @@ public:
     void Resume();
 
 private:
-    ::boost::scoped_ptr<GenericPageCache> mpImplementation;
+    std::unique_ptr<GenericPageCache> mpImplementation;
 };
 
 } } } // end of namespace ::sd::slidesorter::cache
diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
index 1c4bbc6..54fc9e8 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
@@ -31,7 +31,6 @@
 #include <tools/gen.hxx>
 
 #include <memory>
-#include <boost/scoped_ptr.hpp>
 
 namespace sd { namespace slidesorter {
 class SlideSorter;
@@ -228,16 +227,16 @@ private:
     SlideSorter& mrSlideSorter;
     model::SlideSorterModel& mrModel;
     view::SlideSorterView& mrView;
-    ::boost::scoped_ptr<PageSelector> mpPageSelector;
-    ::boost::scoped_ptr<FocusManager> mpFocusManager;
+    std::unique_ptr<PageSelector> mpPageSelector;
+    std::unique_ptr<FocusManager> mpFocusManager;
     std::shared_ptr<SlotManager> mpSlotManager;
-    ::boost::scoped_ptr<ScrollBarManager> mpScrollBarManager;
+    std::unique_ptr<ScrollBarManager> mpScrollBarManager;
     mutable std::shared_ptr<CurrentSlideManager> mpCurrentSlideManager;
     std::shared_ptr<SelectionManager> mpSelectionManager;
-    ::boost::scoped_ptr<controller::Clipboard> mpClipboard;
+    std::unique_ptr<controller::Clipboard> mpClipboard;
     std::shared_ptr<InsertionIndicatorHandler> mpInsertionIndicatorHandler;
     std::shared_ptr<Animator> mpAnimator;
-    ::boost::scoped_ptr<VisibleAreaManager> mpVisibleAreaManager;
+    std::unique_ptr<VisibleAreaManager> mpVisibleAreaManager;
 
     // The listener listens to UNO events and thus is a UNO object.
     ::rtl::Reference<controller::Listener> mpListener;
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
index 6f9fc40..f9c8db3 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
@@ -101,7 +101,7 @@ private:
     AnimationList maAnimations;
     ::canvas::tools::ElapsedTime maElapsedTime;
 
-    ::boost::scoped_ptr<view::SlideSorterView::DrawLock> mpDrawLock;
+    std::unique_ptr<view::SlideSorterView::DrawLock> mpDrawLock;
 
     AnimationId mnNextAnimationId;
 
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx
index 9fc424b..88e3137 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx
@@ -134,7 +134,7 @@ private:
     Animator::AnimationId mnAnimationId;
 
     class PageInsertionListener;
-    ::boost::scoped_ptr<PageInsertionListener> mpPageInsertionListener;
+    std::unique_ptr<PageInsertionListener> mpPageInsertionListener;
 
     std::shared_ptr<SelectionObserver> mpSelectionObserver;
 
diff --git a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
index 774bc0d..6368cd6 100644
--- a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
@@ -231,7 +231,7 @@ private:
     std::shared_ptr<SelectionPainter> mpSelectionPainter;
     vcl::Region maRedrawRegion;
     SharedILayerPainter mpBackgroundPainter;
-    ::boost::scoped_ptr<ToolTip> mpToolTip;
+    std::unique_ptr<ToolTip> mpToolTip;
     bool mbIsRearrangePending;
     ::std::vector<Link<LinkParamNone*,void>> maVisibilityChangeListeners;
 
diff --git a/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx b/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx
index 1cd1db7..71ea664 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx
@@ -28,7 +28,6 @@
 #include <tools/gen.hxx>
 #include <vcl/bitmapex.hxx>
 #include <memory>
-#include <boost/scoped_ptr.hpp>
 #include <vector>
 
 class OutputDevice;
@@ -87,7 +86,7 @@ private:
     Point maLocation;
     BitmapEx maIcon;
     Point maIconOffset;
-    ::boost::scoped_ptr<FramePainter> mpShadowPainter;
+    std::unique_ptr<FramePainter> mpShadowPainter;
 
     void SetPositionAndSize (const Rectangle& rBoundingBox);
     Point PaintRepresentatives (
diff --git a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx
index 9a6e463..2ebed55 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx
@@ -28,7 +28,6 @@
 #include <vcl/mapmod.hxx>
 #include <vector>
 #include <utility>
-#include <boost/scoped_ptr.hpp>
 
 class Size;
 
@@ -187,7 +186,7 @@ public:
     class Implementation;
 
 private:
-    ::boost::scoped_ptr<Implementation> mpImplementation;
+    std::unique_ptr<Implementation> mpImplementation;
     VclPtr<sd::Window> mpWindow;
 };
 
diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx
index 6d08ac7..978bddf 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx
@@ -74,8 +74,8 @@ private:
     std::shared_ptr<controller::Properties> mpProperties;
     std::shared_ptr<view::Theme> mpTheme;
     std::shared_ptr<vcl::Font> mpPageNumberFont;
-    ::boost::scoped_ptr<FramePainter> mpShadowPainter;
-    ::boost::scoped_ptr<FramePainter> mpFocusBorderPainter;
+    std::unique_ptr<FramePainter> mpShadowPainter;
+    std::unique_ptr<FramePainter> mpFocusBorderPainter;
     Bitmap maNormalBackground;
     Bitmap maSelectionBackground;
     Bitmap maFocusedSelectionBackground;
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx
index b001f5e..d71a7e7 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx
@@ -33,7 +33,6 @@
 #include <cppuhelper/propshlp.hxx>
 #include <boost/noncopyable.hpp>
 #include <memory>
-#include <boost/scoped_ptr.hpp>
 
 namespace sd { namespace slidesorter {
 
@@ -184,7 +183,7 @@ private:
     std::shared_ptr<SlideSorter> mpSlideSorter;
     css::uno::Reference<css::drawing::framework::XResourceId> mxViewId;
     css::uno::Reference<css::awt::XWindow> mxParentWindow;
-    ::boost::scoped_ptr<cppu::IPropertyArrayHelper> mpPropertyArrayHelper;
+    std::unique_ptr<cppu::IPropertyArrayHelper> mpPropertyArrayHelper;
 
     void Resize();
 
diff --git a/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx b/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx
index 1e4bdd8..989dadb 100644
--- a/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx
+++ b/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx
@@ -29,7 +29,6 @@
 #include <boost/noncopyable.hpp>
 #include <memory>
 #include <vector>
-#include <boost/scoped_ptr.hpp>
 
 class Rectangle;
 
@@ -73,7 +72,7 @@ public:
 private:
     VclPtr<sd::Window> mpTargetWindow;
     class LayerContainer;
-    ::boost::scoped_ptr<LayerContainer> mpLayers;
+    std::unique_ptr<LayerContainer> mpLayers;
     ScopedVclPtr<VirtualDevice> mpBackBuffer;
     MapMode maSavedMapMode;

More information about the Libreoffice-commits mailing list