sd/source/ui/framework/tools/FrameworkHelper.cxx | 2 +- sd/source/ui/inc/framework/FrameworkHelper.hxx | 2 +- sd/source/ui/remotecontrol/BluetoothServer.cxx | 4 ++-- sd/source/ui/remotecontrol/BluetoothServer.hxx | 3 +-- sd/source/ui/tools/PreviewRenderer.cxx | 3 +-- 5 files changed, 6 insertions(+), 8 deletions(-)
New commits: commit a8200ce3effbddf0b5d26e7c50aa0c2853412a1a Author: Caolán McNamara <caol...@redhat.com> Date: Fri Sep 25 12:43:51 2015 +0100 sd/source/ui/tools boost->std Change-Id: I55f821dd9c2131cfbd8e2cb7838513a6bcb4b97d Reviewed-on: https://gerrit.libreoffice.org/18869 Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx index b715424..eb4e135 100644 --- a/sd/source/ui/framework/tools/FrameworkHelper.cxx +++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx @@ -321,7 +321,7 @@ public: //----- FrameworkHelper ------------------------------------------------------- -::boost::scoped_ptr<FrameworkHelper::ViewURLMap> FrameworkHelper::mpViewURLMap(new ViewURLMap()); +std::unique_ptr<FrameworkHelper::ViewURLMap> FrameworkHelper::mpViewURLMap(new ViewURLMap()); FrameworkHelper::InstanceMap FrameworkHelper::maInstanceMap; diff --git a/sd/source/ui/inc/framework/FrameworkHelper.hxx b/sd/source/ui/inc/framework/FrameworkHelper.hxx index d0d4b04..c5a688d 100644 --- a/sd/source/ui/inc/framework/FrameworkHelper.hxx +++ b/sd/source/ui/inc/framework/FrameworkHelper.hxx @@ -306,7 +306,7 @@ private: */ static InstanceMap maInstanceMap; class ViewURLMap; - static ::boost::scoped_ptr<ViewURLMap> mpViewURLMap; + static std::unique_ptr<ViewURLMap> mpViewURLMap; ViewShellBase& mrBase; css::uno::Reference<css::drawing::framework::XConfigurationController> diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx index 390e134..fb817dd 100644 --- a/sd/source/ui/remotecontrol/BluetoothServer.cxx +++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx @@ -701,7 +701,7 @@ getDBusBooleanProperty( DBusConnection *pConnection, DBusObject *pAdapter, *pBoolean = false; bool bRet = false; - ::boost::scoped_ptr< DBusObject > pProperties ( + std::unique_ptr< DBusObject > pProperties ( pAdapter->cloneForInterface( "org.freedesktop.DBus.Properties" ) ); DBusMessage *pMsg = pProperties->getMethodCall( "Get" ); @@ -762,7 +762,7 @@ setDBusBooleanProperty( DBusConnection *pConnection, DBusObject *pAdapter, { assert( pAdapter ); - ::boost::scoped_ptr< DBusObject > pProperties( + std::unique_ptr< DBusObject > pProperties( pAdapter->cloneForInterface( "org.freedesktop.DBus.Properties" ) ); DBusMessage *pMsg = pProperties->getMethodCall( "Set" ); diff --git a/sd/source/ui/remotecontrol/BluetoothServer.hxx b/sd/source/ui/remotecontrol/BluetoothServer.hxx index 3724b37..bb24268 100644 --- a/sd/source/ui/remotecontrol/BluetoothServer.hxx +++ b/sd/source/ui/remotecontrol/BluetoothServer.hxx @@ -11,7 +11,6 @@ #include <osl/thread.hxx> #include <memory> -#include <boost/scoped_ptr.hpp> #include <vector> #if (defined(LINUX) && !defined(__FreeBSD_kernel__)) && defined(ENABLE_DBUS) @@ -47,7 +46,7 @@ namespace sd #ifdef LINUX_BLUETOOTH struct Impl; - boost::scoped_ptr<Impl> mpImpl; + std::unique_ptr<Impl> mpImpl; #endif virtual void SAL_CALL run() SAL_OVERRIDE; diff --git a/sd/source/ui/tools/PreviewRenderer.cxx b/sd/source/ui/tools/PreviewRenderer.cxx index 1aedf81..81b7ab1 100644 --- a/sd/source/ui/tools/PreviewRenderer.cxx +++ b/sd/source/ui/tools/PreviewRenderer.cxx @@ -37,7 +37,6 @@ #include <svx/sdr/contact/viewcontact.hxx> #include <memory> -#include <boost/scoped_ptr.hpp> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -309,7 +308,7 @@ void PreviewRenderer::PaintPage ( } // Use a special redirector to prevent PresObj shapes from being painted. - boost::scoped_ptr<ViewRedirector> pRedirector; + std::unique_ptr<ViewRedirector> pRedirector; if ( ! bDisplayPresentationObjects) pRedirector.reset(new ViewRedirector());
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits