diff options
Diffstat (limited to 'sd/source/ui/framework/module')
5 files changed, 7 insertions, 6 deletions
diff --git a/sd/source/ui/framework/module/CenterViewFocusModule.cxx b/sd/source/ui/framework/module/CenterViewFocusModule.cxx index a0f2c54f1e9f..986f6fb87888 100644 --- a/sd/source/ui/framework/module/CenterViewFocusModule.cxx +++ b/sd/source/ui/framework/module/CenterViewFocusModule.cxx @@ -142,7 +142,7 @@ void CenterViewFocusModule::HandleNewView ( xTunnel->getSomething(ViewShellWrapper::getUnoTunnelId())); if (pViewShellWrapper != NULL) { - ::boost::shared_ptr<ViewShell> pViewShell = pViewShellWrapper->GetViewShell(); + std::shared_ptr<ViewShell> pViewShell = pViewShellWrapper->GetViewShell(); if (pViewShell.get() != NULL) mpBase->GetViewShellManager()->MoveToTop(*pViewShell); } diff --git a/sd/source/ui/framework/module/ResourceManager.hxx b/sd/source/ui/framework/module/ResourceManager.hxx index e67595155b11..418979b21018 100644 --- a/sd/source/ui/framework/module/ResourceManager.hxx +++ b/sd/source/ui/framework/module/ResourceManager.hxx @@ -25,6 +25,7 @@ #include <com/sun/star/drawing/framework/XConfigurationController.hpp> #include <com/sun/star/frame/XController.hpp> #include <cppuhelper/compbase.hxx> +#include <memory> #include <boost/scoped_ptr.hpp> namespace { diff --git a/sd/source/ui/framework/module/ShellStackGuard.hxx b/sd/source/ui/framework/module/ShellStackGuard.hxx index 63cb56baf972..7842bbc594dc 100644 --- a/sd/source/ui/framework/module/ShellStackGuard.hxx +++ b/sd/source/ui/framework/module/ShellStackGuard.hxx @@ -31,7 +31,7 @@ #include <vcl/timer.hxx> #include <vcl/idle.hxx> #include <cppuhelper/compbase.hxx> -#include <boost/scoped_ptr.hpp> +#include <memory> namespace { diff --git a/sd/source/ui/framework/module/ToolBarModule.cxx b/sd/source/ui/framework/module/ToolBarModule.cxx index 51e4b6ba6254..3e665834a57a 100644 --- a/sd/source/ui/framework/module/ToolBarModule.cxx +++ b/sd/source/ui/framework/module/ToolBarModule.cxx @@ -141,7 +141,7 @@ void ToolBarModule::HandleUpdateStart() // stack. if (mpBase != NULL) { - ::boost::shared_ptr<ToolBarManager> pToolBarManager (mpBase->GetToolBarManager()); + std::shared_ptr<ToolBarManager> pToolBarManager (mpBase->GetToolBarManager()); mpToolBarManagerLock.reset(new ToolBarManager::UpdateLock(pToolBarManager)); pToolBarManager->LockViewShellManager(); } @@ -156,8 +156,8 @@ void ToolBarModule::HandleUpdateEnd() // no longer visible. This is done before the old view shell is // destroyed in order to avoid unnecessary updates of those tool // bars. - ::boost::shared_ptr<ToolBarManager> pToolBarManager (mpBase->GetToolBarManager()); - ::boost::shared_ptr<FrameworkHelper> pFrameworkHelper ( + std::shared_ptr<ToolBarManager> pToolBarManager (mpBase->GetToolBarManager()); + std::shared_ptr<FrameworkHelper> pFrameworkHelper ( FrameworkHelper::Instance(*mpBase)); ViewShell* pViewShell = pFrameworkHelper->GetViewShell(FrameworkHelper::msCenterPaneURL).get(); diff --git a/sd/source/ui/framework/module/ToolBarModule.hxx b/sd/source/ui/framework/module/ToolBarModule.hxx index 67ec89ea8206..3215a75bdde2 100644 --- a/sd/source/ui/framework/module/ToolBarModule.hxx +++ b/sd/source/ui/framework/module/ToolBarModule.hxx @@ -28,7 +28,7 @@ #include <osl/mutex.hxx> #include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> -#include <boost/scoped_ptr.hpp> +#include <memory> namespace sd { class ViewShellBase; |