Kaydet (Commit) a8200ce3 authored tarafından Caolán McNamara's avatar Caolán McNamara

sd/source/ui/tools boost->std

Change-Id: I55f821dd9c2131cfbd8e2cb7838513a6bcb4b97d
Reviewed-on: https://gerrit.libreoffice.org/18869Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst d7540659
......@@ -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;
......
......@@ -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>
......
......@@ -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" );
......
......@@ -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;
......
......@@ -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());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment