loplugin:makeshared in sd

Change-Id: I82ddb851759665f40e23f284cf6eed2b88722c6c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87329
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

40 files changed, 108 insertions, 108 deletions

diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx
index 95c1ca8d734a..439cb07356b3 100644
--- a/sd/source/core/CustomAnimationEffect.cxx
+++ b/sd/source/core/CustomAnimationEffect.cxx
@@ -373,7 +373,7 @@ CustomAnimationEffectPtr CustomAnimationEffect::clone() const
 {
     Reference< XCloneable > xCloneable( mxNode, UNO_QUERY_THROW );
     Reference< XAnimationNode > xNode( xCloneable->createClone(), UNO_QUERY_THROW );
-    CustomAnimationEffectPtr pEffect( new CustomAnimationEffect( xNode ) );
+    CustomAnimationEffectPtr pEffect = std::make_shared<CustomAnimationEffect>( xNode );
     pEffect->setEffectSequence( getEffectSequence() );
     return pEffect;
 }
@@ -1704,7 +1704,7 @@ CustomAnimationEffectPtr EffectSequenceHelper::append( const CustomAnimationPres
             }
 
             // now create effect from preset
-            pEffect.reset( new CustomAnimationEffect( xNode ) );
+            pEffect = std::make_shared<CustomAnimationEffect>( xNode );
             pEffect->setEffectSequence( this );
             pEffect->setTarget( rTarget );
             pEffect->setTargetSubItem( nSubItem );
