summaryrefslogtreecommitdiff
path: root/toolkit
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-09-17 17:10:47 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-09-18 07:59:14 +0000
commit3a00aaef2a51d7a1a87475a316dc9ae232fac60c (patch)
tree4cc4516528c0dcb0bb6871e5b517efb74550a521 /toolkit
parentc8ee3be0e08c435b106f0ac4b76618b33333b040 (diff)
boost->std
Change-Id: Ie490bf2c6921f393bdeed96b1a8815996b701bf0 Reviewed-on: https://gerrit.libreoffice.org/18670 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'toolkit')
-rw-r--r--toolkit/source/awt/stylesettings.hxx4
-rw-r--r--toolkit/source/controls/grid/gridcontrol.cxx4
-rw-r--r--toolkit/source/controls/grid/gridcontrol.hxx4
-rw-r--r--toolkit/source/controls/unocontrolmodel.cxx4
4 files changed, 8 insertions, 8 deletions
diff --git a/toolkit/source/awt/stylesettings.hxx b/toolkit/source/awt/stylesettings.hxx
index 1274b59bab78..46b3ed6d4129 100644
--- a/toolkit/source/awt/stylesettings.hxx
+++ b/toolkit/source/awt/stylesettings.hxx
@@ -24,7 +24,7 @@
#include <cppuhelper/implbase.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace osl
{
@@ -165,7 +165,7 @@ namespace toolkit
virtual void SAL_CALL removeStyleChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XStyleChangeListener >& Listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
- ::boost::scoped_ptr< WindowStyleSettings_Data > m_pData;
+ std::unique_ptr< WindowStyleSettings_Data > m_pData;
};
diff --git a/toolkit/source/controls/grid/gridcontrol.cxx b/toolkit/source/controls/grid/gridcontrol.cxx
index 444d7b1243d4..9bb77f8cb0d0 100644
--- a/toolkit/source/controls/grid/gridcontrol.cxx
+++ b/toolkit/source/controls/grid/gridcontrol.cxx
@@ -37,7 +37,7 @@
#include <toolkit/controls/unocontrolmodel.hxx>
#include <toolkit/helper/listenermultiplexer.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include "helper/unopropertyarrayhelper.hxx"
@@ -311,7 +311,7 @@ void SAL_CALL UnoGridControl::createPeer( const uno::Reference< awt::XToolkit >
namespace
{
- void lcl_setEventForwarding( const Reference< XControlModel >& i_gridControlModel, const ::boost::scoped_ptr< toolkit::GridEventForwarder >& i_listener,
+ void lcl_setEventForwarding( const Reference< XControlModel >& i_gridControlModel, const std::unique_ptr< toolkit::GridEventForwarder >& i_listener,
bool const i_add )
{
const Reference< XPropertySet > xModelProps( i_gridControlModel, UNO_QUERY );
diff --git a/toolkit/source/controls/grid/gridcontrol.hxx b/toolkit/source/controls/grid/gridcontrol.hxx
index b10dd8de0e9e..2aa1a2202731 100644
--- a/toolkit/source/controls/grid/gridcontrol.hxx
+++ b/toolkit/source/controls/grid/gridcontrol.hxx
@@ -30,7 +30,7 @@
#include <comphelper/sequence.hxx>
#include <toolkit/helper/listenermultiplexer.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace toolkit
{
@@ -139,7 +139,7 @@ protected:
private:
SelectionListenerMultiplexer m_aSelectionListeners;
- ::boost::scoped_ptr< GridEventForwarder > m_pEventForwarder;
+ std::unique_ptr< GridEventForwarder > m_pEventForwarder;
};
} // toolkit
diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx
index 9498f0652145..62095125dd86 100644
--- a/toolkit/source/controls/unocontrolmodel.cxx
+++ b/toolkit/source/controls/unocontrolmodel.cxx
@@ -49,8 +49,8 @@
#include <vcl/svapp.hxx>
#include <uno/data.h>
+#include <memory>
#include <set>
-#include <boost/scoped_ptr.hpp>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -1313,7 +1313,7 @@ void UnoControlModel::setPropertyValues( const ::com::sun::star::uno::Sequence<
{
// if somebody sets properties which are single aspects of a font descriptor,
// remove them, and build a font descriptor instead
- boost::scoped_ptr< awt::FontDescriptor > pFD;
+ std::unique_ptr< awt::FontDescriptor > pFD;
for ( sal_Int32 n = 0; n < nProps; ++n )
{
if ( ( pHandles[n] >= BASEPROPERTY_FONTDESCRIPTORPART_START ) && ( pHandles[n] <= BASEPROPERTY_FONTDESCRIPTORPART_END ) )