boost->std

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

47 files changed, 226 insertions, 230 deletions

diff --git a/sdext/inc/pch/precompiled_PresenterScreen.hxx b/sdext/inc/pch/precompiled_PresenterScreen.hxx
index 31d2592e861f..2cce93fc8dda 100644
--- a/sdext/inc/pch/precompiled_PresenterScreen.hxx
+++ b/sdext/inc/pch/precompiled_PresenterScreen.hxx
@@ -18,13 +18,11 @@
 #include "cppuhelper/implementationentry.hxx"
 #include "vcl/settings.hxx"
 #include "vcl/svapp.hxx"
-#include <algorithm>
 #include <boost/bind.hpp>
-#include <boost/enable_shared_from_this.hpp>
 #include <boost/noncopyable.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
+#include <algorithm>
 #include <cmath>
+#include <memory>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/accessibility/AccessibleRelationType.hpp>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
diff --git a/sdext/source/pdfimport/filterdet.cxx b/sdext/source/pdfimport/filterdet.cxx
index af89ee742ae1..d695617d348a 100644
--- a/sdext/source/pdfimport/filterdet.cxx
+++ b/sdext/source/pdfimport/filterdet.cxx
@@ -34,7 +34,7 @@
 #include <com/sun/star/io/TempFile.hpp>
 #include <comphelper/fileurl.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 #include <string.h>
 
 using namespace com::sun::star;
@@ -505,7 +505,7 @@ uno::Reference< io::XStream > getAdditionalStream( const OUString&
     aPDFFile = OUStringToOString( aSysUPath, osl_getThreadTextEncoding() );
 
     pdfparse::PDFReader aParser;
-    boost::scoped_ptr<pdfparse::PDFEntry> pEntry( pdfparse::PDFReader::read( aPDFFile.getStr() ));
+    std::unique_ptr<pdfparse::PDFEntry> pEntry( pdfparse::PDFReader::read( aPDFFile.getStr() ));
     if( pEntry )
     {
         pdfparse::PDFFile* pPDFFile = dynamic_cast<pdfparse::PDFFile*>(pEntry.get());
diff --git a/sdext/source/pdfimport/inc/contentsink.hxx b/sdext/source/pdfimport/inc/contentsink.hxx
index 17e58adae5a9..e3bcb216d939 100644
--- a/sdext/source/pdfimport/inc/contentsink.hxx
+++ b/sdext/source/pdfimport/inc/contentsink.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/rendering/ARGBColor.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 namespace com { namespace sun { namespace star {
 namespace rendering
@@ -173,7 +173,7 @@ namespace pdfi
                                                 css::beans::PropertyValue>& xMask) = 0;
     };
 
-    typedef boost::shared_ptr<ContentSink> ContentSinkSharedPtr;
+    typedef std::shared_ptr<ContentSink> ContentSinkSharedPtr;
 }
 
 #endif // INCLUDED_SDEXT_SOURCE_PDFIMPORT_INC_CONTENTSINK_HXX
diff --git a/sdext/source/pdfimport/inc/treevisitorfactory.hxx b/sdext/source/pdfimport/inc/treevisitorfactory.hxx
index 553bb07c5f09..cd7fcd212f2a 100644
--- a/sdext/source/pdfimport/inc/treevisitorfactory.hxx
+++ b/sdext/source/pdfimport/inc/treevisitorfactory.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_SDEXT_SOURCE_PDFIMPORT_INC_TREEVISITORFACTORY_HXX
 
 #include "pdfihelper.hxx"
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 namespace pdfi
 {
@@ -40,15 +40,15 @@ namespace pdfi
         virtual ~TreeVisitorFactory() {}
 
         /// Create visitor that combines tree nodes
-        virtual boost::shared_ptr<ElementTreeVisitor> createOptimizingVisitor(PDFIProcessor&) const = 0;
+        virtual std::shared_ptr<ElementTreeVisitor> createOptimizingVisitor(PDFIProcessor&) const = 0;
         /// Create visitor that prepares style info
-        virtual boost::shared_ptr<ElementTreeVisitor> createStyleCollectingVisitor(
+        virtual std::shared_ptr<ElementTreeVisitor> createStyleCollectingVisitor(
             StyleContainer&, PDFIProcessor&) const = 0;
         /// Create visitor that emits tree to an output target
-        virtual boost::shared_ptr<ElementTreeVisitor> createEmittingVisitor(EmitContext&) const = 0;
+        virtual std::shared_ptr<ElementTreeVisitor> createEmittingVisitor(EmitContext&) const = 0;
     };
 
-    typedef boost::shared_ptr<TreeVisitorFactory> TreeVisitorFactorySharedPtr;
+    typedef std::shared_ptr<TreeVisitorFactory> TreeVisitorFactorySharedPtr;
 
     TreeVisitorFactorySharedPtr createWriterTreeVisitorFactory();
     TreeVisitorFactorySharedPtr createImpressTreeVisitorFactory();
diff --git a/sdext/source/pdfimport/inc/xmlemitter.hxx b/sdext/source/pdfimport/inc/xmlemitter.hxx
index 72f4d28bbf03..9ffacda7f1aa 100644
--- a/sdext/source/pdfimport/inc/xmlemitter.hxx
+++ b/sdext/source/pdfimport/inc/xmlemitter.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_SDEXT_SOURCE_PDFIMPORT_INC_XMLEMITTER_HXX
 
 #include "pdfihelper.hxx"
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 namespace pdfi
 {
@@ -45,7 +45,7 @@ namespace pdfi
         virtual void endTag( const char* pTag ) = 0;
     };
 
-    typedef boost::shared_ptr<XmlEmitter> XmlEmitterSharedPtr;
+    typedef std::shared_ptr<XmlEmitter> XmlEmitterSharedPtr;
 }
 
 #endif
diff --git a/sdext/source/pdfimport/pdfiadaptor.cxx b/sdext/source/pdfimport/pdfiadaptor.cxx
index d9832bd76c48..90722f87c3c6 100644
--- a/sdext/source/pdfimport/pdfiadaptor.cxx
+++ b/sdext/source/pdfimport/pdfiadaptor.cxx
@@ -40,8 +40,7 @@
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 #include <com/sun/star/io/XSeekable.hpp>
 
-
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 using namespace com::sun::star;
 
@@ -243,7 +242,7 @@ bool PDFIRawAdaptor::parse( const uno::Reference<io::XInputStream>&       xInput
                             const OUString&                          rFilterOptions )
 {
     // container for metaformat
-    boost::shared_ptr<PDFIProcessor> pSink(
+    std::shared_ptr<PDFIProcessor> pSink(
         new PDFIProcessor(xStatus, m_xContext));
 
     // TEMP! TEMP!
diff --git a/sdext/source/pdfimport/test/tests.cxx b/sdext/source/pdfimport/test/tests.cxx
index e8150dd5a6f6..2bd9a87b0197 100644
--- a/sdext/source/pdfimport/test/tests.cxx
+++ b/sdext/source/pdfimport/test/tests.cxx
@@ -455,7 +455,7 @@ namespace
     public:
         void testXPDFParser()
         {
-            boost::shared_ptr<TestSink> pSink( new TestSink() );
+            std::shared_ptr<TestSink> pSink( new TestSink() );
             CPPUNIT_ASSERT(
                 pdfi::xpdf_ImportFromFile(
                     getURLFromSrc("/sdext/source/pdfimport/test/testinput.pdf"),
diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.hxx b/sdext/source/pdfimport/tree/pdfiprocessor.hxx
index d47c89e67b13..527205147a7c 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.hxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.hxx
@@ -37,8 +37,8 @@
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
 
-#include <boost/shared_ptr.hpp>
 #include <list>
+#include <memory>
 #include <unordered_map>
 
 #include "imagecontainer.hxx"
@@ -178,8 +178,8 @@ namespace pdfi
 
         std::vector<CharGlyph>             m_GlyphsList;
 
-        boost::shared_ptr<ElementFactory>  m_pElFactory;
-        boost::shared_ptr<DocumentElement> m_pDocument;
+        std::shared_ptr<ElementFactory>  m_pElFactory;
+        std::shared_ptr<DocumentElement> m_pDocument;
         PageElement*                       m_pCurPage;
         Element*                           m_pCurElement;
         sal_Int32                          m_nNextFontId;
diff --git a/sdext/source/pdfimport/tree/treevisiting.hxx b/sdext/source/pdfimport/tree/treevisiting.hxx
index d19eafc210d5..97a3f18f6f58 100644
--- a/sdext/source/pdfimport/tree/treevisiting.hxx
+++ b/sdext/source/pdfimport/tree/treevisiting.hxx
@@ -53,7 +53,7 @@ namespace pdfi
         virtual void visit( DocumentElement&, const std::list< Element* >::const_iterator&  ) = 0;
         virtual ~ElementTreeVisitor() {}
     };
-    typedef boost::shared_ptr<ElementTreeVisitor> ElementTreeVisitorSharedPtr;
+    typedef std::shared_ptr<ElementTreeVisitor> ElementTreeVisitorSharedPtr;
 
 }
 
diff --git a/sdext/source/pdfimport/tree/treevisitorfactory.cxx b/sdext/source/pdfimport/tree/treevisitorfactory.cxx
index c718277df4bf..8d4f1fc31ac1 100644
--- a/sdext/source/pdfimport/tree/treevisitorfactory.cxx
+++ b/sdext/source/pdfimport/tree/treevisitorfactory.cxx
@@ -28,21 +28,21 @@ namespace pdfi
     {
         WriterTreeVisitorFactory() {}
 
-        virtual boost::shared_ptr<ElementTreeVisitor> createOptimizingVisitor(PDFIProcessor& rProc) const SAL_OVERRIDE
+        virtual std::shared_ptr<ElementTreeVisitor> createOptimizingVisitor(PDFIProcessor& rProc) const SAL_OVERRIDE
         {
-            return boost::shared_ptr<ElementTreeVisitor>(new WriterXmlOptimizer(rProc));
+            return std::shared_ptr<ElementTreeVisitor>(new WriterXmlOptimizer(rProc));
         }
 
-        virtual boost::shared_ptr<ElementTreeVisitor> createStyleCollectingVisitor(
+        virtual std::shared_ptr<ElementTreeVisitor> createStyleCollectingVisitor(
             StyleContainer& rStyles,
             PDFIProcessor&  rProc ) const SAL_OVERRIDE
         {
-            return boost::shared_ptr<ElementTreeVisitor>(new WriterXmlFinalizer(rStyles,rProc));
+            return std::shared_ptr<ElementTreeVisitor>(new WriterXmlFinalizer(rStyles,rProc));
         }
 
-        virtual boost::shared_ptr<ElementTreeVisitor> createEmittingVisitor(EmitContext& rEmitContext) const SAL_OVERRIDE
+        virtual std::shared_ptr<ElementTreeVisitor> createEmittingVisitor(EmitContext& rEmitContext) const SAL_OVERRIDE
         {
-            return boost::shared_ptr<ElementTreeVisitor>(new WriterXmlEmitter(rEmitContext));
+            return std::shared_ptr<ElementTreeVisitor>(new WriterXmlEmitter(rEmitContext));
         }
     };
 
@@ -50,21 +50,21 @@ namespace pdfi
     {
         ImpressTreeVisitorFactory() {}
 
-        virtual boost::shared_ptr<ElementTreeVisitor> createOptimizingVisitor(PDFIProcessor& rProc) const SAL_OVERRIDE
+        virtual std::shared_ptr<ElementTreeVisitor> createOptimizingVisitor(PDFIProcessor& rProc) const SAL_OVERRIDE
         {
-            return boost::shared_ptr<ElementTreeVisitor>(new DrawXmlOptimizer(rProc));
+            return std::shared_ptr<ElementTreeVisitor>(new DrawXmlOptimizer(rProc));
         }
 
-        virtual boost::shared_ptr<ElementTreeVisitor> createStyleCollectingVisitor(
+        virtual std::shared_ptr<ElementTreeVisitor> createStyleCollectingVisitor(
             StyleContainer& rStyles,
             PDFIProcessor&  rProc ) const SAL_OVERRIDE
         {
-            return boost::shared_ptr<ElementTreeVisitor>(new DrawXmlFinalizer(rStyles,rProc));
+            return std::shared_ptr<ElementTreeVisitor>(new DrawXmlFinalizer(rStyles,rProc));
         }
 
-        virtual boost::shared_ptr<ElementTreeVisitor> createEmittingVisitor(EmitContext& rEmitContext) const SAL_OVERRIDE
+        virtual std::shared_ptr<ElementTreeVisitor> createEmittingVisitor(EmitContext& rEmitContext) const SAL_OVERRIDE
         {
-            return boost::shared_ptr<ElementTreeVisitor>(new DrawXmlEmitter(rEmitContext,
+            return std::shared_ptr<ElementTreeVisitor>(new DrawXmlEmitter(rEmitContext,
                                                                             DrawXmlEmitter::IMPRESS_DOC
                                                                             ));
         }
@@ -74,21 +74,21 @@ namespace pdfi
     {
         DrawTreeVisitorFactory() {}
 
-        virtual boost::shared_ptr<ElementTreeVisitor> createOptimizingVisitor(PDFIProcessor& rProc) const SAL_OVERRIDE
+        virtual std::shared_ptr<ElementTreeVisitor> createOptimizingVisitor(PDFIProcessor& rProc) const SAL_OVERRIDE
         {
-            return boost::shared_ptr<ElementTreeVisitor>(new DrawXmlOptimizer(rProc));
+            return std::shared_ptr<ElementTreeVisitor>(new DrawXmlOptimizer(rProc));
         }
 
-        virtual boost::shared_ptr<ElementTreeVisitor> createStyleCollectingVisitor(
+        virtual std::shared_ptr<ElementTreeVisitor> createStyleCollectingVisitor(
             StyleContainer& rStyles,
             PDFIProcessor&  rProc ) const SAL_OVERRIDE
         {
-            return boost::shared_ptr<ElementTreeVisitor>(new DrawXmlFinalizer(rStyles,rProc));
+            return std::shared_ptr<ElementTreeVisitor>(new DrawXmlFinalizer(rStyles,rProc));
         }
 
-        virtual boost::shared_ptr<ElementTreeVisitor> createEmittingVisitor(EmitContext& rEmitContext) const SAL_OVERRIDE
+        virtual std::shared_ptr<ElementTreeVisitor> createEmittingVisitor(EmitContext& rEmitContext) const SAL_OVERRIDE
         {
-            return boost::shared_ptr<ElementTreeVisitor>(new DrawXmlEmitter(rEmitContext,
+            return std::shared_ptr<ElementTreeVisitor>(new DrawXmlEmitter(rEmitContext,
                                                                             DrawXmlEmitter::DRAW_DOC
                                                                             ));
         }
diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx
index 93eb2daa5510..4621be14b69e 100644
--- a/sdext/source/pdfimport/wrapper/wrapper.cxx
+++ b/sdext/source/pdfimport/wrapper/wrapper.cxx
@@ -60,7 +60,7 @@
 #include <vcl/font.hxx>
 #include <vcl/virdev.hxx>
 
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 #include <unordered_map>
 #include <string.h>
 #ifdef WNT
@@ -919,7 +919,7 @@ static bool checkEncryption( const OUString&                               i_rPa
     aPDFFile = OUStringToOString( i_rPath, osl_getThreadTextEncoding() );
 
     pdfparse::PDFReader aParser;
-    boost::scoped_ptr<pdfparse::PDFEntry> pEntry( pdfparse::PDFReader::read( aPDFFile.getStr() ));
+    std::unique_ptr<pdfparse::PDFEntry> pEntry( pdfparse::PDFReader::read( aPDFFile.getStr() ));
     if( pEntry )
     {
         pdfparse::PDFFile* pPDFFile = dynamic_cast<pdfparse::PDFFile*>(pEntry.get());
diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx
index d94a3fc94c5e..9a4864ed3916 100644
--- a/sdext/source/presenter/PresenterAccessibility.cxx
+++ b/sdext/source/presenter/PresenterAccessibility.cxx
@@ -40,6 +40,7 @@
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <boost/bind.hpp>
+#include <algorithm>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::accessibility;
@@ -481,16 +482,16 @@ public:
         const lang::Locale& rLocale,
         const Reference<awt::XWindow>& rxContentWindow,
         const Reference<awt::XWindow>& rxBorderWindow,
-        const ::boost::shared_ptr<PresenterTextView>& rpTextView);
+        const std::shared_ptr<PresenterTextView>& rpTextView);
 
-    void SetTextView (const ::boost::shared_ptr<PresenterTextView>& rpTextView);
+    void SetTextView (const std::shared_ptr<PresenterTextView>& rpTextView);
 
     virtual void SetWindow (
         const css::uno::Reference<css::awt::XWindow>& rxContentWindow,
         const css::uno::Reference<css::awt::XWindow>& rxBorderWindow) SAL_OVERRIDE;
 
 private:
-    ::boost::shared_ptr<PresenterTextView> mpTextView;
+    std::shared_ptr<PresenterTextView> mpTextView;
 
     void NotifyCaretChange (
         const sal_Int32 nOldParagraphIndex,
@@ -508,7 +509,7 @@ private:
 class AccessibleFocusManager
 {
 public:
-    static ::boost::shared_ptr<AccessibleFocusManager> Instance();
+    static std::shared_ptr<AccessibleFocusManager> Instance();
 
     void AddFocusableObject (const ::rtl::Reference<PresenterAccessible::AccessibleObject>& rpObject);
     void RemoveFocusableObject (const ::rtl::Reference<PresenterAccessible::AccessibleObject>& rpObject);
@@ -516,7 +517,7 @@ public:
     void FocusObject (const ::rtl::Reference<PresenterAccessible::AccessibleObject>& rpObject);
 
 private:
-    static ::boost::shared_ptr<AccessibleFocusManager> mpInstance;
+    static std::shared_ptr<AccessibleFocusManager> mpInstance;
     ::std::vector<rtl::Reference<PresenterAccessible::AccessibleObject> > maFocusableObjects;
 
     AccessibleFocusManager();
@@ -620,7 +621,7 @@ void PresenterAccessible::UpdateAccessibilityHierarchy()
         pNotesPane ? pNotesPane->mxBorderWindow : Reference<awt::XWindow>(),
         pNotesView.is()
             ? pNotesView->GetTextView()
-            : ::boost::shared_ptr<PresenterTextView>());
+            : std::shared_ptr<PresenterTextView>());
 }
 
 void PresenterAccessible::UpdateAccessibilityHierarchy (
@@ -629,7 +630,7 @@ void PresenterAccessible::UpdateAccessibilityHierarchy (
     const OUString& rsTitle,
     const Reference<awt::XWindow>& rxNotesContentWindow,
     const Reference<awt::XWindow>& rxNotesBorderWindow,
-    const ::boost::shared_ptr<PresenterTextView>& rpNotesTextView)
+    const std::shared_ptr<PresenterTextView>& rpNotesTextView)
 {
     if ( ! mpAccessibleConsole.is())
         return;
@@ -710,7 +711,7 @@ void SAL_CALL PresenterAccessible::disposing()
         OUString(),
         NULL,
         NULL,
-        ::boost::shared_ptr<PresenterTextView>());
+        std::shared_ptr<PresenterTextView>());
 
     if (mxMainWindow.is())
     {
@@ -1839,7 +1840,7 @@ rtl::Reference<PresenterAccessible::AccessibleObject> AccessibleNotes::Create (
     const lang::Locale& rLocale,
     const Reference<awt::XWindow>& rxContentWindow,
     const Reference<awt::XWindow>& rxBorderWindow,
-    const ::boost::shared_ptr<PresenterTextView>& rpTextView)
+    const std::shared_ptr<PresenterTextView>& rpTextView)
 {
     OUString sName ("Presenter Notes Text");
     {
@@ -1865,7 +1866,7 @@ rtl::Reference<PresenterAccessible::AccessibleObject> AccessibleNotes::Create (
 }
 
 void AccessibleNotes::SetTextView (
-    const ::boost::shared_ptr<PresenterTextView>& rpTextView)
+    const std::shared_ptr<PresenterTextView>& rpTextView)
 {
     ::std::vector<rtl::Reference<PresenterAccessible::AccessibleObject> > aChildren;
 
@@ -1992,9 +1993,9 @@ void AccessibleNotes::HandleTextChange()
 
 //===== AccessibleFocusManager ================================================
 
-::boost::shared_ptr<AccessibleFocusManager> AccessibleFocusManager::mpInstance;
+std::shared_ptr<AccessibleFocusManager> AccessibleFocusManager::mpInstance;
 
-::boost::shared_ptr<AccessibleFocusManager> AccessibleFocusManager::Instance()
+std::shared_ptr<AccessibleFocusManager> AccessibleFocusManager::Instance()
 {
     if ( ! mpInstance)
     {
diff --git a/sdext/source/presenter/PresenterAccessibility.hxx b/sdext/source/presenter/PresenterAccessibility.hxx
index fb5eac8f3f12..590feed60c21 100644
--- a/sdext/source/presenter/PresenterAccessibility.hxx
+++ b/sdext/source/presenter/PresenterAccessibility.hxx
@@ -37,7 +37,7 @@
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <rtl/ref.hxx>
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 
 namespace sdext { namespace presenter {
@@ -120,7 +120,7 @@ private:
         const OUString& rsTitle,
         const css::uno::Reference<css::awt::XWindow>& rxNotesContentWindow,
         const css::uno::Reference<css::awt::XWindow>& rxNotesBorderWindow,
-        const ::boost::shared_ptr<PresenterTextView>& rpNotesTextView);
+        const std::shared_ptr<PresenterTextView>& rpNotesTextView);
     PresenterPaneContainer::SharedPaneDescriptor GetPreviewPane() const;
 };
 
diff --git a/sdext/source/presenter/PresenterBitmapContainer.cxx b/sdext/source/presenter/PresenterBitmapContainer.cxx
index c8e7ac92ce87..eb921325be6d 100644
--- a/sdext/source/presenter/PresenterBitmapContainer.cxx
+++ b/sdext/source/presenter/PresenterBitmapContainer.cxx
@@ -38,7 +38,7 @@ namespace sdext { namespace presenter {
 
 PresenterBitmapContainer::PresenterBitmapContainer (
     const OUString& rsConfigurationBase,
-    const ::boost::shared_ptr<PresenterBitmapContainer>& rpParentContainer,
+    const std::shared_ptr<PresenterBitmapContainer>& rpParentContainer,
     const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext,
     const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,
     const css::uno::Reference<css::drawing::XPresenterHelper>& rxPresenterHelper)
@@ -63,7 +63,7 @@ PresenterBitmapContainer::PresenterBitmapContainer (
 
 PresenterBitmapContainer::PresenterBitmapContainer (
     const css::uno::Reference<css::container::XNameAccess>& rxRootNode,
-    const ::boost::shared_ptr<PresenterBitmapContainer>& rpParentContainer,
+    const std::shared_ptr<PresenterBitmapContainer>& rpParentContainer,
     const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext,
     const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,
     const css::uno::Reference<css::drawing::XPresenterHelper>& rxPresenterHelper)
@@ -299,7 +299,7 @@ PresenterBitmapContainer::BitmapDescriptor::BitmapDescriptor()
 }
 
 PresenterBitmapContainer::BitmapDescriptor::BitmapDescriptor (
-    const ::boost::shared_ptr<PresenterBitmapContainer::BitmapDescriptor>& rpDefault)
+    const std::shared_ptr<PresenterBitmapContainer::BitmapDescriptor>& rpDefault)
     : mnWidth(0),
       mnHeight(0),
       mnXOffset(0),
diff --git a/sdext/source/presenter/PresenterBitmapContainer.hxx b/sdext/source/presenter/PresenterBitmapContainer.hxx
index 22349efa1e29..38a06a91ed27 100644
--- a/sdext/source/presenter/PresenterBitmapContainer.hxx
+++ b/sdext/source/presenter/PresenterBitmapContainer.hxx
@@ -30,7 +30,7 @@
 #include <com/sun/star/util/Color.hpp>
 #include <boost/noncopyable.hpp>
 #include <map>
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 namespace sdext { namespace presenter {
 
@@ -50,7 +50,7 @@ public:
     {
     public:
         BitmapDescriptor();
-        BitmapDescriptor (const ::boost::shared_ptr<BitmapDescriptor>& rpDefault);
+        BitmapDescriptor (const std::shared_ptr<BitmapDescriptor>& rpDefault);
 
         enum Mode {Normal, MouseOver, ButtonDown, Disabled, Mask};
         css::uno::Reference<css::rendering::XBitmap> GetNormalBitmap() const;
@@ -89,13 +89,13 @@ public:
     */
     PresenterBitmapContainer (
         const OUString& rsConfigurationBase,
-        const ::boost::shared_ptr<PresenterBitmapContainer>& rpParentContainer,
+        const std::shared_ptr<PresenterBitmapContainer>& rpParentContainer,
         const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext,
         const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,
         const css::uno::Reference<css::drawing::XPresenterHelper>& rxPresenterHelper = NULL);
     PresenterBitmapContainer (
         const css::uno::Reference<css::container::XNameAccess>& rsRootNode,
-        const ::boost::shared_ptr<PresenterBitmapContainer>& rpParentContainer,
+        const std::shared_ptr<PresenterBitmapContainer>& rpParentContainer,
         const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext,
         const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,
         const css::uno::Reference<css::drawing::XPresenterHelper>& rxPresenterHelper = NULL);
@@ -106,18 +106,18 @@ public:
 
     /** Return the bitmap set that is associated with the given name.
     */
-    ::boost::shared_ptr<BitmapDescriptor> GetBitmap (const OUString& rsName) const;
+    std::shared_ptr<BitmapDescriptor> GetBitmap (const OUString& rsName) const;
 
-    static ::boost::shared_ptr<BitmapDescriptor> LoadBitmap (
+    static std::shared_ptr<BitmapDescriptor> LoadBitmap (
         const css::uno::Reference<css::container::XHierarchicalNameAccess>& rxNode,
         const OUString& rsPathToBitmapNode,
         const css::uno::Reference<css::drawing::XPresenterHelper>& rxPresenterHelper,
         const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,
-        const ::boost::shared_ptr<BitmapDescriptor>& rpDefaultBitmap);
+        const std::shared_ptr<BitmapDescriptor>& rpDefaultBitmap);
 
 private:
-    ::boost::shared_ptr<PresenterBitmapContainer> mpParentContainer;
-    typedef ::std::map<OUString, ::boost::shared_ptr<BitmapDescriptor> > BitmapContainer;
+    std::shared_ptr<PresenterBitmapContainer> mpParentContainer;
+    typedef ::std::map<OUString, std::shared_ptr<BitmapDescriptor> > BitmapContainer;
     BitmapContainer maIconContainer;
     css::uno::Reference<css::rendering::XCanvas> mxCanvas;
     css::uno::Reference<css::drawing::XPresenterHelper> mxPresenterHelper;
@@ -127,17 +127,17 @@ private:
     void ProcessBitmap (
         const OUString& rsKey,
         const css::uno::Reference<css::beans::XPropertySet>& rProperties);
-    static ::boost::shared_ptr<BitmapDescriptor> LoadBitmap (
+    static std::shared_ptr<BitmapDescriptor> LoadBitmap (
         const css::uno::Reference<css::beans::XPropertySet>& rxProperties,
         const css::uno::Reference<css::drawing::XPresenterHelper>& rxPresenterHelper,
         const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,
-        const ::boost::shared_ptr<PresenterBitmapContainer::BitmapDescriptor>& rpDefault);
+        const std::shared_ptr<PresenterBitmapContainer::BitmapDescriptor>& rpDefault);
     static BitmapDescriptor::TexturingMode
         StringToTexturingMode (const OUString& rsTexturingMode);
 };
 
 typedef PresenterBitmapContainer::BitmapDescriptor PresenterBitmapDescriptor;
-typedef ::boost::shared_ptr<PresenterBitmapContainer::BitmapDescriptor> SharedBitmapDescriptor;
+typedef std::shared_ptr<PresenterBitmapContainer::BitmapDescriptor> SharedBitmapDescriptor;
 
 } } // end of namespace ::sdext::presenter
 
diff --git a/sdext/source/presenter/PresenterButton.cxx b/sdext/source/presenter/PresenterButton.cxx
index a4c23d28dcff..7579563ef41d 100644
--- a/sdext/source/presenter/PresenterButton.cxx
+++ b/sdext/source/presenter/PresenterButton.cxx
@@ -42,7 +42,7 @@ const static double gnVerticalBorder (5);
 ::rtl::Reference<PresenterButton> PresenterButton::Create (
     const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext,
     const ::rtl::Reference<PresenterController>& rpPresenterController,
-    const ::boost::shared_ptr<PresenterTheme>& rpTheme,
+    const std::shared_ptr<PresenterTheme>& rpTheme,
     const css::uno::Reference<css::awt::XWindow>& rxParentWindow,
     const css::uno::Reference<css::rendering::XCanvas>& rxParentCanvas,
     const OUString& rsConfigurationName)
@@ -85,7 +85,7 @@ const static double gnVerticalBorder (5);
 PresenterButton::PresenterButton (
     const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext,
     const ::rtl::Reference<PresenterController>& rpPresenterController,
-    const ::boost::shared_ptr<PresenterTheme>& rpTheme,
+    const std::shared_ptr<PresenterTheme>& rpTheme,
     const css::uno::Reference<css::awt::XWindow>& rxParentWindow,
     const PresenterTheme::SharedFontDescriptor& rpFont,
     const PresenterTheme::SharedFontDescriptor& rpMouseOverFont,
diff --git a/sdext/source/presenter/PresenterButton.hxx b/sdext/source/presenter/PresenterButton.hxx
index 2ec4cc485728..5ab424b9ea31 100644
--- a/sdext/source/presenter/PresenterButton.hxx
+++ b/sdext/source/presenter/PresenterButton.hxx
@@ -60,7 +60,7 @@ public:
     static ::rtl::Reference<PresenterButton> Create (
         const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext,
         const ::rtl::Reference<PresenterController>& rpPresenterController,
-        const ::boost::shared_ptr<PresenterTheme>& rpTheme,
+        const std::shared_ptr<PresenterTheme>& rpTheme,
         const css::uno::Reference<css::awt::XWindow>& rxParentWindow,
         const css::uno::Reference<css::rendering::XCanvas>& rxParentCanvas,
         const OUString& rsConfigurationName);
@@ -121,7 +121,7 @@ public:
 
 private:
     ::rtl::Reference<PresenterController> mpPresenterController;
-    ::boost::shared_ptr<PresenterTheme> mpTheme;
+    std::shared_ptr<PresenterTheme> mpTheme;
     css::uno::Reference<css::awt::XWindow> mxWindow;
     css::uno::Reference<css::rendering::XCanvas> mxCanvas;
     css::uno::Reference<css::drawing::XPresenterHelper> mxPresenterHelper;
@@ -138,7 +138,7 @@ private:
     PresenterButton (
         const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext,
         const ::rtl::Reference<PresenterController>& rpPresenterController,
-        const ::boost::shared_ptr<PresenterTheme>& rpTheme,
+        const std::shared_ptr<PresenterTheme>& rpTheme,
         const css::uno::Reference<css::awt::XWindow>& rxParentWindow,
         const PresenterTheme::SharedFontDescriptor& rFont,
         const PresenterTheme::SharedFontDescriptor& rMouseOverFont,
diff --git a/sdext/source/presenter/PresenterController.cxx b/sdext/source/presenter/PresenterController.cxx
index 726995306f8a..ce3e365952c2 100644
--- a/sdext/source/presenter/PresenterController.cxx
+++ b/sdext/source/presenter/PresenterController.cxx
@@ -448,7 +448,7 @@ PresenterTheme::SharedFontDescriptor
     return PresenterTheme::SharedFontDescriptor();
 }
 
-::boost::shared_ptr<PresenterTheme> PresenterController::GetTheme() const
+std::shared_ptr<PresenterTheme> PresenterController::GetTheme() const
 {
     return mpTheme;
 }
@@ -474,7 +474,7 @@ rtl::Reference<PresenterPaneContainer> PresenterController::GetPaneContainer() c
     return mpPaneBorderPainter;
 }
 
-::boost::shared_ptr<PresenterCanvasHelper> PresenterController::GetCanvasHelper() const
+std::shared_ptr<PresenterCanvasHelper> PresenterController::GetCanvasHelper() const
 {
     return mpCanvasHelper;
 }
@@ -484,7 +484,7 @@ Reference<drawing::XPresenterHelper> PresenterController::GetPresenterHelper() c
     return mxPresenterHelper;
 }
 
-::boost::shared_ptr<PresenterPaintManager> PresenterController::GetPaintManager() const
+std::shared_ptr<PresenterPaintManager> PresenterController::GetPaintManager() const
 {
     return mpPaintManager;
 }
diff --git a/sdext/source/presenter/PresenterController.hxx b/sdext/source/presenter/PresenterController.hxx
index 9f9a9447de07..f7a7023a5f3f 100644
--- a/sdext/source/presenter/PresenterController.hxx
+++ b/sdext/source/presenter/PresenterController.hxx
@@ -45,7 +45,7 @@
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <rtl/ref.hxx>
 #include <map>
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 namespace sdext { namespace presenter {
 
@@ -97,15 +97,15 @@ public:
         GetViewBackground (const OUString& rsViewURL) const;
     PresenterTheme::SharedFontDescriptor
         GetViewFont (const OUString& rsViewURL) const;
-    ::boost::shared_ptr<PresenterTheme> GetTheme() const;
+    std::shared_ptr<PresenterTheme> GetTheme() const;
     ::rtl::Reference<PresenterWindowManager> GetWindowManager() const;
     css::uno::Reference<css::presentation::XSlideShowController>
         GetSlideShowController() const;
     rtl::Reference<PresenterPaneContainer> GetPaneContainer() const;
     ::rtl::Reference<PresenterPaneBorderPainter> GetPaneBorderPainter() const;
-    ::boost::shared_ptr<PresenterCanvasHelper> GetCanvasHelper() const;
+    std::shared_ptr<PresenterCanvasHelper> GetCanvasHelper() const;
     css::uno::Reference<css::drawing::XPresenterHelper> GetPresenterHelper() const;
-    ::boost::shared_ptr<PresenterPaintManager> GetPaintManager() const;
+    std::shared_ptr<PresenterPaintManager> GetPaintManager() const;
     double GetSlideAspectRatio() const;
     void ShowView (const OUString& rsViewURL);
     void HideView (const OUString& rsViewURL);
@@ -204,13 +204,13 @@ private:
     css::uno::Reference<css::drawing::XDrawPage> mxCurrentSlide;
     css::uno::Reference<css::drawing::XDrawPage> mxNextSlide;
     ::rtl::Reference<PresenterWindowManager> mpWindowManager;
-    ::boost::shared_ptr<PresenterPaneAnimator> mpCurrentPaneAnimation;
-    ::boost::shared_ptr<PresenterTheme> mpTheme;
+    std::shared_ptr<PresenterPaneAnimator> mpCurrentPaneAnimation;
+    std::shared_ptr<PresenterTheme> mpTheme;
     css::uno::Reference<css::awt::XWindow> mxMainWindow;
     ::rtl::Reference<PresenterPaneBorderPainter> mpPaneBorderPainter;
-    ::boost::shared_ptr<PresenterCanvasHelper> mpCanvasHelper;
+    std::shared_ptr<PresenterCanvasHelper> mpCanvasHelper;
     css::uno::Reference<css::drawing::XPresenterHelper> mxPresenterHelper;
-    ::boost::shared_ptr<PresenterPaintManager> mpPaintManager;
+    std::shared_ptr<PresenterPaintManager> mpPaintManager;
     sal_Int32 mnPendingSlideNumber;
     css::uno::Reference<css::util::XURLTransformer> mxUrlTransformer;
     ::rtl::Reference<PresenterAccessible> mpAccessibleObject;
diff --git a/sdext/source/presenter/PresenterHelpView.cxx b/sdext/source/presenter/PresenterHelpView.cxx
index c2cb2e0e0864..240f46fc9745 100644
--- a/sdext/source/presenter/PresenterHelpView.cxx
+++ b/sdext/source/presenter/PresenterHelpView.cxx
@@ -87,7 +87,7 @@ namespace {
 
     private:
         const OUString msText;
-        ::boost::shared_ptr<vector<LineDescriptor> > mpLineDescriptors;
+        std::shared_ptr<vector<LineDescriptor> > mpLineDescriptors;
 
         static void SplitText (const OUString& rsText, vector<OUString>& rTextParts);
         void FormatText (
@@ -113,7 +113,7 @@ namespace {
     };
 } // end of anonymous namespace
 
-class PresenterHelpView::TextContainer : public vector<boost::shared_ptr<Block> >
+class PresenterHelpView::TextContainer : public vector<std::shared_ptr<Block> >
 {
 };
 
@@ -379,7 +379,7 @@ void PresenterHelpView::ProcessString (
     OUString sRightText;
     PresenterConfigurationAccess::GetProperty(rsProperties, "Right") >>= sRightText;
     mpTextContainer->push_back(
-        ::boost::shared_ptr<Block>(
+        std::shared_ptr<Block>(
             new Block(sLeftText, sRightText, mpFont->mxFont, mnMaximalWidth)));
 }
 
diff --git a/sdext/source/presenter/PresenterHelpView.hxx b/sdext/source/presenter/PresenterHelpView.hxx
index d2cc595e349a..bbff6e262e5a 100644
--- a/sdext/source/presenter/PresenterHelpView.hxx
+++ b/sdext/source/presenter/PresenterHelpView.hxx
@@ -29,7 +29,7 @@
 #include <com/sun/star/drawing/framework/XResourceId.hpp>
 #include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/rendering/XSpriteCanvas.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 namespace {
     typedef cppu::WeakComponentImplHelper<
@@ -102,7 +102,7 @@ private:
     css::uno::Reference<css::rendering::XCanvas> mxCanvas;
     ::rtl::Reference<PresenterController> mpPresenterController;
     PresenterTheme::SharedFontDescriptor mpFont;
-    ::boost::scoped_ptr<TextContainer> mpTextContainer;
+    std::unique_ptr<TextContainer> mpTextContainer;
     ::rtl::Reference<PresenterButton> mpCloseButton;
     sal_Int32 mnSeparatorY;
     sal_Int32 mnMaximalWidth;
diff --git a/sdext/source/presenter/PresenterNotesView.cxx b/sdext/source/presenter/PresenterNotesView.cxx
index 8bb5a0458b7e..e1be7c32eb45 100644
--- a/sdext/source/presenter/PresenterNotesView.cxx
+++ b/sdext/source/presenter/PresenterNotesView.cxx
@@ -657,7 +657,7 @@ void PresenterNotesView::ChangeFontSize (const sal_Int32 nSizeChange)
         {
             const OUString sStyleName (mpPresenterController->GetTheme()->GetStyleName(
                 mxViewId->getResourceURL()));
-            ::boost::shared_ptr<PresenterConfigurationAccess> pConfiguration (
+            std::shared_ptr<PresenterConfigurationAccess> pConfiguration (
                 mpPresenterController->GetTheme()->GetNodeForViewStyle(
                     sStyleName));
             if (pConfiguration.get()==NULL || ! pConfiguration->IsValid())
@@ -674,7 +674,7 @@ void PresenterNotesView::ChangeFontSize (const sal_Int32 nSizeChange)
     }
 }
 
-::boost::shared_ptr<PresenterTextView> PresenterNotesView::GetTextView() const
+std::shared_ptr<PresenterTextView> PresenterNotesView::GetTextView() const
 {
     return mpTextView;
 }
diff --git a/sdext/source/presenter/PresenterNotesView.hxx b/sdext/source/presenter/PresenterNotesView.hxx
index 057a18e72323..d6fe3dab52bb 100644
--- a/sdext/source/presenter/PresenterNotesView.hxx
+++ b/sdext/source/presenter/PresenterNotesView.hxx
@@ -37,7 +37,7 @@
 #include <com/sun/star/drawing/framework/XResourceId.hpp>
 #include <com/sun/star/frame/XController.hpp>
 #include <rtl/ref.hxx>
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 namespace {
     typedef cppu::WeakComponentImplHelper<
@@ -85,7 +85,7 @@ public:
 
     void ChangeFontSize (const sal_Int32 nSizeChange);
 
-    ::boost::shared_ptr<PresenterTextView> GetTextView() const;
+    std::shared_ptr<PresenterTextView> GetTextView() const;
 
     // lang::XEventListener
 
@@ -153,7 +153,7 @@ private:
     SharedBitmapDescriptor mpBackground;
     double mnTop;
     PresenterTheme::SharedFontDescriptor mpFont;
-    ::boost::shared_ptr<PresenterTextView> mpTextView;
+    std::shared_ptr<PresenterTextView> mpTextView;
 
     void CreateToolBar (
         const css::uno::Reference<css::uno::XComponentContext>& rxContext,
diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.cxx b/sdext/source/presenter/PresenterPaneBorderPainter.cxx
index 97f6781073c2..31b260bcd704 100644
--- a/sdext/source/presenter/PresenterPaneBorderPainter.cxx
+++ b/sdext/source/presenter/PresenterPaneBorderPainter.cxx
@@ -37,8 +37,8 @@
 #include <com/sun/star/rendering/XIntegerBitmap.hpp>
 #include <com/sun/star/rendering/XSpriteCanvas.hpp>
 #include <map>
+#include <memory>
 #include <vector>
-#include <boost/shared_ptr.hpp>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -60,7 +60,7 @@ namespace {
     {
     public:
         RendererPaneStyle (
-            const ::boost::shared_ptr<PresenterTheme>& rpTheme,
+            const std::shared_ptr<PresenterTheme>& rpTheme,
             const OUString& rsStyleName);
 
         awt::Rectangle AddBorder (
@@ -95,7 +95,7 @@ namespace {
     private:
         void UpdateBorderSizes();
         SharedBitmapDescriptor GetBitmap(
-            const ::boost::shared_ptr<PresenterTheme>& rpTheme,
+            const std::shared_ptr<PresenterTheme>& rpTheme,
             const OUString& rsStyleName,
             const OUString& rsBitmapName);
     };
@@ -106,7 +106,7 @@ class  PresenterPaneBorderPainter::Renderer
 public:
     Renderer (
         const Reference<XComponentContext>& rxContext,
-        const ::boost::shared_ptr<PresenterTheme>& rpTheme);
+        const std::shared_ptr<PresenterTheme>& rpTheme);
     ~Renderer();
 
     void SetCanvas (const Reference<rendering::XCanvas>& rxCanvas);
@@ -117,7 +117,7 @@ public:
         const OUString& rsPaneURL);
     void PaintTitle (
         const OUString& rsTitle,
-        const ::boost::shared_ptr<RendererPaneStyle>& rpStyle,
+        const std::shared_ptr<RendererPaneStyle>& rpStyle,
         const awt::Rectangle& rUpdateBox,
         const awt::Rectangle& rOuterBox,
         const awt::Rectangle& rInnerBox,
@@ -126,13 +126,13 @@ public:
         const awt::Rectangle& rUpdateBox,
         const awt::Rectangle& rOuterBox,
         const OUString& rsPaneStyleName);
-    ::boost::shared_ptr<RendererPaneStyle> GetRendererPaneStyle (const OUString& rsResourceURL);
+    std::shared_ptr<RendererPaneStyle> GetRendererPaneStyle (const OUString& rsResourceURL);
     void SetCalloutAnchor (
         const awt::Point& rCalloutAnchor);
 
 private:
-    ::boost::shared_ptr<PresenterTheme> mpTheme;
-    typedef ::std::map<OUString, ::boost::shared_ptr<RendererPaneStyle> > RendererPaneStyleContainer;
+    std::shared_ptr<PresenterTheme> mpTheme;
+    typedef ::std::map<OUString, std::shared_ptr<RendererPaneStyle> > RendererPaneStyleContainer;
     RendererPaneStyleContainer maRendererPaneStyles;
     Reference<rendering::XCanvas> mxCanvas;
     Reference<drawing::XPresenterHelper> mxPresenterHelper;
@@ -276,7 +276,7 @@ awt::Point SAL_CALL PresenterPaneBorderPainter::getCalloutOffset (
     ProvideTheme();
     if (mpRenderer.get() != NULL)
     {
-        const ::boost::shared_ptr<RendererPaneStyle> pRendererPaneStyle(
+        const std::shared_ptr<RendererPaneStyle> pRendererPaneStyle(
             mpRenderer->GetRendererPaneStyle(rsPaneBorderStyleName));
         if (pRendererPaneStyle.get() != NULL
             && pRendererPaneStyle->mpBottomCallout.get() != NULL)
@@ -341,7 +341,7 @@ bool PresenterPaneBorderPainter::ProvideTheme()
     }
 }
 
-void PresenterPaneBorderPainter::SetTheme (const ::boost::shared_ptr<PresenterTheme>& rpTheme)
+void PresenterPaneBorderPainter::SetTheme (const std::shared_ptr<PresenterTheme>& rpTheme)
 {
     mpTheme = rpTheme;
     if (mpRenderer.get() == NULL)
@@ -355,7 +355,7 @@ awt::Rectangle PresenterPaneBorderPainter::AddBorder (
 {
     if (mpRenderer.get() != NULL)
     {
-        const ::boost::shared_ptr<RendererPaneStyle> pRendererPaneStyle(mpRenderer->GetRendererPaneStyle(rsPaneURL));
+        const std::shared_ptr<RendererPaneStyle> pRendererPaneStyle(mpRenderer->GetRendererPaneStyle(rsPaneURL));
         if (pRendererPaneStyle.get() != NULL)
             return pRendererPaneStyle->AddBorder(rInnerBox, eBorderType);
     }
@@ -369,7 +369,7 @@ awt::Rectangle PresenterPaneBorderPainter::RemoveBorder (
 {
     if (mpRenderer.get() != NULL)
     {
-        const ::boost::shared_ptr<RendererPaneStyle> pRendererPaneStyle(mpRenderer->GetRendererPaneStyle(rsPaneURL));
+        const std::shared_ptr<RendererPaneStyle> pRendererPaneStyle(mpRenderer->GetRendererPaneStyle(rsPaneURL));
         if (pRendererPaneStyle.get() != NULL)
             return pRendererPaneStyle->RemoveBorder(rOuterBox, eBorderType);
     }
@@ -392,7 +392,7 @@ void PresenterPaneBorderPainter::ThrowIfDisposed() const
 
 PresenterPaneBorderPainter::Renderer::Renderer (
     const Reference<XComponentContext>& rxContext,
-    const ::boost::shared_ptr<PresenterTheme>& rpTheme)
+    const std::shared_ptr<PresenterTheme>& rpTheme)
     : mpTheme(rpTheme),
       maRendererPaneStyles(),
       mxCanvas(),
@@ -437,7 +437,7 @@ void PresenterPaneBorderPainter::Renderer::PaintBorder (
         return;
 
     // Create the outer and inner border of the, ahm, border.
-    ::boost::shared_ptr<RendererPaneStyle> pStyle (GetRendererPaneStyle(rsPaneURL));
+    std::shared_ptr<RendererPaneStyle> pStyle (GetRendererPaneStyle(rsPaneURL));
     if (pStyle.get() == NULL)
         return;
 
@@ -506,7 +506,7 @@ void PresenterPaneBorderPainter::Renderer::PaintBorder (
 
 void PresenterPaneBorderPainter::Renderer::PaintTitle (
     const OUString& rsTitle,
-    const ::boost::shared_ptr<RendererPaneStyle>& rpStyle,
+    const std::shared_ptr<RendererPaneStyle>& rpStyle,
     const awt::Rectangle& rUpdateBox,
     const awt::Rectangle& rOuterBox,
     const awt::Rectangle& rInnerBox,
@@ -602,7 +602,7 @@ void PresenterPaneBorderPainter::Renderer::PaintTitle (
     }
 }
 
-::boost::shared_ptr<RendererPaneStyle>
+std::shared_ptr<RendererPaneStyle>
     PresenterPaneBorderPainter::Renderer::GetRendererPaneStyle (const OUString& rsResourceURL)
 {
     OSL_ASSERT(mpTheme.get()!=NULL);
@@ -618,7 +618,7 @@ void PresenterPaneBorderPainter::Renderer::PaintTitle (
             sPaneStyleName = sStyleName;
 
         // Create a new pane style object and initialize it with bitmaps.
-        ::boost::shared_ptr<RendererPaneStyle> pStyle (
+        std::shared_ptr<RendererPaneStyle> pStyle (
             new RendererPaneStyle(mpTheme,sPaneStyleName));
         iStyle = maRendererPaneStyles.insert(
             RendererPaneStyleContainer::value_type(rsResourceURL, pStyle)).first;
@@ -626,7 +626,7 @@ void PresenterPaneBorderPainter::Renderer::PaintTitle (
     if (iStyle != maRendererPaneStyles.end())
         return iStyle->second;
     else
-        return ::boost::shared_ptr<RendererPaneStyle>();
+        return std::shared_ptr<RendererPaneStyle>();
 }
 
 void PresenterPaneBorderPainter::Renderer::SetCalloutAnchor (
@@ -756,7 +756,7 @@ void PresenterPaneBorderPainter::Renderer::SetupClipping (
     if ( ! mxCanvas.is())
         return;
 
-    ::boost::shared_ptr<RendererPaneStyle> pStyle (GetRendererPaneStyle(rsPaneStyleName));
+    std::shared_ptr<RendererPaneStyle> pStyle (GetRendererPaneStyle(rsPaneStyleName));
     if (pStyle.get() == NULL)
     {
         mxViewStateClip = PresenterGeometryHelper::CreatePolygon(
@@ -794,7 +794,7 @@ BorderSize::BorderSize()
 //===== RendererPaneStyle  ============================================================
 
 RendererPaneStyle::RendererPaneStyle (
-    const ::boost::shared_ptr<PresenterTheme>& rpTheme,
+    const std::shared_ptr<PresenterTheme>& rpTheme,
     const OUString& rsStyleName)
     : mpTopLeft(),
       mpTop(),
@@ -941,7 +941,7 @@ void RendererPaneStyle::UpdateBorderSizes()
 }
 
 SharedBitmapDescriptor RendererPaneStyle::GetBitmap(
-    const ::boost::shared_ptr<PresenterTheme>& rpTheme,
+    const std::shared_ptr<PresenterTheme>& rpTheme,
     const OUString& rsStyleName,
     const OUString& rsBitmapName)
 {
diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.hxx b/sdext/source/presenter/PresenterPaneBorderPainter.hxx
index f7c74d6f8a6f..603fc9cc76f5 100644
--- a/sdext/source/presenter/PresenterPaneBorderPainter.hxx
+++ b/sdext/source/presenter/PresenterPaneBorderPainter.hxx
@@ -30,8 +30,7 @@
 #include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/compbase.hxx>
 #include <boost/noncopyable.hpp>
-#include <boost/scoped_ptr.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 namespace sdext { namespace presenter {
 
@@ -84,7 +83,7 @@ public:
         const css::awt::Rectangle& rOuterBox,
         const css::drawing::framework::BorderType eBorderType) const;
 
-    void SetTheme (const ::boost::shared_ptr<PresenterTheme>& rpTheme);
+    void SetTheme (const std::shared_ptr<PresenterTheme>& rpTheme);
 
     class Renderer;
 
@@ -125,8 +124,8 @@ public:
 
 private:
     css::uno::Reference<css::uno::XComponentContext> mxContext;
-    ::boost::shared_ptr<PresenterTheme> mpTheme;
-    ::boost::scoped_ptr<Renderer> mpRenderer;
+    std::shared_ptr<PresenterTheme> mpTheme;
+    std::unique_ptr<Renderer> mpRenderer;
 
     /** When the theme for the border has not yet been loaded then try again
         when this method is called.
diff --git a/sdext/source/presenter/PresenterPaneContainer.hxx b/sdext/source/presenter/PresenterPaneContainer.hxx
index ced20baf6e25..99b70e90b62b 100644
--- a/sdext/source/presenter/PresenterPaneContainer.hxx
+++ b/sdext/source/presenter/PresenterPaneContainer.hxx
@@ -35,10 +35,10 @@
 #include <rtl/ref.hxx>
 
 #include <boost/noncopyable.hpp>
-#include <boost/shared_ptr.hpp>
 
-#include <vector>
 #include <functional>
+#include <memory>
+#include <vector>
 
 namespace sdext { namespace presenter {
 
@@ -82,7 +82,7 @@ public:
     {
     public:
         typedef ::std::function<void (bool)> Activator;
-        typedef ::std::function<boost::shared_ptr<PresenterSprite> ()> SpriteProvider;
+        typedef ::std::function<std::shared_ptr<PresenterSprite> ()> SpriteProvider;
         css::uno::Reference<css::drawing::framework::XResourceId> mxPaneId;
         OUString msViewURL;
         ::rtl::Reference<PresenterPaneBase> mxPane;
@@ -109,7 +109,7 @@ public:
 
         void SetActivationState (const bool bIsActive);
     };
-    typedef ::boost::shared_ptr<PaneDescriptor> SharedPaneDescriptor;
+    typedef std::shared_ptr<PaneDescriptor> SharedPaneDescriptor;
     typedef ::std::vector<SharedPaneDescriptor> PaneList;
     PaneList maPanes;
 
diff --git a/sdext/source/presenter/PresenterPaneFactory.hxx b/sdext/source/presenter/PresenterPaneFactory.hxx
index ec53e017a66f..a3c72a537ada 100644
--- a/sdext/source/presenter/PresenterPaneFactory.hxx
+++ b/sdext/source/presenter/PresenterPaneFactory.hxx
@@ -30,8 +30,8 @@
 #include <com/sun/star/drawing/framework/XResourceFactory.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <rtl/ref.hxx>
-#include <boost/scoped_ptr.hpp>
 #include <map>
+#include <memory>
 
 namespace sdext { namespace presenter {
 
@@ -97,7 +97,7 @@ private:
     ::rtl::Reference<PresenterController> mpPresenterController;
     typedef ::std::map<OUString, css::uno::Reference<css::drawing::framework::XResource> >
         ResourceContainer;
-    ::boost::scoped_ptr<ResourceContainer> mpResourceCache;
+    std::unique_ptr<ResourceContainer> mpResourceCache;
 
     PresenterPaneFactory (
         const css::uno::Reference<css::uno::XComponentContext>& rxContext,
diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx b/sdext/source/presenter/PresenterProtocolHandler.cxx
index fa5a535e912b..ddaa4a4cf788 100644
--- a/sdext/source/presenter/PresenterProtocolHandler.cxx
+++ b/sdext/source/presenter/PresenterProtocolHandler.cxx
@@ -37,6 +37,7 @@
 #include <com/sun/star/presentation/XPresentationSupplier.hpp>
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
+#include <algorithm>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -218,7 +219,7 @@ public:
 
 private:
     OUString msURLPath;
-    ::boost::scoped_ptr<Command> mpCommand;
+    std::unique_ptr<Command> mpCommand;
     ::rtl::Reference<PresenterController> mpPresenterController;
     typedef ::std::vector<Reference<frame::XStatusListener> > StatusListenerContainer;
     StatusListenerContainer maStatusListenerContainer;
diff --git a/sdext/source/presenter/PresenterScrollBar.cxx b/sdext/source/presenter/PresenterScrollBar.cxx
index bd5f07b78c81..2440e17f4659 100644
--- a/sdext/source/presenter/PresenterScrollBar.cxx
+++ b/sdext/source/presenter/PresenterScrollBar.cxx
@@ -32,8 +32,7 @@
 #include <com/sun/star/rendering/TexturingMode.hpp>
 #include <com/sun/star/rendering/XPolyPolygon2D.hpp>
 #include <boost/bind.hpp>
-#include <boost/enable_shared_from_this.hpp>
-#include <boost/weak_ptr.hpp>
+#include <memory>
 #include <math.h>
 
 using namespace ::com::sun::star;
@@ -46,7 +45,7 @@ namespace sdext { namespace presenter {
 //===== PresenterScrollBar::MousePressRepeater ================================
 
 class PresenterScrollBar::MousePressRepeater
-    : public ::boost::enable_shared_from_this<MousePressRepeater>
+    : public std::enable_shared_from_this<MousePressRepeater>
 {
 public:
     MousePressRepeater (const ::rtl::Reference<PresenterScrollBar>& rpScrollBar);
@@ -66,12 +65,12 @@ private:
 
 //===== PresenterScrollBar ====================================================
 
-boost::weak_ptr<PresenterBitmapContainer> PresenterScrollBar::mpSharedBitmaps;
+std::weak_ptr<PresenterBitmapContainer> PresenterScrollBar::mpSharedBitmaps;
 
 PresenterScrollBar::PresenterScrollBar (
     const Reference<XComponentContext>& rxComponentContext,
     const Reference<awt::XWindow>& rxParentWindow,
-    const ::boost::shared_ptr<PresenterPaintManager>& rpPaintManager,
+    const std::shared_ptr<PresenterPaintManager>& rpPaintManager,
     const ::std::function<void (double)>& rThumbMotionListener)
     : PresenterScrollBarInterfaceBase(m_aMutex),
       mxComponentContext(rxComponentContext),
@@ -254,7 +253,7 @@ void PresenterScrollBar::SetCanvas (const Reference<css::rendering::XCanvas>& rx
                     {
                         mpBitmaps.reset(new PresenterBitmapContainer(
                             OUString("PresenterScreenSettings/ScrollBar/Bitmaps"),
-                            ::boost::shared_ptr<PresenterBitmapContainer>(),
+                            std::shared_ptr<PresenterBitmapContainer>(),
                             mxComponentContext,
                             mxCanvas));
                         mpSharedBitmaps = mpBitmaps;
@@ -265,7 +264,7 @@ void PresenterScrollBar::SetCanvas (const Reference<css::rendering::XCanvas>& rx
                     }
                 }
                 else
-                    mpBitmaps = ::boost::shared_ptr<PresenterBitmapContainer>(mpSharedBitmaps);
+                    mpBitmaps = std::shared_ptr<PresenterBitmapContainer>(mpSharedBitmaps);
                 UpdateBitmaps();
                 UpdateBorders();
             }
@@ -629,7 +628,7 @@ bool PresenterScrollBar::IsDisabled (const Area eArea) const
 PresenterVerticalScrollBar::PresenterVerticalScrollBar (
     const Reference<XComponentContext>& rxComponentContext,
     const Reference<awt::XWindow>& rxParentWindow,
-    const ::boost::shared_ptr<PresenterPaintManager>& rpPaintManager,
+    const std::shared_ptr<PresenterPaintManager>& rpPaintManager,
     const ::std::function<void (double)>& rThumbMotionListener)
     : PresenterScrollBar(rxComponentContext, rxParentWindow, rpPaintManager, rThumbMotionListener),
       mnScrollBarWidth(0)
diff --git a/sdext/source/presenter/PresenterScrollBar.hxx b/sdext/source/presenter/PresenterScrollBar.hxx
index 5a7389f5a25a..4aaf2b960e75 100644
--- a/sdext/source/presenter/PresenterScrollBar.hxx
+++ b/sdext/source/presenter/PresenterScrollBar.hxx
@@ -30,10 +30,9 @@
 #include <cppuhelper/compbase.hxx>
 
 #include <boost/noncopyable.hpp>
-#include <boost/scoped_ptr.hpp>
-#include <boost/shared_ptr.hpp>
 
 #include <functional>
+#include <memory>
 
 namespace sdext { namespace presenter {
 
@@ -167,7 +166,7 @@ protected:
     css::uno::Reference<css::awt::XWindow> mxWindow;
     css::uno::Reference<css::rendering::XCanvas> mxCanvas;
     css::uno::Reference<css::drawing::XPresenterHelper> mxPresenterHelper;
-    ::boost::shared_ptr<PresenterPaintManager> mpPaintManager;
+    std::shared_ptr<PresenterPaintManager> mpPaintManager;
     double mnThumbPosition;
     double mnTotalSize;
     double mnThumbSize;
@@ -178,8 +177,8 @@ protected:
     Area meMouseMoveArea;
     css::geometry::RealRectangle2D maBox[__AreaCount__];
     bool mbIsNotificationActive;
-    static boost::weak_ptr<PresenterBitmapContainer> mpSharedBitmaps;
-    boost::shared_ptr<PresenterBitmapContainer> mpBitmaps;
+    static std::weak_ptr<PresenterBitmapContainer> mpSharedBitmaps;
+    std::shared_ptr<PresenterBitmapContainer> mpBitmaps;
     SharedBitmapDescriptor mpPrevButtonDescriptor;
     SharedBitmapDescriptor mpNextButtonDescriptor;
     SharedBitmapDescriptor mpPagerStartDescriptor;
@@ -206,7 +205,7 @@ protected:
     PresenterScrollBar (
         const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext,
         const css::uno::Reference<css::awt::XWindow>& rxParentWindow,
-        const ::boost::shared_ptr<PresenterPaintManager>& rpPaintManager,
+        const std::shared_ptr<PresenterPaintManager>& rpPaintManager,
         const ::std::function<void (double)>& rThumbMotionListener);
 
     void Repaint (
@@ -236,9 +235,9 @@ protected:
 
 private:
     class MousePressRepeater;
-    ::boost::shared_ptr<MousePressRepeater> mpMousePressRepeater;
+    std::shared_ptr<MousePressRepeater> mpMousePressRepeater;
     SharedBitmapDescriptor mpBackgroundBitmap;
-    ::boost::scoped_ptr<PresenterCanvasHelper> mpCanvasHelper;
+    std::unique_ptr<PresenterCanvasHelper> mpCanvasHelper;
 
     Area GetArea (const double nX, const double nY) const;
 };
@@ -251,7 +250,7 @@ public:
     PresenterVerticalScrollBar (
         const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext,
         const css::uno::Reference<css::awt::XWindow>& rxParentWindow,
-        const ::boost::shared_ptr<PresenterPaintManager>& rpPaintManager,
+        const std::shared_ptr<PresenterPaintManager>& rpPaintManager,
         const ::std::function<void (double)>& rThumbMotionListener);
     virtual ~PresenterVerticalScrollBar();
     virtual sal_Int32 GetSize() const SAL_OVERRIDE;
diff --git a/sdext/source/presenter/PresenterSlidePreview.cxx b/sdext/source/presenter/PresenterSlidePreview.cxx
index 2610348377bd..6b2047d0dd37 100644
--- a/sdext/source/presenter/PresenterSlidePreview.cxx
+++ b/sdext/source/presenter/PresenterSlidePreview.cxx
@@ -99,7 +99,7 @@ PresenterSlidePreview::PresenterSlidePreview (
             UNO_QUERY);
     mpBitmaps.reset(new PresenterBitmapContainer(
             OUString("PresenterScreenSettings/ScrollBar/Bitmaps"),
-            ::boost::shared_ptr<PresenterBitmapContainer>(),
+            std::shared_ptr<PresenterBitmapContainer>(),
             rxContext,
             mxCanvas));
     Resize();
diff --git a/sdext/source/presenter/PresenterSlidePreview.hxx b/sdext/source/presenter/PresenterSlidePreview.hxx
index afe809d64361..070dc779a001 100644
--- a/sdext/source/presenter/PresenterSlidePreview.hxx
+++ b/sdext/source/presenter/PresenterSlidePreview.hxx
@@ -123,7 +123,7 @@ private:
         size.
     */
     css::uno::Reference<css::rendering::XBitmap> mxPreview;
-    boost::shared_ptr<PresenterBitmapContainer> mpBitmaps;
+    std::shared_ptr<PresenterBitmapContainer> mpBitmaps;
 
     /**  The current slide for which a preview is displayed.  This may or
         may not be the same as the current slide of the PresenterView.
diff --git a/sdext/source/presenter/PresenterSlideShowView.cxx b/sdext/source/presenter/PresenterSlideShowView.cxx
index b3308e2b221c..ca5c1ae2a5a4 100644
--- a/sdext/source/presenter/PresenterSlideShowView.cxx
+++ b/sdext/source/presenter/PresenterSlideShowView.cxx
@@ -773,7 +773,7 @@ void PresenterSlideShowView::PaintEndSlide (const awt::Rectangle& rRepaintBox)
     {
         if (mpPresenterController.get() == NULL)
             break;
-        ::boost::shared_ptr<PresenterTheme> pTheme (mpPresenterController->GetTheme());
+        std::shared_ptr<PresenterTheme> pTheme (mpPresenterController->GetTheme());
         if (pTheme.get() == NULL)
             break;
 
diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx
index 0ea7ab5ed402..151395223378 100644
--- a/sdext/source/presenter/PresenterSlideSorter.cxx
+++ b/sdext/source/presenter/PresenterSlideSorter.cxx
@@ -141,9 +141,9 @@ class PresenterSlideSorter::MouseOverManager
 public:
     MouseOverManager (
         const Reference<container::XIndexAccess>& rxSlides,
-        const ::boost::shared_ptr<PresenterTheme>& rpTheme,
+        const std::shared_ptr<PresenterTheme>& rpTheme,
         const Reference<awt::XWindow>& rxInvalidateTarget,
-        const ::boost::shared_ptr<PresenterPaintManager>& rpPaintManager);
+        const std::shared_ptr<PresenterPaintManager>& rpPaintManager);
     ~MouseOverManager();
 
     void Paint (
@@ -167,7 +167,7 @@ private:
     OUString msText;
     Reference<rendering::XBitmap> mxBitmap;
     Reference<awt::XWindow> mxInvalidateTarget;
-    ::boost::shared_ptr<PresenterPaintManager> mpPaintManager;
+    std::shared_ptr<PresenterPaintManager> mpPaintManager;
 
     void SetCanvas (
         const Reference<rendering::XCanvas>& rxCanvas);
@@ -906,7 +906,7 @@ void PresenterSlideSorter::PaintPreview (
 
     PresenterBitmapContainer aContainer (
         "PresenterScreenSettings/ScrollBar/Bitmaps",
-        ::boost::shared_ptr<PresenterBitmapContainer>(),
+        std::shared_ptr<PresenterBitmapContainer>(),
         mxComponentContext,
         rxCanvas);
     Reference<container::XIndexAccess> xIndexAccess(mxSlideShowController, UNO_QUERY);
@@ -1488,9 +1488,9 @@ sal_Int32 PresenterSlideSorter::Layout::GetColumn (const sal_Int32 nSlideIndex)
 
 PresenterSlideSorter::MouseOverManager::MouseOverManager (
     const Reference<container::XIndexAccess>& rxSlides,
-    const ::boost::shared_ptr<PresenterTheme>& rpTheme,
+    const std::shared_ptr<PresenterTheme>& rpTheme,
     const Reference<awt::XWindow>& rxInvalidateTarget,
-    const ::boost::shared_ptr<PresenterPaintManager>& rpPaintManager)
+    const std::shared_ptr<PresenterPaintManager>& rpPaintManager)
     : mxCanvas(),
       mxSlides(rxSlides),
       mpLeftLabelBitmap(),
@@ -1504,7 +1504,7 @@ PresenterSlideSorter::MouseOverManager::MouseOverManager (
 {
     if (rpTheme.get()!=NULL)
     {
-        ::boost::shared_ptr<PresenterBitmapContainer> pBitmaps (rpTheme->GetBitmapContainer());
+        std::shared_ptr<PresenterBitmapContainer> pBitmaps (rpTheme->GetBitmapContainer());
         if (pBitmaps.get() != NULL)
         {
             mpLeftLabelBitmap = pBitmaps->GetBitmap("LabelLeft");
@@ -1807,7 +1807,7 @@ PresenterSlideSorter::CurrentSlideFrameRenderer::CurrentSlideFrameRenderer (
 
     PresenterBitmapContainer aContainer (
         "PresenterScreenSettings/SlideSorter/CurrentSlideBorderBitmaps",
-        ::boost::shared_ptr<PresenterBitmapContainer>(),
+        std::shared_ptr<PresenterBitmapContainer>(),
         rxContext,
         rxCanvas);
 
diff --git a/sdext/source/presenter/PresenterSlideSorter.hxx b/sdext/source/presenter/PresenterSlideSorter.hxx
index 109778701b05..9bc92bcb48ad 100644
--- a/sdext/source/presenter/PresenterSlideSorter.hxx
+++ b/sdext/source/presenter/PresenterSlideSorter.hxx
@@ -164,11 +164,11 @@ private:
     bool mbIsPaintPending;
     bool mbIsLayoutPending;
     class Layout;
-    ::boost::shared_ptr<Layout> mpLayout;
+    std::shared_ptr<Layout> mpLayout;
     ::rtl::Reference<PresenterScrollBar> mpVerticalScrollBar;
     ::rtl::Reference<PresenterButton> mpCloseButton;
     class MouseOverManager;
-    ::boost::scoped_ptr<MouseOverManager> mpMouseOverManager;
+    std::unique_ptr<MouseOverManager> mpMouseOverManager;
     sal_Int32 mnSlideIndexMousePressed;
     sal_Int32 mnCurrentSlideIndex;
     sal_Int32 mnSeparatorY;
@@ -176,7 +176,7 @@ private:
     css::awt::Point maCloseButtonCenter;
     css::awt::Rectangle maCurrentSlideFrameBoundingBox;
     class CurrentSlideFrameRenderer;
-    ::boost::shared_ptr<CurrentSlideFrameRenderer> mpCurrentSlideFrameRenderer;
+    std::shared_ptr<CurrentSlideFrameRenderer> mpCurrentSlideFrameRenderer;
     css::uno::Reference<css::rendering::XPolyPolygon2D> mxPreviewFrame;
 
     void UpdateLayout();
diff --git a/sdext/source/presenter/PresenterSpritePane.cxx b/sdext/source/presenter/PresenterSpritePane.cxx
index a12015e0076f..a0282ae02309 100644
--- a/sdext/source/presenter/PresenterSpritePane.cxx
+++ b/sdext/source/presenter/PresenterSpritePane.cxx
@@ -148,7 +148,7 @@ void SAL_CALL PresenterSpritePane::windowPaint (const awt::PaintEvent& rEvent)
 
 
 
-::boost::shared_ptr<PresenterSprite> PresenterSpritePane::GetSprite()
+std::shared_ptr<PresenterSprite> PresenterSpritePane::GetSprite()
 {
     return mpSprite;
 }
diff --git a/sdext/source/presenter/PresenterSpritePane.hxx b/sdext/source/presenter/PresenterSpritePane.hxx
index 6174e449b1e2..3124bb3378da 100644
--- a/sdext/source/presenter/PresenterSpritePane.hxx
+++ b/sdext/source/presenter/PresenterSpritePane.hxx
@@ -36,7 +36,7 @@
 #include <com/sun/star/rendering/XSpriteCanvas.hpp>
 #include <cppuhelper/basemutex.hxx>
 #include <rtl/ref.hxx>
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 namespace sdext { namespace presenter {
 
@@ -57,7 +57,7 @@ public:
 
     using PresenterPaneBase::disposing;
 
-    ::boost::shared_ptr<PresenterSprite> GetSprite();
+    std::shared_ptr<PresenterSprite> GetSprite();
 
     // XPane
 
@@ -89,7 +89,7 @@ public:
 private:
     css::uno::Reference<css::awt::XWindow> mxParentWindow;
     css::uno::Reference<css::rendering::XSpriteCanvas> mxParentCanvas;
-    ::boost::shared_ptr<PresenterSprite> mpSprite;
+    std::shared_ptr<PresenterSprite> mpSprite;
 
     virtual void CreateCanvases (
         const css::uno::Reference<css::awt::XWindow>& rxParentWindow,
diff --git a/sdext/source/presenter/PresenterTextView.hxx b/sdext/source/presenter/PresenterTextView.hxx
index e9acc4328049..f301007d4127 100644
--- a/sdext/source/presenter/PresenterTextView.hxx
+++ b/sdext/source/presenter/PresenterTextView.hxx
@@ -80,7 +80,7 @@ private:
 
     void InvertCaret();
 };
-typedef ::boost::shared_ptr<PresenterTextCaret> SharedPresenterTextCaret;
+typedef std::shared_ptr<PresenterTextCaret> SharedPresenterTextCaret;
 
 //===== PresenterTextParagraph ================================================
 
@@ -208,7 +208,7 @@ private:
     sal_Int8 GetTextDirection() const;
     bool IsTextReferencePointLeft() const;
 };
-typedef ::boost::shared_ptr<PresenterTextParagraph> SharedPresenterTextParagraph;
+typedef std::shared_ptr<PresenterTextParagraph> SharedPresenterTextParagraph;
 
 /** A simple text view that paints text onto a given canvas.
 */
diff --git a/sdext/source/presenter/PresenterTheme.cxx b/sdext/source/presenter/PresenterTheme.cxx
index 0e8af211d1da..015fdfdb65d8 100644
--- a/sdext/source/presenter/PresenterTheme.cxx
+++ b/sdext/source/presenter/PresenterTheme.cxx
@@ -109,7 +109,7 @@ public:
         const Reference<beans::XPropertySet>& rxFontProperties,
         const PresenterTheme::SharedFontDescriptor& rpDefault);
 
-    ::boost::shared_ptr<PresenterTheme::Theme> ReadTheme (
+    std::shared_ptr<PresenterTheme::Theme> ReadTheme (
         PresenterConfigurationAccess& rConfiguration,
         const OUString& rsThemeName);
 
@@ -132,16 +132,16 @@ public:
     const SharedBitmapDescriptor GetBitmap (const OUString& sBitmapName) const;
 
     OUString msStyleName;
-    ::boost::shared_ptr<PaneStyle> mpParentStyle;
+    std::shared_ptr<PaneStyle> mpParentStyle;
     PresenterTheme::SharedFontDescriptor mpFont;
     BorderSize maInnerBorderSize;
     BorderSize maOuterBorderSize;
-    ::boost::shared_ptr<PresenterBitmapContainer> mpBitmaps;
+    std::shared_ptr<PresenterBitmapContainer> mpBitmaps;
 
     PresenterTheme::SharedFontDescriptor GetFont() const;
 };
 
-typedef ::boost::shared_ptr<PaneStyle> SharedPaneStyle;
+typedef std::shared_ptr<PaneStyle> SharedPaneStyle;
 
 class PaneStyleContainer
 {
@@ -175,13 +175,13 @@ public:
     PresenterTheme::SharedFontDescriptor GetFont() const;
 
     OUString msStyleName;
-    ::boost::shared_ptr<ViewStyle> mpParentStyle;
+    std::shared_ptr<ViewStyle> mpParentStyle;
     PresenterTheme::SharedFontDescriptor mpFont;
-    ::boost::shared_ptr<PresenterBitmapContainer> mpBitmaps;
+    std::shared_ptr<PresenterBitmapContainer> mpBitmaps;
     SharedBitmapDescriptor mpBackground;
 };
 
-typedef ::boost::shared_ptr<ViewStyle> SharedViewStyle;
+typedef std::shared_ptr<ViewStyle> SharedViewStyle;
 
 class ViewStyleContainer
 {
@@ -204,7 +204,7 @@ private:
 class ViewDescriptor
 {
 };
-typedef ::boost::shared_ptr<ViewDescriptor> SharedViewDescriptor;
+typedef std::shared_ptr<ViewDescriptor> SharedViewDescriptor;
 typedef ::std::vector<SharedViewDescriptor> ViewDescriptorContainer;
 
 class StyleAssociationContainer
@@ -243,14 +243,14 @@ public:
 
     OUString msThemeName;
     OUString msConfigurationNodeName;
-    ::boost::shared_ptr<Theme> mpParentTheme;
+    std::shared_ptr<Theme> mpParentTheme;
     SharedBitmapDescriptor mpBackground;
     PaneStyleContainer maPaneStyles;
     ViewStyleContainer maViewStyles;
     ViewDescriptorContainer maViewDescriptors;
     StyleAssociationContainer maStyleAssociations;
     Reference<container::XHierarchicalNameAccess> mxThemeRoot;
-    ::boost::shared_ptr<PresenterBitmapContainer> mpIconContainer;
+    std::shared_ptr<PresenterBitmapContainer> mpIconContainer;
     typedef map<OUString,SharedFontDescriptor> FontContainer;
     FontContainer maFontContainer;
 
@@ -283,7 +283,7 @@ PresenterTheme::~PresenterTheme()
 {
 }
 
-::boost::shared_ptr<PresenterTheme::Theme> PresenterTheme::ReadTheme()
+std::shared_ptr<PresenterTheme::Theme> PresenterTheme::ReadTheme()
 {
     ReadContext aReadContext(mxContext, mxCanvas);
 
@@ -312,7 +312,7 @@ void PresenterTheme::ProvideCanvas (const Reference<rendering::XCanvas>& rxCanva
 OUString PresenterTheme::GetStyleName (const OUString& rsResourceURL) const
 {
     OUString sStyleName;
-    ::boost::shared_ptr<Theme> pTheme (mpTheme);
+    std::shared_ptr<Theme> pTheme (mpTheme);
     while (sStyleName.isEmpty() && pTheme.get()!=NULL)
     {
         sStyleName = pTheme->maStyleAssociations.GetStyleName(rsResourceURL);
@@ -367,14 +367,14 @@ bool PresenterTheme::ConvertToColor (
         return false;
 }
 
-::boost::shared_ptr<PresenterConfigurationAccess> PresenterTheme::GetNodeForViewStyle (
+std::shared_ptr<PresenterConfigurationAccess> PresenterTheme::GetNodeForViewStyle (
     const OUString& rsStyleName) const
 {
     if (mpTheme.get() == NULL)
-        return ::boost::shared_ptr<PresenterConfigurationAccess>();
+        return std::shared_ptr<PresenterConfigurationAccess>();
 
     // Open configuration for writing.
-    ::boost::shared_ptr<PresenterConfigurationAccess> pConfiguration (
+    std::shared_ptr<PresenterConfigurationAccess> pConfiguration (
         new PresenterConfigurationAccess(
             mxContext,
             OUString("/org.openoffice.Office.PresenterScreen/"),
@@ -404,7 +404,7 @@ SharedBitmapDescriptor PresenterTheme::GetBitmap (
         {
             if (rsBitmapName == "Background")
             {
-                ::boost::shared_ptr<Theme> pTheme (mpTheme);
+                std::shared_ptr<Theme> pTheme (mpTheme);
                 while (pTheme.get()!=NULL && pTheme->mpBackground.get()==NULL)
                     pTheme = pTheme->mpParentTheme;
                 if (pTheme.get() != NULL)
@@ -443,7 +443,7 @@ SharedBitmapDescriptor PresenterTheme::GetBitmap (
     {
         if (rsBitmapName == "Background")
         {
-            ::boost::shared_ptr<Theme> pTheme (mpTheme);
+            std::shared_ptr<Theme> pTheme (mpTheme);
             while (pTheme.get()!=NULL && pTheme->mpBackground.get()==NULL)
                 pTheme = pTheme->mpParentTheme;
             if (pTheme.get() != NULL)
@@ -461,12 +461,12 @@ SharedBitmapDescriptor PresenterTheme::GetBitmap (
     return SharedBitmapDescriptor();
 }
 
-::boost::shared_ptr<PresenterBitmapContainer> PresenterTheme::GetBitmapContainer() const
+std::shared_ptr<PresenterBitmapContainer> PresenterTheme::GetBitmapContainer() const
 {
     if (mpTheme.get() != NULL)
         return mpTheme->mpIconContainer;
     else
-        return ::boost::shared_ptr<PresenterBitmapContainer>();
+        return std::shared_ptr<PresenterBitmapContainer>();
 }
 
 PresenterTheme::SharedFontDescriptor PresenterTheme::GetFont (
@@ -482,7 +482,7 @@ PresenterTheme::SharedFontDescriptor PresenterTheme::GetFont (
         if (pViewStyle.get() != NULL)
             return pViewStyle->GetFont();
 
-        ::boost::shared_ptr<Theme> pTheme (mpTheme);
+        std::shared_ptr<Theme> pTheme (mpTheme);
         while (pTheme.get() != NULL)
         {
             Theme::FontContainer::const_iterator iFont (pTheme->maFontContainer.find(rsStyleName));
@@ -499,7 +499,7 @@ PresenterTheme::SharedFontDescriptor PresenterTheme::GetFont (
 //===== FontDescriptor ========================================================
 
 PresenterTheme::FontDescriptor::FontDescriptor (
-    const ::boost::shared_ptr<FontDescriptor>& rpDescriptor)
+    const std::shared_ptr<FontDescriptor>& rpDescriptor)
     : msFamilyName(),
       msStyleName(),
       mnSize(12),
@@ -646,7 +646,7 @@ void PresenterTheme::Theme::Read (
                 UNO_QUERY),
             mpParentTheme.get()!=NULL
                 ? mpParentTheme->mpIconContainer
-                : ::boost::shared_ptr<PresenterBitmapContainer>(),
+                : std::shared_ptr<PresenterBitmapContainer>(),
             rReadContext.mxComponentContext,
             rReadContext.mxCanvas));
 
@@ -748,7 +748,7 @@ PresenterTheme::SharedFontDescriptor ReadContext::ReadFont (
     const Reference<beans::XPropertySet>& rxProperties,
     const PresenterTheme::SharedFontDescriptor& rpDefault)
 {
-    ::boost::shared_ptr<PresenterTheme::FontDescriptor> pDescriptor (
+    std::shared_ptr<PresenterTheme::FontDescriptor> pDescriptor (
         new PresenterTheme::FontDescriptor(rpDefault));
 
     PresenterConfigurationAccess::GetProperty(rxProperties, "FamilyName") >>= pDescriptor->msFamilyName;
@@ -775,11 +775,11 @@ Any ReadContext::GetByName (
         return Any();
 }
 
-::boost::shared_ptr<PresenterTheme::Theme> ReadContext::ReadTheme (
+std::shared_ptr<PresenterTheme::Theme> ReadContext::ReadTheme (
     PresenterConfigurationAccess& rConfiguration,
     const OUString& rsThemeName)
 {
-    ::boost::shared_ptr<PresenterTheme::Theme> pTheme;
+    std::shared_ptr<PresenterTheme::Theme> pTheme;
 
     OUString sCurrentThemeName (rsThemeName);
      if (sCurrentThemeName.isEmpty())
@@ -881,7 +881,7 @@ void PaneStyleContainer::ProcessPaneStyle(
     if (rValues.size() != 6)
         return;
 
-    ::boost::shared_ptr<PaneStyle> pStyle (new PaneStyle());
+    std::shared_ptr<PaneStyle> pStyle (new PaneStyle());
 
     rValues[0] >>= pStyle->msStyleName;
 
@@ -920,7 +920,7 @@ void PaneStyleContainer::ProcessPaneStyle(
             xBitmapsNode,
             pStyle->mpParentStyle.get()!=NULL
                 ? pStyle->mpParentStyle->mpBitmaps
-                : ::boost::shared_ptr<PresenterBitmapContainer>(),
+                : std::shared_ptr<PresenterBitmapContainer>(),
             rReadContext.mxComponentContext,
             rReadContext.mxCanvas,
             rReadContext.mxPresenterHelper));
@@ -1005,7 +1005,7 @@ void ViewStyleContainer::ProcessViewStyle(
     ReadContext& rReadContext,
     const Reference<beans::XPropertySet>& rxProperties)
 {
-    ::boost::shared_ptr<ViewStyle> pStyle (new ViewStyle());
+    std::shared_ptr<ViewStyle> pStyle (new ViewStyle());
 
     PresenterConfigurationAccess::GetProperty(rxProperties, "StyleName")
         >>= pStyle->msStyleName;
diff --git a/sdext/source/presenter/PresenterTheme.hxx b/sdext/source/presenter/PresenterTheme.hxx
index 651859e59bd3..4a34110ff01b 100644
--- a/sdext/source/presenter/PresenterTheme.hxx
+++ b/sdext/source/presenter/PresenterTheme.hxx
@@ -27,7 +27,7 @@
 #include <com/sun/star/rendering/XCanvasFont.hpp>
 #include <com/sun/star/rendering/XIntegerBitmap.hpp>
 #include <com/sun/star/util/Color.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 namespace sdext { namespace presenter {
 
@@ -76,7 +76,7 @@ public:
     class FontDescriptor
     {
     public:
-        explicit FontDescriptor (const ::boost::shared_ptr<FontDescriptor>& rpDescriptor);
+        explicit FontDescriptor (const std::shared_ptr<FontDescriptor>& rpDescriptor);
 
         OUString msFamilyName;
         OUString msStyleName;
@@ -97,7 +97,7 @@ public:
             const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,
             const double nDesignSize) const;
     };
-    typedef ::boost::shared_ptr<FontDescriptor> SharedFontDescriptor;
+    typedef std::shared_ptr<FontDescriptor> SharedFontDescriptor;
 
     SharedBitmapDescriptor GetBitmap (
         const OUString& rsStyleName,
@@ -106,7 +106,7 @@ public:
     SharedBitmapDescriptor GetBitmap (
         const OUString& rsBitmapName) const;
 
-    ::boost::shared_ptr<PresenterBitmapContainer> GetBitmapContainer() const;
+    std::shared_ptr<PresenterBitmapContainer> GetBitmapContainer() const;
 
     SharedFontDescriptor GetFont (
         const OUString& rsStyleName) const;
@@ -120,17 +120,17 @@ public:
         const css::uno::Any& rColorSequence,
         sal_uInt32& rColor);
 
-    ::boost::shared_ptr<PresenterConfigurationAccess> GetNodeForViewStyle (
+    std::shared_ptr<PresenterConfigurationAccess> GetNodeForViewStyle (
         const OUString& rsStyleName) const;
 
 private:
     css::uno::Reference<css::uno::XComponentContext> mxContext;
     const OUString msThemeName;
-    ::boost::shared_ptr<Theme> mpTheme;
-    ::boost::shared_ptr<PresenterBitmapContainer> mpBitmapContainer;
+    std::shared_ptr<Theme> mpTheme;
+    std::shared_ptr<PresenterBitmapContainer> mpBitmapContainer;
     css::uno::Reference<css::rendering::XCanvas> mxCanvas;
 
-    ::boost::shared_ptr<Theme> ReadTheme();
+    std::shared_ptr<Theme> ReadTheme();
 };
 
 } } // end of namespace ::sd::presenter
diff --git a/sdext/source/presenter/PresenterTimer.cxx b/sdext/source/presenter/PresenterTimer.cxx
index dd0e671080ed..cdc8882cd097 100644
--- a/sdext/source/presenter/PresenterTimer.cxx
+++ b/sdext/source/presenter/PresenterTimer.cxx
@@ -23,9 +23,10 @@
 #include <osl/doublecheckedlocking.h>
 #include <osl/thread.hxx>
 #include <boost/bind.hpp>
-#include <boost/enable_shared_from_this.hpp>
-#include <set>
+#include <algorithm>
 #include <iterator>
+#include <memory>
+#include <set>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -50,7 +51,7 @@ public:
     bool mbIsCanceled;
 };
 
-typedef ::boost::shared_ptr<TimerTask> SharedTimerTask;
+typedef std::shared_ptr<TimerTask> SharedTimerTask;
 
 class TimerTaskComparator
 {
@@ -66,11 +67,11 @@ public:
 /** Queue all scheduled tasks and process them when their time has come.
 */
 class TimerScheduler
-    : public ::boost::enable_shared_from_this<TimerScheduler>,
+    : public std::enable_shared_from_this<TimerScheduler>,
       public ::osl::Thread
 {
 public:
-    static ::boost::shared_ptr<TimerScheduler> Instance();
+    static std::shared_ptr<TimerScheduler> Instance();
     static SharedTimerTask CreateTimerTask (
         const PresenterTimer::Task& rTask,
         const TimeValue& rDueTime,
@@ -90,9 +91,9 @@ public:
         const TimeValue& rTimeValue);
 
 private:
-    static ::boost::shared_ptr<TimerScheduler> mpInstance;
+    static std::shared_ptr<TimerScheduler> mpInstance;
     static ::osl::Mutex maInstanceMutex;
-    ::boost::shared_ptr<TimerScheduler> mpLateDestroy; // for clean exit
+    std::shared_ptr<TimerScheduler> mpLateDestroy; // for clean exit
     static sal_Int32 mnTaskId;
 
     ::osl::Mutex maTaskContainerMutex;
@@ -141,11 +142,11 @@ void PresenterTimer::CancelTask (const sal_Int32 nTaskId)
 
 //===== TimerScheduler ========================================================
 
-::boost::shared_ptr<TimerScheduler> TimerScheduler::mpInstance;
+std::shared_ptr<TimerScheduler> TimerScheduler::mpInstance;
 ::osl::Mutex TimerScheduler::maInstanceMutex;
 sal_Int32 TimerScheduler::mnTaskId = PresenterTimer::NotAValidTaskId;
 
-::boost::shared_ptr<TimerScheduler> TimerScheduler::Instance()
+std::shared_ptr<TimerScheduler> TimerScheduler::Instance()
 {
     ::osl::MutexGuard aGuard (maInstanceMutex);
     if (mpInstance.get() == NULL)
diff --git a/sdext/source/presenter/PresenterTimer.hxx b/sdext/source/presenter/PresenterTimer.hxx
index 9b1249b7bc6c..c39626de89fa 100644
--- a/sdext/source/presenter/PresenterTimer.hxx
+++ b/sdext/source/presenter/PresenterTimer.hxx
@@ -29,9 +29,8 @@
 #include <rtl/ref.hxx>
 #include <sal/types.h>
 
-#include <boost/shared_ptr.hpp>
-
 #include <functional>
+#include <memory>
 #include <vector>
 
 namespace com { namespace sun { namespace star { namespace uno {
@@ -84,7 +83,7 @@ public:
     protected:
         ~Listener() {}
     };
-    typedef ::boost::shared_ptr<Listener> SharedListener;
+    typedef std::shared_ptr<Listener> SharedListener;
 
     static ::rtl::Reference<PresenterClockTimer> Instance (
         const css::uno::Reference<css::uno::XComponentContext>& rxContext);
diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx
index 406c94a20720..660e12df9caa 100644
--- a/sdext/source/presenter/PresenterToolBar.cxx
+++ b/sdext/source/presenter/PresenterToolBar.cxx
@@ -103,10 +103,10 @@ namespace {
         void ReadElementMode (
             const Reference<beans::XPropertySet>& rxProperties,
             const OUString& rsModeName,
-            ::boost::shared_ptr<ElementMode>& rpDefaultMode,
+            std::shared_ptr<ElementMode>& rpDefaultMode,
             ::sdext::presenter::PresenterToolBar::Context& rContext);
     };
-    typedef ::boost::shared_ptr<ElementMode> SharedElementMode;
+    typedef std::shared_ptr<ElementMode> SharedElementMode;
 
 }  // end of anonymous namespace
 
@@ -290,7 +290,7 @@ namespace {
         private:
             ::rtl::Reference<TimeLabel> mxLabel;
         };
-        ::boost::shared_ptr<PresenterClockTimer::Listener> mpListener;
+        std::shared_ptr<PresenterClockTimer::Listener> mpListener;
     };
 
     class CurrentTimeLabel : public TimeLabel
@@ -458,7 +458,7 @@ void PresenterToolBar::InvalidateArea (
     const awt::Rectangle& rRepaintBox,
     const bool bSynchronous)
 {
-    ::boost::shared_ptr<PresenterPaintManager> xManager(mpPresenterController->GetPaintManager());
+    std::shared_ptr<PresenterPaintManager> xManager(mpPresenterController->GetPaintManager());
     if (!xManager)
         return;
     xManager->Invalidate(
@@ -471,7 +471,7 @@ void PresenterToolBar::RequestLayout()
 {
     mbIsLayoutPending = true;
 
-    ::boost::shared_ptr<PresenterPaintManager> xManager(mpPresenterController->GetPaintManager());
+    std::shared_ptr<PresenterPaintManager> xManager(mpPresenterController->GetPaintManager());
     if (!xManager)
         return;
 
@@ -830,7 +830,7 @@ void PresenterToolBar::Layout (
     }
 
     // The whole window has to be repainted.
-    ::boost::shared_ptr<PresenterPaintManager> xManager(mpPresenterController->GetPaintManager());
+    std::shared_ptr<PresenterPaintManager> xManager(mpPresenterController->GetPaintManager());
     if (!xManager)
         return;
     xManager->Invalidate(mxWindow);
@@ -1418,7 +1418,7 @@ ElementMode::ElementMode()
 void ElementMode::ReadElementMode (
     const Reference<beans::XPropertySet>& rxElementProperties,
     const OUString& rsModeName,
-    ::boost::shared_ptr<ElementMode>& rpDefaultMode,
+    std::shared_ptr<ElementMode>& rpDefaultMode,
     ::sdext::presenter::PresenterToolBar::Context& rContext)
 {
     try
diff --git a/sdext/source/presenter/PresenterToolBar.hxx b/sdext/source/presenter/PresenterToolBar.hxx
index c76a62bf6253..81bf00c39136 100644
--- a/sdext/source/presenter/PresenterToolBar.hxx
+++ b/sdext/source/presenter/PresenterToolBar.hxx
@@ -165,7 +165,7 @@ private:
     css::uno::Reference<css::uno::XComponentContext> mxComponentContext;
 
     class ElementContainerPart;
-    typedef ::boost::shared_ptr<ElementContainerPart> SharedElementContainerPart;
+    typedef std::shared_ptr<ElementContainerPart> SharedElementContainerPart;
     typedef ::std::vector<SharedElementContainerPart> ElementContainer;
     ElementContainer maElementContainer;
     SharedElementContainerPart mpCurrentContainerPart;
diff --git a/sdext/source/presenter/PresenterViewFactory.hxx b/sdext/source/presenter/PresenterViewFactory.hxx
index 48a369e5de6c..8483d23c5048 100644
--- a/sdext/source/presenter/PresenterViewFactory.hxx
+++ b/sdext/source/presenter/PresenterViewFactory.hxx
@@ -30,7 +30,7 @@
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <rtl/ref.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 namespace sdext { namespace presenter {
 
@@ -122,7 +122,7 @@ private:
     typedef ::std::pair<css::uno::Reference<css::drawing::framework::XView>,
         css::uno::Reference<css::drawing::framework::XPane> > ViewResourceDescriptor;
     typedef ::std::map<OUString, ViewResourceDescriptor> ResourceContainer;
-    ::boost::scoped_ptr<ResourceContainer> mpResourceCache;
+    std::unique_ptr<ResourceContainer> mpResourceCache;
 
     PresenterViewFactory (
         const css::uno::Reference<css::uno::XComponentContext>& rxContext,
diff --git a/sdext/source/presenter/PresenterWindowManager.cxx b/sdext/source/presenter/PresenterWindowManager.cxx
index 9a2f2212b47f..8d08bc0cab1a 100644
--- a/sdext/source/presenter/PresenterWindowManager.cxx
+++ b/sdext/source/presenter/PresenterWindowManager.cxx
@@ -156,7 +156,7 @@ void PresenterWindowManager::SetParentPane (
     }
 }
 
-void PresenterWindowManager::SetTheme (const ::boost::shared_ptr<PresenterTheme>& rpTheme)
+void PresenterWindowManager::SetTheme (const std::shared_ptr<PresenterTheme>& rpTheme)
 {
     mpTheme = rpTheme;
 
diff --git a/sdext/source/presenter/PresenterWindowManager.hxx b/sdext/source/presenter/PresenterWindowManager.hxx
index 22d84019be8d..d12dd77b563c 100644
--- a/sdext/source/presenter/PresenterWindowManager.hxx
+++ b/sdext/source/presenter/PresenterWindowManager.hxx
@@ -40,7 +40,7 @@
 #include <cppuhelper/compbase.hxx>
 #include <rtl/ref.hxx>
 #include <boost/noncopyable.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 namespace sdext { namespace presenter {
 
@@ -76,7 +76,7 @@ public:
     void SAL_CALL disposing() SAL_OVERRIDE;
 
     void SetParentPane (const css::uno::Reference<css::drawing::framework::XPane>& rxPane);
-    void SetTheme (const ::boost::shared_ptr<PresenterTheme>& rpTheme);
+    void SetTheme (const std::shared_ptr<PresenterTheme>& rpTheme);
     void NotifyViewCreation (const css::uno::Reference<css::drawing::framework::XView>& rxView);
     void SetPanePosSizeAbsolute (
         const OUString& rsPaneURL,
@@ -175,7 +175,7 @@ private:
         the window sizes.
     */
     bool mbIsLayouting;
-    ::boost::shared_ptr<PresenterTheme> mpTheme;
+    std::shared_ptr<PresenterTheme> mpTheme;
     SharedBitmapDescriptor mpBackgroundBitmap;
     css::uno::Reference<css::rendering::XBitmap> mxScaledBackgroundBitmap;
     css::uno::Reference<css::rendering::XPolyPolygon2D> mxClipPolygon;