@@ -1742,7 +1742,7 @@ CustomAnimationEffectPtr EffectSequenceHelper::append( const SdrPathObj& rPathOb
         if( rTarget.getValueType() == ::cppu::UnoType<ParagraphTarget>::get() )
             nSubItem = ShapeAnimationSubType::ONLY_TEXT;
 
-        pEffect.reset( new CustomAnimationEffect( xEffectContainer ) );
+        pEffect = std::make_shared<CustomAnimationEffect>( xEffectContainer );
         pEffect->setEffectSequence( this );
         pEffect->setTarget( rTarget );
         pEffect->setTargetSubItem( nSubItem );
@@ -2418,7 +2418,7 @@ void EffectSequenceHelper::updateTextGroups()
         CustomAnimationTextGroupPtr pGroup = findGroup( nGroupId );
         if( !pGroup.get() )
         {
-            pGroup.reset( new CustomAnimationTextGroup( pEffect->getTargetShape(), nGroupId ) );
+            pGroup = std::make_shared<CustomAnimationTextGroup>( pEffect->getTargetShape(), nGroupId );
             maGroupMap[nGroupId] = pGroup;
         }
 
@@ -2461,7 +2461,7 @@ EffectSequenceHelper::createTextGroup(const CustomAnimationEffectPtr& pEffect,
 
     Reference< XShape > xTarget( pEffect->getTargetShape() );
 
-    CustomAnimationTextGroupPtr pTextGroup( new CustomAnimationTextGroup( xTarget, nGroupId ) );
+    CustomAnimationTextGroupPtr pTextGroup = std::make_shared<CustomAnimationTextGroup>( xTarget, nGroupId );
     maGroupMap[nGroupId] = pTextGroup;
 
     bool bUsed = false;
@@ -2940,7 +2940,7 @@ void EffectSequenceHelper::createEffects( const Reference< XAnimationNode >& xNo
             case AnimationNodeType::PAR:
             case AnimationNodeType::ITERATE:
                 {
-                    CustomAnimationEffectPtr pEffect( new CustomAnimationEffect( xChildNode ) );
+                    CustomAnimationEffectPtr pEffect = std::make_shared<CustomAnimationEffect>( xChildNode );
 
                     if( pEffect->mnNodeType != -1 )
                     {
@@ -3127,7 +3127,7 @@ void MainSequence::createMainSequence()
             else if( nNodeType == EffectNodeType::INTERACTIVE_SEQUENCE )
             {
                 Reference< XTimeContainer > xInteractiveRoot( xChildNode, UNO_QUERY_THROW );
-                InteractiveSequencePtr pIS( new InteractiveSequence( xInteractiveRoot, this ) );
+                InteractiveSequencePtr pIS = std::make_shared<InteractiveSequence>( xInteractiveRoot, this );
                 pIS->addListener( this );
                 maInteractiveSequenceVector.push_back( pIS );
             }
@@ -3204,7 +3204,7 @@ InteractiveSequencePtr MainSequence::createInteractiveSequence( const css::uno::
     Reference< XTimeContainer > xParent( xChild->getParent(), UNO_QUERY_THROW );
     xParent->appendChild( xISRoot );
 
-    pIS.reset( new InteractiveSequence( xISRoot, this) );
+    pIS = std::make_shared<InteractiveSequence>( xISRoot, this);
     pIS->setTriggerShape( xShape );
     pIS->addListener( this );
     maInteractiveSequenceVector.push_back( pIS );
diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx
index f2358fe18bf5..6c2a3f701043 100644
--- a/sd/source/core/CustomAnimationPreset.cxx
+++ b/sd/source/core/CustomAnimationPreset.cxx
@@ -296,7 +296,7 @@ void CustomAnimationPresets::importEffects()
                         pDescriptor->add( pEffect );
                     else
                     {
-                        pDescriptor.reset( new CustomAnimationPreset( pEffect ) );
+                        pDescriptor = std::make_shared<CustomAnimationPreset>( pEffect );
                         pDescriptor->maLabel = getUINameForPresetId( pEffect->getPresetId() );
                         maEffectDescriptorMap[aPresetId] = pDescriptor;
                     }
diff --git a/sd/source/core/EffectMigration.cxx b/sd/source/core/EffectMigration.cxx
index 29f4134aff97..c5fb8e1be584 100644
--- a/sd/source/core/EffectMigration.cxx
+++ b/sd/source/core/EffectMigration.cxx
@@ -506,7 +506,7 @@ void EffectMigration::SetAnimationEffect( SvxShape* pShape, AnimationEffect eEff
             DBG_ASSERT( xNode.is(), "EffectMigration::SetAnimationEffect(), could not create preset!" );
             if( xNode.is() )
             {
-                CustomAnimationEffectPtr pEffect( new CustomAnimationEffect( xNode ) );
+                CustomAnimationEffectPtr pEffect = std::make_shared<CustomAnimationEffect>( xNode );
                 pEffect->setTarget( makeAny( xShape ) );
                 SdPage* pPage = dynamic_cast< SdPage* >( pObj->getSdrPageFromSdrObject() );
                 const bool bManual = (pPage == nullptr) || (pPage->GetPresChange() == PRESCHANGE_MANUAL);
@@ -662,7 +662,7 @@ void EffectMigration::SetTextAnimationEffect( SvxShape* pShape, AnimationEffect
                 DBG_ASSERT( xNode.is(), "EffectMigration::SetTextAnimationEffect(), could not create preset!" );
                 if( xNode.is() )
                 {
-                    pShapeEffect.reset( new CustomAnimationEffect( xNode ) );
+                    pShapeEffect = std::make_shared<CustomAnimationEffect>( xNode );
                     pShapeEffect->setTarget( makeAny( xShape ) );
                     pShapeEffect->setDuration( 0.1 );
                     pMainSequence->append( pShapeEffect );
diff --git a/sd/source/core/sdpage_animations.cxx b/sd/source/core/sdpage_animations.cxx
index f9d55654ff0e..3a1a75d5869f 100644
--- a/sd/source/core/sdpage_animations.cxx
+++ b/sd/source/core/sdpage_animations.cxx
@@ -38,7 +38,7 @@ using ::com::sun::star::drawing::XShape;
 std::shared_ptr< sd::MainSequence >  const & SdPage::getMainSequence()
 {
     if (nullptr == mpMainSequence)
-        mpMainSequence.reset( new sd::MainSequence( getAnimationNode() ) );
+        mpMainSequence = std::make_shared<sd::MainSequence>( getAnimationNode() );
 
     return mpMainSequence;
 }
diff --git a/sd/source/core/text/textapi.cxx b/sd/source/core/text/textapi.cxx
index b7ed923fdf1e..fb15d060ab64 100644
--- a/sd/source/core/text/textapi.cxx
+++ b/sd/source/core/text/textapi.cxx
@@ -207,7 +207,7 @@ void TextAPIEditSource::UpdateData()
 }
 
 TextAPIEditSource::TextAPIEditSource(SdDrawDocument* pDoc)
-: m_xImpl(new TextAPIEditSource_Impl)
+: m_xImpl(std::make_shared<TextAPIEditSource_Impl>())
 {
     m_xImpl->mpDoc = pDoc;
     m_xImpl->mpOutliner = nullptr;
diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx
index f2ef8866df8b..bfd0c35dd664 100644
--- a/sd/source/filter/eppt/pptexanimations.cxx
+++ b/sd/source/filter/eppt/pptexanimations.cxx
@@ -379,7 +379,7 @@ void AnimationExporter::processAfterEffectNodes( const Reference< XAnimationNode
                                     if (p != aUserData.end())
                                         p->Value >>= xMaster;
 
-                                    AfterEffectNodePtr pAfterEffectNode( new AfterEffectNode( xChildNode3, xMaster ) );
+                                    AfterEffectNodePtr pAfterEffectNode = std::make_shared<AfterEffectNode>( xChildNode3, xMaster );
                                     maAfterEffectNodes.push_back( pAfterEffectNode );
                                 }
                                 break;
diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx
index 8179504de015..5180051ecc2c 100644
--- a/sd/source/filter/eppt/pptx-text.cxx
+++ b/sd/source/filter/eppt/pptx-text.cxx
@@ -1269,7 +1269,7 @@ ImplTextObj::ImplTextObj( int nInstance )
 
 TextObj::TextObj( css::uno::Reference< css::text::XSimpleText > const & rXTextRef,
             int nInstance, FontCollection& rFontCollection, PPTExBulletProvider& rProv ):
-    mpImplTextObj(new ImplTextObj(nInstance))
+    mpImplTextObj(std::make_shared<ImplTextObj>(nInstance))
 {
     css::uno::Reference< css::container::XEnumerationAccess > aXTextParagraphEA( rXTextRef, css::uno::UNO_QUERY );
 
diff --git a/sd/source/filter/ppt/ppt97animations.cxx b/sd/source/filter/ppt/ppt97animations.cxx
index c26523c332cc..64312a026292 100644
--- a/sd/source/filter/ppt/ppt97animations.cxx
+++ b/sd/source/filter/ppt/ppt97animations.cxx
@@ -577,7 +577,7 @@ void Ppt97Animation::createAndSetCustomAnimationEffect( SdrObject* pObj )
     //--------------start doing something
 
     //1. ------ create an effect from the presets ------
-    ::sd::CustomAnimationEffectPtr pEffect( new ::sd::CustomAnimationEffect( pPreset->create( GetPresetSubType() ) ) );
+    ::sd::CustomAnimationEffectPtr pEffect = std::make_shared<::sd::CustomAnimationEffect>( pPreset->create( GetPresetSubType() ) );
 
     //2. ------ adapt the created effect ------
 
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index cd1d62012a72..6aeb33182b31 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -2606,7 +2606,7 @@ SdrObject* ImplSdPPTImport::ProcessObj( SvStream& rSt, DffObjData& rData, SvxMSD
                             if ( SeekToRec( rSt, PPT_PST_AnimationInfoAtom, nHdRecEnd, &aHdAnimInfoAtom ) )
                             {
                                 // read data from stream
-                                Ppt97AnimationPtr pAnimation( new Ppt97Animation( rSt ) );
+                                Ppt97AnimationPtr pAnimation = std::make_shared<Ppt97Animation>( rSt );
                                 // store animation information
                                 if( pAnimation->HasEffect() )
                                 {
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 32c8a3e1d1df..ea64b247f8fb 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -2376,7 +2376,7 @@ void CustomAnimationPane::onPreview( bool bForcePreview )
 
         if( xMotionPathTag.is() )
         {
-            MainSequencePtr pSequence( new MainSequence() );
+            MainSequencePtr pSequence = std::make_shared<MainSequence>();
             pSequence->append( xMotionPathTag->getEffect()->clone() );
             preview( pSequence->getRootNode() );
         }
@@ -2391,7 +2391,7 @@ void CustomAnimationPane::onPreview( bool bForcePreview )
     }
     else
     {
-        MainSequencePtr pSequence( new MainSequence() );
+        MainSequencePtr pSequence = std::make_shared<MainSequence>();
 
         for( const CustomAnimationEffectPtr& pEffect : maListSelection )
         {
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index 0cff7d5fc1ec..7200cbe503f4 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -537,7 +537,7 @@ void SlideTransitionPane::onChangeCurrentPage()
     }
     else
     {
-        pSelection.reset(new sd::slidesorter::SlideSorterViewShell::PageSelection);
+        pSelection = std::make_shared<sd::slidesorter::SlideSorterViewShell::PageSelection>();
         if( mxView.is() )
         {
             SdPage* pPage = SdPage::getImplementation( mxView->getCurrentPage() );
@@ -984,8 +984,8 @@ IMPL_LINK_NOARG(SlideTransitionPane, ApplyToAllButtonClicked, weld::Button&, voi
     if( !mpDrawDoc )
         return;
 
-    ::sd::slidesorter::SharedPageSelection pPages (
-        new ::sd::slidesorter::SlideSorterViewShell::PageSelection);
+    ::sd::slidesorter::SharedPageSelection pPages =
+        std::make_shared<::sd::slidesorter::SlideSorterViewShell::PageSelection>();
 
     sal_uInt16 nPageCount = mpDrawDoc->GetSdPageCount( PageKind::Standard );
     pPages->reserve( nPageCount );
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx
index 3d84ddb0da56..259a171e82e0 100644
--- a/sd/source/ui/app/sdmod1.cxx
+++ b/sd/source/ui/app/sdmod1.cxx
@@ -537,7 +537,7 @@ OutlineToImpressFinalizer::OutlineToImpressFinalizer (
 
     // Create a memory stream and prepare to fill it with the content of
     // the original stream.
-    mpStream.reset(new SvMemoryStream());
+    mpStream = std::make_shared<SvMemoryStream>();
     static const std::size_t nBufferSize = 4096;
     ::std::unique_ptr<sal_Int8[]> pBuffer (new sal_Int8[nBufferSize]);
 
diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
index 5b243953d362..cda0c5ac2447 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
@@ -85,7 +85,7 @@ ClientBoxEntry* ClientBox::GetActiveEntry()
 
 void ClientBox::addEntry( const std::shared_ptr<ClientInfo>& pClientInfo )
 {
-    TClientBoxEntry xEntry(new ClientBoxEntry(this, pClientInfo));
+    TClientBoxEntry xEntry = std::make_shared<ClientBoxEntry>(this, pClientInfo);
     m_vEntries.push_back(xEntry);
 }
 
diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx
index 8151c6e0033c..023605ed625f 100644
--- a/sd/source/ui/framework/configuration/ConfigurationController.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx
@@ -514,13 +514,13 @@ ConfigurationController::Implementation::Implementation (
     ConfigurationController& rController,
     const Reference<frame::XController>& rxController)
     : mxControllerManager(rxController, UNO_QUERY_THROW),
-      mpBroadcaster(new ConfigurationControllerBroadcaster(&rController)),
+      mpBroadcaster(std::make_shared<ConfigurationControllerBroadcaster>(&rController)),
       mxRequestedConfiguration(new Configuration(&rController, true)),
-      mpResourceFactoryContainer(new ResourceFactoryManager(mxControllerManager)),
+      mpResourceFactoryContainer(std::make_shared<ResourceFactoryManager>(mxControllerManager)),
       mpResourceManager(
-          new ConfigurationControllerResourceManager(mpResourceFactoryContainer,mpBroadcaster)),
+          std::make_shared<ConfigurationControllerResourceManager>(mpResourceFactoryContainer,mpBroadcaster)),
       mpConfigurationUpdater(
-          new ConfigurationUpdater(mpBroadcaster, mpResourceManager,mxControllerManager)),
+          std::make_shared<ConfigurationUpdater>(mpBroadcaster, mpResourceManager,mxControllerManager)),
       mpQueueProcessor(new ChangeRequestQueueProcessor(mpConfigurationUpdater)),
       mpConfigurationUpdaterLock(),
       mnLockCount(0)
diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx
index 71e13694741f..c4260ce8fc6b 100644
--- a/sd/source/ui/framework/factories/BasicViewFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx
@@ -88,7 +88,7 @@ BasicViewFactory::BasicViewFactory ()
       mpBase(nullptr),
       mpFrameView(nullptr),
       mpWindow(VclPtr<WorkWindow>::Create(nullptr,WB_STDWORK)),
-      mpViewCache(new ViewCache()),
+      mpViewCache(std::make_shared<ViewCache>()),
       mxLocalPane(new Pane(Reference<XResourceId>(), mpWindow.get()))
 {
 }
@@ -321,60 +321,60 @@ std::shared_ptr<ViewShell> BasicViewFactory::CreateViewShell (
     const OUString& rsViewURL (rxViewId->getResourceURL());
     if (rsViewURL == FrameworkHelper::msImpressViewURL)
     {
-        pViewShell.reset(
-            new DrawViewShell(
+        pViewShell =
+            std::make_shared<DrawViewShell>(
                 *mpBase,
                 &rWindow,
                 PageKind::Standard,
-                pFrameView));
+                pFrameView);
         pViewShell->GetContentWindow()->set_id("impress_win");
     }
     else if (rsViewURL == FrameworkHelper::msDrawViewURL)
     {
-        pViewShell.reset(
-            new GraphicViewShell (
+        pViewShell =
+            std::make_shared<GraphicViewShell>(
                 *mpBase,
                 &rWindow,
-                pFrameView));
+                pFrameView);
         pViewShell->GetContentWindow()->set_id("draw_win");
     }
     else if (rsViewURL == FrameworkHelper::msOutlineViewURL)
     {
-        pViewShell.reset(
-            new OutlineViewShell (
+        pViewShell =
+            std::make_shared<OutlineViewShell>(
                 &rFrame,
                 *mpBase,
                 &rWindow,
-                pFrameView));
+                pFrameView);
         pViewShell->GetContentWindow()->set_id("outline_win");
     }
     else if (rsViewURL == FrameworkHelper::msNotesViewURL)
     {
-        pViewShell.reset(
-            new DrawViewShell(
+        pViewShell =
+            std::make_shared<DrawViewShell>(
                 *mpBase,
                 &rWindow,
                 PageKind::Notes,
-                pFrameView));
+                pFrameView);
         pViewShell->GetContentWindow()->set_id("notes_win");
     }
     else if (rsViewURL == FrameworkHelper::msHandoutViewURL)
     {
-        pViewShell.reset(
-            new DrawViewShell(
+        pViewShell =
+            std::make_shared<DrawViewShell>(
                 *mpBase,
                 &rWindow,
                 PageKind::Handout,
-                pFrameView));
+                pFrameView);
         pViewShell->GetContentWindow()->set_id("handout_win");
     }
     else if (rsViewURL == FrameworkHelper::msPresentationViewURL)
     {
-        pViewShell.reset(
-            new PresentationViewShell(
+        pViewShell =
+            std::make_shared<PresentationViewShell>(
                 *mpBase,
                 &rWindow,
-                pFrameView));
+                pFrameView);
         pViewShell->GetContentWindow()->set_id("presentation_win");
     }
     else if (rsViewURL == FrameworkHelper::msSlideSorterURL)
diff --git a/sd/source/ui/presenter/PresenterPreviewCache.cxx b/sd/source/ui/presenter/PresenterPreviewCache.cxx
index be89822e6f08..c420cf5f9091 100644
--- a/sd/source/ui/presenter/PresenterPreviewCache.cxx
+++ b/sd/source/ui/presenter/PresenterPreviewCache.cxx
@@ -74,8 +74,8 @@ private:
 PresenterPreviewCache::PresenterPreviewCache ()
     : PresenterPreviewCacheInterfaceBase(m_aMutex),
       maPreviewSize(Size(200,200)),
-      mpCacheContext(new PresenterCacheContext()),
-      mpCache(new PageCache(maPreviewSize, Bitmap::HasFastScale(), mpCacheContext))
+      mpCacheContext(std::make_shared<PresenterCacheContext>()),
+      mpCache(std::make_shared<PageCache>(maPreviewSize, Bitmap::HasFastScale(), mpCacheContext))
 {
 }
 
diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
index ec018e9cf53c..c27bb31f976a 100644
--- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
@@ -130,7 +130,7 @@ void CurrentMasterPagesSelector::Fill (ItemList& rItemList)
         MasterPageContainer::Token aToken = mpContainer->GetTokenForPageObject(pMasterPage);
         if (aToken == MasterPageContainer::NIL_TOKEN)
         {
-            SharedMasterPageDescriptor pDescriptor (new MasterPageDescriptor(
+            SharedMasterPageDescriptor pDescriptor = std::make_shared<MasterPageDescriptor>(
                 MasterPageContainer::MASTERPAGE,
                 nIndex,
                 OUString(),
@@ -138,7 +138,7 @@ void CurrentMasterPagesSelector::Fill (ItemList& rItemList)
                 OUString(),
                 pMasterPage->IsPrecious(),
                 std::make_shared<ExistingPageProvider>(pMasterPage),
-                std::make_shared<PagePreviewProvider>()));
+                std::make_shared<PagePreviewProvider>());
             aToken = mpContainer->PutMasterPage(pDescriptor);
         }
 
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index bb1e479a9fe9..b1563c1c1d33 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -428,7 +428,7 @@ void LayoutMenu::AssignLayoutToSelectedSlides (AutoLayout aLayout)
         {
             // No valid slide sorter available.  Ask the main view shell for
             // its current page.
-            pPageSelection.reset(new ::sd::slidesorter::SlideSorterViewShell::PageSelection);
+            pPageSelection = std::make_shared<::sd::slidesorter::SlideSorterViewShell::PageSelection>();
             pPageSelection->push_back(pMainViewShell->GetActualPage());
         }
 
diff --git a/sd/source/ui/sidebar/MasterPageContainerFiller.cxx b/sd/source/ui/sidebar/MasterPageContainerFiller.cxx
index f9bb76f4cf98..57401a90ff48 100644
--- a/sd/source/ui/sidebar/MasterPageContainerFiller.cxx
+++ b/sd/source/ui/sidebar/MasterPageContainerFiller.cxx
@@ -39,7 +39,7 @@ MasterPageContainerFiller::MasterPageContainerFiller (ContainerAdapter& rpAdapte
     // DefaultPagePreviewProvider to prevent the rendering (and the
     // expensive creation) of the default page.  It is replaced later on by
     // another.
-    SharedMasterPageDescriptor pDescriptor (new MasterPageDescriptor(
+    SharedMasterPageDescriptor pDescriptor = std::make_shared<MasterPageDescriptor>(
         MasterPageContainer::DEFAULT,
         0,
         OUString(),
@@ -47,7 +47,7 @@ MasterPageContainerFiller::MasterPageContainerFiller (ContainerAdapter& rpAdapte
         OUString(),
         false,
         std::make_shared<DefaultPageObjectProvider>(),
-        std::make_shared<PagePreviewProvider>()));
+        std::make_shared<PagePreviewProvider>());
     mrContainerAdapter.PutMasterPage(pDescriptor);
 }
 
@@ -140,7 +140,7 @@ MasterPageContainerFiller::State MasterPageContainerFiller::AddTemplate()
 {
     if (mpLastAddedEntry != nullptr)
     {
-        SharedMasterPageDescriptor pDescriptor (new MasterPageDescriptor(
+        SharedMasterPageDescriptor pDescriptor = std::make_shared<MasterPageDescriptor>(
             MasterPageContainer::TEMPLATE,
             mnIndex,
             mpLastAddedEntry->msPath,
@@ -148,7 +148,7 @@ MasterPageContainerFiller::State MasterPageContainerFiller::AddTemplate()
             OUString(),
             false,
             std::make_shared<TemplatePageObjectProvider>(mpLastAddedEntry->msPath),
-            std::make_shared<TemplatePreviewProvider>(mpLastAddedEntry->msPath)));
+            std::make_shared<TemplatePreviewProvider>(mpLastAddedEntry->msPath));
         // For user supplied templates we use a different preview provider:
         // The preview in the document shows not only shapes on the master
         // page but also shapes on the foreground.  This is misleading and
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx
index cf30e28c913f..8ca3fe8e7f0d 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx
@@ -333,8 +333,8 @@ void MasterPagesSelector::AssignMasterPageToAllSlides (SdPage* pMasterPage)
     // include pages that do not already have the given master page
     // assigned.
     OUString sFullLayoutName(pMasterPage->GetLayoutName());
-    ::sd::slidesorter::SharedPageSelection pPageList (
-        new ::sd::slidesorter::SlideSorterViewShell::PageSelection);
+    ::sd::slidesorter::SharedPageSelection pPageList =
+        std::make_shared<::sd::slidesorter::SlideSorterViewShell::PageSelection>();
     for (sal_uInt16 nPageIndex=0; nPageIndex<nPageCount; nPageIndex++)
     {
         SdPage* pPage = mrDocument.GetSdPage (nPageIndex, PageKind::Standard);
diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
index 455ad7fed20e..2bc048209582 100644
--- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
+++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
@@ -82,7 +82,7 @@ static constexpr size_t gnMaxListSize(8);
 RecentlyUsedMasterPages::RecentlyUsedMasterPages()
     : maListeners(),
       mvMasterPages(),
-      mpContainer(new MasterPageContainer())
+      mpContainer(std::make_shared<MasterPageContainer>())
 {
 }
 
@@ -137,7 +137,7 @@ void RecentlyUsedMasterPages::LoadPersistentValues()
                 Any aName (xSetItem->getByName(sNameMemberName));
                 aURL >>= sURL;
                 aName >>= sName;
-                SharedMasterPageDescriptor pDescriptor (new MasterPageDescriptor(
+                SharedMasterPageDescriptor pDescriptor = std::make_shared<MasterPageDescriptor>(
                     MasterPageContainer::TEMPLATE,
                     -1,
                     sURL,
@@ -145,7 +145,7 @@ void RecentlyUsedMasterPages::LoadPersistentValues()
                     sName,
                     false,
                     std::make_shared<TemplatePageObjectProvider>(sURL),
-                    std::make_shared<TemplatePreviewProvider>(sURL)));
+                    std::make_shared<TemplatePreviewProvider>(sURL));
                 // For user supplied templates we use a different
                 // preview provider: The preview in the document shows
                 // not only shapes on the master page but also shapes on
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx
index cd67f219ccaf..e43d08b960a9 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -82,7 +82,7 @@ namespace {
             const ::rtl::Reference<SlideShow>& rpSlideShow,
             ViewShellBase* pViewShellBase)
             : WorkWindow(nullptr, WB_HIDE | WB_CLIPCHILDREN),
-              mpRestarter(new SlideShowRestarter(rpSlideShow, pViewShellBase))
+              mpRestarter(std::make_shared<SlideShowRestarter>(rpSlideShow, pViewShellBase))
         {}
 
         void Restart(bool bForce)
@@ -807,7 +807,7 @@ void SAL_CALL SlideShow::startWithArguments(const Sequence< PropertyValue >& rAr
     // Prevent multiple instance of the SlideShow class for one document.
     mbIsInStartup = true;
 
-    mxCurrentSettings.reset( new PresentationSettingsEx( mpDoc->getPresentationSettings() ) );
+    mxCurrentSettings = std::make_shared<PresentationSettingsEx>( mpDoc->getPresentationSettings() );
     mxCurrentSettings->SetArguments( rArguments );
 
     // if there is no view shell base set, use the current one or the first using this document
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 2e33d4a64f35..18b367aece04 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -760,7 +760,7 @@ bool SlideshowImpl::startPreview(
 
         Reference< XDrawPagesSupplier > xDrawPages( mpDoc->getUnoModel(), UNO_QUERY_THROW );
         Reference< XIndexAccess > xSlides( xDrawPages->getDrawPages(), UNO_QUERY_THROW );
-        mpSlideController.reset( new AnimationSlideController( xSlides, AnimationSlideController::PREVIEW ) );
+        mpSlideController = std::make_shared<AnimationSlideController>( xSlides, AnimationSlideController::PREVIEW );
 
         sal_Int32 nSlideNumber = 0;
         Reference< XPropertySet > xSet( mxPreviewDrawPage, UNO_QUERY_THROW );
@@ -1260,7 +1260,7 @@ void SlideshowImpl::registerShapeEvents( Reference< XShapes > const & xShapes )
             if( !xSetInfo.is() || !xSetInfo->hasPropertyByName( gsOnClick ) )
                 continue;
 
-            WrappedShapeEventImplPtr pEvent( new WrappedShapeEventImpl );
+            WrappedShapeEventImplPtr pEvent = std::make_shared<WrappedShapeEventImpl>();
             xSet->getPropertyValue( gsOnClick ) >>= pEvent->meClickAction;
 
             switch( pEvent->meClickAction )
@@ -2237,7 +2237,7 @@ void SlideshowImpl::createSlideList( bool bAll, const OUString& rPresSlide )
 
     Reference< XDrawPagesSupplier > xDrawPages( mpDoc->getUnoModel(), UNO_QUERY_THROW );
     Reference< XIndexAccess > xSlides( xDrawPages->getDrawPages(), UNO_QUERY_THROW );
-    mpSlideController.reset( new AnimationSlideController( xSlides, eMode ) );
+    mpSlideController = std::make_shared<AnimationSlideController>( xSlides, eMode );
 
     if( eMode != AnimationSlideController::CUSTOM )
     {
diff --git a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx
index c24fad226dee..fa598567f84f 100644
--- a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx
@@ -91,13 +91,13 @@ namespace sd::slidesorter::cache {
     if (aCompressionPolicy.has<OUString>())
         aCompressionPolicy >>= sCompressionPolicy;
     if (sCompressionPolicy == sNone)
-        pCompressor.reset(new NoBitmapCompression);
+        pCompressor = std::make_shared<NoBitmapCompression>();
     else if (sCompressionPolicy == "Erase")
-        pCompressor.reset(new CompressionByDeletion);
+        pCompressor = std::make_shared<CompressionByDeletion>();
     else if (sCompressionPolicy == "ResolutionReduction")
-        pCompressor.reset(new ResolutionReduction);
+        pCompressor = std::make_shared<ResolutionReduction>();
     else
-        pCompressor.reset(new PngCompression);
+        pCompressor = std::make_shared<PngCompression>();
 
     ::std::unique_ptr<CacheCompactor> pCompactor;
     OUString sCompactionPolicy("Compress");
diff --git a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx
index ee81849cb7d2..a41306908c8d 100644
--- a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx
@@ -205,7 +205,7 @@ std::shared_ptr<BitmapCache> PageCacheManager::GetCache (
 
     // Create the cache when no suitable one does exist.
     if (pResult == nullptr)
-        pResult.reset(new BitmapCache());
+        pResult = std::make_shared<BitmapCache>();
 
     // The cache may be newly created and thus empty or is old and may
     // contain previews that are not up-to-date.  Recycle previews from
diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
index a03d20b5e600..2c216f8806b3 100644
--- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
+++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
@@ -91,8 +91,8 @@ SlideSorterController::SlideSorterController (SlideSorter& rSlideSorter)
       mpCurrentSlideManager(),
       mpSelectionManager(),
       mpClipboard(),
-      mpInsertionIndicatorHandler(new InsertionIndicatorHandler(rSlideSorter)),
-      mpAnimator(new Animator(rSlideSorter)),
+      mpInsertionIndicatorHandler(std::make_shared<InsertionIndicatorHandler>(rSlideSorter)),
+      mpAnimator(std::make_shared<Animator>(rSlideSorter)),
       mpVisibleAreaManager(new VisibleAreaManager(rSlideSorter)),
       mpListener(),
       mnModelChangeLockCount(0),
@@ -125,12 +125,12 @@ SlideSorterController::SlideSorterController (SlideSorter& rSlideSorter)
 
 void SlideSorterController::Init()
 {
-    mpCurrentSlideManager.reset(new CurrentSlideManager(mrSlideSorter));
+    mpCurrentSlideManager = std::make_shared<CurrentSlideManager>(mrSlideSorter);
     mpPageSelector.reset(new PageSelector(mrSlideSorter));
     mpFocusManager.reset(new FocusManager(mrSlideSorter));
-    mpSlotManager.reset(new SlotManager(mrSlideSorter));
+    mpSlotManager = std::make_shared<SlotManager>(mrSlideSorter);
     mpScrollBarManager.reset(new ScrollBarManager(mrSlideSorter));
-    mpSelectionManager.reset(new SelectionManager(mrSlideSorter));
+    mpSelectionManager = std::make_shared<SelectionManager>(mrSlideSorter);
     mpClipboard.reset(new Clipboard(mrSlideSorter));
 
     // Create the selection function.
diff --git a/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx b/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx
index e998c86cc4e2..7c89c89dc925 100644
--- a/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx
@@ -35,7 +35,7 @@ namespace sd::slidesorter::controller {
 InsertionIndicatorHandler::InsertionIndicatorHandler (SlideSorter& rSlideSorter)
     : mrSlideSorter(rSlideSorter),
       mpInsertAnimator(),
-      mpInsertionIndicatorOverlay(new view::InsertionIndicatorOverlay(rSlideSorter)),
+      mpInsertionIndicatorOverlay(std::make_shared<view::InsertionIndicatorOverlay>(rSlideSorter)),
       maInsertPosition(),
       meMode(MoveMode),
       mbIsInsertionTrivial(false),
@@ -78,7 +78,7 @@ void InsertionIndicatorHandler::End (const controller::Animator::AnimationMode e
     meMode = UnknownMode;
 
     mpInsertionIndicatorOverlay->Hide();
-    mpInsertionIndicatorOverlay.reset(new view::InsertionIndicatorOverlay(mrSlideSorter));
+    mpInsertionIndicatorOverlay = std::make_shared<view::InsertionIndicatorOverlay>(mrSlideSorter);
 }
 
 void InsertionIndicatorHandler::ForceShow()
@@ -171,7 +171,7 @@ void InsertionIndicatorHandler::SetPosition (
 std::shared_ptr<view::InsertAnimator> const & InsertionIndicatorHandler::GetInsertAnimator()
 {
     if ( ! mpInsertAnimator)
-        mpInsertAnimator.reset(new view::InsertAnimator(mrSlideSorter));
+        mpInsertAnimator = std::make_shared<view::InsertAnimator>(mrSlideSorter);
     return mpInsertAnimator;
 }
 
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
index 3702cb27ced7..8c4b0979bee9 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
@@ -299,7 +299,7 @@ SelectionFunction::SelectionFunction (
       mrSlideSorter(rSlideSorter),
       mrController(mrSlideSorter.GetController()),
       mnShiftKeySelectionAnchor(-1),
-      mpModeHandler(new NormalModeHandler(rSlideSorter, *this))
+      mpModeHandler(std::make_shared<NormalModeHandler>(rSlideSorter, *this))
 {
 }
 
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx
index 18bb3dd0b936..68e0bb9addfd 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx
@@ -56,7 +56,7 @@ SelectionManager::SelectionManager (SlideSorter& rSlideSorter)
     : mrSlideSorter(rSlideSorter),
       mrController(rSlideSorter.GetController()),
       mnInsertionPosition(-1),
-      mpSelectionObserver(new SelectionObserver(rSlideSorter))
+      mpSelectionObserver(std::make_shared<SelectionObserver>(rSlideSorter))
 {
 }
 
diff --git a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
index dec496679efa..0fe7fbdcbcaf 100644
--- a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
+++ b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
@@ -174,10 +174,10 @@ SharedPageDescriptor SlideSorterModel::GetPageDescriptor (
         if (pDescriptor == nullptr && bCreate && mxSlides.is())
         {
             SdPage* pPage = GetPage(nPageIndex);
-            pDescriptor.reset(new PageDescriptor (
+            pDescriptor = std::make_shared<PageDescriptor>(
                 Reference<drawing::XDrawPage>(mxSlides->getByIndex(nPageIndex),UNO_QUERY),
                 pPage,
-                nPageIndex));
+                nPageIndex);
             maPageDescriptors[nPageIndex] = pDescriptor;
         }
     }
diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx
index f392780512cb..a0ef078f9953 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx
@@ -116,8 +116,8 @@ SlideSorter::SlideSorter (
       mpHorizontalScrollBar(pHorizontalScrollBar),
       mpVerticalScrollBar(pVerticalScrollBar),
       mpScrollBarBox(pScrollBarBox),
-      mpProperties(new controller::Properties()),
-      mpTheme(new view::Theme(mpProperties))
+      mpProperties(std::make_shared<controller::Properties>()),
+      mpTheme(std::make_shared<view::Theme>(mpProperties))
 {
 }
 
@@ -135,8 +135,8 @@ SlideSorter::SlideSorter (
       mpHorizontalScrollBar(VclPtr<ScrollBar>::Create(&rParentWindow,WinBits(WB_HSCROLL | WB_DRAG))),
       mpVerticalScrollBar(VclPtr<ScrollBar>::Create(&rParentWindow,WinBits(WB_VSCROLL | WB_DRAG))),
       mpScrollBarBox(VclPtr<ScrollBarBox>::Create(&rParentWindow)),
-      mpProperties(new controller::Properties()),
-      mpTheme(new view::Theme(mpProperties))
+      mpProperties(std::make_shared<controller::Properties>()),
+      mpTheme(std::make_shared<view::Theme>(mpProperties))
 {
 }
 
diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
index f275e6631156..19ac5f42b231 100644
--- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx
+++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
@@ -120,7 +120,7 @@ SlideSorterView::SlideSorterView (SlideSorter& rSlideSorter)
       mpLayouter (new Layouter(rSlideSorter.GetContentWindow(), rSlideSorter.GetTheme())),
       mbPageObjectVisibilitiesValid (false),
       mpPreviewCache(),
-      mpLayeredDevice(new LayeredDevice(rSlideSorter.GetContentWindow())),
+      mpLayeredDevice(std::make_shared<LayeredDevice>(rSlideSorter.GetContentWindow())),
       maVisiblePageRange(-1,-1),
       maPreviewSize(0,0),
       mbPreciousFlagUpdatePending(true),
@@ -128,7 +128,7 @@ SlideSorterView::SlideSorterView (SlideSorter& rSlideSorter)
       mpPageUnderMouse(),
       mpPageObjectPainter(),
       mpBackgroundPainter(
-          new BackgroundPainter(mrSlideSorter.GetTheme()->GetColor(Theme::Color_Background))),
+          std::make_shared<BackgroundPainter>(mrSlideSorter.GetTheme()->GetColor(Theme::Color_Background))),
       mpToolTip(new ToolTip(mrSlideSorter)),
       mbIsRearrangePending(true),
       maVisibilityChangeListeners()
@@ -145,7 +145,7 @@ SlideSorterView::SlideSorterView (SlideSorter& rSlideSorter)
     // the SlideSorterView destructor the layered device is destroyed and
     // with it the only reference to the wrapper which therefore is also
     // destroyed.
-    SharedILayerPainter pPainter (new Painter(*this));
+    SharedILayerPainter pPainter = std::make_shared<Painter>(*this);
 
     // The painter is placed on level 1 to avoid buffering.  This should be
     // a little faster during animations because the previews are painted
@@ -668,11 +668,11 @@ std::shared_ptr<cache::PageCache> const & SlideSorterView::GetPreviewCache()
     sd::Window *pWindow (mrSlideSorter.GetContentWindow().get());
     if (pWindow && mpPreviewCache == nullptr)
     {
-        mpPreviewCache.reset(
-            new cache::PageCache(
+        mpPreviewCache =
+            std::make_shared<cache::PageCache>(
                 mpLayouter->GetPageObjectSize(),
                 Bitmap::HasFastScale(),
-                cache::SharedCacheContext(new ViewCacheContext(mrSlideSorter))));
+                std::make_shared<ViewCacheContext>(mrSlideSorter));
     }
 
     return mpPreviewCache;
@@ -799,7 +799,7 @@ bool SlideSorterView::SetState (
 std::shared_ptr<PageObjectPainter> const & SlideSorterView::GetPageObjectPainter()
 {
     if ( ! mpPageObjectPainter)
-        mpPageObjectPainter.reset(new PageObjectPainter(mrSlideSorter));
+        mpPageObjectPainter = std::make_shared<PageObjectPainter>(mrSlideSorter);
     return mpPageObjectPainter;
 }
 
diff --git a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
index 3e16b3bccfe4..6eac97c38003 100644
--- a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
+++ b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
@@ -147,7 +147,7 @@ private:
 //===== InsertAnimator ========================================================
 
 InsertAnimator::InsertAnimator (SlideSorter& rSlideSorter)
-    : mpImplementation(new Implementation(rSlideSorter))
+    : mpImplementation(std::make_shared<Implementation>(rSlideSorter))
 {
 }
 
diff --git a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
index 7a84a86aa1db..51f6e12b4483 100644
--- a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
+++ b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
@@ -218,7 +218,7 @@ void LayeredDevice::RegisterPainter (
         mpLayers->resize(nLayer+1);
 
         for (size_t nIndex=nOldLayerCount; nIndex<mpLayers->size(); ++nIndex)
-            (*mpLayers)[nIndex].reset(new Layer());
+            (*mpLayers)[nIndex] = std::make_shared<Layer>();
     }
 
     (*mpLayers)[nLayer]->AddPainter(rpPainter);
@@ -226,7 +226,7 @@ void LayeredDevice::RegisterPainter (
         (*mpLayers)[nLayer]->Initialize(mpTargetWindow);
 
     rpPainter->SetLayerInvalidator(
-        SharedILayerInvalidator(new LayerInvalidator(shared_from_this(),mpTargetWindow,nLayer)));
+        std::make_shared<LayerInvalidator>(shared_from_this(),mpTargetWindow,nLayer));
 }
 
 void LayeredDevice::RemovePainter (
diff --git a/sd/source/ui/slidesorter/view/SlsLayouter.cxx b/sd/source/ui/slidesorter/view/SlsLayouter.cxx
index c41f49a11acc..a566b3c8adb2 100644
--- a/sd/source/ui/slidesorter/view/SlsLayouter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsLayouter.cxx
@@ -513,12 +513,12 @@ bool Layouter::Implementation::Rearrange (
             mnBottomBorder = nMinimumBorderHeight;
     }
 
-    mpPageObjectLayouter.reset(
-        new PageObjectLayouter(
+    mpPageObjectLayouter =
+        std::make_shared<PageObjectLayouter>(
             CalculateTargetSize(rWindowSize),
             rPreviewModelSize,
             mpWindow,
-            mnPageCount));
+            mnPageCount);
 
     maPageObjectSize = mpPageObjectLayouter->GetGridMaxSize();
 
diff --git a/sd/source/ui/slidesorter/view/SlsTheme.cxx b/sd/source/ui/slidesorter/view/SlsTheme.cxx
index 48d42d081d71..a20fc60c62e8 100644
--- a/sd/source/ui/slidesorter/view/SlsTheme.cxx
+++ b/sd/source/ui/slidesorter/view/SlsTheme.cxx
@@ -127,13 +127,13 @@ std::shared_ptr<vcl::Font> Theme::GetFont (
     switch (eType)
     {
         case Font_PageNumber:
-            pFont.reset(new vcl::Font(Application::GetSettings().GetStyleSettings().GetAppFont()));
+            pFont = std::make_shared<vcl::Font>(Application::GetSettings().GetStyleSettings().GetAppFont());
             pFont->SetTransparent(true);
             pFont->SetWeight(WEIGHT_BOLD);
             break;
 
         case Font_PageCount:
-            pFont.reset(new vcl::Font(Application::GetSettings().GetStyleSettings().GetAppFont()));
+            pFont = std::make_shared<vcl::Font>(Application::GetSettings().GetStyleSettings().GetAppFont());
             pFont->SetTransparent(true);
             pFont->SetWeight(WEIGHT_NORMAL);
             {
diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx
index 0a77dacf6074..01aedcb24ca6 100644
--- a/sd/source/ui/table/TableDesignPane.cxx
+++ b/sd/source/ui/table/TableDesignPane.cxx
@@ -496,7 +496,7 @@ static void FillCellInfoVector( const Reference< XIndexAccess >& xTableStyle, Ce
         {
             Reference< XStyle > xStyle( xTableStyle->getByIndex( nStyle ), UNO_QUERY );
             if( xStyle.is() )
-                rVector[nStyle].reset( new CellInfo( xStyle ) );
+                rVector[nStyle] = std::make_shared<CellInfo>( xStyle );
         }
     }
     catch(Exception&)
diff --git a/sd/source/ui/view/FormShellManager.cxx b/sd/source/ui/view/FormShellManager.cxx
index e1e2ce680747..9b4ff79b717b 100644
--- a/sd/source/ui/view/FormShellManager.cxx
+++ b/sd/source/ui/view/FormShellManager.cxx
@@ -148,7 +148,7 @@ void FormShellManager::RegisterAtCenterPane()
 
     // Create a shell factory and with it activate the form shell.
     OSL_ASSERT(mpSubShellFactory.get()==nullptr);
-    mpSubShellFactory.reset(new FormShellManagerFactory(*pShell, *this));
+    mpSubShellFactory = std::make_shared<FormShellManagerFactory>(*pShell, *this);
     mrBase.GetViewShellManager()->AddSubShellFactory(pShell,mpSubShellFactory);
     mrBase.GetViewShellManager()->ActivateSubShell(*pShell, ToolbarId::FormLayer_Toolbox);
 }
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index 5f872e7b8a7b..b1650903d7d7 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -239,7 +239,7 @@ ViewShellBase::ViewShellBase (
             GetViewFrame()->GetObjectShell());
     if (mpDocShell != nullptr)
         mpDocument = mpDocShell->GetDoc();
-    mpImpl->mpViewShellManager.reset(new ViewShellManager(*this));
+    mpImpl->mpViewShellManager = std::make_shared<ViewShellManager>(*this);
 
     SetWindow(mpImpl->mpViewWindow.get());
 
@@ -297,9 +297,9 @@ void ViewShellBase::LateInit (const OUString& rsDefaultView)
     mpImpl->LateInit();
     InitializeFramework();
 
-    mpImpl->mpEventMultiplexer.reset(new tools::EventMultiplexer (*this));
+    mpImpl->mpEventMultiplexer = std::make_shared<tools::EventMultiplexer>(*this);
 
-    mpImpl->mpFormShellManager.reset(new FormShellManager(*this));
+    mpImpl->mpFormShellManager = std::make_shared<FormShellManager>(*this);
 
     mpImpl->mpToolBarManager = ToolBarManager::Create(
         *this,
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index 9697c3de8461..916e30d306bd 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -233,7 +233,7 @@ void ViewShell::construct()
         pSpellDialog->InvalidateSpellDialog();
 
     // Register the sub shell factory.
-    mpImpl->mpSubShellFactory.reset(new ViewShellObjectBarFactory(*this));
+    mpImpl->mpSubShellFactory = std::make_shared<ViewShellObjectBarFactory>(*this);
     GetViewShellBase().GetViewShellManager()->AddSubShellFactory(this,mpImpl->mpSubShellFactory);
 }